summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2004-10-18 03:39:40 +0000
committerColin Walters <walters@verbum.org>2004-10-18 03:39:40 +0000
commitca293924a0320277919c881d36bccdae5b8a32e7 (patch)
treeffda2d517eb14991cdf0c119d9cf360d1c6e8762
parentdbb4ee01e029908787dbf38fa2543ac35e36b5dd (diff)
2004-10-17 Colin Walters <walters@verbum.org>
* dbus/dbus-memory.c (_dbus_initialize_malloc_debug, check_guards) (dbus_malloc, dbus_malloc0, dbus_realloc): Fix up printf format specifier mismatches.
-rw-r--r--ChangeLog6
-rw-r--r--dbus/dbus-memory.c18
2 files changed, 15 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 9f05ea4e..e477ccd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-17 Colin Walters <walters@verbum.org>
+
+ * dbus/dbus-memory.c (_dbus_initialize_malloc_debug, check_guards)
+ (dbus_malloc, dbus_malloc0, dbus_realloc): Fix up printf
+ format specifier mismatches.
+
2004-10-07 Olivier Andrieu <oliv__a@users.sourceforge.net>
* dbus/dbus-sysdeps.c (_dbus_file_get_contents): fix an incorrect
diff --git a/dbus/dbus-memory.c b/dbus/dbus-memory.c
index 8ed84c7e..3b59c26f 100644
--- a/dbus/dbus-memory.c
+++ b/dbus/dbus-memory.c
@@ -137,8 +137,8 @@ _dbus_initialize_malloc_debug (void)
if (_dbus_getenv ("DBUS_MALLOC_FAIL_GREATER_THAN") != NULL)
{
fail_size = atoi (_dbus_getenv ("DBUS_MALLOC_FAIL_GREATER_THAN"));
- _dbus_verbose ("Will fail mallocs over %d bytes\n",
- fail_size);
+ _dbus_verbose ("Will fail mallocs over %ld bytes\n",
+ (long) fail_size);
}
if (_dbus_getenv ("DBUS_MALLOC_GUARDS") != NULL)
@@ -340,8 +340,8 @@ check_guards (void *free_block)
dbus_uint32_t value = *(dbus_uint32_t*) &block[i];
if (value != GUARD_VALUE)
{
- _dbus_warn ("Block of %u bytes from %s had start guard value 0x%x at %d expected 0x%x\n",
- requested_bytes, source_string (source),
+ _dbus_warn ("Block of %lu bytes from %s had start guard value 0x%ux at %d expected 0x%x\n",
+ (long) requested_bytes, source_string (source),
value, i, GUARD_VALUE);
failed = TRUE;
}
@@ -355,8 +355,8 @@ check_guards (void *free_block)
dbus_uint32_t value = *(dbus_uint32_t*) &block[i];
if (value != GUARD_VALUE)
{
- _dbus_warn ("Block of %u bytes from %s had end guard value 0x%x at %d expected 0x%x\n",
- requested_bytes, source_string (source),
+ _dbus_warn ("Block of %lu bytes from %s had end guard value 0x%ux at %d expected 0x%x\n",
+ (long) requested_bytes, source_string (source),
value, i, GUARD_VALUE);
failed = TRUE;
}
@@ -434,7 +434,7 @@ dbus_malloc (size_t bytes)
if (_dbus_decrement_fail_alloc_counter ())
{
- _dbus_verbose (" FAILING malloc of %d bytes\n", bytes);
+ _dbus_verbose (" FAILING malloc of %ld bytes\n", (long) bytes);
return NULL;
}
@@ -485,7 +485,7 @@ dbus_malloc0 (size_t bytes)
if (_dbus_decrement_fail_alloc_counter ())
{
- _dbus_verbose (" FAILING malloc0 of %d bytes\n", bytes);
+ _dbus_verbose (" FAILING malloc0 of %ld bytes\n", (long) bytes);
return NULL;
}
@@ -537,7 +537,7 @@ dbus_realloc (void *memory,
if (_dbus_decrement_fail_alloc_counter ())
{
- _dbus_verbose (" FAILING realloc of %d bytes\n", bytes);
+ _dbus_verbose (" FAILING realloc of %ld bytes\n", (long) bytes);
return NULL;
}