shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-11 09:18:07 +03:00
Code

execute: shorten some code by using RET_NERRNO()

Browse Source
This commit is contained in:
Lennart Poettering 2023-06-27 11:19:12 +02:00
parent 59dd2bbbb6
commit db58f5de3d
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/execute.c
View File

@ -2625,10 +2625,9 @@ static int setup_exec_directory(
"Apparently, service previously had DynamicUser= turned off, and has now turned it on.",
exec_directory_type_to_string(type), p, pp);
if (rename(p, pp) < 0) {
r = -errno;
r = RET_NERRNO(rename(p, pp));
if (r < 0)
goto fail;
}
} else {
/* Otherwise, create the actual directory for the service */
@ -2694,15 +2693,13 @@ static int setup_exec_directory(
"Apparently, service previously had DynamicUser= turned on, and has now turned it off.",
exec_directory_type_to_string(type), q, p);
if (unlink(p) < 0) {
r = -errno;
r = RET_NERRNO(unlink(p));
if (r < 0)
goto fail;
}
if (rename(q, p) < 0) {
r = -errno;
r = RET_NERRNO(rename(q, p));
if (r < 0)
goto fail;
}
}
}
@ -2718,10 +2715,9 @@ static int setup_exec_directory(
* as in the common case it is not written to by a service, and shall
* not be writable. */
if (stat(p, &st) < 0) {
r = -errno;
r = RET_NERRNO(stat(p, &st));
if (r < 0)
goto fail;
}
/* Still complain if the access mode doesn't match */
if (((st.st_mode ^ context->directories[type].mode) & 07777) != 0)