diff src/xmlnode.c @ 14035:8bda65b88e49

[gaim-migrate @ 16638] A bunch of small changes. Mostly remove "if not null" checks before calling g_free, g_list_free, g_slist_free and g_strdup. Also use g_list_foreach() to call g_free to free strings in an array. And some whitespace changes here and there. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sat, 05 Aug 2006 08:27:39 +0000
parents 3c6d0c24179a
children d38d8716426c
line wrap: on
line diff
--- a/src/xmlnode.c	Sat Aug 05 05:42:28 2006 +0000
+++ b/src/xmlnode.c	Sat Aug 05 08:27:39 2006 +0000
@@ -48,8 +48,7 @@
 {
 	xmlnode *node = g_new0(xmlnode, 1);
 
-	if(name)
-		node->name = g_strdup(name);
+	node->name = g_strdup(name);
 	node->type = type;
 
 	return node;
@@ -181,12 +180,10 @@
 #ifdef HAVE_LIBXML
 	g_return_if_fail(node != NULL);
 
-	if (node->namespace)
-		g_free(node->namespace);
-	
+	g_free(node->namespace);
 	node->namespace = g_strdup(xmlns);
 #else
-	return xmlnode_set_attrib(node, "xmlns", xmlns);
+	xmlnode_set_attrib(node, "xmlns", xmlns);
 #endif
 }
 
@@ -215,13 +212,10 @@
 		x = y;
 	}
 
-	if(node->name)
-		g_free(node->name);
-	if(node->data)
-		g_free(node->data);
+	g_free(node->name);
+	g_free(node->data);
 #ifdef HAVE_LIBXML
-	if(node->namespace)
-		g_free(node->namespace);
+	g_free(node->namespace);
 #endif
 	g_free(node);
 }
@@ -311,7 +305,7 @@
 		g_string_append_printf(text, " xmlns='%s'", namespace);
 		g_free(namespace);
 	}
-#endif	
+#endif
 	for(c = node->child; c; c = c->next)
 	{
 		if(c->type == XMLNODE_TYPE_ATTRIB) {
@@ -353,8 +347,7 @@
 
 	g_free(node_name);
 
-	if(tab)
-		g_free(tab);
+	g_free(tab);
 
 	if(len)
 		*len = text->len;
@@ -422,7 +415,7 @@
 }
 
 static void
-xmlnode_parser_element_end_libxml(void *user_data, const xmlChar *element_name, 
+xmlnode_parser_element_end_libxml(void *user_data, const xmlChar *element_name,
 				 const xmlChar *prefix, const xmlChar *namespace)
 {
 	struct _xmlnode_parser_data *xpd = user_data;