summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1999-07-13 02:05:05 +0000
committerJeremy Allison <jra@samba.org>1999-07-13 02:05:05 +0000
commit5de7667548b562c153afe1b2928e0af38be2f79c (patch)
treeb33c518745d3221dcbea643434bc2c745ccc9fb8
parent8d474b62acb70e06fe99e27a6e70aafd5ed27685 (diff)
downloadsamba-5de7667548b562c153afe1b2928e0af38be2f79c.tar.gz
Looking at string_sub() - which seems to be the cause of Olaf's complaints,
it looks like the lengths which were converted to size_t's should have been ssize_t's in these two functions. At one point two lengths are subtracted, and this should be a signed type. Jeremy.
-rw-r--r--source/lib/util_str.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/source/lib/util_str.c b/source/lib/util_str.c
index 32232a09e58..16d951c0be8 100644
--- a/source/lib/util_str.c
+++ b/source/lib/util_str.c
@@ -1020,13 +1020,13 @@ any of " ; ' or ` in the insert string are replaced with _
void string_sub(char *s,const char *pattern,const char *insert)
{
char *p;
- size_t ls,lp,li, i;
+ ssize_t ls,lp,li, i;
if (!insert || !pattern || !s) return;
- ls = strlen(s);
- lp = strlen(pattern);
- li = strlen(insert);
+ ls = (ssize_t)strlen(s);
+ lp = (ssize_t)strlen(pattern);
+ li = (ssize_t)strlen(insert);
if (!*pattern) return;
@@ -1057,13 +1057,13 @@ Use with caution!
void all_string_sub(char *s,const char *pattern,const char *insert)
{
char *p;
- size_t ls,lp,li;
+ ssize_t ls,lp,li;
if (!insert || !pattern || !s) return;
- ls = strlen(s);
- lp = strlen(pattern);
- li = strlen(insert);
+ ls = (ssize_t)strlen(s);
+ lp = (ssize_t)strlen(pattern);
+ li = (ssize_t)strlen(insert);
if (!*pattern) return;