Attachment 41916 Details for Bug 32992 – [3/4] _dbus_loop_iterate: cleanup: make more use of a temporary variable

[patch] [3/4] _dbus_loop_iterate: cleanup: make more use of a temporary variable

0003-_dbus_loop_iterate-cleanup-make-more-use-of-a-tempor.patch (text/plain), 1.93 KB, created by Simon McVittie on 2011-01-12 04:25:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-01-12 04:25:42 UTC

Size: 1.93 KB

patch

obsolete

>From 432e34d9289e64de68469cf678fc9b722d84b327 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Wed, 12 Jan 2011 11:59:19 +0000
>Subject: [PATCH 3/4] _dbus_loop_iterate: cleanup: make more use of a temporary variable
>
>It was added by the previous commit.
>---
> dbus/dbus-mainloop.c |    8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/dbus/dbus-mainloop.c b/dbus/dbus-mainloop.c
>index 2e1cf7e..c375138 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
>             }
>-- 
>1.7.2.3
>

Actions: View | Splinter Review

Attachments on bug 32992: 41912 | 41914 | 41916 | 41917

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.