diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-10-28 18:23:07 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-10-31 19:09:20 +0100 |
| commit | 97044145b48fa5644ecd23e73bc33980faeabda3 (patch) | |
| tree | a01134e8ebc67abc81e313e97044b5bd10990c4f | |
| parent | 3c747da38ca2f0642b4811812f6e2e2e1449a622 (diff) | |
core,nspawn: minor coding style fixes
| -rw-r--r-- | src/core/manager.c | 6 | ||||
| -rw-r--r-- | src/nspawn/nspawn.c | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/core/manager.c b/src/core/manager.c index 8decfd472f..5fdeb4a99c 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -2000,8 +2000,7 @@ int manager_loop(Manager *m) { m->exit_code = MANAGER_OK; /* Release the path cache */ - set_free_free(m->unit_path_cache); - m->unit_path_cache = NULL; + m->unit_path_cache = set_free_free(m->unit_path_cache); manager_check_finished(m); @@ -2771,8 +2770,7 @@ static int create_generator_dir(Manager *m, char **generator, const char *name) return log_oom(); if (!mkdtemp(p)) { - log_error_errno(errno, "Failed to create generator directory %s: %m", - p); + log_error_errno(errno, "Failed to create generator directory %s: %m", p); free(p); return -errno; } diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 44f08ab1b4..ff12ca6498 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -3227,8 +3227,7 @@ int main(int argc, char *argv[]) { } for (;;) { - _cleanup_close_pair_ int kmsg_socket_pair[2] = { -1, -1 }, rtnl_socket_pair[2] = { -1, -1 }, pid_socket_pair[2] = { -1, -1 }, - uid_shift_socket_pair[2] = { -1, -1 }; + _cleanup_close_pair_ int kmsg_socket_pair[2] = { -1, -1 }, rtnl_socket_pair[2] = { -1, -1 }, pid_socket_pair[2] = { -1, -1 }, uid_shift_socket_pair[2] = { -1, -1 }; ContainerStatus container_status; _cleanup_(barrier_destroy) Barrier barrier = BARRIER_NULL; static const struct sigaction sa = { |