g_free and friends handles NULL just fine. Closes bug #371087 reported by

2008-01-10  Kjartan Maraas  <kmaraas@gnome.org>

	* backends/evoldap-backend.c: (parse_server_info),
	(destroy_source):
	* backends/markup-tree.c: (markup_entry_set_value):
	* backends/xml-dir.c: (create_fs_dir):
	* backends/xml-entry.c: (entry_destroy), (entry_set_schema_name),
	(entry_set_mod_user):
	* examples/simple-view.c: (main):
	* gconf/gconf-schema.c: (gconf_schema_free), (gconf_schema_copy):
	* gconf/gconf-sources.c: (gconf_sources_query_value):
	* gconf/gconf-value.c: (set_string), (gconf_value_free),
	(gconf_entry_unref), (gconf_entry_set_schema_name):
	* gconf/gconf.c: (gconf_engine_get_string):
	g_free and friends handles NULL just fine.
	Closes bug #371087 reported by Morten Welinder.

svn path=/trunk/; revision=2510

10 files changed, 49 insertions, 59 deletions

diff --git a/ChangeLog b/ChangeLog
index 4ca87ac0..f9cf7d18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2008-01-10  Kjartan Maraas  <kmaraas@gnome.org>
 
+	* backends/evoldap-backend.c: (parse_server_info),
+	(destroy_source):
+	* backends/markup-tree.c: (markup_entry_set_value):
+	* backends/xml-dir.c: (create_fs_dir):
+	* backends/xml-entry.c: (entry_destroy), (entry_set_schema_name),
+	(entry_set_mod_user):
+	* examples/simple-view.c: (main):
+	* gconf/gconf-schema.c: (gconf_schema_free), (gconf_schema_copy):
+	* gconf/gconf-sources.c: (gconf_sources_query_value):
+	* gconf/gconf-value.c: (set_string), (gconf_value_free),
+	(gconf_entry_unref), (gconf_entry_set_schema_name):
+	* gconf/gconf.c: (gconf_engine_get_string):
+	g_free and friends handles NULL just fine.
+	Closes bug #371087 reported by Morten Welinder.
+
+2008-01-10  Kjartan Maraas  <kmaraas@gnome.org>
+
 	* configure.in: Bump version
 	* backends/xml-dir.c:
 	* examples/basic-gconf-app.schemas:
