From 78d04e556ad6bf405840afd0ef20f5bcabc469f6 Mon Sep 17 00:00:00 2001 From: Chen Hanxiao Date: Fri, 6 Dec 2013 14:20:21 +0800 Subject: [PATCH] lxcContainerMountFSDevPTS: Unify @ret usage pattern Currently, if virFileMakePath() fails, the @ret is left initialized from virAsprintf() just a few lines above leading to a wrong return value of zero whereas -1 should be returned. Signed-off-by: Chen Hanxiao Signed-off-by: Michal Privoznik --- src/lxc/lxc_container.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index b1b63fb687..b17259c4e1 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -940,16 +940,14 @@ cleanup: static int lxcContainerMountFSDevPTS(virDomainDefPtr def, const char *stateDir) { - int ret; + int ret = -1; char *path = NULL; int flags = def->idmap.nuidmap ? MS_BIND : MS_MOVE; VIR_DEBUG("Mount /dev/pts stateDir=%s", stateDir); - if ((ret = virAsprintf(&path, - "/.oldroot/%s/%s.devpts", - stateDir, - def->name)) < 0) + if (virAsprintf(&path, "/.oldroot/%s/%s.devpts", + stateDir, def->name) < 0) return ret; if (virFileMakePath("/dev/pts") < 0) { @@ -961,16 +959,16 @@ static int lxcContainerMountFSDevPTS(virDomainDefPtr def, VIR_DEBUG("Trying to %s %s to /dev/pts", def->idmap.nuidmap ? "bind" : "move", path); - if ((ret = mount(path, "/dev/pts", NULL, flags, NULL)) < 0) { + if (mount(path, "/dev/pts", NULL, flags, NULL) < 0) { virReportSystemError(errno, _("Failed to mount %s on /dev/pts"), path); goto cleanup; } + ret = 0; cleanup: VIR_FREE(path); - return ret; } -- 2.47.2