[PATCH 08/34] dbus: Avoid shadowing signal variable

[Jukka Rissanen]

---
 src/dbus.c |   33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/dbus.c b/src/dbus.c
index 38a6b92..5b46afa 100644
--- a/src/dbus.c
+++ b/src/dbus.c
@@ -213,20 +213,21 @@ dbus_bool_t connman_dbus_property_changed_basic(const 
char *path,
                                const char *interface, const char *key,
                                                        int type, void *val)
 {
-       DBusMessage *signal;
+       DBusMessage *dbus_signal;
        DBusMessageIter iter;
 
        if (path == NULL)
                return FALSE;
 
-       signal = dbus_message_new_signal(path, interface, "PropertyChanged");
-       if (signal == NULL)
+       dbus_signal = dbus_message_new_signal(path, interface,
+                                       "PropertyChanged");
+       if (dbus_signal == NULL)
                return FALSE;
 
-       dbus_message_iter_init_append(signal, &iter);
+       dbus_message_iter_init_append(dbus_signal, &iter);
        connman_dbus_property_append_basic(&iter, key, type, val);
 
-       g_dbus_send_message(connection, signal);
+       g_dbus_send_message(connection, dbus_signal);
 
        return TRUE;
 }
@@ -235,20 +236,21 @@ dbus_bool_t connman_dbus_property_changed_dict(const char 
*path,
                                const char *interface, const char *key,
                        connman_dbus_append_cb_t function, void *user_data)
 {
-       DBusMessage *signal;
+       DBusMessage *dbus_signal;
        DBusMessageIter iter;
 
        if (path == NULL)
                return FALSE;
 
-       signal = dbus_message_new_signal(path, interface, "PropertyChanged");
-       if (signal == NULL)
+       dbus_signal = dbus_message_new_signal(path, interface,
+                                       "PropertyChanged");
+       if (dbus_signal == NULL)
                return FALSE;
 
-       dbus_message_iter_init_append(signal, &iter);
+       dbus_message_iter_init_append(dbus_signal, &iter);
        connman_dbus_property_append_dict(&iter, key, function, user_data);
 
-       g_dbus_send_message(connection, signal);
+       g_dbus_send_message(connection, dbus_signal);
 
        return TRUE;
 }
@@ -257,21 +259,22 @@ dbus_bool_t connman_dbus_property_changed_array(const 
char *path,
                        const char *interface, const char *key, int type,
                        connman_dbus_append_cb_t function, void *user_data)
 {
-       DBusMessage *signal;
+       DBusMessage *dbus_signal;
        DBusMessageIter iter;
 
        if (path == NULL)
                return FALSE;
 
-       signal = dbus_message_new_signal(path, interface, "PropertyChanged");
-       if (signal == NULL)
+       dbus_signal = dbus_message_new_signal(path, interface,
+                                       "PropertyChanged");
+       if (dbus_signal == NULL)
                return FALSE;
 
-       dbus_message_iter_init_append(signal, &iter);
+       dbus_message_iter_init_append(dbus_signal, &iter);
        connman_dbus_property_append_array(&iter, key, type,
                                                function, user_data);
 
-       g_dbus_send_message(connection, signal);
+       g_dbus_send_message(connection, dbus_signal);
 
        return TRUE;
 }
-- 
1.7.9.5

_______________________________________________
connman mailing list
connman@connman.net
http://lists.connman.net/listinfo/connman