From: Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de>
Date: Wed, 14 Apr 2010 00:28:44 +0000 (+0200)
Subject: Fix warnings on Windows builds.
X-Git-Tag: dbus-1.3.1~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e419a5cff71bf71c626223393692c341f3db35e9;p=thirdparty%2Fdbus.git

Fix warnings on Windows builds.
---

diff --git a/bus/dir-watch-default.c b/bus/dir-watch-default.c
index 8e457eb6b..69361b1fb 100644
--- a/bus/dir-watch-default.c
+++ b/bus/dir-watch-default.c
@@ -29,11 +29,6 @@
 
 /* NoOp */
 
-void
-bus_watch_directory (const char *dir, BusContext *context)
-{
-}
-
 void
 bus_set_watched_dirs (BusContext *context, DBusList **directories)
 {
diff --git a/dbus/dbus-file-win.c b/dbus/dbus-file-win.c
index d1a81e269..932b459c2 100644
--- a/dbus/dbus-file-win.c
+++ b/dbus/dbus-file-win.c
@@ -133,7 +133,7 @@ _dbus_file_get_contents (DBusString       *str,
       return FALSE;
     }
 
-  _dbus_verbose ("file %s fd 0x%x opened\n", filename_c, hnd);
+  _dbus_verbose ("file %s hnd %p opened\n", filename_c, hnd);
   
   fsize = GetFileSize (hnd, &fsize_hi);
   if (fsize == 0xFFFFFFFF && GetLastError() != NO_ERROR)
@@ -274,7 +274,7 @@ _dbus_string_save_to_file (const DBusString *str,
       goto out;
     }
 
-  _dbus_verbose ("tmp file %s fd 0x%x opened\n", tmp_filename_c, hnd);
+  _dbus_verbose ("tmp file %s hnd %p opened\n", tmp_filename_c, hnd);
 
   need_unlink = TRUE;
 
@@ -383,7 +383,7 @@ _dbus_create_file_exclusively (const DBusString *filename,
       return FALSE;
     }
 
-  _dbus_verbose ("exclusive file %s fd 0x%x opened\n", filename_c, hnd);
+  _dbus_verbose ("exclusive file %s hnd %p opened\n", filename_c, hnd);
 
   if (CloseHandle (hnd) == 0)
     {
diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index d0b208192..bcb9c824f 100644
--- a/dbus/dbus-sysdeps-win.c
+++ b/dbus/dbus-sysdeps-win.c
@@ -2487,7 +2487,7 @@ _dbus_daemon_publish_session_bus_address (const char* address)
   hDBusDaemonMutex = CreateMutexA( NULL, FALSE, cDBusDaemonMutex );
   ret = WaitForSingleObject( hDBusDaemonMutex, 1000 );
   if ( ret != WAIT_OBJECT_0 ) {
-    _dbus_warn("Could not lock mutex %s (return code %d). daemon already running? Bus address not published.\n", cDBusDaemonMutex, ret );
+    _dbus_warn("Could not lock mutex %s (return code %ld). daemon already running? Bus address not published.\n", cDBusDaemonMutex, ret );
     return;
   }