From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 12 Jan 2011 11:59:19 +0000 (+0000)
Subject: _dbus_loop_iterate: cleanup: make more use of a temporary variable
X-Git-Tag: dbus-1.4.4~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f3ed53a30f77cc0c87cf469857263bb9682acd9a;p=thirdparty%2Fdbus.git

_dbus_loop_iterate: cleanup: make more use of a temporary variable

It was added by the previous commit.

Reviewed-by: Colin Walters <walters@verbum.org>
---

diff --git a/dbus/dbus-mainloop.c b/dbus/dbus-mainloop.c
index 2e1cf7e99..c37513829 100644
--- a/dbus/dbus-mainloop.c
+++ b/dbus/dbus-mainloop.c
@@ -601,7 +601,7 @@ _dbus_loop_iterate (DBusLoop     *loop,
 
 #if MAINLOOP_SPEW
               _dbus_verbose ("  skipping watch on fd %d as it was out of memory last time\n",
-                             dbus_watch_get_socket (wcb->watch));
+                             fd);
 #endif
             }
           else if (_DBUS_UNLIKELY (fd == -1))
@@ -619,7 +619,7 @@ _dbus_loop_iterate (DBusLoop     *loop,
                   
               flags = dbus_watch_get_flags (wcb->watch);
                   
-              fds[n_fds].fd = dbus_watch_get_socket (wcb->watch);
+              fds[n_fds].fd = fd;
               fds[n_fds].revents = 0;
               fds[n_fds].events = 0;
               if (flags & DBUS_WATCH_READABLE)
@@ -629,7 +629,7 @@ _dbus_loop_iterate (DBusLoop     *loop,
 
 #if MAINLOOP_SPEW
               _dbus_verbose ("  polling watch on fd %d  %s\n",
-                             fds[n_fds].fd, watch_flags_to_string (flags));
+                             fd, watch_flags_to_string (flags));
 #endif
 
               n_fds += 1;
@@ -638,7 +638,7 @@ _dbus_loop_iterate (DBusLoop     *loop,
             {
 #if MAINLOOP_SPEW
               _dbus_verbose ("  skipping disabled watch on fd %d  %s\n",
-                             dbus_watch_get_socket (wcb->watch),
+                             fd,
                              watch_flags_to_string (dbus_watch_get_flags (wcb->watch)));
 #endif
             }