[pulseaudio-discuss] [RFC v2 3/3] bluetooth: Remove minor unnecessary check

Mikel Astiz mikel.astiz.oss at gmail.com
Fri Jul 27 08:20:39 PDT 2012


From: Mikel Astiz <mikel.astiz at bmw-carit.de>

The return value of dbus_message_iter_next() doesn't need to be checked
since the while condition will be false anyway (arg type will be
DBUS_TYPE_INVALID).
---
 src/modules/bluetooth/bluetooth-util.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/modules/bluetooth/bluetooth-util.c b/src/modules/bluetooth/bluetooth-util.c
index 92c763b..8a0cad7 100644
--- a/src/modules/bluetooth/bluetooth-util.c
+++ b/src/modules/bluetooth/bluetooth-util.c
@@ -398,8 +398,7 @@ static int parse_device_property(pa_bluetooth_discovery *y, pa_bluetooth_device
                         has_audio = TRUE;
                     }
 
-                    if (!dbus_message_iter_next(&ai))
-                        break;
+                    dbus_message_iter_next(&ai);
                 }
 
                 /* this might eventually be racy if .Audio is not there yet, but the State change will come anyway later, so this call is for cold-detection mostly */
@@ -591,8 +590,7 @@ static void get_properties_reply(DBusPendingCall *pending, void *userdata) {
             }
         }
 
-        if (!dbus_message_iter_next(&element_i))
-            break;
+        dbus_message_iter_next(&element_i);
     }
 
 finish:
-- 
1.7.7.6



More information about the pulseaudio-discuss mailing list