diff options
author | Xavier Claessens <xclaesse@gmail.com> | 2011-11-16 15:35:10 +0100 |
---|---|---|
committer | Xavier Claessens <xclaesse@gmail.com> | 2011-11-16 15:35:31 +0100 |
commit | b7cfa229c65ecba4d4a5e9e0ea90331e9d5bb269 (patch) | |
tree | 8ea475c882ba20c8b42bcc7348c361e8b55ceb54 /lib | |
parent | 54f726c81670463a8bf16b4cd002d258f03aa05a (diff) | |
download | telepathy-salut-b7cfa229c65ecba4d4a5e9e0ea90331e9d5bb269.tar.gz |
Use _unref instead of _free _destroy when possible.unref
Replace g_(ptr_)array_free (foo, TRUE) and g_hash_table_destroy
with respectively g_(ptr_)array_unref (foo) and g_hash_table_unref.
I used this command to generate this patch:
for f in `find -name "*.c"`; do sed -i $f -re 's/g_ptr_array_free \(([^ ,]+), TRUE\)/g_ptr_array_unref \(\1\)/'; done
See Danielle's blog for explanation of possible bug _free can do:
http://blogs.gnome.org/danni/2011/11/16/mistakes-with-g_value_set_boxed/
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gibber/gibber-bytestream-direct.c | 2 | ||||
-rw-r--r-- | lib/gibber/gibber-bytestream-muc.c | 2 | ||||
-rw-r--r-- | lib/gibber/gibber-muc-connection.c | 4 | ||||
-rw-r--r-- | lib/gibber/gibber-r-multicast-packet.c | 8 | ||||
-rw-r--r-- | lib/gibber/gibber-r-multicast-sender.c | 10 | ||||
-rw-r--r-- | lib/gibber/gibber-r-multicast-transport.c | 28 | ||||
-rw-r--r-- | lib/gibber/tests/test-transport.c | 2 |
7 files changed, 28 insertions, 28 deletions
diff --git a/lib/gibber/gibber-bytestream-direct.c b/lib/gibber/gibber-bytestream-direct.c index 3503819f..2537d32c 100644 --- a/lib/gibber/gibber-bytestream-direct.c +++ b/lib/gibber/gibber-bytestream-direct.c @@ -135,7 +135,7 @@ gibber_bytestream_direct_finalize (GObject *object) g_free (priv->peer_id); if (priv->addresses != NULL) - g_array_free (priv->addresses, TRUE); + g_array_unref (priv->addresses); G_OBJECT_CLASS (gibber_bytestream_direct_parent_class)->finalize (object); } diff --git a/lib/gibber/gibber-bytestream-muc.c b/lib/gibber/gibber-bytestream-muc.c index 0a3a11fd..a9b79ce7 100644 --- a/lib/gibber/gibber-bytestream-muc.c +++ b/lib/gibber/gibber-bytestream-muc.c @@ -128,7 +128,7 @@ gibber_bytestream_muc_dispose (GObject *object) gibber_bytestream_iface_close (GIBBER_BYTESTREAM_IFACE (self), NULL); } - g_hash_table_destroy (priv->senders); + g_hash_table_unref (priv->senders); G_OBJECT_CLASS (gibber_bytestream_muc_parent_class)->dispose (object); } diff --git a/lib/gibber/gibber-muc-connection.c b/lib/gibber/gibber-muc-connection.c index a64ba16e..39b8a27f 100644 --- a/lib/gibber/gibber-muc-connection.c +++ b/lib/gibber/gibber-muc-connection.c @@ -257,11 +257,11 @@ gibber_muc_connection_finalize (GObject *object) priv->port = NULL; if (priv->parameters != NULL) { - g_hash_table_destroy (priv->parameters); + g_hash_table_unref (priv->parameters); priv->parameters = NULL; } - g_array_free (priv->streams_used, TRUE); + g_array_unref (priv->streams_used); G_OBJECT_CLASS (gibber_muc_connection_parent_class)->finalize (object); } diff --git a/lib/gibber/gibber-r-multicast-packet.c b/lib/gibber/gibber-r-multicast-packet.c index 07954f63..5710b6dd 100644 --- a/lib/gibber/gibber-r-multicast-packet.c +++ b/lib/gibber/gibber-r-multicast-packet.c @@ -129,7 +129,7 @@ gibber_r_multicast_packet_finalize (GObject *object) gibber_r_multicast_packet_sender_info_free ( g_array_index (self->depends, GibberRMulticastPacketSenderInfo *, i)); } - g_array_free (self->depends, TRUE); + g_array_unref (self->depends); /* free any data held directly by the object here */ switch (self->type) { @@ -140,13 +140,13 @@ gibber_r_multicast_packet_finalize (GObject *object) g_free (self->data.data.payload); break; case PACKET_TYPE_ATTEMPT_JOIN: - g_array_free (self->data.attempt_join.senders, TRUE); + g_array_unref (self->data.attempt_join.senders); break; case PACKET_TYPE_JOIN: - g_array_free (self->data.join.failures, TRUE); + g_array_unref (self->data.join.failures); break; case PACKET_TYPE_FAILURE: - g_array_free (self->data.failure.failures, TRUE); + g_array_unref (self->data.failure.failures); break; default: /* Nothing specific to free */; diff --git a/lib/gibber/gibber-r-multicast-sender.c b/lib/gibber/gibber-r-multicast-sender.c index 1f3cca34..936dd87b 100644 --- a/lib/gibber/gibber-r-multicast-sender.c +++ b/lib/gibber/gibber-r-multicast-sender.c @@ -161,7 +161,7 @@ gibber_r_multicast_sender_group_free (GibberRMulticastSenderGroup *group) h = group->senders; group->senders = NULL; - g_hash_table_destroy (h); + g_hash_table_unref (h); for (i = 0; i < group->pending_removal->len ; i++) { @@ -169,7 +169,7 @@ gibber_r_multicast_sender_group_free (GibberRMulticastSenderGroup *group) g_ptr_array_index (group->pending_removal, i))); } - g_ptr_array_free (group->pending_removal, TRUE); + g_ptr_array_unref (group->pending_removal); g_queue_free (group->pop_queue); g_slice_free (GibberRMulticastSenderGroup, group); @@ -449,7 +449,7 @@ gibber_r_multicast_sender_group_gc (GibberRMulticastSenderGroup *group) gibber_r_multicast_sender_ack (sender, info->packet_id); } - g_array_free (array, TRUE); + g_array_unref (array); /* Check if we can remove pending removals */ for (i = 0; i < group->pending_removal->len ; i++) @@ -793,8 +793,8 @@ gibber_r_multicast_sender_dispose (GObject *object) priv->dispose_has_run = TRUE; - g_hash_table_destroy (priv->packet_cache); - g_hash_table_destroy (priv->acks); + g_hash_table_unref (priv->packet_cache); + g_hash_table_unref (priv->acks); if (priv->whois_timer != 0) { diff --git a/lib/gibber/gibber-r-multicast-transport.c b/lib/gibber/gibber-r-multicast-transport.c index 44516092..7c845ab9 100644 --- a/lib/gibber/gibber-r-multicast-transport.c +++ b/lib/gibber/gibber-r-multicast-transport.c @@ -299,13 +299,13 @@ gibber_r_multicast_transport_flush_state (GibberRMulticastTransport *self) if (priv->send_join != NULL) { - g_array_free (priv->send_join, TRUE); + g_array_unref (priv->send_join); priv->send_join = NULL; } if (priv->send_join_failures != NULL) { - g_array_free (priv->send_join_failures, TRUE); + g_array_unref (priv->send_join_failures); priv->send_join_failures = NULL; } @@ -351,10 +351,10 @@ gibber_r_multicast_transport_finalize (GObject *object) GibberRMulticastTransportPrivate *priv = GIBBER_R_MULTICAST_TRANSPORT_GET_PRIVATE (self); - g_hash_table_destroy (priv->members); + g_hash_table_unref (priv->members); if (priv->pending_failures != NULL) { - g_array_free (priv->pending_failures, TRUE); + g_array_unref (priv->pending_failures); priv->pending_failures = NULL; } @@ -447,7 +447,7 @@ free_member_info (gpointer data) if (info->fail_timeout != 0) g_source_remove (info->fail_timeout); - g_array_free (info->failures, TRUE); + g_array_unref (info->failures); g_slice_free (MemberInfo, info); } @@ -650,8 +650,8 @@ setup_joining_phase (GibberRMulticastTransport *self) else { g_assert (priv->state == STATE_JOINING); - g_array_free (priv->send_join, TRUE); - g_array_free (priv->send_join_failures, TRUE); + g_array_unref (priv->send_join); + g_array_unref (priv->send_join_failures); priv->send_join = g_array_new (FALSE, FALSE, sizeof (guint32)); priv->send_join_failures = g_array_new (FALSE, FALSE, sizeof (guint32)); @@ -847,7 +847,7 @@ do_send_attempt_join (gpointer user_data) { data.senders, priv->repeating_join); priv->send_empty = FALSE; } - g_array_free (data.senders, TRUE); + g_array_unref (data.senders); return FALSE; } @@ -1148,7 +1148,7 @@ recheck_failures (GibberRMulticastTransport *self) g_array_index (array, guint32, i)); } - g_array_free (array, TRUE); + g_array_unref (array); } static void @@ -1179,7 +1179,7 @@ check_failure_completion (GibberRMulticastTransport *self, guint32 id) id); g_array_append_val (lost, sender->name); g_signal_emit (self, signals[LOST_SENDERS], 0, lost); - g_array_free (lost, TRUE); + g_array_unref (lost); } gibber_r_multicast_causal_transport_remove_sender (priv->transport, id); @@ -1506,12 +1506,12 @@ check_join_agreement (GibberRMulticastTransport *self) g_free (g_array_index (lost, gchar *, i)); } - g_array_free (lost, TRUE); - g_array_free (new, TRUE); + g_array_unref (lost); + g_array_unref (new); - g_array_free (priv->send_join, TRUE); + g_array_unref (priv->send_join); priv->send_join = NULL; - g_array_free (priv->send_join_failures, TRUE); + g_array_unref (priv->send_join_failures); priv->send_join_failures = NULL; priv->state = STATE_NORMAL; diff --git a/lib/gibber/tests/test-transport.c b/lib/gibber/tests/test-transport.c index 78bd5660..b035a534 100644 --- a/lib/gibber/tests/test-transport.c +++ b/lib/gibber/tests/test-transport.c @@ -131,7 +131,7 @@ send_data (gpointer data) priv->send (GIBBER_TRANSPORT (self), (guint8 *) arr->data, arr->len, NULL, priv->user_data); - g_array_free (arr, TRUE); + g_array_unref (arr); if (g_queue_is_empty (priv->buffers)) { |