]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
dbus-print-message: conditionalize Unix FD handling on DBUS_UNIX
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 4 Mar 2015 12:11:20 +0000 (12:11 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 5 Mar 2015 13:15:00 +0000 (13:15 +0000)
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>
tools/dbus-print-message.c

index bd0817c0691bc632a6173d0bd459dd661dbc5847..1891da77a665e5a927ec24ada7407be37ba920eb 100644 (file)
@@ -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);