[kazehakase-svn] [3484] * src/kz-xml.c: Use g_slice.

Zurück zum Archiv-Index

svnno****@sourc***** svnno****@sourc*****
Fri Mar 14 12:21:32 JST 2008


Revision: 3484
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3484
Author:   ikezoe
Date:     2008-03-14 12:21:32 +0900 (Fri, 14 Mar 2008)

Log Message:
-----------
	* src/kz-xml.c: Use g_slice.

Modified Paths:
--------------
    kazehakase/trunk/ChangeLog
    kazehakase/trunk/src/kz-xml.c

Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog	2008-03-12 09:47:58 UTC (rev 3483)
+++ kazehakase/trunk/ChangeLog	2008-03-14 03:21:32 UTC (rev 3484)
@@ -1,3 +1,7 @@
+2008-03-14  Hiroyuki Ikezoe  <poinc****@ikezo*****>
+
+	* src/kz-xml.c: Use g_slice.
+
 2008-03-12  Hiroyuki Ikezoe  <poinc****@ikezo*****>
 
 	* macro/gecko.m4: Append some directories to MOZILLA_INCLUDE_ROOT for

Modified: kazehakase/trunk/src/kz-xml.c
===================================================================
--- kazehakase/trunk/src/kz-xml.c	2008-03-12 09:47:58 UTC (rev 3483)
+++ kazehakase/trunk/src/kz-xml.c	2008-03-14 03:21:32 UTC (rev 3484)
@@ -348,7 +348,7 @@
 	g_return_val_if_fail(type > KZ_XML_NODE_INVALID &&
 			     type < KZ_XML_N_NODE_TYPES,
 			     NULL);
-	node = g_new0(KzXMLNode, 1);
+	node = g_slice_new0(KzXMLNode);
 	node->type        = type;
 	node->content     = NULL;
 	node->parent      = NULL;
@@ -380,7 +380,7 @@
 	}
 	case KZ_XML_NODE_ELEMENT:
 	{
-		KzXMLElement *element = g_new0(KzXMLElement, 1);
+		KzXMLElement *element = g_slice_new0(KzXMLElement);
 		element->name  = NULL;
 		element->attrs = NULL;
 		node->content = element;
@@ -436,14 +436,14 @@
 		g_free(element->name);
 		g_list_foreach(element->attrs, (GFunc)kz_xml_attr_free, NULL);
 		g_list_free(element->attrs);
-		g_free(element);
+		g_slice_free(KzXMLElement, element);
 	}
 	else if (node->type != KZ_XML_NODE_DOC_ROOT)
 	{
 		g_free(node->content);
 	}
 
-	g_free(node);
+	g_slice_free(KzXMLNode, node);
 }
 
 
@@ -452,7 +452,7 @@
 {
 	g_free(attr->name);
 	g_free(attr->value);
-	g_free(attr);
+	g_slice_free(KzXMLAttr, attr);
 }
 
 
@@ -675,15 +675,13 @@
 			g_warning("Attribute %s is duplicated!", attr->name);
 			element->attrs
 				= g_list_remove(element->attrs, attr);
-			g_free(attr->name);
-			g_free(attr->value);
-			g_free(attr);
+			kz_xml_attr_free(attr);
 		}
 	}
 
 	if (!found)
 	{
-		attr = g_new0(KzXMLAttr, 1);
+		attr = g_slice_new0(KzXMLAttr);
 		attr->name  = g_strdup(name);
 		attr->value = g_strdup(value);
 		element->attrs = g_list_append(element->attrs, attr);




More information about the Kazehakase-cvs mailing list
Zurück zum Archiv-Index