summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2015-03-04 12:11:20 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2015-03-05 13:15:00 +0000
commit58f66e6c408adc5c9f9bcecef55e5b7cdf787110 (patch)
tree054bc88d266f21f13e5d9c2f9adf5e2002eacaea
parent188884dd624af8d489ab731c1f37ddbcc6d14282 (diff)
downloaddbus-58f66e6c408adc5c9f9bcecef55e5b7cdf787110.tar.gz
dbus-58f66e6c408adc5c9f9bcecef55e5b7cdf787110.tar.bz2
dbus-58f66e6c408adc5c9f9bcecef55e5b7cdf787110.zip
dbus-print-message: conditionalize Unix FD handling on DBUS_UNIX
We close() the fd after we have printed it, but close() isn't standard functionality on Windows. Unix FD-passing is never going to work on non-Unix platforms anyway. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89428 Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
-rw-r--r--tools/dbus-print-message.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/dbus-print-message.c b/tools/dbus-print-message.c
index bd0817c0..1891da77 100644
--- a/tools/dbus-print-message.c
+++ b/tools/dbus-print-message.c
@@ -505,6 +505,7 @@ print_iter (DBusMessageIter *iter, dbus_bool_t literal, int depth)
break;
}
+#ifdef DBUS_UNIX
case DBUS_TYPE_UNIX_FD:
{
int fd;
@@ -520,6 +521,7 @@ print_iter (DBusMessageIter *iter, dbus_bool_t literal, int depth)
break;
}
+#endif
default:
printf (" (dbus-monitor too dumb to decipher arg type '%c')\n", type);