diff options
author | Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de> | 2010-04-14 02:28:44 +0200 |
---|---|---|
committer | Ralf Habacker <ralf.habacker@freenet.de> | 2010-04-14 08:26:40 +0200 |
commit | e419a5cff71bf71c626223393692c341f3db35e9 (patch) | |
tree | d8adc1ad07f3022dc440a41d356b2addecddcc35 | |
parent | 3678d71d18f4c5d4ac4ab0472e52c06a80207d8e (diff) | |
download | dbus-e419a5cff71bf71c626223393692c341f3db35e9.tar.gz |
Fix warnings on Windows builds.
-rw-r--r-- | bus/dir-watch-default.c | 5 | ||||
-rw-r--r-- | dbus/dbus-file-win.c | 6 | ||||
-rw-r--r-- | 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 8e457eb6..69361b1f 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 d1a81e26..932b459c 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 d0b20819..bcb9c824 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; } |