Cleanup some unnecessary void * casts when using pfree() in contrib/xml

Neil Conway · Neil Conway · commit 04a1a24e9c07 · 2004-10-13T01:26:42.000Z
and contrib/xml2
diff --git a/contrib/xml/pgxml_dom.c b/contrib/xml/pgxml_dom.c
@@ -47,7 +47,7 @@ pgxml_repalloc(void *ptr, size_t size)
 static void
 pgxml_pfree(void *ptr)
 {
-	return pfree(ptr);
+	pfree(ptr);
 }
 
 static char *
@@ -216,7 +216,7 @@ pgxml_xpath(PG_FUNCTION_ARGS)
 	{
 		elog(WARNING, "XPath syntax error");
 		xmlFreeDoc(doctree);
-		pfree((void *) xpath);
+		pfree(xpath);
 		xmlCleanupParser();
 		PG_RETURN_NULL();
 	}
@@ -228,7 +228,7 @@ pgxml_xpath(PG_FUNCTION_ARGS)
 	if (res == NULL)
 	{
 		xmlFreeDoc(doctree);
-		pfree((void *) xpath);
+		pfree(xpath);
 		xmlCleanupParser();
 		PG_RETURN_NULL();		/* seems appropriate */
 	}
@@ -258,7 +258,7 @@ pgxml_xpath(PG_FUNCTION_ARGS)
 
 	/* Free various storage */
 	xmlFreeDoc(doctree);
-	pfree((void *) xpath);
+	pfree(xpath);
 	xmlFree(xpresstr);
 	xmlCleanupParser();
 	PG_RETURN_TEXT_P(xpres);
diff --git a/contrib/xml2/xpath.c b/contrib/xml2/xpath.c
@@ -79,7 +79,7 @@ static void
 pgxml_pfree(void *ptr)
 {
 /*	elog(DEBUG1,"Free in CMC %x",CurrentMemoryContext); */
-	return pfree(ptr);
+	pfree(ptr);
 }
 
 static char *
@@ -322,7 +322,7 @@ xpath_nodeset(PG_FUNCTION_ARGS)
 								 toptag, septag, NULL);
 
 	/* xmlCleanupParser(); done by result_to_text routine */
-	pfree((void *) xpath);
+	pfree(xpath);
 
 	if (xpres == NULL)
 		PG_RETURN_NULL();
@@ -358,7 +358,7 @@ xpath_list(PG_FUNCTION_ARGS)
 								 NULL, NULL, plainsep);
 
 	/* xmlCleanupParser(); done by result_to_text routine */
-	pfree((void *) xpath);
+	pfree(xpath);
 
 	if (xpres == NULL)
 		PG_RETURN_NULL();
@@ -399,7 +399,7 @@ xpath_string(PG_FUNCTION_ARGS)
 								 NULL, NULL, NULL);
 
 	xmlCleanupParser();
-	pfree((void *) xpath);
+	pfree(xpath);
 
 	if (xpres == NULL)
 		PG_RETURN_NULL();
@@ -429,7 +429,7 @@ xpath_number(PG_FUNCTION_ARGS)
 	xpath = pgxml_texttoxmlchar(xpathsupp);
 
 	res = pgxml_xpath(PG_GETARG_TEXT_P(0), xpath);
-	pfree((void *) xpath);
+	pfree(xpath);
 
 	if (res == NULL)
 	{
@@ -469,7 +469,7 @@ xpath_bool(PG_FUNCTION_ARGS)
 	xpath = pgxml_texttoxmlchar(xpathsupp);
 
 	res = pgxml_xpath(PG_GETARG_TEXT_P(0), xpath);
-	pfree((void *) xpath);
+	pfree(xpath);
 
 	if (res == NULL)
 	{

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ pgxml_repalloc(void *ptr, size_t size)`
`47`	`47`	`static void`
`48`	`48`	`pgxml_pfree(void *ptr)`
`49`	`49`	`{`
`50`		`- return pfree(ptr);`
	`50`	`+ pfree(ptr);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`static char *`
`@@ -216,7 +216,7 @@ pgxml_xpath(PG_FUNCTION_ARGS)`
`216`	`216`	`{`
`217`	`217`	`elog(WARNING, "XPath syntax error");`
`218`	`218`	`xmlFreeDoc(doctree);`
`219`		`- pfree((void *) xpath);`
	`219`	`+ pfree(xpath);`
`220`	`220`	`xmlCleanupParser();`
`221`	`221`	`PG_RETURN_NULL();`
`222`	`222`	`}`
`@@ -228,7 +228,7 @@ pgxml_xpath(PG_FUNCTION_ARGS)`
`228`	`228`	`if (res == NULL)`
`229`	`229`	`{`
`230`	`230`	`xmlFreeDoc(doctree);`
`231`		`- pfree((void *) xpath);`
	`231`	`+ pfree(xpath);`
`232`	`232`	`xmlCleanupParser();`
`233`	`233`	`PG_RETURN_NULL(); /* seems appropriate */`
`234`	`234`	`}`
`@@ -258,7 +258,7 @@ pgxml_xpath(PG_FUNCTION_ARGS)`
`258`	`258`
`259`	`259`	`/* Free various storage */`
`260`	`260`	`xmlFreeDoc(doctree);`
`261`		`- pfree((void *) xpath);`
	`261`	`+ pfree(xpath);`
`262`	`262`	`xmlFree(xpresstr);`
`263`	`263`	`xmlCleanupParser();`
`264`	`264`	`PG_RETURN_TEXT_P(xpres);`