]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
simplify lxc_spawn() gotos
authorCedric Le Goater <clg@vnet.ibm.com>
Wed, 26 May 2010 14:54:48 +0000 (16:54 +0200)
committerDaniel Lezcano <dlezcano@fr.ibm.com>
Wed, 26 May 2010 14:54:48 +0000 (16:54 +0200)
label 'out_close' is used only once.

Signed-off-by: Cedric Le Goater <clg@fr.ibm.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
src/lxc/start.c

index d0fbd6f6c5119ee4771c49faae30976a8ee5d1ee..9acc662bd37bbd12d010f24e1bed1a138944d6e0 100644 (file)
@@ -498,7 +498,9 @@ int lxc_spawn(struct start_arg *start_arg, int flags)
                 */
                if (lxc_create_network(&handler->conf->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)
        close(sv[1]);
        return 0;
 
-out_close:
-       close(sv[0]);
-       close(sv[1]);
-       return -1;
-
 out_delete_net:
        if (clone_flags & CLONE_NEWNET)
                lxc_delete_network(&handler->conf->network);