+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
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)
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;
}
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;
}
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;
}
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;
}
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;
}