From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Thu, 12 Dec 2013 19:47:24 +0000 (-0600)
Subject: coverity: fix mix of bool and int
X-Git-Tag: lxc-1.0.0.beta1~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fef48dc942425cfe8bd848189b5a58d5ee4dcace;p=thirdparty%2Flxc.git

coverity: fix mix of bool and int

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index be8b74d2b..55ef2dba1 100644
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -1877,8 +1877,8 @@ static int lxc_rmdir_onedev_wrapper(void *data)
 static bool lxcapi_destroy(struct lxc_container *c)
 {
 	struct bdev *r = NULL;
-	bool ret = false;
-	bool am_unpriv;
+	bool bret = false, am_unpriv;
+	int ret;
 
 	if (!c || !lxcapi_is_defined(c))
 		return false;
@@ -1924,11 +1924,11 @@ static bool lxcapi_destroy(struct lxc_container *c)
 		ERROR("Error destroying container directory for %s", c->name);
 		goto out;
 	}
-	ret = true;
+	bret = true;
 
 out:
 	container_disk_unlock(c);
-	return ret;
+	return bret;
 }
 
 static bool set_config_item_locked(struct lxc_container *c, const char *key, const char *v)