Remove variables that shadow global function names

3 files changed, 10 insertions, 12 deletions

diff --git a/telepathy-glib/base-connection.c b/telepathy-glib/base-connection.c
index fd1dac317..99cceaaab 100644
--- a/telepathy-glib/base-connection.c
+++ b/telepathy-glib/base-connection.c
@@ -2706,23 +2706,23 @@ tp_base_connection_disconnect_with_dbus_error (TpBaseConnection *self,
                                                GHashTable *details,
                                                TpConnectionStatusReason reason)
 {
-  GHashTable *dup = NULL;
+  GHashTable *dup_ = NULL;
 
   g_return_if_fail (TP_IS_BASE_CONNECTION (self));
   g_return_if_fail (tp_dbus_check_valid_interface_name (error_name, NULL));
 
   if (details == NULL)
     {
-      dup = g_hash_table_new (g_str_hash, g_str_equal);
-      details = dup;
+      dup_ = g_hash_table_new (g_str_hash, g_str_equal);
+      details = dup_;
     }
 
   tp_svc_connection_emit_connection_error (self, error_name, details);
   tp_base_connection_change_status (self, TP_CONNECTION_STATUS_DISCONNECTED,
       reason);
 
-  if (dup != NULL)
-    g_hash_table_destroy (dup);
+  if (dup_ != NULL)
+    g_hash_table_destroy (dup_);
 }
 
 /**
diff --git a/telepathy-glib/channel.c b/telepathy-glib/channel.c
index 0c0052980..0c90428f0 100644
--- a/telepathy-glib/channel.c
+++ b/telepathy-glib/channel.c
@@ -1759,7 +1759,6 @@ tp_channel_new (TpConnection *conn,
 {
   TpChannel *ret = NULL;
   TpProxy *conn_proxy = (TpProxy *) conn;
-  gchar *dup = NULL;
 
   g_return_val_if_fail (TP_IS_CONNECTION (conn), NULL);
   g_return_val_if_fail (object_path != NULL, NULL);
@@ -1803,7 +1802,6 @@ tp_channel_new (TpConnection *conn,
         NULL));
 
 finally:
-  g_free (dup);
 
   return ret;
 }
diff --git a/telepathy-glib/message-mixin.c b/telepathy-glib/message-mixin.c
index 46ee0c907..504b4003d 100644
--- a/telepathy-glib/message-mixin.c
+++ b/telepathy-glib/message-mixin.c
@@ -1923,15 +1923,15 @@ tp_message_mixin_get_dbus_property (GObject *object,
     {
       GPtrArray *arrays = g_ptr_array_sized_new (g_queue_get_length (
             mixin->priv->pending));
-      GList *link;
+      GList *l;
       GType type = dbus_g_type_get_collection ("GPtrArray",
           TP_HASH_TYPE_MESSAGE_PART);
 
-      for (link = g_queue_peek_head_link (mixin->priv->pending);
-           link != NULL;
-           link = g_list_next (link))
+      for (l = g_queue_peek_head_link (mixin->priv->pending);
+           l != NULL;
+           l = g_list_next (l))
         {
-          TpMessage *msg = link->data;
+          TpMessage *msg = l->data;
 
           g_ptr_array_add (arrays, g_boxed_copy (type, msg->parts));
         }