From: Martin Schwenke <martin@meltin.net>
Date: Fri, 21 Jun 2019 05:10:19 +0000 (+1000)
Subject: util: Fix signed/unsigned comparisons by declaring as size_t
X-Git-Tag: ldb-2.0.5~128
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=abea597b7fc5c221205143d537cf5fb009a234bf;p=thirdparty%2Fsamba.git

util: Fix signed/unsigned comparisons by declaring as size_t

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Andreas Schneider <asn@samba.org>
---

diff --git a/lib/util/fault.c b/lib/util/fault.c
index bde20e33460..5be9162679e 100644
--- a/lib/util/fault.c
+++ b/lib/util/fault.c
@@ -261,10 +261,10 @@ libunwind_failed:
 		  (unsigned long)backtrace_size));
 
 	if (backtrace_strings) {
-		int i;
+		size_t i;
 
 		for (i = 0; i < backtrace_size; i++)
-			DEBUGADD(0, (" #%u %s\n", i, backtrace_strings[i]));
+			DEBUGADD(0, (" #%zu %s\n", i, backtrace_strings[i]));
 
 		/* Leak the backtrace_strings, rather than risk what free() might do */
 	}
diff --git a/lib/util/util_file.c b/lib/util/util_file.c
index 79276153015..5d92eaafdf4 100644
--- a/lib/util/util_file.c
+++ b/lib/util/util_file.c
@@ -140,7 +140,7 @@ char *fgets_slash(TALLOC_CTX *mem_ctx, char *s2, size_t maxlen, FILE *f)
 			    s[len] = 0;
 		}
 		if ((s2 == NULL) && (len > maxlen-3)) {
-			int m;
+			size_t m;
 			char *t;
 
 			m = maxlen * 2;
diff --git a/lib/util/util_strlist.c b/lib/util/util_strlist.c
index 203a643b09b..9462e9c6ad4 100644
--- a/lib/util/util_strlist.c
+++ b/lib/util/util_strlist.c
@@ -361,7 +361,7 @@ _PUBLIC_ const char **str_list_append(const char **list1,
 	size_t len1 = str_list_length(list1);
 	size_t len2 = str_list_length(list2);
 	const char **ret;
-	int i;
+	size_t i;
 
 	ret = talloc_realloc(NULL, list1, const char *, len1+len2+1);
 	if (ret == NULL) return NULL;
@@ -390,7 +390,7 @@ _PUBLIC_ const char **str_list_unique(const char **list)
 {
 	size_t len = str_list_length(list);
 	const char **list2;
-	int i, j;
+	size_t i, j;
 	if (len < 2) {
 		return list;
 	}
@@ -435,7 +435,7 @@ _PUBLIC_ const char **str_list_append_const(const char **list1,
 	size_t len1 = str_list_length(list1);
 	size_t len2 = str_list_length(list2);
 	const char **ret;
-	int i;
+	size_t i;
 
 	ret = talloc_realloc(NULL, list1, const char *, len1+len2+1);
 	if (ret == NULL) return NULL;