diff options
| author | Neil Conway | 2004-10-13 01:26:42 +0000 |
|---|---|---|
| committer | Neil Conway | 2004-10-13 01:26:42 +0000 |
| commit | 04a1a24e9c070cb53343253834699e7d3f5a3531 (patch) | |
| tree | b2742b37fcc179d62e3ca47b5080ad50c3154916 | |
| parent | 7069dbcc317c287f98e55d5296ff7ca77fadab49 (diff) | |
Cleanup some unnecessary void * casts when using pfree() in contrib/xml
and contrib/xml2
| -rw-r--r-- | contrib/xml/pgxml_dom.c | 8 | ||||
| -rw-r--r-- | contrib/xml2/xpath.c | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/contrib/xml/pgxml_dom.c b/contrib/xml/pgxml_dom.c index 2b11b1d646..47913647d3 100644 --- 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 index 67ae99fbfb..ca95d41c22 100644 --- 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) { |