From: Stéphane Graber <stgraber@ubuntu.com>
Date: Thu, 24 Oct 2013 01:50:43 +0000 (-0400)
Subject: clang: Remaining changes
X-Git-Tag: lxc-1.0.0.alpha3~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f371aca939bd8fab254de6f0a63d141f7550cf57;p=thirdparty%2Flxc.git

clang: Remaining changes

Those are a bit less obvious than those I pushed directly to master.
All those changes were required to build LXC under clang here.

With this, gcc can be replaced by clang to build LXC so long as you're
not using the python3 binding (as python extensions can't be built under
clang at the moment).

For reference, the clang output for those is: http://paste.ubuntu.com/6292460/

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/caps.c b/src/lxc/caps.c
index bcbb859ff..89b87afc2 100644
--- a/src/lxc/caps.c
+++ b/src/lxc/caps.c
@@ -204,7 +204,7 @@ static int _real_caps_last_cap(void)
 			buf[n] = '\0';
 			result = strtol(buf, &ptr, 10);
 			if (!ptr || (*ptr != '\0' && *ptr != '\n') ||
-			    result == LONG_MIN || result == LONG_MAX)
+			    result == INT_MIN || result == INT_MAX)
 				result = -1;
 		}
 
diff --git a/src/lxc/commands.c b/src/lxc/commands.c
index 33821dd86..3e44ef3b8 100644
--- a/src/lxc/commands.c
+++ b/src/lxc/commands.c
@@ -109,7 +109,7 @@ static const char *lxc_cmd_str(lxc_cmd_t cmd)
 		[LXC_CMD_GET_CONFIG_ITEM] = "get_config_item",
 	};
 
-	if (cmd < 0 || cmd >= LXC_CMD_MAX)
+	if (cmd >= LXC_CMD_MAX)
 		return "Unknown cmd";
 	return cmdname[cmd];
 }
@@ -735,7 +735,7 @@ static int lxc_cmd_process(int fd, struct lxc_cmd_req *req,
 		[LXC_CMD_GET_CONFIG_ITEM] = lxc_cmd_get_config_item_callback,
 	};
 
-	if (req->cmd < 0 || req->cmd >= LXC_CMD_MAX) {
+	if (req->cmd >= LXC_CMD_MAX) {
 		ERROR("bad cmd %d received", req->cmd);
 		return -1;
 	}
diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 208c08ba5..0724e3f5a 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -1948,7 +1948,7 @@ static int setup_caps(struct lxc_list *caps)
 			* we don't */
 			capid = strtol(drop_entry, &ptr, 10);
 			if (!ptr || *ptr != '\0' ||
-			capid == LONG_MIN || capid == LONG_MAX)
+			capid == INT_MIN || capid == INT_MAX)
 				/* not a valid number */
 				capid = -1;
 			else if (capid > lxc_caps_last_cap())
@@ -2013,7 +2013,7 @@ static int dropcaps_except(struct lxc_list *caps)
 			* we don't */
 			capid = strtol(keep_entry, &ptr, 10);
 			if (!ptr || *ptr != '\0' ||
-			capid == LONG_MIN || capid == LONG_MAX)
+			capid == INT_MIN || capid == INT_MAX)
 				/* not a valid number */
 				capid = -1;
 			else if (capid > lxc_caps_last_cap())