From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Fri, 3 Sep 2021 08:14:55 +0000 (+0200)
Subject: string_utils: fix integer comparisons
X-Git-Tag: lxc-5.0.0~92^2~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5e92f5dff3cd3e3c62677294f04225016bd105f;p=thirdparty%2Flxc.git

string_utils: fix integer comparisons

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/string_utils.c b/src/lxc/string_utils.c
index 372d660cb..95f3f59a3 100644
--- a/src/lxc/string_utils.c
+++ b/src/lxc/string_utils.c
@@ -1000,10 +1000,9 @@ char *lxc_trim_whitespace_in_place(char *buffer)
 
 int lxc_is_line_empty(const char *line)
 {
-	int i;
 	size_t len = strlen(line);
 
-	for (i = 0; i < len; i++)
+	for (size_t i = 0; i < len; i++)
 		if (line[i] != ' ' && line[i] != '\t' &&
 		    line[i] != '\n' && line[i] != '\r' &&
 		    line[i] != '\f' && line[i] != '\0')
diff --git a/src/lxc/string_utils.h b/src/lxc/string_utils.h
index 2c1af4a88..7bf4f585a 100644
--- a/src/lxc/string_utils.h
+++ b/src/lxc/string_utils.h
@@ -151,13 +151,13 @@ static inline char *deabs(char *str)
 	return str + strspn(str, "/");
 }
 
-#define strnprintf(buf, buf_size, ...)                                            \
-	({                                                                        \
-		int __ret_strnprintf;                                             \
-		__ret_strnprintf = snprintf(buf, buf_size, ##__VA_ARGS__);        \
-		if (__ret_strnprintf < 0 || (size_t)__ret_strnprintf >= buf_size) \
-			__ret_strnprintf = ret_errno(EIO);                        \
-		__ret_strnprintf;                                                 \
+#define strnprintf(buf, buf_size, ...)                                                    \
+	({                                                                                \
+		int __ret_strnprintf;                                                     \
+		__ret_strnprintf = snprintf(buf, buf_size, ##__VA_ARGS__);                \
+		if (__ret_strnprintf < 0 || (size_t)__ret_strnprintf >= (size_t)buf_size) \
+			__ret_strnprintf = ret_errno(EIO);				  \
+		__ret_strnprintf;                                                         \
 	})
 
 static inline const char *proc_self_fd(int fd)