Attachment 84304 Details for Bug 68303 – [PATCH 03/10] Move function to the right place where it supposed to be used (merged)

[patch] [PATCH 03/10] Move function to the right place where it supposed to be used (merged)

0003-Move-function-to-the-right-place-where-it-supposed-t.patch (text/plain), 3.29 KB, created by Chengwei Yang on 2013-08-20 07:42:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chengwei Yang

Created: 2013-08-20 07:42:59 UTC

Size: 3.29 KB

patch

obsolete

>From e70988f850acae1ea595dc3eed4396b30ab8cb04 Mon Sep 17 00:00:00 2001
>From: Chengwei Yang <chengwei.yang@intel.com>
>Date: Fri, 12 Jul 2013 11:34:31 +0800
>Subject: [PATCH 03/10] Move function to the right place where it supposed to
> be used
>
>---
> dbus/dbus-mainloop.c |   21 ---------------------
> dbus/dbus-watch.c    |   43 ++++++++++++++++++++++---------------------
> 2 files changed, 22 insertions(+), 42 deletions(-)
>
>diff --git a/dbus/dbus-mainloop.c b/dbus/dbus-mainloop.c
>index 457242d..8b4da16 100644
>--- a/dbus/dbus-mainloop.c
>+++ b/dbus/dbus-mainloop.c
>@@ -34,27 +34,6 @@
> 
> #define MAINLOOP_SPEW 0
> 
>-#if MAINLOOP_SPEW
>-#ifdef DBUS_ENABLE_VERBOSE_MODE
>-static const char*
>-watch_flags_to_string (int flags)
>-{
>-  const char *watch_type;
>-
>-  if ((flags & DBUS_WATCH_READABLE) &&
>-      (flags & DBUS_WATCH_WRITABLE))
>-    watch_type = "readwrite";
>-  else if (flags & DBUS_WATCH_READABLE)
>-    watch_type = "read";
>-  else if (flags & DBUS_WATCH_WRITABLE)
>-    watch_type = "write";
>-  else
>-    watch_type = "not read or write";
>-  return watch_type;
>-}
>-#endif /* DBUS_ENABLE_VERBOSE_MODE */
>-#endif /* MAINLOOP_SPEW */
>-
> struct DBusLoop
> {
>   int refcount;
>diff --git a/dbus/dbus-watch.c b/dbus/dbus-watch.c
>index b9f4ac2..b82c57d 100644
>--- a/dbus/dbus-watch.c
>+++ b/dbus/dbus-watch.c
>@@ -259,6 +259,25 @@ _dbus_watch_list_free (DBusWatchList *watch_list)
>   dbus_free (watch_list);
> }
> 
>+#ifdef DBUS_ENABLE_VERBOSE_MODE
>+static const char*
>+watch_flags_to_string (int flags)
>+{
>+  const char *watch_type;
>+
>+  if ((flags & DBUS_WATCH_READABLE) &&
>+      (flags & DBUS_WATCH_WRITABLE))
>+    watch_type = "readwrite";
>+  else if (flags & DBUS_WATCH_READABLE)
>+    watch_type = "read";
>+  else if (flags & DBUS_WATCH_WRITABLE)
>+    watch_type = "write";
>+  else
>+    watch_type = "not read or write";
>+  return watch_type;
>+}
>+#endif /* DBUS_ENABLE_VERBOSE_MODE */
>+
> /**
>  * Sets the watch functions. This function is the "backend"
>  * for dbus_connection_set_watch_functions() and
>@@ -292,27 +311,9 @@ _dbus_watch_list_set_functions (DBusWatchList           *watch_list,
>           DBusList *next = _dbus_list_get_next_link (&watch_list->watches,
>                                                      link);
> 
>-#ifdef DBUS_ENABLE_VERBOSE_MODE
>-          {
>-            const char *watch_type;
>-            int flags;
>-
>-            flags = dbus_watch_get_flags (link->data);
>-            if ((flags & DBUS_WATCH_READABLE) &&
>-                (flags & DBUS_WATCH_WRITABLE))
>-              watch_type = "readwrite";
>-            else if (flags & DBUS_WATCH_READABLE)
>-              watch_type = "read";
>-            else if (flags & DBUS_WATCH_WRITABLE)
>-              watch_type = "write";
>-            else
>-              watch_type = "not read or write";
>-            
>-            _dbus_verbose ("Adding a %s watch on fd %d using newly-set add watch function\n",
>-                           watch_type,
>-                           dbus_watch_get_socket (link->data));
>-          }
>-#endif /* DBUS_ENABLE_VERBOSE_MODE */
>+          _dbus_verbose ("Adding a %s watch on fd %d using newly-set add watch function\n",
>+                         watch_flags_to_string (dbus_watch_get_flags (link->data)),
>+                         dbus_watch_get_socket (link->data));
>           
>           if (!(* add_function) (link->data, data))
>             {
>-- 
>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.