提交 169afbe9 编写于 作者: M Mark McLoughlin

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: NMark McLoughlin <markmc@redhat.com>
上级 316befbb
Thu Apr 16 14:05:28 GMT 2009 Mark McLoughlin <markmc@redhat.com>
* src/lxc_container.c: syntax-check fixes
Wed Apr 15 22:40:50 CEST 2009 Daniel Veillard <veillard@redhat.com>
* docs/Makefile.am docs/api.html docs/api.html.in docs/archdomain.html
......
......@@ -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)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册