From 1708094c0e00ab433bb0a51981f8b77d24aee256 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Wed, 9 Apr 2003 20:31:21 +0000 Subject: 2003-04-09 Havoc Pennington * dbus/dbus-bus.c (dbus_bus_register): fix up error handling and a memory leak * bus/dispatch.c (check_service_activated): fix bug in test * dbus/dbus-mainloop.c (check_timeout): fix this up * dbus/dbus-internals.c (_dbus_verbose_real): include PID in verbose output so we can sort out output from different processes, e.g. in the activation case. --- dbus/dbus-internals.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'dbus/dbus-internals.c') diff --git a/dbus/dbus-internals.c b/dbus/dbus-internals.c index de98c1fc..6a662e5d 100644 --- a/dbus/dbus-internals.c +++ b/dbus/dbus-internals.c @@ -189,7 +189,8 @@ _dbus_verbose_real (const char *format, va_list args; static dbus_bool_t verbose = TRUE; static dbus_bool_t initted = FALSE; - + static unsigned long pid; + /* things are written a bit oddly here so that * in the non-verbose case we just have the one * conditional and return immediately. @@ -200,10 +201,13 @@ _dbus_verbose_real (const char *format, if (!initted) { verbose = _dbus_getenv ("DBUS_VERBOSE") != NULL; + pid = _dbus_getpid (); initted = TRUE; if (!verbose) return; } + + fprintf (stderr, "%lu: ", pid); va_start (args, format); vfprintf (stderr, format, args); -- cgit