From 77373f1f8e3b2f61e9bbcd9fadfb83257d390cf2 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Thu, 24 Jul 2003 23:46:27 +0000 Subject: More printf fixes - size_t is long on some architectures. (This used to be commit ba4d334b822248d8ab929c9568533431603d967e) --- source3/lib/charcnv.c | 2 +- source3/lib/util_file.c | 2 +- source3/lib/util_str.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/lib') diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c index 4e9c2c1592..7910099cd8 100644 --- a/source3/lib/charcnv.c +++ b/source3/lib/charcnv.c @@ -190,7 +190,7 @@ size_t convert_string(charset_t from, charset_t to, break; case E2BIG: reason="No more room"; - DEBUG(0, ("convert_string: Required %d, available %d\n", + DEBUG(0, ("convert_string: Required %l, available %l\n", srclen, destlen)); /* we are not sure we need srclen bytes, may be more, may be less. diff --git a/source3/lib/util_file.c b/source3/lib/util_file.c index 02acbd4d7e..5e9732ce52 100644 --- a/source3/lib/util_file.c +++ b/source3/lib/util_file.c @@ -455,7 +455,7 @@ void *map_file(char *fname, size_t size) p = file_load(fname, &s2); if (!p) return NULL; if (s2 != size) { - DEBUG(1,("incorrect size for %s - got %d expected %d\n", + DEBUG(1,("incorrect size for %s - got %l expected %l\n", fname, s2, size)); if (p) free(p); return NULL; diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c index 7bf43de5f3..dca1d19593 100644 --- a/source3/lib/util_str.c +++ b/source3/lib/util_str.c @@ -1588,7 +1588,7 @@ int ipstr_list_parse(const char* ipstr_list, struct ip_service **ip_list) count = count_chars(ipstr_list, IPSTR_LIST_CHAR) + 1; if ( (*ip_list = (struct ip_service*)malloc(count * sizeof(struct ip_service))) == NULL ) { - DEBUG(0,("ipstr_list_parse: malloc failed for %d entries\n", count)); + DEBUG(0,("ipstr_list_parse: malloc failed for %l entries\n", count)); return 0; } -- cgit