From a7774a8ccb0838a0c427ca28910a391959646603 Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Wed, 20 Dec 2023 21:11:26 +0800 Subject: [PATCH 1/2] core/execute: remove unneeded brackets I did not merge the if-s, since I think it's easier to read in the current form with those long socketpair() calls. --- src/core/execute.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/core/execute.c b/src/core/execute.c index ef0bf88687..3b223a3ace 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -2094,15 +2094,13 @@ static int exec_shared_runtime_make( return r; } - if (exec_needs_network_namespace(c)) { + if (exec_needs_network_namespace(c)) if (socketpair(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0, netns_storage_socket) < 0) return -errno; - } - if (exec_needs_ipc_namespace(c)) { + if (exec_needs_ipc_namespace(c)) if (socketpair(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0, ipcns_storage_socket) < 0) return -errno; - } r = exec_shared_runtime_add(m, id, &tmp_dir, &var_tmp_dir, netns_storage_socket, ipcns_storage_socket, ret); if (r < 0) From e03975b90fee0ac92ba2958cf12d60cf36343be5 Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Wed, 20 Dec 2023 21:56:49 +0800 Subject: [PATCH 2/2] core/execute: use assertion for _done function As per our usual coding style. --- src/core/execute.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/core/execute.c b/src/core/execute.c index 3b223a3ace..da55ef0564 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -1955,8 +1955,7 @@ static char *destroy_tree(char *path) { } void exec_shared_runtime_done(ExecSharedRuntime *rt) { - if (!rt) - return; + assert(rt); if (rt->manager) (void) hashmap_remove(rt->manager->exec_shared_runtime_by_id, rt->id); @@ -1969,8 +1968,10 @@ void exec_shared_runtime_done(ExecSharedRuntime *rt) { } static ExecSharedRuntime* exec_shared_runtime_free(ExecSharedRuntime *rt) { - exec_shared_runtime_done(rt); + if (!rt) + return NULL; + exec_shared_runtime_done(rt); return mfree(rt); }