[Telepathy-commits] [telepathy-gabble/master] use g_slice for allocating JingleCodec and JingleCandidate structs

[Senko Rasic]

---
 src/jingle-media-rtp.c        |   13 +++----------
 src/jingle-transport-google.c |   13 +++----------
 src/media-stream.c            |   23 ++---------------------
 3 files changed, 8 insertions(+), 41 deletions(-)

diff --git a/src/jingle-media-rtp.c b/src/jingle-media-rtp.c
index 4dc4e1d..2fcd2bc 100644
--- a/src/jingle-media-rtp.c
+++ b/src/jingle-media-rtp.c
@@ -99,7 +99,7 @@ _free_codecs (GList *codecs)
       JingleCodec *p = (JingleCodec *) codecs->data;
 
       g_free (p->name);
-      g_free (p);
+      g_slice_free (JingleCodec, p);
 
       codecs = g_list_remove (codecs, p);
     }
@@ -313,7 +313,7 @@ parse_description (GabbleJingleContent *content,
 
       /* FIXME: do we need "bitrate" param? never seen it in use */
 
-      p = g_new0 (JingleCodec, 1);
+      p = g_slice_new0 (JingleCodec);
       p->id = id;
       p->name = g_strdup (name);
       p->clockrate = clockrate;
@@ -328,14 +328,7 @@ parse_description (GabbleJingleContent *content,
   if (node != NULL)
     {
       /* rollback these */
-      while (codecs != NULL)
-        {
-          JingleCodec *p = codecs->data;
-
-          g_free (codecs->data);
-          codecs = g_list_remove (codecs, p);
-        }
-
+      _free_codecs (codecs);
       SET_BAD_REQ ("invalid payload");
       return;
     }
diff --git a/src/jingle-transport-google.c b/src/jingle-transport-google.c
index 56d1b6f..6d918cd 100644
--- a/src/jingle-transport-google.c
+++ b/src/jingle-transport-google.c
@@ -107,7 +107,7 @@ _free_candidates (GList *candidates)
       g_free (c->username);
       g_free (c->password);
 
-      g_free (c);
+      g_slice_free (JingleCandidate, c);
 
       candidates = g_list_remove (candidates, c);
     }
@@ -365,7 +365,7 @@ parse_candidates (GabbleJingleTransportIface *obj,
 
       gen = atoi (str);
 
-      c = g_new0 (JingleCandidate, 1);
+      c = g_slice_new0 (JingleCandidate);
       c->address = g_strdup (address);
       c->port = port;
       c->protocol = proto;
@@ -383,14 +383,7 @@ parse_candidates (GabbleJingleTransportIface *obj,
     {
       DEBUG ("not all nodes were processed, reporting error");
       /* rollback these */
-      while (candidates != NULL)
-        {
-          JingleCandidate *c = candidates->data;
-
-          g_free (candidates->data);
-          candidates = g_list_remove (candidates, c);
-        }
-
+      _free_candidates (candidates);
       SET_BAD_REQ ("invalid candidate");
       return;
     }
diff --git a/src/media-stream.c b/src/media-stream.c
index 6ef1483..8f6fe94 100644
--- a/src/media-stream.c
+++ b/src/media-stream.c
@@ -122,21 +122,6 @@ struct _GabbleMediaStreamPrivate
 
 #define GABBLE_MEDIA_STREAM_GET_PRIVATE(obj) ((obj)->priv)
 
-#ifdef ENABLE_DEBUG
-#if _GMS_DEBUG_LEVEL > 1
-static const char *tp_protocols[] = {
-  "TP_MEDIA_STREAM_BASE_PROTO_UDP (0)",
-  "TP_MEDIA_STREAM_BASE_PROTO_TCP (1)"
-};
-
-static const char *tp_transports[] = {
-  "TP_MEDIA_STREAM_TRANSPORT_TYPE_LOCAL (0)",
-  "TP_MEDIA_STREAM_TRANSPORT_TYPE_DERIVED (1)",
-  "TP_MEDIA_STREAM_TRANSPORT_TYPE_RELAY (2)"
-};
-#endif
-#endif
-
 static void push_remote_codecs (GabbleMediaStream *stream);
 static void push_remote_candidates (GabbleMediaStream *stream);
 static void push_playing (GabbleMediaStream *stream);
@@ -839,10 +824,6 @@ gabble_media_stream_new_native_candidate (TpSvcMediaStreamHandler *iface,
   if (!strcmp (addr, "127.0.0.1"))
     {
       DEBUG ("ignoring native localhost candidate");
-      /*
-      GMS_DEBUG_WARNING (priv->session,
-          "%s: ignoring native localhost candidate", G_STRFUNC); */
-
       tp_svc_media_stream_handler_return_from_new_native_candidate (context);
       return;
     }
@@ -859,7 +840,7 @@ gabble_media_stream_new_native_candidate (TpSvcMediaStreamHandler *iface,
 
   DEBUG ("put 1 native candidate from stream-engine into cache");
 
-  c = g_new0 (JingleCandidate, 1);
+  c = g_slice_new0 (JingleCandidate);
   c->address = g_value_dup_string (g_value_array_get_nth (transport, 1));
   c->port = g_value_get_uint (g_value_array_get_nth (transport, 2));
   c->protocol = g_value_get_uint (g_value_array_get_nth (transport, 3));
@@ -966,7 +947,7 @@ gabble_media_stream_set_local_codecs (TpSvcMediaStreamHandler *iface,
           5, &params,
           G_MAXUINT);
 
-      c = g_new0 (JingleCodec, 1);
+      c = g_slice_new0 (JingleCodec);
 
       c->id = id;
       c->name = g_strdup (name);
-- 
1.5.6.5