dbus/dbus dbus-sysdeps.c,1.79,1.80

[Olivier Andrieu]

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

Modified Files:
	dbus-sysdeps.c 
Log Message:
* dbus/dbus-sysdeps.c (_dbus_file_get_contents): fix an incorrect format string.

* glib/dbus-dbus-gmain.c (dbus_g_bus_get): do not mangle NULL pointer
(bug #1540, Leonardo Boiko).


Index: dbus-sysdeps.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- dbus-sysdeps.c	17 Sep 2004 09:14:49 -0000	1.79
+++ dbus-sysdeps.c	7 Oct 2004 09:56:02 -0000	1.80
@@ -2122,7 +2122,7 @@
     {
       dbus_set_error (error, DBUS_ERROR_FAILED,
                       "File size %lu of \"%s\" is too large.",
-                      filename_c, (unsigned long) sb.st_size);
+                      (unsigned long) sb.st_size, filename_c);
       close (fd);
       return FALSE;
     }