From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Wed, 21 Mar 2018 18:29:44 +0000 (+0100)
Subject: dbus-transport-socket: Correctly print DBusSocket with DBUS_SOCKET_FORMAT
X-Git-Tag: dbus-1.12.12~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cface8bb166e8954c26717f31a45ef162747d263;p=thirdparty%2Fdbus.git

dbus-transport-socket: Correctly print DBusSocket with DBUS_SOCKET_FORMAT

Previously, on 64-bit Windows we were passing a 32-bit int where the
format string expects a 64-bit SOCKET.

Reviewed-by: Simon McVittie <smcv@collabora.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=105662
(cherry picked from commit 18d4ff664491c17664b9f88c06d9338cd3750120)
---

diff --git a/dbus/dbus-transport-socket.c b/dbus/dbus-transport-socket.c
index 05acde0c3..73896501f 100644
--- a/dbus/dbus-transport-socket.c
+++ b/dbus/dbus-transport-socket.c
@@ -1026,7 +1026,7 @@ socket_handle_watch (DBusTransport *transport,
                        flags);
       else
         _dbus_verbose ("asked to handle watch %p on fd %" DBUS_SOCKET_FORMAT " that we don't recognize\n",
-                       watch, dbus_watch_get_socket (watch));
+                       watch, _dbus_socket_printable (_dbus_watch_get_socket (watch)));
     }
 #endif /* DBUS_ENABLE_VERBOSE_MODE */