From 169afbe9aa839fa5857f5e2e38abf1ddd1f07562 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Thu, 16 Apr 2009 13:08:03 +0000 Subject: [PATCH] Fix lxc syntax-check failure Fixes: CHECK: avoid_if_before_free src/lxc_container.c: if (oldroot) VIR_FREE(oldroot) src/lxc_container.c: if (newroot) VIR_FREE(newroot) Makefile.maint: found useless "if" before "free" above and: src/lxc_container.c:317: Makefile.maint: found trailing blank(s) Signed-off-by: Mark McLoughlin --- ChangeLog | 4 ++++ src/lxc_container.c | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5b6b343db4..05119a752c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Apr 16 14:05:28 GMT 2009 Mark McLoughlin + + * src/lxc_container.c: syntax-check fixes + Wed Apr 15 22:40:50 CEST 2009 Daniel Veillard * docs/Makefile.am docs/api.html docs/api.html.in docs/archdomain.html diff --git a/src/lxc_container.c b/src/lxc_container.c index ff115d1889..67c66bd9b3 100644 --- a/src/lxc_container.c +++ b/src/lxc_container.c @@ -282,9 +282,11 @@ static int lxcContainerChildMountSort(const void *a, const void *b) static int lxcContainerPivotRoot(virDomainFSDefPtr root) { - int rc; + int rc, ret; char *oldroot = NULL, *newroot = NULL; + ret = -1; + /* root->parent must be private, so make / private. */ if (mount("", "/", NULL, MS_PRIVATE|MS_REC, NULL) < 0) { virReportSystemError(NULL, errno, "%s", @@ -312,7 +314,7 @@ static int lxcContainerPivotRoot(virDomainFSDefPtr root) oldroot); goto err; } - + /* Create a directory called 'new' in tmpfs */ if (virAsprintf(&newroot, "%s/new", oldroot) < 0) { virReportOOMError(NULL); @@ -366,15 +368,13 @@ static int lxcContainerPivotRoot(virDomainFSDefPtr root) goto err; } + ret = 0; + +err: VIR_FREE(oldroot); VIR_FREE(newroot); - return 0; - -err: - if (oldroot) VIR_FREE(oldroot); - if (newroot) VIR_FREE(newroot); - return -1; + return ret; } static int lxcContainerPopulateDevices(void)