plugins: Avoid shadowing connection variable

diff --git a/plugins/bluetooth.c b/plugins/bluetooth.c
index 6f476e233b7ee4930f12cfbc27db2ca40deb1ac0..b06460a1b6e49314bb2a53500e85cbad8d17e037 100644 (file)
--- a/plugins/bluetooth.c
+++ b/plugins/bluetooth.c
@@ -271,7 +271,7 @@ static struct connman_network_driver pan_driver = {
        .disconnect     = pan_disconnect,
 };
 
-static gboolean network_changed(DBusConnection *connection,
+static gboolean network_changed(DBusConnection *conn,
                                DBusMessage *message, void *user_data)
 {
        const char *path = dbus_message_get_path(message);
@@ -507,7 +507,7 @@ static void check_networks(struct connman_device *device,
        }
 }
 
-static gboolean adapter_changed(DBusConnection *connection,
+static gboolean adapter_changed(DBusConnection *conn,
                                DBusMessage *message, void *user_data)
 {
        const char *path = dbus_message_get_path(message);
@@ -546,7 +546,7 @@ static gboolean adapter_changed(DBusConnection *connection,
        return TRUE;
 }
 
-static gboolean device_removed(DBusConnection *connection,
+static gboolean device_removed(DBusConnection *conn,
                                DBusMessage *message, void *user_data)
 {
        const char *network_path;
@@ -574,7 +574,7 @@ static gboolean device_removed(DBusConnection *connection,
        return TRUE;
 }
 
-static gboolean device_changed(DBusConnection *connection,
+static gboolean device_changed(DBusConnection *conn,
                                DBusMessage *message, void *user_data)
 {
        const char *path = dbus_message_get_path(message);
@@ -704,7 +704,7 @@ done:
        dbus_pending_call_unref(call);
 }
 
-static void add_adapter(DBusConnection *connection, const char *path)
+static void add_adapter(DBusConnection *conn, const char *path)
 {
        DBusMessage *message;
        DBusPendingCall *call;
@@ -718,7 +718,7 @@ static void add_adapter(DBusConnection *connection, const char *path)
 
        dbus_message_set_auto_start(message, FALSE);
 
-       if (dbus_connection_send_with_reply(connection, message,
+       if (dbus_connection_send_with_reply(conn, message,
                                                &call, TIMEOUT) == FALSE) {
                connman_error("Failed to get adapter properties for %s", path);
                goto done;
@@ -736,32 +736,32 @@ done:
        dbus_message_unref(message);
 }
 
-static gboolean adapter_added(DBusConnection *connection, DBusMessage *message,
+static gboolean adapter_added(DBusConnection *conn, DBusMessage *message,
                                void *user_data)
 {
        const char *path;
 
        dbus_message_get_args(message, NULL, DBUS_TYPE_OBJECT_PATH, &path,
                                DBUS_TYPE_INVALID);
-       add_adapter(connection, path);
+       add_adapter(conn, path);
        return TRUE;
 }
 
-static void remove_adapter(DBusConnection *connection, const char *path)
+static void remove_adapter(DBusConnection *conn, const char *path)
 {
        DBG("path %s", path);
 
        g_hash_table_remove(bluetooth_devices, path);
 }
 
-static gboolean adapter_removed(DBusConnection *connection, DBusMessage *message,
+static gboolean adapter_removed(DBusConnection *conn, DBusMessage *message,
                                void *user_data)
 {
        const char *path;
 
        dbus_message_get_args(message, NULL, DBUS_TYPE_OBJECT_PATH, &path,
                                DBUS_TYPE_INVALID);
-       remove_adapter(connection, path);
+       remove_adapter(conn, path);
        return TRUE;
 }
 
@@ -833,12 +833,12 @@ static void remove_network(gpointer data)
        connman_network_unref(network);
 }
 
-static void bluetooth_connect(DBusConnection *connection, void *user_data)
+static void bluetooth_connect(DBusConnection *conn, void *user_data)
 {
        DBusMessage *message;
        DBusPendingCall *call;
 
-       DBG("connection %p", connection);
+       DBG("connection %p", conn);
 
        bluetooth_devices = g_hash_table_new_full(g_str_hash, g_str_equal,
                                                g_free, unregister_device);
@@ -853,7 +853,7 @@ static void bluetooth_connect(DBusConnection *connection, void *user_data)
 
        dbus_message_set_auto_start(message, FALSE);
 
-       if (dbus_connection_send_with_reply(connection, message,
+       if (dbus_connection_send_with_reply(conn, message,
                                                &call, TIMEOUT) == FALSE) {
                connman_error("Failed to get Bluetooth adapters");
                goto done;
@@ -870,9 +870,9 @@ done:
        dbus_message_unref(message);
 }
 
-static void bluetooth_disconnect(DBusConnection *connection, void *user_data)
+static void bluetooth_disconnect(DBusConnection *conn, void *user_data)
 {
-       DBG("connection %p", connection);
+       DBG("connection %p", conn);
 
        if (bluetooth_devices == NULL)
                return;
@@ -935,7 +935,7 @@ static void powered_reply(DBusPendingCall *call, void *user_data)
        add_adapter(connection, user_data);
 }
 
-static int change_powered(DBusConnection *connection, const char *path,
+static int change_powered(DBusConnection *conn, const char *path,
                                                        dbus_bool_t powered)
 {
        DBusMessage *message;
@@ -958,7 +958,7 @@ static int change_powered(DBusConnection *connection, const char *path,
        connman_dbus_property_append_basic(&iter, "Powered",
                                                DBUS_TYPE_BOOLEAN, &powered);
 
-       if (dbus_connection_send_with_reply(connection, message,
+       if (dbus_connection_send_with_reply(conn, message,
                                                &call, TIMEOUT) == FALSE) {
                connman_error("Failed to change Powered property");
                dbus_message_unref(message);

diff --git a/plugins/dundee.c b/plugins/dundee.c
index d0ecdef8a28d5359134e559690aab035088c3819..0dae0c967a6b2d19c0c50bd3bc57edff49ad3460 100644 (file)
--- a/plugins/dundee.c
+++ b/plugins/dundee.c
@@ -490,7 +490,7 @@ out:
        g_free(gateway);
 }
 
-static gboolean device_changed(DBusConnection *connection,
+static gboolean device_changed(DBusConnection *conn,
                                DBusMessage *message,
                                void *user_data)
 {
@@ -608,7 +608,7 @@ static void add_device(const char *path, DBusMessageIter *properties)
                set_connected(info);
 }
 
-static gboolean device_added(DBusConnection *connection, DBusMessage *message,
+static gboolean device_added(DBusConnection *conn, DBusMessage *message,
                                void *user_data)
 {
        DBusMessageIter iter, properties;
@@ -640,14 +640,14 @@ static gboolean device_added(DBusConnection *connection, DBusMessage *message,
        return TRUE;
 }
 
-static void remove_device(DBusConnection *connection, const char *path)
+static void remove_device(DBusConnection *conn, const char *path)
 {
        DBG("path %s", path);
 
        g_hash_table_remove(dundee_devices, path);
 }
 
-static gboolean device_removed(DBusConnection *connection, DBusMessage *message,
+static gboolean device_removed(DBusConnection *conn, DBusMessage *message,
                                void *user_data)
 {
        const char *path;
@@ -660,7 +660,7 @@ static gboolean device_removed(DBusConnection *connection, DBusMessage *message,
 
        dbus_message_get_args(message, NULL, DBUS_TYPE_OBJECT_PATH, &path,
                                DBUS_TYPE_INVALID);
-       remove_device(connection, path);
+       remove_device(conn, path);
        return TRUE;
 }
 
@@ -755,9 +755,9 @@ static int manager_get_devices(void)
        return -EINPROGRESS;
 }
 
-static void dundee_connect(DBusConnection *connection, void *user_data)
+static void dundee_connect(DBusConnection *conn, void *user_data)
 {
-       DBG("connection %p", connection);
+       DBG("connection %p", conn);
 
        dundee_devices = g_hash_table_new_full(g_str_hash, g_str_equal,
                                        g_free, device_destroy);
@@ -765,9 +765,9 @@ static void dundee_connect(DBusConnection *connection, void *user_data)
        manager_get_devices();
 }
 
-static void dundee_disconnect(DBusConnection *connection, void *user_data)
+static void dundee_disconnect(DBusConnection *conn, void *user_data)
 {
-       DBG("connection %p", connection);
+       DBG("connection %p", conn);
 
        g_hash_table_destroy(dundee_devices);
        dundee_devices = NULL;

diff --git a/plugins/ofono.c b/plugins/ofono.c
index d9696d77e3cdc9499b9350806f0e7b4a5078f7c0..1fb075ca86ffc6e7735d5191dd7476a6916a7520 100644 (file)
--- a/plugins/ofono.c
+++ b/plugins/ofono.c
@@ -1164,7 +1164,7 @@ static void remove_cm_context(struct modem_data *modem,
                remove_network(modem);
 }
 
-static gboolean context_changed(DBusConnection *connection,
+static gboolean context_changed(DBusConnection *conn,
                                DBusMessage *message,
                                void *user_data)
 {
@@ -1333,7 +1333,7 @@ static int cm_get_contexts(struct modem_data *modem)
        return -EINPROGRESS;
 }
 
-static gboolean cm_context_added(DBusConnection *connection,
+static gboolean cm_context_added(DBusConnection *conn,
                                        DBusMessage *message,
                                        void *user_data)
 {
@@ -1362,7 +1362,7 @@ static gboolean cm_context_added(DBusConnection *connection,
        return TRUE;
 }
 
-static gboolean cm_context_removed(DBusConnection *connection,
+static gboolean cm_context_removed(DBusConnection *conn,
                                        DBusMessage *message,
                                        void *user_data)
 {
@@ -1506,7 +1506,7 @@ static void netreg_update_regdom(struct modem_data *modem,
                connman_technology_set_regdom(alpha2);
 }
 
-static gboolean netreg_changed(DBusConnection *connection, DBusMessage *message,
+static gboolean netreg_changed(DBusConnection *conn, DBusMessage *message,
                                void *user_data)
 {
        const char *path = dbus_message_get_path(message);
@@ -1615,7 +1615,7 @@ static void add_cdma_network(struct modem_data *modem)
                set_connected(modem);
 }
 
-static gboolean cdma_netreg_changed(DBusConnection *connection,
+static gboolean cdma_netreg_changed(DBusConnection *conn,
                                        DBusMessage *message,
                                        void *user_data)
 {
@@ -1723,7 +1723,7 @@ static void cm_update_powered(struct modem_data *modem,
        cm_set_powered(modem, TRUE);
 }
 
-static gboolean cm_changed(DBusConnection *connection, DBusMessage *message,
+static gboolean cm_changed(DBusConnection *conn, DBusMessage *message,
                                void *user_data)
 {
        const char *path = dbus_message_get_path(message);
@@ -1778,7 +1778,7 @@ static void cdma_cm_update_settings(struct modem_data *modem,
        extract_ipv4_settings(value, modem->context);
 }
 
-static gboolean cdma_cm_changed(DBusConnection *connection,
+static gboolean cdma_cm_changed(DBusConnection *conn,
                                DBusMessage *message, void *user_data)
 {
        const char *path = dbus_message_get_path(message);
@@ -1884,7 +1884,7 @@ static void sim_update_imsi(struct modem_data *modem,
        modem->imsi = g_strdup(imsi);
 }
 
-static gboolean sim_changed(DBusConnection *connection, DBusMessage *message,
+static gboolean sim_changed(DBusConnection *conn, DBusMessage *message,
                                void *user_data)
 {
        const char *path = dbus_message_get_path(message);
@@ -2062,7 +2062,7 @@ static void modem_update_interfaces(struct modem_data *modem,
        }
 }
 
-static gboolean modem_changed(DBusConnection *connection, DBusMessage *message,
+static gboolean modem_changed(DBusConnection *conn, DBusMessage *message,
                                void *user_data)
 {
        const char *path = dbus_message_get_path(message);
@@ -2255,7 +2255,7 @@ static void remove_modem(gpointer data)
        g_free(modem);
 }
 
-static gboolean modem_added(DBusConnection *connection,
+static gboolean modem_added(DBusConnection *conn,
                                DBusMessage *message, void *user_data)
 {
        DBusMessageIter iter, properties;
@@ -2276,7 +2276,7 @@ static gboolean modem_added(DBusConnection *connection,
        return TRUE;
 }
 
-static gboolean modem_removed(DBusConnection *connection,
+static gboolean modem_removed(DBusConnection *conn,
                                DBusMessage *message, void *user_data)
 {
        DBusMessageIter iter;