When using g_free (obj) don't test if obj != NULL g_free () already do

1999-09-01  bertrand  <Bertrand.Guiheneuf@aful.org>

	* camel/camel-folder.c (_finalize):
	(_set_name):
	* camel/camel-mime-message.c (_finalize):
	* camel/camel-mime-part.c (_finalize):
	(_set_description):
	(_set_disposition):
	* camel/camel-service.c (_finalize):
	* camel/camel-stream-fs.c (_finalize):
	* camel/gmime-content-field.c:
	(gmime_content_field_construct_from_string):
	* camel/url-util.c (g_url_free):

	When using g_free (obj) don't test if obj != NULL
	g_free () already do that. Thanks to elerium for
	the feedback.

19

svn path=/trunk/; revision=1151

1 files changed, 5 insertions, 10 deletions

diff --git a/camel/gmime-content-field.c b/camel/gmime-content-field.c
index ad48880e7a..d838c5c8de 100644
--- a/camel/gmime-content-field.c
+++ b/camel/gmime-content-field.c
@@ -76,8 +76,8 @@ gmime_content_field_free (GMimeContentField *content_field)
 {
 	g_assert (content_field);
 	g_hash_table_foreach (content_field->parameters, _free_parameter, NULL);
-	if (content_field->type) g_free (content_field->type);
-	if (content_field->subtype) g_free (content_field->subtype);
+	g_free (content_field->type);
+	g_free (content_field->subtype);
 	g_hash_table_destroy (content_field->parameters);
 	g_free (content_field);
 }
@@ -297,14 +297,9 @@ gmime_content_field_construct_from_string (GMimeContentField *content_field, con
 	g_assert (string);
 	g_assert (content_field);
  
-	if (content_field->type) {
-		CAMEL_LOG_FULL_DEBUG ( "GMimeContentField::construct_from_string, Freeing old mime type string\n");
-		g_free (content_field->type);
-	}
-	if (content_field->subtype) {
-		CAMEL_LOG_FULL_DEBUG ( "GMimeContentField::construct_from_string, Freeing old mime type substring\n");
-		g_free (content_field->subtype);
-	}
+	g_free (content_field->type);	
+	g_free (content_field->subtype);
+	
 	
 	first = 0;
 	len = strlen (string);