summaryrefslogtreecommitdiff
path: root/source4/lib/util_str.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-07-17 09:20:52 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:29:34 -0500
commite835621799647ee70630b389fb53d15b15d68355 (patch)
tree429a4ab67cf53f2853ba93f4628b63cd5aac2b02 /source4/lib/util_str.c
parentccc65fb995154451537879b57b900b8b4e340bd2 (diff)
downloadsamba-e835621799647ee70630b389fb53d15b15d68355.tar.gz
samba-e835621799647ee70630b389fb53d15b15d68355.tar.bz2
samba-e835621799647ee70630b389fb53d15b15d68355.zip
r8520: fixed a pile of warnings from the build farm gcc -Wall output on
S390. This is an attempt to avoid the panic we're seeing in the automatic builds. The main fixes are: - assumptions that sizeof(size_t) == sizeof(int), mostly in printf formats - use of NULL format statements to perform dn searches. - assumption that sizeof() returns an int (This used to be commit a58ea6b3854973b694d2b1e22323ed7eb00e3a3f)
Diffstat (limited to 'source4/lib/util_str.c')
-rw-r--r--source4/lib/util_str.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/lib/util_str.c b/source4/lib/util_str.c
index 592c38e53c..a0e9da4160 100644
--- a/source4/lib/util_str.c
+++ b/source4/lib/util_str.c
@@ -274,7 +274,7 @@ char *safe_strcpy(char *dest,const char *src, size_t maxlength)
if (len > maxlength) {
DEBUG(0,("ERROR: string overflow by %u (%u - %u) in safe_strcpy [%.50s]\n",
- (uint_t)(len-maxlength), len, maxlength, src));
+ (uint_t)(len-maxlength), (unsigned)len, (unsigned)maxlength, src));
len = maxlength;
}
@@ -760,7 +760,7 @@ void strlower_m(char *s)
c_size2 = push_codepoint(d, tolower_w(c));
if (c_size2 > c_size) {
DEBUG(0,("FATAL: codepoint 0x%x (0x%x) expanded from %d to %d bytes in strlower_m\n",
- c, tolower_w(c), c_size, c_size2));
+ c, tolower_w(c), (int)c_size, (int)c_size2));
smb_panic("codepoint expansion in strlower_m\n");
}
s += c_size;
@@ -796,7 +796,7 @@ void strupper_m(char *s)
c_size2 = push_codepoint(d, toupper_w(c));
if (c_size2 > c_size) {
DEBUG(0,("FATAL: codepoint 0x%x (0x%x) expanded from %d to %d bytes in strupper_m\n",
- c, toupper_w(c), c_size, c_size2));
+ c, toupper_w(c), (int)c_size, (int)c_size2));
smb_panic("codepoint expansion in strupper_m\n");
}
s += c_size;