summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2019-06-25 10:50:05 +1000
committerAndreas Schneider <asn@cryptomilk.org>2019-07-01 06:44:13 +0000
commit115353a00149997f01fb9964cdbc9be4c7a0cd0a (patch)
treed4f3af152f177b172fab7401a4ae3481f8fd5034 /lib
parentabea597b7fc5c221205143d537cf5fb009a234bf (diff)
downloadsamba-115353a00149997f01fb9964cdbc9be4c7a0cd0a.tar.gz
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>
Diffstat (limited to 'lib')
-rw-r--r--lib/util/substitute.c16
1 files changed, 8 insertions, 8 deletions
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;