diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2012-07-15 19:39:24 -0300 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2012-07-15 19:39:24 -0300 |
commit | 984efc4ad43a2cd20e76b2f78355ff97d103cc64 (patch) | |
tree | acb6714e2198eac9ac53caaca26e3926e5cbdd5a /plugins/dundee.c | |
parent | 3118b6115b20e0dde831a74dca7045faed5863ae (diff) | |
download | connman-984efc4ad43a2cd20e76b2f78355ff97d103cc64.tar.gz connman-984efc4ad43a2cd20e76b2f78355ff97d103cc64.tar.bz2 connman-984efc4ad43a2cd20e76b2f78355ff97d103cc64.zip |
plugins: Avoid shadowing connection variable
Diffstat (limited to 'plugins/dundee.c')
-rw-r--r-- | plugins/dundee.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/plugins/dundee.c b/plugins/dundee.c index d0ecdef8..0dae0c96 100644 --- 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; |