From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Wed, 16 Jul 2008 23:12:00 +0000 (+0000)
Subject: Avoid a warning when printing a pid_t. Pointed out by Morten Welinder.
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=f37b73fb95d29efdcb24c3d30ceccc3883738e7e;p=dana%2Fcg-glib.git

Avoid a warning when printing a pid_t. Pointed out by Morten Welinder.

        * glib/gslice.c (mem_error): Avoid a warning when printing a pid_t.
        Pointed out by Morten Welinder.


svn path=/trunk/; revision=7196
---

diff --git a/ChangeLog b/ChangeLog
index a64b42f7..4cb30fbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-16  Matthias Clasen  <mclasen@redhat.com>
+
+	Bug 334234 – "printf" format error
+
+	* glib/gslice.c (mem_error): Avoid a warning when printing a pid_t.
+	Pointed out by Morten Welinder. 
+
 2008-07-16  Matthias Clasen  <mclasen@redhat.com>
 
 	Bug 406120 – g_ascii_strtod
diff --git a/glib/gslice.c b/glib/gslice.c
index 24040f47..5bad65e5 100644
--- a/glib/gslice.c
+++ b/glib/gslice.c
@@ -1189,7 +1189,7 @@ mem_error (const char *format,
   /* at least, put out "MEMORY-ERROR", in case we segfault during the rest of the function */
   fputs ("\n***MEMORY-ERROR***: ", stderr);
   pname = g_get_prgname();
-  fprintf (stderr, "%s[%u]: GSlice: ", pname ? pname : "", getpid());
+  fprintf (stderr, "%s[%ld]: GSlice: ", pname ? pname : "", (long)getpid());
   va_start (args, format);
   vfprintf (stderr, format, args);
   va_end (args);