From 05b246ed5fe7d97ebd23fb8427725d5465e59c57 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Wed, 14 Apr 2010 02:28:44 +0200 Subject: [PATCH 3/4] Fix warnings on Windows builds. --- bus/dir-watch-default.c | 5 ----- dbus/dbus-file-win.c | 6 +++--- dbus/dbus-sysdeps-win.c | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/bus/dir-watch-default.c b/bus/dir-watch-default.c index 8e457eb..69361b1 100644 --- a/bus/dir-watch-default.c +++ b/bus/dir-watch-default.c @@ -30,11 +30,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 d1a81e2..932b459 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 d0b2081..bcb9c82 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; } -- 1.7.0.4