From caa35130516182949575509cb44d161601e19a33 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 2 Feb 2015 20:07:45 +0000 Subject: [PATCH 4/7] dbus-monitor: use common code from dbus-test-tool Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46787 --- tools/Makefile.am | 11 +++++++---- tools/dbus-monitor.c | 12 +++--------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 05d1dcb..821ad5c 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -31,10 +31,13 @@ dbus_send_SOURCES= \ dbus-print-message.h \ dbus-send.c -dbus_monitor_SOURCES= \ - dbus-monitor.c \ - dbus-print-message.c \ - dbus-print-message.h +dbus_monitor_SOURCES= \ + dbus-monitor.c \ + dbus-print-message.c \ + dbus-print-message.h \ + tool-common.c \ + tool-common.h \ + $(NULL) if DBUS_WIN dbus_launch_SOURCES= \ diff --git a/tools/dbus-monitor.c b/tools/dbus-monitor.c index ff8390d..c15589a 100644 --- a/tools/dbus-monitor.c +++ b/tools/dbus-monitor.c @@ -34,6 +34,7 @@ #include #include "dbus-print-message.h" +#include "tool-common.h" #define EAVESDROPPING_RULE "eavesdrop=true" @@ -78,13 +79,6 @@ gettimeofday (struct timeval *__p, } #endif -inline static void -oom (const char *doing) -{ - fprintf (stderr, "OOM while %s\n", doing); - exit (1); -} - static DBusHandlerResult monitor_filter_func (DBusConnection *connection, DBusMessage *message, @@ -312,10 +306,10 @@ main (int argc, char *argv[]) filters = (char **) realloc (filters, numFilters * sizeof (char *)); if (filters == NULL) - oom ("adding a new filter slot"); + tool_oom ("adding a new filter slot"); filters[j] = (char *) malloc (filter_len); if (filters[j] == NULL) - oom ("adding a new filter"); + tool_oom ("adding a new filter"); snprintf (filters[j], filter_len, "%s,%s", EAVESDROPPING_RULE, arg); j++; } -- 2.1.4