Commit 32e1c760 by Cedric Le Goater Committed by Daniel Lezcano

simplify lxc_spawn() gotos

label 'out_close' is used only once. Signed-off-by: 's avatarCedric Le Goater <clg@fr.ibm.com> Signed-off-by: 's avatarDaniel Lezcano <dlezcano@fr.ibm.com>
parent 79fd982e
...@@ -498,7 +498,9 @@ int lxc_spawn(struct start_arg *start_arg, int flags) ...@@ -498,7 +498,9 @@ int lxc_spawn(struct start_arg *start_arg, int flags)
*/ */
if (lxc_create_network(&handler->conf->network)) { if (lxc_create_network(&handler->conf->network)) {
ERROR("failed to create the network"); ERROR("failed to create the network");
goto out_close; close(sv[0]);
close(sv[1]);
return -1;
} }
} }
...@@ -555,11 +557,6 @@ int lxc_spawn(struct start_arg *start_arg, int flags) ...@@ -555,11 +557,6 @@ int lxc_spawn(struct start_arg *start_arg, int flags)
close(sv[1]); close(sv[1]);
return 0; return 0;
out_close:
close(sv[0]);
close(sv[1]);
return -1;
out_delete_net: out_delete_net:
if (clone_flags & CLONE_NEWNET) if (clone_flags & CLONE_NEWNET)
lxc_delete_network(&handler->conf->network); lxc_delete_network(&handler->conf->network);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment