shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-02 19:21:53 +03:00
Code

main: minor coding style update

Browse Source
This commit is contained in:
Lennart Poettering 2018-10-09 15:30:48 +02:00
parent b03d6c5f48
commit 2cc856ac89
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/main.c
View File

@ -1115,14 +1115,19 @@ static int help(void) {
return 0; return 0;
} }
static int prepare_reexecute(Manager *m, FILE **_f, FDSet **_fds, bool switching_root) { static int prepare_reexecute(
Manager *m,
FILE **ret_f,
FDSet **ret_fds,
bool switching_root) {
_cleanup_fdset_free_ FDSet *fds = NULL; _cleanup_fdset_free_ FDSet *fds = NULL;
_cleanup_fclose_ FILE *f = NULL; _cleanup_fclose_ FILE *f = NULL;
int r; int r;
assert(m); assert(m);
assert(_f); assert(ret_f);
assert(_fds); assert(ret_fds);
r = manager_open_serialization(m, &f); r = manager_open_serialization(m, &f);
if (r < 0) if (r < 0)
@ -1151,8 +1156,8 @@ static int prepare_reexecute(Manager *m, FILE **_f, FDSet **_fds, bool switching
if (r < 0) if (r < 0)
return log_error_errno(r, "Failed to disable O_CLOEXEC for serialization fds: %m"); return log_error_errno(r, "Failed to disable O_CLOEXEC for serialization fds: %m");
*_f = TAKE_PTR(f); *ret_f = TAKE_PTR(f);
*_fds = TAKE_PTR(fds); *ret_fds = TAKE_PTR(fds);
return 0; return 0;
} }