From: Cedric Le Goater <clg@vnet.ibm.com>
Date: Wed, 26 May 2010 14:54:48 +0000 (+0200)
Subject: simplify lxc_spawn() gotos
X-Git-Tag: lxc-0.7.0~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32e1c76058ebca7a02d26f7667a0479c7493d3f1;p=thirdparty%2Flxc.git

simplify lxc_spawn() gotos

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>
---

diff --git a/src/lxc/start.c b/src/lxc/start.c
index d0fbd6f6c..9acc662bd 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -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);