From 306eab3e3d998472ad111146a12b7697ea96c9b9 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Fri, 16 May 2003 20:09:25 +0000 Subject: 2003-05-16 Havoc Pennington * dbus/dbus-connection.c: disable verbose lock spew * tools/dbus-send.c: add --print-reply command line option * tools/dbus-print-message.h (print_message): new util function shared by dbus-send and dbus-monitor * tools/dbus-monitor.c (handler_func): exit on disconnect * dbus/dbus-transport-unix.c (do_reading): if the transport is disconnected, don't try to use the read_watch * dbus/dbus-watch.c (dbus_watch_get_enabled): assert watch != NULL so we can find this bug more easily --- tools/dbus-monitor.c | 58 ++++++---------------------------------------------- 1 file changed, 6 insertions(+), 52 deletions(-) (limited to 'tools/dbus-monitor.c') diff --git a/tools/dbus-monitor.c b/tools/dbus-monitor.c index 441ead38..465515ba 100644 --- a/tools/dbus-monitor.c +++ b/tools/dbus-monitor.c @@ -27,6 +27,7 @@ #include /* Don't copy this, for programs outside the dbus tree it's dbus/dbus-glib.h */ #include +#include "dbus-print-message.h" static DBusHandlerResult handler_func (DBusMessageHandler *handler, @@ -34,58 +35,11 @@ handler_func (DBusMessageHandler *handler, DBusMessage *message, void *user_data) { - DBusMessageIter iter; - - printf ("message name=%s; sender=%s\n", dbus_message_get_name (message), - dbus_message_get_sender (message)); - - dbus_message_iter_init (message, &iter); - - do - { - int type = dbus_message_iter_get_arg_type (&iter); - char *str; - dbus_uint32_t uint32; - dbus_int32_t int32; - double d; - unsigned char byte; - - if (type == DBUS_TYPE_INVALID) - break; - - switch (type) - { - case DBUS_TYPE_STRING: - str = dbus_message_iter_get_string (&iter); - printf ("string:%s\n", str); - break; - - case DBUS_TYPE_INT32: - int32 = dbus_message_iter_get_int32 (&iter); - printf ("int32:%d\n", int32); - break; - - case DBUS_TYPE_UINT32: - uint32 = dbus_message_iter_get_uint32 (&iter); - printf ("int32:%u\n", uint32); - break; - - case DBUS_TYPE_DOUBLE: - d = dbus_message_iter_get_double (&iter); - printf ("double:%f\n", d); - break; - - case DBUS_TYPE_BYTE: - byte = dbus_message_iter_get_byte (&iter); - printf ("byte:%d\n", byte); - break; - - default: - printf ("(unknown arg type %d)\n", type); - break; - } - } while (dbus_message_iter_next (&iter)); - + print_message (message); + + if (dbus_message_has_name (message, DBUS_MESSAGE_LOCAL_DISCONNECT)) + exit (0); + return DBUS_HANDLER_RESULT_ALLOW_MORE_HANDLERS; } -- cgit