summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2018-03-21 19:29:44 +0100
committerSimon McVittie <smcv@collabora.com>2018-10-04 11:19:21 +0100
commitcface8bb166e8954c26717f31a45ef162747d263 (patch)
tree5a1368d3bec3a8d09461bd8ea5850f8287943f33
parentece958ce9ca66956b8fdc85944f276f89ce3dd73 (diff)
downloaddbus-cface8bb166e8954c26717f31a45ef162747d263.tar.gz
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)
-rw-r--r--dbus/dbus-transport-socket.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dbus/dbus-transport-socket.c b/dbus/dbus-transport-socket.c
index 05acde0c..73896501 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 */