diff --git a/backends/evoldap-backend.c b/backends/evoldap-backend.c
index 12037d04..dfd4f801 100644
--- a/backends/evoldap-backend.c
+++ b/backends/evoldap-backend.c
@@ -377,8 +377,7 @@ parse_server_info (xmlNodePtr   node,
 
 	  host_value = xmlNodeGetContent (node);
 
-	  if (*host != NULL)
-	    g_free (*host);
+	  g_free (*host);
 	  *host = g_strdup ((char *) host_value);
 
 	  xmlFree (host_value);
@@ -406,8 +405,7 @@ parse_server_info (xmlNodePtr   node,
 
 	  base_dn_value = xmlNodeGetContent (node);
 
-	  if (*base_dn != NULL)
-	    g_free (*base_dn);
+	  g_free (*base_dn);
 	  *base_dn = g_strdup ((char *) base_dn_value);
 
 	  if (base_dn_value != NULL)
@@ -994,20 +992,16 @@ destroy_source (GConfSource *source)
   esource->template_calendar    = NULL;
   esource->template_tasks       = NULL;
 
-  if (esource->filter_str != NULL)
-    g_free (esource->filter_str);
+  g_free (esource->filter_str);
   esource->filter_str = NULL;
 
-  if (esource->ldap_host != NULL)
-    g_free (esource->ldap_host);
+  g_free (esource->ldap_host);
   esource->ldap_host = NULL;
 
-  if (esource->base_dn != NULL)
-    g_free (esource->base_dn);
+  g_free (esource->base_dn);
   esource->base_dn = NULL;
 
-  if (esource->conf_file != NULL)
-    g_free (esource->conf_file);
+  g_free (esource->conf_file);
   esource->conf_file = NULL;
 
   g_free (esource);
diff --git a/backends/markup-tree.c b/backends/markup-tree.c
index 8b9542e8..61ead91b 100644
--- a/backends/markup-tree.c
+++ b/backends/markup-tree.c
@@ -1540,10 +1540,8 @@ markup_entry_set_value (MarkupEntry       *entry,
             g_slist_prepend (entry->local_schemas, local_schema);
         }
 
-      if (local_schema->short_desc)
-        g_free (local_schema->short_desc);
-      if (local_schema->long_desc)
-        g_free (local_schema->long_desc);
+      g_free (local_schema->short_desc);
+      g_free (local_schema->long_desc);
       if (local_schema->default_value)
         gconf_value_free (local_schema->default_value);
 
diff --git a/backends/xml-dir.c b/backends/xml-dir.c
index 324dc59f..9c32d8e9 100644
--- a/backends/xml-dir.c
+++ b/backends/xml-dir.c
@@ -1245,8 +1245,7 @@ create_fs_dir(const gchar* dir, const gchar* xml_filename,
             gconf_log(GCL_DEBUG, "failed parent: %s", parent);
           
           g_free(parent);
-          if (parent_xml)
-            g_free(parent_xml);
+          g_free(parent_xml);
           
           if (!success)
             return FALSE;
diff --git a/backends/xml-entry.c b/backends/xml-entry.c
index f2b80866..ececb383 100644
--- a/backends/xml-entry.c
+++ b/backends/xml-entry.c
@@ -64,14 +64,12 @@ entry_new (const gchar* relative_name)
 void
 entry_destroy (Entry* e)
 {
-  if (e->name)
-    g_free(e->name);
+  g_free(e->name);
 
   if (e->cached_value)
     gconf_value_free(e->cached_value);
 
-  if (e->mod_user)
-    g_free(e->mod_user);
+  g_free(e->mod_user);
 
   if (e->node != NULL)
     {
@@ -259,10 +257,9 @@ void
 entry_set_schema_name (Entry        *e,
                        const gchar  *name)
 {
-  if (e->schema_name)
-    g_free(e->schema_name);
+  g_free(e->schema_name);
 
-  e->schema_name = name ? g_strdup(name) : NULL;
+  e->schema_name = g_strdup(name);
   
   e->dirty = TRUE;
 }
@@ -283,8 +280,7 @@ entry_set_mod_user (Entry *e,
 {
   g_return_if_fail(e != NULL);
   
-  if (e->mod_user)
-    g_free(e->mod_user);
+  g_free(e->mod_user);
   e->mod_user = g_strdup(user);
 
   e->dirty = TRUE;
diff --git a/examples/simple-view.c b/examples/simple-view.c
index f6c77e93..41822d89 100644
--- a/examples/simple-view.c
+++ b/examples/simple-view.c
@@ -71,8 +71,7 @@ main(int argc, char** argv)
   
   label = gtk_label_new(str ? str : "<unset>");
 
-  if (str)
-    g_free(str);
+  g_free(str);
   
   gtk_container_add(GTK_CONTAINER(window), label);
 
diff --git a/gconf/gconf-schema.c b/gconf/gconf-schema.c
index ecfa5a89..395ee9d2 100644
--- a/gconf/gconf-schema.c
+++ b/gconf/gconf-schema.c
@@ -59,17 +59,10 @@ gconf_schema_free (GConfSchema* sc)
 {
   GConfRealSchema *real = REAL_SCHEMA (sc);
   
-  if (real->locale)
-    g_free (real->locale);
-
-  if (real->short_desc)
-    g_free (real->short_desc);
-
-  if (real->long_desc)
-    g_free (real->long_desc);
-
-  if (real->owner)
-    g_free (real->owner);
+  g_free (real->locale);
+  g_free (real->short_desc);
+  g_free (real->long_desc);
+  g_free (real->owner);
 
   if (real->default_value)
     gconf_value_free (real->default_value);
@@ -91,13 +84,13 @@ gconf_schema_copy (const GConfSchema* sc)
   dest->car_type = real->car_type;
   dest->cdr_type = real->cdr_type;
 
-  dest->locale = real->locale ? g_strdup (real->locale) : NULL;
+  dest->locale = g_strdup (real->locale);
   
-  dest->short_desc = real->short_desc ? g_strdup (real->short_desc) : NULL;
+  dest->short_desc = g_strdup (real->short_desc);
 
-  dest->long_desc = real->long_desc ? g_strdup (real->long_desc) : NULL;
+  dest->long_desc = g_strdup (real->long_desc);
 
-  dest->owner = real->owner ? g_strdup (real->owner) : NULL;
+  dest->owner = g_strdup (real->owner);
 
   dest->default_value = real->default_value ? gconf_value_copy (real->default_value) : NULL;
   
diff --git a/gconf/gconf-sources.c b/gconf/gconf-sources.c
index 4a6d7745..d89dc5b3 100644
--- a/gconf/gconf-sources.c
+++ b/gconf/gconf-sources.c
@@ -580,8 +580,7 @@ gconf_sources_query_value (GConfSources* sources,
           if (val)
             gconf_value_free (val);
 
-          if (schema_name)
-            g_free (schema_name);
+          g_free (schema_name);
           
           return NULL;
         }
diff --git a/gconf/gconf-value.c b/gconf/gconf-value.c
index 61398f5d..bd02cfaa 100644
--- a/gconf/gconf-value.c
+++ b/gconf/gconf-value.c
@@ -49,10 +49,8 @@ typedef struct {
 static void
 set_string(gchar** dest, const gchar* src)
 {
-  if (*dest != NULL)
-    g_free(*dest);
-
-  *dest = src ? g_strdup(src) : NULL;
+  g_free(*dest);
+  *dest = g_strdup(src);
 }
 
 /*
@@ -808,8 +806,7 @@ gconf_value_free(GConfValue* value)
   switch (real->type)
     {
     case GCONF_VALUE_STRING:
-      if (real->d.string_data != NULL)
-        g_free(real->d.string_data);
+      g_free(real->d.string_data);
       break;
     case GCONF_VALUE_SCHEMA:
       if (real->d.schema_data != NULL)
@@ -1492,8 +1489,7 @@ gconf_entry_unref (GConfEntry *entry)
       g_free (real->key);
       if (real->value)
         gconf_value_free (real->value);
-      if (real->schema_name)
-        g_free (real->schema_name);
+      g_free (real->schema_name);
       g_slice_free (GConfRealEntry, real);
     }
 }
@@ -1630,10 +1626,9 @@ void
 gconf_entry_set_schema_name(GConfEntry* entry,
                             const gchar* name)
 {
-  if (REAL_ENTRY (entry)->schema_name)
-    g_free (REAL_ENTRY (entry)->schema_name);
+  g_free (REAL_ENTRY (entry)->schema_name);
 
-  REAL_ENTRY (entry)->schema_name = name ? g_strdup(name) : NULL;
+  REAL_ENTRY (entry)->schema_name = g_strdup(name);
 }
 
 void
diff --git a/gconf/gconf.c b/gconf/gconf.c
index e79e843c..ea9e6143 100644
--- a/gconf/gconf.c
+++ b/gconf/gconf.c
@@ -3182,7 +3182,7 @@ gconf_engine_get_string(GConfEngine* conf, const gchar* key,
   val = gconf_engine_get (conf, key, err);
 
   if (val == NULL)
-    return deflt ? g_strdup(deflt) : NULL;
+    return g_strdup(deflt);
   else
     {
       gchar* retval;
@@ -3193,7 +3193,7 @@ gconf_engine_get_string(GConfEngine* conf, const gchar* key,
             *err = gconf_error_new(GCONF_ERROR_TYPE_MISMATCH, _("Expected string, got %s"),
                                     gconf_value_type_to_string(val->type));
           gconf_value_free(val);
-          return deflt ? g_strdup(deflt) : NULL;
+          return g_strdup(deflt);
         }
 
       retval = gconf_value_steal_string (val);