Fixed gcc 4.8.1 -Wformat warnings on windows.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=67072
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>

diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index 38758bd480f0d87dc39eab519393650b6cb3cc7e..efeb2a616f377eb6378c72510db7f10b039a1796 100644 (file)
--- a/dbus/dbus-sysdeps-win.c
+++ b/dbus/dbus-sysdeps-win.c
@@ -165,7 +165,7 @@ get_pid_from_extended_tcp_table(int peer_port)
     }
   else
     {
-      _dbus_verbose ("unexpected error returned from GetExtendedTcpTable %d\n", errorCode);
+      _dbus_win_warn_win_error ("unexpected error returned from GetExtendedTcpTable", errorCode);
       return 0;
     }
 
@@ -188,7 +188,7 @@ get_pid_from_extended_tcp_table(int peer_port)
     }
 
   dbus_free (tcp_table);
-  _dbus_verbose ("got pid %d\n", (int)result);
+  _dbus_verbose ("got pid %lu\n", result);
   return result;
 }
 
@@ -236,7 +236,7 @@ get_pid_from_tcp_ex_table(int peer_port)
     }
 
   HeapFree (GetProcessHeap(), 0, tcp_table);
-  _dbus_verbose ("got pid %d\n", (int)result);
+  _dbus_verbose ("got pid %lu\n", result);
   return result;
 }
 
@@ -3840,7 +3840,7 @@ _dbus_win_set_error_from_win_error (DBusError *error,
 
 void
 _dbus_win_warn_win_error (const char *message,
-                          int         code)
+                          unsigned long code)
 {
   DBusError error;
 

diff --git a/dbus/dbus-sysdeps-win.h b/dbus/dbus-sysdeps-win.h
index 5e7f1e461afc26b4b9ebba6091abbe147314f4c6..7cb1b6ffa4a5a46e4998c1b02a94acb5cdcae593 100644 (file)
--- a/dbus/dbus-sysdeps-win.h
+++ b/dbus/dbus-sysdeps-win.h
@@ -44,7 +44,7 @@ const char* _dbus_win_error_from_last_error (void);
 
 void _dbus_win_startup_winsock (void);
 void _dbus_win_warn_win_error  (const char *message,
-                                int         code);
+                                unsigned long code);
                                 
 char * _dbus_win_error_string (int error_number);
 void _dbus_win_free_error_string (char *string);