[Galago-commits] r2850 - in trunk/galago-daemon: . src

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-06-14 00:09:46 -0700 (Wed, 14 Jun 2006)
New Revision: 2850

Modified:
   trunk/galago-daemon/ChangeLog
   trunk/galago-daemon/src/coco.c
Log:
g_free() checks for NULL pointers, so don't be redundant.


Modified: trunk/galago-daemon/ChangeLog
===================================================================
--- trunk/galago-daemon/ChangeLog	2006-06-14 06:57:53 UTC (rev 2849)
+++ trunk/galago-daemon/ChangeLog	2006-06-14 07:09:46 UTC (rev 2850)
@@ -1,3 +1,8 @@
+Wed Jun 14 00:08:38 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* src/coco.c:
+	  - g_free() checks for NULL pointers, so don't be redundant.
+
 Tue Jun 13 23:55:32 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* src/coco.c:

Modified: trunk/galago-daemon/src/coco.c
===================================================================
--- trunk/galago-daemon/src/coco.c	2006-06-14 06:57:53 UTC (rev 2849)
+++ trunk/galago-daemon/src/coco.c	2006-06-14 07:09:46 UTC (rev 2850)
@@ -85,15 +85,9 @@
 
 	g_object_unref(coco->priv->context);
 
-	if (coco->priv->name != NULL)
-		g_free(coco->priv->name);
-
-	if (coco->priv->id != NULL)
-		g_free(coco->priv->id);
-
-	if (coco->priv->dbus_service_id != NULL)
-		g_free(coco->priv->dbus_service_id);
-
+	g_free(coco->priv->name);
+	g_free(coco->priv->id);
+	g_free(coco->priv->dbus_service_id);
 	g_free(coco->priv);
 
 	G_OBJECT_CLASS(parent_class)->finalize(gobject);
@@ -138,9 +132,7 @@
 
 	do
 	{
-		if (id != NULL)
-			g_free(id);
-
+		g_free(id);
 		id = g_strdup_printf("%s%d", nname, ++i);
 		obj_path = generate_obj_path(id);
 	}