]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
util: Fix signed/unsigned comparisons by declaring as size_t
authorMartin Schwenke <martin@meltin.net>
Tue, 25 Jun 2019 00:50:05 +0000 (10:50 +1000)
committerAndreas Schneider <asn@cryptomilk.org>
Mon, 1 Jul 2019 06:44:13 +0000 (06:44 +0000)
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>
lib/util/substitute.c

index 2c18257da252a4cdc72b1ef98ea5c8107dc6cd3d..2249035f7047ee8ff71f2bb3a0f15e42c2c9f295 100644 (file)
@@ -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;