[empathy: 118/148] Style fixes for *_free() functions
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: svn-commits-list gnome org
- Subject: [empathy: 118/148] Style fixes for *_free() functions
- Date: Mon, 1 Jun 2009 12:17:41 -0400 (EDT)
commit fec609875fd59ec0d50114e638620e3d372c511e
Author: Cosimo Cecchi <cosimo cecchi collabora co uk>
Date: Sat May 23 15:34:28 2009 +0200
Style fixes for *_free() functions
---
libempathy/empathy-dispatcher.c | 3 +--
libempathy/empathy-ft-handler.c | 27 ++++++---------------------
2 files changed, 7 insertions(+), 23 deletions(-)
diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c
index b8a185f..04e248d 100644
--- a/libempathy/empathy-dispatcher.c
+++ b/libempathy/empathy-dispatcher.c
@@ -756,8 +756,7 @@ dispatcher_connection_got_all (TpProxy *proxy,
free_find_channel_request (request);
}
- if (requests)
- g_list_free (requests);
+ g_list_free (requests);
g_hash_table_remove (priv->outstanding_classes_requests, proxy);
}
diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c
index 9286e56..d515c86 100644
--- a/libempathy/empathy-ft-handler.c
+++ b/libempathy/empathy-ft-handler.c
@@ -460,34 +460,19 @@ empathy_ft_handler_init (EmpathyFTHandler *self)
static void
hash_data_free (HashingData *data)
{
- if (data->buffer != NULL)
- {
- g_free (data->buffer);
- data->buffer = NULL;
- }
+ g_free (data->buffer);
if (data->stream != NULL)
- {
- g_object_unref (data->stream);
- data->stream = NULL;
- }
+ g_object_unref (data->stream);
if (data->checksum != NULL)
- {
- g_checksum_free (data->checksum);
- data->checksum = NULL;
- }
+ g_checksum_free (data->checksum);
if (data->error != NULL)
- {
- g_error_free (data->error);
- data->error = NULL;
- }
+ g_error_free (data->error);
+
if (data->handler != NULL)
- {
- g_object_unref (data->handler);
- data->handler = NULL;
- }
+ g_object_unref (data->handler);
g_slice_free (HashingData, data);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]