[lxc-devel] [lxc/master] tools: fix usage of boolean function set_config_item

[flx42 on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 871 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20180314/f1420b85/attachment.bin>
-------------- next part --------------
From e2eae7035443c1d3b9b26f983228ecfaebfa5aba Mon Sep 17 00:00:00 2001
From: Felix Abecassis <fabecassis at nvidia.com>
Date: Tue, 13 Mar 2018 21:50:46 -0700
Subject: [PATCH] tools: fix usage of boolean function set_config_item

Signed-off-by: Felix Abecassis <fabecassis at nvidia.com>
---
 src/lxc/tools/lxc_execute.c | 12 ++++++------
 src/lxc/tools/lxc_start.c   |  2 +-
 src/lxc/tools/tool_utils.c  | 10 +++++-----
 src/lxc/tools/tool_utils.h  |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/lxc/tools/lxc_execute.c b/src/lxc/tools/lxc_execute.c
index 20c1b98a6..8f38a40db 100644
--- a/src/lxc/tools/lxc_execute.c
+++ b/src/lxc/tools/lxc_execute.c
@@ -194,8 +194,8 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	ret = lxc_config_define_load(&defines, c);
-	if (ret) {
+	bret = lxc_config_define_load(&defines, c);
+	if (!bret) {
 		lxc_container_put(c);
 		exit(EXIT_FAILURE);
 	}
@@ -209,8 +209,8 @@ int main(int argc, char *argv[])
 			exit(EXIT_FAILURE);
 		}
 
-		ret = c->set_config_item(c, "lxc.init.uid", buf);
-		if (ret < 0) {
+		bret = c->set_config_item(c, "lxc.init.uid", buf);
+		if (!bret) {
 			lxc_container_put(c);
 			exit(EXIT_FAILURE);
 		}
@@ -225,8 +225,8 @@ int main(int argc, char *argv[])
 			exit(EXIT_FAILURE);
 		}
 
-		ret = c->set_config_item(c, "lxc.init.gid", buf);
-		if (ret < 0) {
+		bret = c->set_config_item(c, "lxc.init.gid", buf);
+		if (!bret) {
 			lxc_container_put(c);
 			exit(EXIT_FAILURE);
 		}
diff --git a/src/lxc/tools/lxc_start.c b/src/lxc/tools/lxc_start.c
index d84fece11..aa754247d 100644
--- a/src/lxc/tools/lxc_start.c
+++ b/src/lxc/tools/lxc_start.c
@@ -277,7 +277,7 @@ int main(int argc, char *argv[])
 		goto out;
 	}
 
-	if (lxc_config_define_load(&defines, c))
+	if (!lxc_config_define_load(&defines, c))
 		goto out;
 
 	if (!rcfile && !strcmp("/sbin/init", args[0])) {
diff --git a/src/lxc/tools/tool_utils.c b/src/lxc/tools/tool_utils.c
index e83560c2f..ca325456a 100644
--- a/src/lxc/tools/tool_utils.c
+++ b/src/lxc/tools/tool_utils.c
@@ -800,20 +800,20 @@ int lxc_config_define_add(struct lxc_list *defines, char *arg)
 	return 0;
 }
 
-int lxc_config_define_load(struct lxc_list *defines, struct lxc_container *c)
+bool lxc_config_define_load(struct lxc_list *defines, struct lxc_container *c)
 {
 	struct lxc_list *it;
-	int ret = 0;
+	bool bret = true;
 
 	lxc_list_for_each(it, defines) {
 		struct new_config_item *new_item = it->elem;
-		ret = c->set_config_item(c, new_item->key, new_item->val);
-		if (ret < 0)
+		bret = c->set_config_item(c, new_item->key, new_item->val);
+		if (!bret)
 			break;
 	}
 
 	lxc_config_define_free(defines);
-	return ret;
+	return bret;
 }
 
 void lxc_config_define_free(struct lxc_list *defines)
diff --git a/src/lxc/tools/tool_utils.h b/src/lxc/tools/tool_utils.h
index 851fa97c4..25f2dfd61 100644
--- a/src/lxc/tools/tool_utils.h
+++ b/src/lxc/tools/tool_utils.h
@@ -160,8 +160,8 @@ extern char *get_template_path(const char *t);
 extern bool switch_to_ns(pid_t pid, const char *ns);
 
 extern int lxc_config_define_add(struct lxc_list *defines, char *arg);
-extern int lxc_config_define_load(struct lxc_list *defines,
-				  struct lxc_container *c);
+extern bool lxc_config_define_load(struct lxc_list *defines,
+				   struct lxc_container *c);
 extern void lxc_config_define_free(struct lxc_list *defines);
 extern int lxc_char_left_gc(const char *buffer, size_t len);
 extern int lxc_char_right_gc(const char *buffer, size_t len);