Attachment 129210 Details for Bug 99585 – Add dbus verbose channels.

[patch] Add dbus verbose channels.

Add-dbus-verbose-channels.patch (text/plain), 23.28 KB, created by Ralf Habacker on 2017-01-29 09:17:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2017-01-29 09:17:05 UTC

Size: 23.28 KB

patch

obsolete

>From f6f8f4d3f2851c8a9ae1f34fbcb8881f5de28eb7 Mon Sep 17 00:00:00 2001
>From: Ralf Habacker <ralf.habacker@freenet.de>
>Date: Sun, 15 May 2016 23:40:42 +0200
>Subject: [PATCH] Add dbus verbose channels.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=99585
>---
> bus/activation-helper.c            |  2 ++
> bus/activation.c                   |  2 ++
> bus/bus.c                          |  2 ++
> bus/config-parser-trivial.c        |  2 ++
> bus/config-parser.c                |  2 ++
> bus/connection.c                   |  2 ++
> bus/dir-watch-inotify.c            |  2 ++
> bus/dispatch.c                     |  2 ++
> bus/driver.c                       |  2 ++
> bus/expirelist.c                   |  2 ++
> bus/main.c                         |  2 ++
> bus/policy.c                       |  2 ++
> bus/services.c                     |  2 ++
> bus/signals.c                      |  2 ++
> bus/test.c                         |  2 ++
> dbus/dbus-auth-script.c            |  2 ++
> dbus/dbus-auth-util.c              |  2 ++
> dbus/dbus-auth.c                   |  2 ++
> dbus/dbus-bus.c                    |  2 ++
> dbus/dbus-connection.c             |  2 ++
> dbus/dbus-dataslot.c               |  2 ++
> dbus/dbus-file-unix.c              |  2 ++
> dbus/dbus-file-win.c               |  1 +
> dbus/dbus-internals.c              |  5 +++++
> dbus/dbus-internals.h              | 19 ++++++++++++++-----
> dbus/dbus-keyring.c                |  2 ++
> dbus/dbus-mainloop.c               |  2 ++
> dbus/dbus-marshal-basic.c          |  2 ++
> dbus/dbus-marshal-header.c         |  2 ++
> dbus/dbus-marshal-recursive-util.c |  2 ++
> dbus/dbus-marshal-recursive.c      |  2 ++
> dbus/dbus-marshal-validate.c       |  1 +
> dbus/dbus-memory.c                 |  2 ++
> dbus/dbus-mempool.c                |  2 ++
> dbus/dbus-message-factory.c        |  2 ++
> dbus/dbus-message-util.c           |  2 ++
> dbus/dbus-message.c                |  2 ++
> dbus/dbus-nonce.c                  |  2 ++
> dbus/dbus-object-tree.c            |  2 ++
> dbus/dbus-pending-call.c           |  2 ++
> dbus/dbus-server-debug-pipe.c      |  2 ++
> dbus/dbus-server-socket.c          |  2 ++
> dbus/dbus-server.c                 |  2 ++
> dbus/dbus-shell.c                  |  2 ++
> dbus/dbus-socket-set-poll.c        |  2 ++
> dbus/dbus-spawn-win.c              |  2 ++
> dbus/dbus-spawn.c                  |  2 ++
> dbus/dbus-sysdeps-unix.c           |  2 ++
> dbus/dbus-sysdeps-util-unix.c      |  2 ++
> dbus/dbus-sysdeps-util-win.c       |  2 ++
> dbus/dbus-sysdeps-win.c            |  2 ++
> dbus/dbus-transport-socket.c       |  2 ++
> dbus/dbus-transport-unix.c         |  2 ++
> dbus/dbus-transport.c              |  2 ++
> dbus/dbus-userdb-util.c            |  2 ++
> dbus/dbus-userdb.c                 |  2 ++
> dbus/dbus-watch.c                  |  2 ++
> test/test-utils.h                  |  3 +++
> 58 files changed, 130 insertions(+), 5 deletions(-)
>
>diff --git a/bus/activation-helper.c b/bus/activation-helper.c
>index 394f393..993dd73 100644
>--- a/bus/activation-helper.c
>+++ b/bus/activation-helper.c
>@@ -44,6 +44,8 @@
> #include <dbus/dbus-shell.h>
> #include <dbus/dbus-marshal-validate.h>
> 
>+DBUS_VERBOSE_CHANNEL(default)
>+
> static BusDesktopFile *
> desktop_file_for_name (BusConfigParser *parser,
>                        const char *name,
>diff --git a/bus/activation.c b/bus/activation.c
>index 614ce65..02434b3 100644
>--- a/bus/activation.c
>+++ b/bus/activation.c
>@@ -42,6 +42,8 @@
> #include <errno.h>
> #endif
> 
>+DBUS_VERBOSE_CHANNEL(activation)
>+
> struct BusActivation
> {
>   int refcount;
>diff --git a/bus/bus.c b/bus/bus.c
>index fd4ab9e..5fd062c 100644
>--- a/bus/bus.c
>+++ b/bus/bus.c
>@@ -43,6 +43,8 @@
> #include <dbus/dbus-internals.h>
> #include <dbus/dbus-server-protected.h>
> 
>+DBUS_VERBOSE_CHANNEL(bus)
>+
> #ifdef DBUS_CYGWIN
> #include <signal.h>
> #endif
>diff --git a/bus/config-parser-trivial.c b/bus/config-parser-trivial.c
>index 03ad838..1b38161 100644
>--- a/bus/config-parser-trivial.c
>+++ b/bus/config-parser-trivial.c
>@@ -30,6 +30,8 @@
> #include <dbus/dbus-internals.h>
> #include <string.h>
> 
>+DBUS_VERBOSE_CHANNEL(config)
>+
> /**
>  * TRIVIAL parser for bus configuration file.
>  */
>diff --git a/bus/config-parser.c b/bus/config-parser.c
>index adba69e..9a2475f 100644
>--- a/bus/config-parser.c
>+++ b/bus/config-parser.c
>@@ -35,6 +35,8 @@
> #include <dbus/dbus-sysdeps.h>
> #include <string.h>
> 
>+DBUS_VERBOSE_CHANNEL(config)
>+
> typedef enum
> {
>   /* we ignore policies for unknown groups/users */
>diff --git a/bus/connection.c b/bus/connection.c
>index 67793ba..22c7ef4 100644
>--- a/bus/connection.c
>+++ b/bus/connection.c
>@@ -37,6 +37,8 @@
> #include <dbus/dbus-connection-internal.h>
> #include <dbus/dbus-internals.h>
> 
>+DBUS_VERBOSE_CHANNEL(connection)
>+
> /* Trim executed commands to this length; we want to keep logs readable */
> #define MAX_LOG_COMMAND_LEN 50
> 
>diff --git a/bus/dir-watch-inotify.c b/bus/dir-watch-inotify.c
>index ce19fdc..f93cac1 100644
>--- a/bus/dir-watch-inotify.c
>+++ b/bus/dir-watch-inotify.c
>@@ -42,6 +42,8 @@
> #include <dbus/dbus-watch.h>
> #include "dir-watch.h"
> 
>+DBUS_VERBOSE_CHANNEL(inotify)
>+
> #define MAX_DIRS_TO_WATCH 128
> #define INOTIFY_EVENT_SIZE (sizeof(struct inotify_event))
> #define INOTIFY_BUF_LEN (1024 * (INOTIFY_EVENT_SIZE + 16))
>diff --git a/bus/dispatch.c b/bus/dispatch.c
>index 9a6eaaf..cf6ae46 100644
>--- a/bus/dispatch.c
>+++ b/bus/dispatch.c
>@@ -42,6 +42,8 @@
> #include <unistd.h>
> #endif
> 
>+DBUS_VERBOSE_CHANNEL(dispatch)
>+
> /* This is hard-coded in the files in valid-config-files-*. We have to use
>  * the debug-pipe transport because the tests in this file require that
>  * dbus_connection_open_private() does not block. */
>diff --git a/bus/driver.c b/bus/driver.c
>index 684c3d8..4d303af 100644
>--- a/bus/driver.c
>+++ b/bus/driver.c
>@@ -43,6 +43,8 @@
> #include <dbus/dbus-marshal-validate.h>
> #include <string.h>
> 
>+DBUS_VERBOSE_CHANNEL(driver)
>+
> typedef enum
> {
>   BUS_DRIVER_FOUND_SELF,
>diff --git a/bus/expirelist.c b/bus/expirelist.c
>index 9a3886e..a8eeaff 100644
>--- a/bus/expirelist.c
>+++ b/bus/expirelist.c
>@@ -28,6 +28,8 @@
> #include <dbus/dbus-mainloop.h>
> #include <dbus/dbus-timeout.h>
> 
>+DBUS_VERBOSE_CHANNEL(default)
>+
> struct BusExpireList
> {
>   DBusList      *items; /**< List of BusExpireItem */
>diff --git a/bus/main.c b/bus/main.c
>index 612b4a6..cab9002 100644
>--- a/bus/main.c
>+++ b/bus/main.c
>@@ -42,6 +42,8 @@
> #include "apparmor.h"
> #include "audit.h"
> 
>+DBUS_VERBOSE_CHANNEL(daemon)
>+
> static BusContext *context;
> 
> #ifdef DBUS_UNIX
>diff --git a/bus/policy.c b/bus/policy.c
>index 082f385..9841ed1 100644
>--- a/bus/policy.c
>+++ b/bus/policy.c
>@@ -30,6 +30,8 @@
> #include <dbus/dbus-hash.h>
> #include <dbus/dbus-internals.h>
> 
>+DBUS_VERBOSE_CHANNEL(policy)
>+
> BusPolicyRule*
> bus_policy_rule_new (BusPolicyRuleType type,
>                      dbus_bool_t       allow)
>diff --git a/bus/services.c b/bus/services.c
>index 6a4c884..cb6dcc7 100644
>--- a/bus/services.c
>+++ b/bus/services.c
>@@ -38,6 +38,8 @@
> #include "selinux.h"
> #include "apparmor.h"
> 
>+DBUS_VERBOSE_CHANNEL(service)
>+
> struct BusService
> {
>   int refcount;
>diff --git a/bus/signals.c b/bus/signals.c
>index 2965f6e..acde33f 100644
>--- a/bus/signals.c
>+++ b/bus/signals.c
>@@ -30,6 +30,8 @@
> #include "utils.h"
> #include <dbus/dbus-marshal-validate.h>
> 
>+DBUS_VERBOSE_CHANNEL(signal)
>+
> struct BusMatchRule
> {
>   int refcount;       /**< reference count */
>diff --git a/bus/test.c b/bus/test.c
>index 31ef4c8..4713183 100644
>--- a/bus/test.c
>+++ b/bus/test.c
>@@ -29,6 +29,8 @@
> #include <dbus/dbus-list.h>
> #include <dbus/dbus-sysdeps.h>
> 
>+DBUS_VERBOSE_CHANNEL(test)
>+
> /* The "debug client" watch/timeout handlers don't dispatch messages,
>  * as we manually pull them in order to verify them. This is why they
>  * are different from the real handlers in connection.c
>diff --git a/dbus/dbus-auth-script.c b/dbus/dbus-auth-script.c
>index aaaed30..f1903b5 100644
>--- a/dbus/dbus-auth-script.c
>+++ b/dbus/dbus-auth-script.c
>@@ -34,6 +34,8 @@
> #include "dbus-credentials.h"
> #include "dbus-internals.h"
> 
>+DBUS_VERBOSE_CHANNEL(auth)
>+
> /**
>  * @defgroup DBusAuthScript code for running unit test scripts for DBusAuth
>  * @ingroup  DBusInternals
>diff --git a/dbus/dbus-auth-util.c b/dbus/dbus-auth-util.c
>index 10cbc49..073926e 100644
>--- a/dbus/dbus-auth-util.c
>+++ b/dbus/dbus-auth-util.c
>@@ -26,6 +26,8 @@
> #include "dbus-test.h"
> #include "dbus-auth.h"
> 
>+DBUS_VERBOSE_CHANNEL(auth)
>+
> /**
>  * @addtogroup DBusAuth
>  * @{
>diff --git a/dbus/dbus-auth.c b/dbus/dbus-auth.c
>index f222787..5f6e503 100644
>--- a/dbus/dbus-auth.c
>+++ b/dbus/dbus-auth.c
>@@ -31,6 +31,8 @@
> #include "dbus-protocol.h"
> #include "dbus-credentials.h"
> 
>+DBUS_VERBOSE_CHANNEL(auth)
>+
> /**
>  * @defgroup DBusAuth Authentication
>  * @ingroup  DBusInternals
>diff --git a/dbus/dbus-bus.c b/dbus/dbus-bus.c
>index 0fd4831..b0e03de 100644
>--- a/dbus/dbus-bus.c
>+++ b/dbus/dbus-bus.c
>@@ -33,6 +33,8 @@
> #include "dbus-connection-internal.h"
> #include "dbus-string.h"
> 
>+DBUS_VERBOSE_CHANNEL(bus)
>+
> /**
>  * @defgroup DBusBus Message bus APIs
>  * @ingroup DBus
>diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
>index 81b3a83..ebd6b24 100644
>--- a/dbus/dbus-connection.c
>+++ b/dbus/dbus-connection.c
>@@ -45,6 +45,8 @@
> #include "dbus-bus.h"
> #include "dbus-marshal-basic.h"
> 
>+DBUS_VERBOSE_CHANNEL(connection)
>+
> #ifdef DBUS_DISABLE_CHECKS
> #define TOOK_LOCK_CHECK(connection)
> #define RELEASING_LOCK_CHECK(connection)
>diff --git a/dbus/dbus-dataslot.c b/dbus/dbus-dataslot.c
>index e37c9dd..02fcfb3 100644
>--- a/dbus/dbus-dataslot.c
>+++ b/dbus/dbus-dataslot.c
>@@ -25,6 +25,8 @@
> #include "dbus-dataslot.h"
> #include "dbus-threads-internal.h"
> 
>+DBUS_VERBOSE_CHANNEL(dataslot)
>+
> /**
>  * @defgroup DBusDataSlot Data slots
>  * @ingroup  DBusInternals
>diff --git a/dbus/dbus-file-unix.c b/dbus/dbus-file-unix.c
>index 830d3fe..8bcbe0f 100644
>--- a/dbus/dbus-file-unix.c
>+++ b/dbus/dbus-file-unix.c
>@@ -37,6 +37,8 @@
> #include <unistd.h>
> #include <errno.h>
> 
>+DBUS_VERBOSE_CHANNEL(file)
>+
> #ifndef O_BINARY
> #define O_BINARY 0
> #endif
>diff --git a/dbus/dbus-file-win.c b/dbus/dbus-file-win.c
>index 0dbe11e..ade4fff 100644
>--- a/dbus/dbus-file-win.c
>+++ b/dbus/dbus-file-win.c
>@@ -31,6 +31,7 @@
> 
> #include <windows.h>
> 
>+DBUS_VERBOSE_CHANNEL(file)
> 
> /**
>  * Thin wrapper around the read() system call that appends
>diff --git a/dbus/dbus-internals.c b/dbus/dbus-internals.c
>index 18db69e..750d29e 100644
>--- a/dbus/dbus-internals.c
>+++ b/dbus/dbus-internals.c
>@@ -36,6 +36,8 @@
> #include <mbstring.h>
> #endif
> 
>+DBUS_DEFAULT_VERBOSE_CHANNEL(default)
>+
> /**
>  * @defgroup DBusInternals D-Bus secret internal implementation details
>  * @brief Documentation useful when developing or debugging D-Bus itself.
>@@ -377,6 +379,7 @@ dbus_bool_t _dbus_get_verbose (void)
>  */
> void
> _dbus_verbose_real (
>+                    const char *channel,
> #ifdef DBUS_CPP_SUPPORTS_VARIABLE_MACRO_ARGUMENTS
>                     const char *file,
>                     const int line, 
>@@ -414,6 +417,8 @@ _dbus_verbose_real (
>   else
>     need_pid = FALSE;
> 
>+  fprintf (stderr, "%s ", channel);
>+
>   va_start (args, format);
> #ifdef DBUS_USE_OUTPUT_DEBUG_STRING
>   {
>diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h
>index 7ec77e5..30dd7bd 100644
>--- a/dbus/dbus-internals.h
>+++ b/dbus/dbus-internals.h
>@@ -90,15 +90,24 @@ void _dbus_warn_check_failed  (const char *format,
> #define DBUS_CPP_SUPPORTS_VARIABLE_MACRO_ARGUMENTS
> #endif
> 
>+#ifdef __GNUC__
>+#define DBUS_UNUSED __attribute__ ((unused))
>+#else
>+#define DBUS_UNUSED
>+#endif
>+
>+#define DBUS_VERBOSE_CHANNEL(a) static DBUS_UNUSED const char *_DBUS_DEFAULT_VERBOSE_CHANNEL = #a;
>+#define DBUS_DEFAULT_VERBOSE_CHANNEL(a) DBUS_UNUSED const char *_DBUS_DEFAULT_VERBOSE_CHANNEL = #a;
>+
> #ifdef DBUS_CPP_SUPPORTS_VARIABLE_MACRO_ARGUMENTS
> DBUS_PRIVATE_EXPORT
>-void _dbus_verbose_real       (const char *file, const int line, const char *function, 
>-                               const char *format,...) _DBUS_GNUC_PRINTF (4, 5);
>-#  define _dbus_verbose(fmt,...) _dbus_verbose_real( __FILE__,__LINE__,__FUNCTION__,fmt, ## __VA_ARGS__)
>+void _dbus_verbose_real       (const char *channel, const char *file, const int line, const char *function,
>+                               const char *format,...) _DBUS_GNUC_PRINTF (5, 6);
>+#  define _dbus_verbose(fmt,...) _dbus_verbose_real(_DBUS_DEFAULT_VERBOSE_CHANNEL, __FILE__,__LINE__,__FUNCTION__,fmt, ## __VA_ARGS__)
> #else
> DBUS_PRIVATE_EXPORT
>-void _dbus_verbose_real       (const char *format,
>-                               ...) _DBUS_GNUC_PRINTF (1, 2);
>+void _dbus_verbose_real       (const char *channel, const char *format,
>+                               ...) _DBUS_GNUC_PRINTF (2, 3);
> #  define _dbus_verbose _dbus_verbose_real
> #endif
> DBUS_PRIVATE_EXPORT
>diff --git a/dbus/dbus-keyring.c b/dbus/dbus-keyring.c
>index bb7e4f8..563e1e8 100644
>--- a/dbus/dbus-keyring.c
>+++ b/dbus/dbus-keyring.c
>@@ -28,6 +28,8 @@
> #include <dbus/dbus-list.h>
> #include <dbus/dbus-sysdeps.h>
> 
>+DBUS_VERBOSE_CHANNEL(keyring)
>+
> /**
>  * @defgroup DBusKeyring keyring class
>  * @ingroup  DBusInternals
>diff --git a/dbus/dbus-mainloop.c b/dbus/dbus-mainloop.c
>index f6736fe..d58d4e1 100644
>--- a/dbus/dbus-mainloop.c
>+++ b/dbus/dbus-mainloop.c
>@@ -32,6 +32,8 @@
> #include <dbus/dbus-socket-set.h>
> #include <dbus/dbus-watch.h>
> 
>+DBUS_VERBOSE_CHANNEL(mainloop)
>+
> #define MAINLOOP_SPEW 0
> 
> struct DBusLoop
>diff --git a/dbus/dbus-marshal-basic.c b/dbus/dbus-marshal-basic.c
>index b5b0d4b..1aba84e 100644
>--- a/dbus/dbus-marshal-basic.c
>+++ b/dbus/dbus-marshal-basic.c
>@@ -29,6 +29,8 @@
> 
> #include <string.h>
> 
>+DBUS_VERBOSE_CHANNEL(marshal)
>+
> #if !defined(PRIx64) && defined(DBUS_WIN)
> #define PRIx64 "I64x"
> #endif
>diff --git a/dbus/dbus-marshal-header.c b/dbus/dbus-marshal-header.c
>index 74b39cd..9296cf1 100644
>--- a/dbus/dbus-marshal-header.c
>+++ b/dbus/dbus-marshal-header.c
>@@ -27,6 +27,8 @@
> #include "dbus-marshal-recursive.h"
> #include "dbus-marshal-byteswap.h"
> 
>+DBUS_VERBOSE_CHANNEL(marshal)
>+
> /**
>  * @addtogroup DBusMarshal
>  *
>diff --git a/dbus/dbus-marshal-recursive-util.c b/dbus/dbus-marshal-recursive-util.c
>index 309da26..1176631 100644
>--- a/dbus/dbus-marshal-recursive-util.c
>+++ b/dbus/dbus-marshal-recursive-util.c
>@@ -31,6 +31,8 @@
> #include "dbus-internals.h"
> #include <string.h>
> 
>+DBUS_VERBOSE_CHANNEL(marshal)
>+
> #if !defined(PRIx64) && defined(DBUS_WIN)
> #define PRIx64 "I64x"
> #endif
>diff --git a/dbus/dbus-marshal-recursive.c b/dbus/dbus-marshal-recursive.c
>index b58a283..03b46c9 100644
>--- a/dbus/dbus-marshal-recursive.c
>+++ b/dbus/dbus-marshal-recursive.c
>@@ -27,6 +27,8 @@
> #include "dbus-signature.h"
> #include "dbus-internals.h"
> 
>+DBUS_VERBOSE_CHANNEL(marshal)
>+
> /**
>  * @addtogroup DBusMarshal
>  * @{
>diff --git a/dbus/dbus-marshal-validate.c b/dbus/dbus-marshal-validate.c
>index e122499..b68d1b0 100644
>--- a/dbus/dbus-marshal-validate.c
>+++ b/dbus/dbus-marshal-validate.c
>@@ -29,6 +29,7 @@
> #include "dbus-signature.h"
> #include "dbus-string.h"
> 
>+DBUS_VERBOSE_CHANNEL(marshal)
> /**
>  * @addtogroup DBusMarshal
>  *
>diff --git a/dbus/dbus-memory.c b/dbus/dbus-memory.c
>index 1a77d1f..efbe85d 100644
>--- a/dbus/dbus-memory.c
>+++ b/dbus/dbus-memory.c
>@@ -29,6 +29,8 @@
> #include "dbus-threads.h"
> #include <stdlib.h>
> 
>+DBUS_VERBOSE_CHANNEL(memory)
>+
> #ifdef DBUS_MEMORY_DEBUG
> void dbus_track_malloc(void *p, int size, const char *file, int line);
> void dbus_track_free(void *p);
>diff --git a/dbus/dbus-mempool.c b/dbus/dbus-mempool.c
>index 5246615..5cacc94 100644
>--- a/dbus/dbus-mempool.c
>+++ b/dbus/dbus-mempool.c
>@@ -26,6 +26,8 @@
> #include "dbus-internals.h"
> #include "dbus-valgrind-internal.h"
> 
>+DBUS_VERBOSE_CHANNEL(mempool)
>+
> /**
>  * @defgroup DBusMemPool memory pools
>  * @ingroup  DBusInternals
>diff --git a/dbus/dbus-message-factory.c b/dbus/dbus-message-factory.c
>index b742e4c..c0a9ea3 100644
>--- a/dbus/dbus-message-factory.c
>+++ b/dbus/dbus-message-factory.c
>@@ -31,6 +31,8 @@
> #include "dbus-test.h"
> #include <stdio.h>
> 
>+DBUS_VERBOSE_CHANNEL(message)
>+
> typedef enum
>   {
>     CHANGE_TYPE_ADJUST,
>diff --git a/dbus/dbus-message-util.c b/dbus/dbus-message-util.c
>index a9d4a51..08e7e8e 100644
>--- a/dbus/dbus-message-util.c
>+++ b/dbus/dbus-message-util.c
>@@ -32,6 +32,8 @@
> #include "dbus-sysdeps-unix.h"
> #endif
> 
>+DBUS_VERBOSE_CHANNEL(message)
>+
> #ifdef __linux__
> /* Necessary for the Linux-specific fd leak checking code only */
> #include <sys/types.h>
>diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
>index e22fe51..43a3aab 100644
>--- a/dbus/dbus-message.c
>+++ b/dbus/dbus-message.c
>@@ -41,6 +41,8 @@
> 
> #include <string.h>
> 
>+DBUS_VERBOSE_CHANNEL(message)
>+
> #define _DBUS_TYPE_IS_STRINGLIKE(type) \
>   (type == DBUS_TYPE_STRING || type == DBUS_TYPE_SIGNATURE || \
>    type == DBUS_TYPE_OBJECT_PATH)
>diff --git a/dbus/dbus-nonce.c b/dbus/dbus-nonce.c
>index 3c0f6f3..8694f9c 100644
>--- a/dbus/dbus-nonce.c
>+++ b/dbus/dbus-nonce.c
>@@ -30,6 +30,8 @@
> 
> #include <stdio.h>
> 
>+DBUS_VERBOSE_CHANNEL(nonce)
>+
> static dbus_bool_t
> do_check_nonce (DBusSocket fd, const DBusString *nonce, DBusError *error)
> {
>diff --git a/dbus/dbus-object-tree.c b/dbus/dbus-object-tree.c
>index 27481a8..06749a2 100644
>--- a/dbus/dbus-object-tree.c
>+++ b/dbus/dbus-object-tree.c
>@@ -31,6 +31,8 @@
> #include <string.h>
> #include <stdlib.h>
> 
>+DBUS_VERBOSE_CHANNEL(object)
>+
> /**
>  * @defgroup DBusObjectTree A hierarchy of objects with container-contained relationship
>  * @ingroup  DBusInternals
>diff --git a/dbus/dbus-pending-call.c b/dbus/dbus-pending-call.c
>index be53410..734824c 100644
>--- a/dbus/dbus-pending-call.c
>+++ b/dbus/dbus-pending-call.c
>@@ -31,6 +31,8 @@
> #include "dbus-threads.h"
> #include "dbus-test.h"
> 
>+DBUS_VERBOSE_CHANNEL(pending-call)
>+
> /**
>  * @defgroup DBusPendingCallInternals DBusPendingCall implementation details
>  * @ingroup DBusInternals
>diff --git a/dbus/dbus-server-debug-pipe.c b/dbus/dbus-server-debug-pipe.c
>index ca0be87..f5da645 100644
>--- a/dbus/dbus-server-debug-pipe.c
>+++ b/dbus/dbus-server-debug-pipe.c
>@@ -31,6 +31,8 @@
> #include "dbus-string.h"
> #include "dbus-protocol.h"
> 
>+DBUS_VERBOSE_CHANNEL(server)
>+
> #ifdef DBUS_ENABLE_EMBEDDED_TESTS
> 
> /**
>diff --git a/dbus/dbus-server-socket.c b/dbus/dbus-server-socket.c
>index d716f50..3c6b52b 100644
>--- a/dbus/dbus-server-socket.c
>+++ b/dbus/dbus-server-socket.c
>@@ -30,6 +30,8 @@
> #include "dbus-nonce.h"
> #include "dbus-string.h"
> 
>+DBUS_VERBOSE_CHANNEL(server)
>+
> /**
>  * @defgroup DBusServerSocket DBusServer implementations for SOCKET
>  * @ingroup  DBusInternals
>diff --git a/dbus/dbus-server.c b/dbus/dbus-server.c
>index 9af906f..73c52a2 100644
>--- a/dbus/dbus-server.c
>+++ b/dbus/dbus-server.c
>@@ -32,6 +32,8 @@
> #include "dbus-address.h"
> #include "dbus-protocol.h"
> 
>+DBUS_VERBOSE_CHANNEL(server)
>+
> /**
>  * @defgroup DBusServer DBusServer
>  * @ingroup  DBus
>diff --git a/dbus/dbus-shell.c b/dbus/dbus-shell.c
>index 2384961..15cf4ca 100644
>--- a/dbus/dbus-shell.c
>+++ b/dbus/dbus-shell.c
>@@ -31,6 +31,8 @@
> #include "dbus-shell.h"
> #include "dbus-string.h"
> 
>+DBUS_VERBOSE_CHANNEL(shell)
>+
> /* Single quotes preserve the literal string exactly. escape
>  * sequences are not allowed; not even \' - if you want a '
>  * in the quoted text, you have to do something like 'foo'\''bar'
>diff --git a/dbus/dbus-socket-set-poll.c b/dbus/dbus-socket-set-poll.c
>index 623e28f..c3602e5 100644
>--- a/dbus/dbus-socket-set-poll.c
>+++ b/dbus/dbus-socket-set-poll.c
>@@ -30,6 +30,8 @@
> #include <dbus/dbus-sysdeps.h>
> #include <dbus/dbus-watch.h>
> 
>+DBUS_VERBOSE_CHANNEL(socket)
>+
> #ifndef DOXYGEN_SHOULD_SKIP_THIS
> 
> typedef struct {
>diff --git a/dbus/dbus-spawn-win.c b/dbus/dbus-spawn-win.c
>index 5cb3044..eb09e45 100644
>--- a/dbus/dbus-spawn-win.c
>+++ b/dbus/dbus-spawn-win.c
>@@ -41,6 +41,8 @@
> #include "dbus-test.h"
> #include "dbus-protocol.h"
> 
>+DBUS_VERBOSE_CHANNEL(spawn)
>+
> #define WIN32_LEAN_AND_MEAN
> #include <windows.h>
> //#define STRICT
>diff --git a/dbus/dbus-spawn.c b/dbus/dbus-spawn.c
>index afdcd68..5c8353b 100644
>--- a/dbus/dbus-spawn.c
>+++ b/dbus/dbus-spawn.c
>@@ -45,6 +45,8 @@
> #include <systemd/sd-journal.h>
> #endif
> 
>+DBUS_VERBOSE_CHANNEL(spawn)
>+
> extern char **environ;
> 
> /**
>diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
>index ce8cbf7..40ba8dd 100644
>--- a/dbus/dbus-sysdeps-unix.c
>+++ b/dbus/dbus-sysdeps-unix.c
>@@ -90,6 +90,8 @@
> #include <pthread.h>
> #endif
> 
>+DBUS_VERBOSE_CHANNEL(sysdeps)
>+
> #ifndef O_BINARY
> #define O_BINARY 0
> #endif
>diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c
>index 1f9ddb9..e5a583f 100644
>--- a/dbus/dbus-sysdeps-util-unix.c
>+++ b/dbus/dbus-sysdeps-util-unix.c
>@@ -62,6 +62,8 @@
> #include <systemd/sd-daemon.h>
> #endif
> 
>+DBUS_VERBOSE_CHANNEL(sysdeps)
>+
> #ifndef O_BINARY
> #define O_BINARY 0
> #endif
>diff --git a/dbus/dbus-sysdeps-util-win.c b/dbus/dbus-sysdeps-util-win.c
>index 9089bf3..9803cf9 100644
>--- a/dbus/dbus-sysdeps-util-win.c
>+++ b/dbus/dbus-sysdeps-util-win.c
>@@ -36,6 +36,8 @@
> #include "dbus-memory.h"
> #include "dbus-pipe.h"
> 
>+DBUS_VERBOSE_CHANNEL(sysdeps)
>+
> #include <stdio.h>
> #include <stdlib.h>
> #if HAVE_ERRNO_H
>diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
>index 2a632d9..2624951 100644
>--- a/dbus/dbus-sysdeps-win.c
>+++ b/dbus/dbus-sysdeps-win.c
>@@ -55,6 +55,8 @@
> #include <wincrypt.h>
> #include <iphlpapi.h>
> 
>+DBUS_VERBOSE_CHANNEL(sysdeps)
>+
> /* Declarations missing in mingw's and windows sdk 7.0 headers */
> extern BOOL WINAPI ConvertStringSidToSidA (LPCSTR  StringSid, PSID *Sid);
> extern BOOL WINAPI ConvertSidToStringSidA (PSID Sid, LPSTR *StringSid);
>diff --git a/dbus/dbus-transport-socket.c b/dbus/dbus-transport-socket.c
>index dce5c7d..7f4e39b 100644
>--- a/dbus/dbus-transport-socket.c
>+++ b/dbus/dbus-transport-socket.c
>@@ -30,6 +30,8 @@
> #include "dbus-watch.h"
> #include "dbus-credentials.h"
> 
>+DBUS_VERBOSE_CHANNEL(transport)
>+
> /**
>  * @defgroup DBusTransportSocket DBusTransport implementations for sockets
>  * @ingroup  DBusInternals
>diff --git a/dbus/dbus-transport-unix.c b/dbus/dbus-transport-unix.c
>index f2b1f09..12effaf 100644
>--- a/dbus/dbus-transport-unix.c
>+++ b/dbus/dbus-transport-unix.c
>@@ -34,6 +34,8 @@
> #include "dbus-sysdeps-unix.h"
> #include "dbus-test.h"
> 
>+DBUS_VERBOSE_CHANNEL(transport)
>+
> /**
>  * @defgroup DBusTransportUnix DBusTransport implementations for UNIX
>  * @ingroup  DBusInternals
>diff --git a/dbus/dbus-transport.c b/dbus/dbus-transport.c
>index 9eda837..6bcb10d 100644
>--- a/dbus/dbus-transport.c
>+++ b/dbus/dbus-transport.c
>@@ -36,6 +36,8 @@
> #include "dbus-server-debug-pipe.h"
> #endif
> 
>+DBUS_VERBOSE_CHANNEL(transport)
>+
> /**
>  * @defgroup DBusTransport DBusTransport object
>  * @ingroup  DBusInternals
>diff --git a/dbus/dbus-userdb-util.c b/dbus/dbus-userdb-util.c
>index 888a23e..e7507c7 100644
>--- a/dbus/dbus-userdb-util.c
>+++ b/dbus/dbus-userdb-util.c
>@@ -33,6 +33,8 @@
> #include <systemd/sd-login.h>
> #endif
> 
>+DBUS_VERBOSE_CHANNEL(userdb)
>+
> /**
>  * @addtogroup DBusInternalsUtils
>  * @{
>diff --git a/dbus/dbus-userdb.c b/dbus/dbus-userdb.c
>index 52f927a..01872f1 100644
>--- a/dbus/dbus-userdb.c
>+++ b/dbus/dbus-userdb.c
>@@ -30,6 +30,8 @@
> #include "dbus-credentials.h"
> #include <string.h>
> 
>+DBUS_VERBOSE_CHANNEL(userdb)
>+
> /**
>  * @addtogroup DBusInternalsUtils
>  * @{
>diff --git a/dbus/dbus-watch.c b/dbus/dbus-watch.c
>index 093f193..6054f77 100644
>--- a/dbus/dbus-watch.c
>+++ b/dbus/dbus-watch.c
>@@ -26,6 +26,8 @@
> #include "dbus-watch.h"
> #include "dbus-list.h"
> 
>+DBUS_VERBOSE_CHANNEL(watch)
>+
> /**
>  * @defgroup DBusWatchInternals DBusWatch implementation details
>  * @ingroup  DBusInternals
>diff --git a/test/test-utils.h b/test/test-utils.h
>index 39fae77..51117a0 100644
>--- a/test/test-utils.h
>+++ b/test/test-utils.h
>@@ -8,6 +8,9 @@
> 
> #include <dbus/dbus-mainloop.h>
> #include <dbus/dbus-internals.h>
>+
>+DBUS_VERBOSE_CHANNEL(test)
>+
> typedef DBusLoop TestMainContext;
> 
> TestMainContext *test_main_context_get            (void);
>-- 
>2.6.6

Actions: View | Splinter Review

Attachments on bug 99585: 129210 | 129281 | 129282 | 129283

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.