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 372d660cb2e591c20ac879d8f5b6859834e81000..95f3f59a3abf7d6f1fe542af0aa0788d8f81037e 100644 (file)
--- 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 2c1af4a885bf43aa81f192e8f710fd66e8ca35d2..7bf4f585a55531c71393f8d080e9ed765f92255f 100644 (file)
--- 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)