Attachment 84503 Details for Bug 68303 – [PATCH v2 1/7] Cleanup: polish verbose mode checking

[patch] [PATCH v2 1/7] Cleanup: polish verbose mode checking

0001-Cleanup-polish-verbose-mode-checking.patch (text/plain), 4.25 KB, created by Chengwei Yang on 2013-08-23 09:31:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chengwei Yang

Created: 2013-08-23 09:31:34 UTC

Size: 4.25 KB

patch

obsolete

>From 6aff58c6a59c10701f97fee22eb33e978bec4d11 Mon Sep 17 00:00:00 2001
>From: Chengwei Yang <chengwei.yang@intel.com>
>Date: Fri, 23 Aug 2013 16:49:39 +0800
>Subject: [PATCH v2 1/7] Cleanup: polish verbose mode checking
>
>---
> bus/selinux.c            |   19 +++++--------------
> bus/signals.c            |    2 --
> dbus/dbus-connection.c   |   11 ++---------
> dbus/dbus-pending-call.c |   11 ++---------
> 4 files changed, 9 insertions(+), 34 deletions(-)
>
>diff --git a/bus/selinux.c b/bus/selinux.c
>index 36287e9..57c9432 100644
>--- a/bus/selinux.c
>+++ b/bus/selinux.c
>@@ -936,8 +936,7 @@ bus_selinux_get_policy_root (void)
> void
> bus_selinux_id_table_print (DBusHashTable *service_table)
> {
>-#ifdef DBUS_ENABLE_VERBOSE_MODE
>-#ifdef HAVE_SELINUX
>+#if defined (DBUS_ENABLE_VERBOSE_MODE) && defined (HAVE_SELINUX)
>   DBusHashIter iter;
> 
>   if (!selinux_enabled)
>@@ -953,19 +952,17 @@ bus_selinux_id_table_print (DBusHashTable *service_table)
>       _dbus_verbose ("The context is %s\n", sid->ctx);
>       _dbus_verbose ("The refcount is %d\n", sid->refcnt);
>     }
>-#endif /* HAVE_SELINUX */
>-#endif /* DBUS_ENABLE_VERBOSE_MODE */
>+#endif /* DBUS_ENABLE_VERBOSE_MODE && HAVE_SELINUX */
> }
> 
> 
>-#ifdef DBUS_ENABLE_VERBOSE_MODE
>-#ifdef HAVE_SELINUX
> /**
>  * Print out some AVC statistics.
>  */
> static void
> bus_avc_print_stats (void)
> {
>+#if defined (DBUS_ENABLE_VERBOSE_MODE) && defined (HAVE_SELINUX)
>   struct avc_cache_stats cstats;
> 
>   if (!selinux_enabled)
>@@ -983,9 +980,8 @@ bus_avc_print_stats (void)
>   _dbus_verbose ("CAV hits: %d\n", cstats.cav_hits);
>   _dbus_verbose ("CAV probes: %d\n", cstats.cav_probes);
>   _dbus_verbose ("CAV misses: %d\n", cstats.cav_misses);
>+#endif /* DBUS_ENABLE_VERBOSE_MODE && HAVE_SELINUX */
> }
>-#endif /* HAVE_SELINUX */
>-#endif /* DBUS_ENABLE_VERBOSE_MODE */
> 
> 
> /**
>@@ -1005,12 +1001,7 @@ bus_selinux_shutdown (void)
>       sidput (bus_sid);
>       bus_sid = SECSID_WILD;
> 
>-#ifdef DBUS_ENABLE_VERBOSE_MODE
>- 
>-      if (_dbus_is_verbose()) 
>-        bus_avc_print_stats ();
>- 
>-#endif /* DBUS_ENABLE_VERBOSE_MODE */
>+      bus_avc_print_stats ();
> 
>       avc_destroy ();
> #ifdef HAVE_LIBAUDIT
>diff --git a/bus/signals.c b/bus/signals.c
>index 72487ed..dab7154 100644
>--- a/bus/signals.c
>+++ b/bus/signals.c
>@@ -1980,12 +1980,10 @@ get_recipients_from_list (DBusList       **rules,
>               if (!_dbus_list_append (recipients_p, rule->matches_go_to))
>                 return FALSE;
>             }
>-#ifdef DBUS_ENABLE_VERBOSE_MODE
>           else
>             {
>               _dbus_verbose ("Connection already receiving this message, so not adding again\n");
>             }
>-#endif /* DBUS_ENABLE_VERBOSE_MODE */
>         }
> 
>       link = _dbus_list_get_next_link (rules, link);
>diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
>index a82ebcf..3e5e0b8 100644
>--- a/dbus/dbus-connection.c
>+++ b/dbus/dbus-connection.c
>@@ -203,26 +203,19 @@
>  * @{
>  */
> 
>-#ifdef DBUS_ENABLE_VERBOSE_MODE
> static void
> _dbus_connection_trace_ref (DBusConnection *connection,
>     int old_refcount,
>     int new_refcount,
>     const char *why)
> {
>+#ifdef DBUS_ENABLE_VERBOSE_MODE
>   static int enabled = -1;
> 
>   _dbus_trace_ref ("DBusConnection", connection, old_refcount, new_refcount,
>       why, "DBUS_CONNECTION_TRACE", &enabled);
>-}
>-#else
>-#define _dbus_connection_trace_ref(c,o,n,w) \
>-  do \
>-  {\
>-    (void) (o); \
>-    (void) (n); \
>-  } while (0)
> #endif
>+}
> 
> /**
>  * Internal struct representing a message filter function 
>diff --git a/dbus/dbus-pending-call.c b/dbus/dbus-pending-call.c
>index 1604408..be53410 100644
>--- a/dbus/dbus-pending-call.c
>+++ b/dbus/dbus-pending-call.c
>@@ -79,26 +79,19 @@ struct DBusPendingCall
>   unsigned int timeout_added : 1;                 /**< Have added the timeout */
> };
> 
>-#ifdef DBUS_ENABLE_VERBOSE_MODE
> static void
> _dbus_pending_call_trace_ref (DBusPendingCall *pending_call,
>     int old_refcount,
>     int new_refcount,
>     const char *why)
> {
>+#ifdef DBUS_ENABLE_VERBOSE_MODE
>   static int enabled = -1;
> 
>   _dbus_trace_ref ("DBusPendingCall", pending_call, old_refcount,
>       new_refcount, why, "DBUS_PENDING_CALL_TRACE", &enabled);
>-}
>-#else
>-#define _dbus_pending_call_trace_ref(p, o, n, w) \
>-  do \
>-  {\
>-    (void) (o); \
>-    (void) (n); \
>-  } while (0)
> #endif
>+}
> 
> static dbus_int32_t notify_user_data_slot = -1;
> 
>-- 
>1.7.9.5
>

Actions: View | Splinter Review

Attachments on bug 68303: 84302 | 84303 | 84304 | 84305 | 84306 | 84307 | 84308 | 84309 | 84310 | 84311 | 84503 | 84504 | 84505 | 84507 | 84508 | 84509 | 84510

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.