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

util: Fix signed/unsigned comparisons by declaring as size_t

I may be missing something subtle but I can't see a reason for
declaring these as ssize_t.

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

diff --git a/lib/util/substitute.c b/lib/util/substitute.c
index 2c18257da25..2249035f704 100644
--- a/lib/util/substitute.c
+++ b/lib/util/substitute.c
@@ -52,14 +52,14 @@ static void string_sub2(char *s,const char *pattern, const char *insert, size_t
 			bool allow_trailing_dollar)
 {
 	char *p;
-	ssize_t ls, lp, li, i;
+	size_t ls, lp, li, i;
 
 	if (!insert || !pattern || !*pattern || !s)
 		return;
 
-	ls = (ssize_t)strlen(s);
-	lp = (ssize_t)strlen(pattern);
-	li = (ssize_t)strlen(insert);
+	ls = strlen(s);
+	lp = strlen(pattern);
+	li = strlen(insert);
 
 	if (len == 0)
 		len = ls + 1; /* len is number of *bytes* */
@@ -176,14 +176,14 @@ _PUBLIC_ char *string_sub_talloc(TALLOC_CTX *mem_ctx, const char *s,
 _PUBLIC_ void all_string_sub(char *s,const char *pattern,const char *insert, size_t len)
 {
 	char *p;
-	ssize_t ls,lp,li;
+	size_t ls,lp,li;
 
 	if (!insert || !pattern || !s)
 		return;
 
-	ls = (ssize_t)strlen(s);
-	lp = (ssize_t)strlen(pattern);
-	li = (ssize_t)strlen(insert);
+	ls = strlen(s);
+	lp = strlen(pattern);
+	li = strlen(insert);
 
 	if (!*pattern)
 		return;