summaryrefslogtreecommitdiff
path: root/source4/lib/util_str.c
diff options
context:
space:
mode:
authorLove Hörnquist Åstrand <lha@samba.org>2005-07-12 22:22:59 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:20:14 -0500
commit61edb97bdfabf1ab313fbec5f47f5e6c8a79da1a (patch)
tree7b554690182fd2be55ba76a793227c3d3e46064c /source4/lib/util_str.c
parentdf426e5d4a33491c6b4bd8878ae3fbf29e728b5f (diff)
downloadsamba-61edb97bdfabf1ab313fbec5f47f5e6c8a79da1a.tar.gz
samba-61edb97bdfabf1ab313fbec5f47f5e6c8a79da1a.tar.bz2
samba-61edb97bdfabf1ab313fbec5f47f5e6c8a79da1a.zip
r8394: Make sure the argument to ctype is*(3) macros are unsigned char as
required by ISO C99. (This used to be commit 56fd21c806e816cf4c3d23881f26474f858b45e2)
Diffstat (limited to 'source4/lib/util_str.c')
-rw-r--r--source4/lib/util_str.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/lib/util_str.c b/source4/lib/util_str.c
index fea7170014..592c38e53c 100644
--- a/source4/lib/util_str.c
+++ b/source4/lib/util_str.c
@@ -159,7 +159,8 @@ int strwicmp(const char *psz1, const char *psz2)
psz1++;
while (isspace((int)*psz2))
psz2++;
- if (toupper(*psz1) != toupper(*psz2) || *psz1 == '\0'
+ if (toupper((unsigned char)*psz1) != toupper((unsigned char)*psz2)
+ || *psz1 == '\0'
|| *psz2 == '\0')
break;
psz1++;
@@ -412,12 +413,12 @@ size_t strhex_to_str(char *p, size_t len, const char *strhex)
continue;
}
- if (!(p1 = strchr_m(hexchars, toupper(strhex[i]))))
+ if (!(p1 = strchr_m(hexchars, toupper((unsigned char)strhex[i]))))
break;
i++; /* next hex digit */
- if (!(p2 = strchr_m(hexchars, toupper(strhex[i]))))
+ if (!(p2 = strchr_m(hexchars, toupper((unsigned char)strhex[i]))))
break;
/* get the two nybbles */