[Telepathy-commits] [telepathy-gabble/master] Fix strict-aliasing warnings, and remove excessive usage of casts

[Alban Crequy]

---
 src/capabilities.c          |    7 ++++---
 src/private-tubes-factory.c |   34 +++++++++++++++++-----------------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/capabilities.c b/src/capabilities.c
index 9bfc815..7883eda 100644
--- a/src/capabilities.c
+++ b/src/capabilities.c
@@ -60,8 +60,6 @@ capabilities_get_features (GabblePresenceCapabilities caps,
                            GHashTable *per_channel_manager_caps)
 {
   GHashTableIter channel_manager_iter;
-  GabbleCapsChannelManager *manager;
-  gpointer cap;
   GSList *features = NULL;
   const Feature *i;
 
@@ -71,9 +69,12 @@ capabilities_get_features (GabblePresenceCapabilities caps,
 
   if (per_channel_manager_caps != NULL)
     {
+      gpointer manager;
+      gpointer cap;
+
       g_hash_table_iter_init (&channel_manager_iter, per_channel_manager_caps);
       while (g_hash_table_iter_next (&channel_manager_iter,
-                 (gpointer *) &manager, &cap))
+                 &manager, &cap))
         {
           gabble_caps_channel_manager_get_feature_list (manager, cap,
               &features);
diff --git a/src/private-tubes-factory.c b/src/private-tubes-factory.c
index 93ebfdf..50e5737 100644
--- a/src/private-tubes-factory.c
+++ b/src/private-tubes-factory.c
@@ -467,7 +467,7 @@ gabble_private_tubes_factory_get_contact_caps (
   GHashTable *dbus_tube_caps;
   GabblePresence *presence;
   GHashTableIter tube_caps_iter;
-  gchar *service;
+  gpointer service;
 
   g_assert (handle != 0);
 
@@ -492,7 +492,7 @@ gabble_private_tubes_factory_get_contact_caps (
   if (stream_tube_caps != NULL)
     {
       g_hash_table_iter_init (&tube_caps_iter, stream_tube_caps);
-      while (g_hash_table_iter_next (&tube_caps_iter, (gpointer *) &service,
+      while (g_hash_table_iter_next (&tube_caps_iter, &service,
             NULL))
         {
           add_service_to_array (service, arr, TP_TUBE_TYPE_STREAM, handle);
@@ -502,7 +502,7 @@ gabble_private_tubes_factory_get_contact_caps (
   if (dbus_tube_caps != NULL)
     {
       g_hash_table_iter_init (&tube_caps_iter, dbus_tube_caps);
-      while (g_hash_table_iter_next (&tube_caps_iter, (gpointer *) &service,
+      while (g_hash_table_iter_next (&tube_caps_iter, &service,
             NULL))
         {
           add_service_to_array (service, arr, TP_TUBE_TYPE_DBUS, handle);
@@ -518,28 +518,28 @@ gabble_private_tubes_factory_get_feature_list (
 {
   TubesCapabilities *caps = specific_caps;
   GHashTableIter iter;
-  gchar *service;
-  Feature *feat;
+  gpointer service;
+  gpointer feat;
 
   g_hash_table_iter_init (&iter, caps->stream_tube_caps);
-  while (g_hash_table_iter_next (&iter, (gpointer *) &service,
-        (gpointer *) &feat))
+  while (g_hash_table_iter_next (&iter, &service,
+        &feat))
     {
-      *features = g_slist_append (*features, (gpointer) feat);
+      *features = g_slist_append (*features, feat);
     }
 
   g_hash_table_iter_init (&iter, caps->dbus_tube_caps);
-  while (g_hash_table_iter_next (&iter, (gpointer *) &service,
-        (gpointer *) &feat))
+  while (g_hash_table_iter_next (&iter, &service,
+        &feat))
     {
-      *features = g_slist_append (*features, (gpointer) feat);
+      *features = g_slist_append (*features, feat);
     }
 }
 
 static void
 gabble_private_tubes_factory_free_feat (gpointer data)
 {
-  Feature *feat = (Feature *)data;
+  Feature *feat = (Feature *) data;
 
   if (feat == NULL)
     return;
@@ -670,12 +670,12 @@ gabble_private_tubes_factory_caps_diff (
   TubesCapabilities *old_caps = specific_old_caps;
   TubesCapabilities *new_caps = specific_new_caps;
   GHashTableIter tube_caps_iter;
-  gchar *service;
+  gpointer service;
 
   if (old_caps != NULL)
     {
       g_hash_table_iter_init (&tube_caps_iter, old_caps->stream_tube_caps);
-      while (g_hash_table_iter_next (&tube_caps_iter, (gpointer *) &service,
+      while (g_hash_table_iter_next (&tube_caps_iter, &service,
             NULL))
         {
           gpointer key, value;
@@ -687,7 +687,7 @@ gabble_private_tubes_factory_caps_diff (
             }
         }
       g_hash_table_iter_init (&tube_caps_iter, old_caps->dbus_tube_caps);
-      while (g_hash_table_iter_next (&tube_caps_iter, (gpointer *) &service,
+      while (g_hash_table_iter_next (&tube_caps_iter, &service,
             NULL))
         {
           gpointer key, value;
@@ -703,7 +703,7 @@ gabble_private_tubes_factory_caps_diff (
   if (new_caps != NULL)
     {
       g_hash_table_iter_init (&tube_caps_iter, new_caps->stream_tube_caps);
-      while (g_hash_table_iter_next (&tube_caps_iter, (gpointer *) &service,
+      while (g_hash_table_iter_next (&tube_caps_iter, &service,
             NULL))
         {
           gpointer key, value;
@@ -715,7 +715,7 @@ gabble_private_tubes_factory_caps_diff (
             }
         }
       g_hash_table_iter_init (&tube_caps_iter, new_caps->dbus_tube_caps);
-      while (g_hash_table_iter_next (&tube_caps_iter, (gpointer *) &service,
+      while (g_hash_table_iter_next (&tube_caps_iter, &service,
             NULL))
         {
           gpointer key, value;
-- 
1.5.6.5