summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@gmail.com>2016-08-22 02:53:00 +1000
committerStefan Metzmacher <metze@samba.org>2016-08-24 11:42:28 +0200
commitca7fa0c854b4e6687276ce0b62d39405b4e25ade (patch)
treec8c20b77eaf881f6cb47bc94fdc385b356aaa780 /lib
parent6275a94bc776dfad6f2fe7c3de7057239a6447dc (diff)
downloadsamba-ca7fa0c854b4e6687276ce0b62d39405b4e25ade.tar.gz
lib/util: Fix format strings and argument data types
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12168 Signed-off-by: Amitay Isaacs <amitay@gmail.com> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Wed Aug 24 05:32:15 CEST 2016 on sn-devel-144 (cherry picked from commit 04126d54d5430c5e2fdbbfea58d76b253b81a407)
Diffstat (limited to 'lib')
-rw-r--r--lib/util/talloc_report.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/util/talloc_report.c b/lib/util/talloc_report.c
index 5d96ddd27ad..63213a014b6 100644
--- a/lib/util/talloc_report.c
+++ b/lib/util/talloc_report.c
@@ -146,18 +146,18 @@ static void talloc_report_str_helper(const void *ptr, int depth, int max_depth,
state->s = talloc_asprintf_append_largebuf(
state->s, &state->str_len,
"%*s%-30s contains %6lu bytes in %3lu blocks "
- "(ref %d): %*s\n", depth*4, "", name,
+ "(ref %zu): %*s\n", depth*4, "", name,
(unsigned long)talloc_total_size(ptr),
(unsigned long)talloc_total_blocks(ptr),
talloc_reference_count(ptr),
- MIN(50, talloc_get_size(ptr)),
+ (int)MIN(50, talloc_get_size(ptr)),
(const char *)ptr);
return;
}
state->s = talloc_asprintf_append_largebuf(
state->s, &state->str_len,
- "%*s%-30s contains %6lu bytes in %3lu blocks (ref %d) %p\n",
+ "%*s%-30s contains %6lu bytes in %3lu blocks (ref %zu) %p\n",
depth*4, "", name,
(unsigned long)talloc_total_size(ptr),
(unsigned long)talloc_total_blocks(ptr),