dbus/dbus dbus-memory.c,1.23,1.24

[Colin Walters]

Update of /cvs/dbus/dbus/dbus
In directory gabe:/tmp/cvs-serv1858/dbus

Modified Files:
	dbus-memory.c 
Log Message:
2004-10-17  Colin Walters  <walters at verbum.org>

	* dbus/dbus-memory.c (_dbus_initialize_malloc_debug, check_guards)
	(dbus_malloc, dbus_malloc0, dbus_realloc): Fix up printf
	format specifier mismatches.


Index: dbus-memory.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-memory.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- dbus-memory.c	10 Aug 2004 03:07:00 -0000	1.23
+++ dbus-memory.c	18 Oct 2004 03:39:40 -0000	1.24
@@ -137,8 +137,8 @@
       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 @@
           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 @@
           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 @@
   
   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 @@
   
   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 @@
   
   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;
     }