Commit a12333ee authored by Tom Lane's avatar Tom Lane

Assorted code cleanup for contrib/xml2. No change in functionality,

just make it a bit less ugly in places.
parent bd7246f6
This diff is collapsed.
/* /*
* $PostgreSQL: pgsql/contrib/xml2/xslt_proc.c,v 1.16 2009/07/10 00:32:00 tgl Exp $ * $PostgreSQL: pgsql/contrib/xml2/xslt_proc.c,v 1.17 2010/02/28 19:51:37 tgl Exp $
* *
* XSLT processing functions (requiring libxslt) * XSLT processing functions (requiring libxslt)
* *
...@@ -27,17 +27,17 @@ ...@@ -27,17 +27,17 @@
#include <libxslt/xsltutils.h> #include <libxslt/xsltutils.h>
/* externally accessible functions */
Datum xslt_process(PG_FUNCTION_ARGS);
/* declarations to come from xpath.c */ /* declarations to come from xpath.c */
extern void elog_error(int level, char *explain, int force); extern void elog_error(const char *explain, bool force);
extern void pgxml_parser_init(); extern void pgxml_parser_init(void);
extern xmlChar *pgxml_texttoxmlchar(text *textstring);
/* local defs */ /* local defs */
static void parse_params(const char **params, text *paramstr); static void parse_params(const char **params, text *paramstr);
Datum xslt_process(PG_FUNCTION_ARGS);
#define MAXPARAMS 20 /* must be even, see parse_params() */ #define MAXPARAMS 20 /* must be even, see parse_params() */
...@@ -80,7 +80,7 @@ xslt_process(PG_FUNCTION_ARGS) ...@@ -80,7 +80,7 @@ xslt_process(PG_FUNCTION_ARGS)
if (doctree == NULL) if (doctree == NULL)
{ {
xmlCleanupParser(); xmlCleanupParser();
elog_error(ERROR, "error parsing XML document", 0); elog_error("error parsing XML document", false);
PG_RETURN_NULL(); PG_RETURN_NULL();
} }
...@@ -94,7 +94,7 @@ xslt_process(PG_FUNCTION_ARGS) ...@@ -94,7 +94,7 @@ xslt_process(PG_FUNCTION_ARGS)
{ {
xmlFreeDoc(doctree); xmlFreeDoc(doctree);
xmlCleanupParser(); xmlCleanupParser();
elog_error(ERROR, "error parsing stylesheet as XML document", 0); elog_error("error parsing stylesheet as XML document", false);
PG_RETURN_NULL(); PG_RETURN_NULL();
} }
...@@ -109,7 +109,7 @@ xslt_process(PG_FUNCTION_ARGS) ...@@ -109,7 +109,7 @@ xslt_process(PG_FUNCTION_ARGS)
xmlFreeDoc(doctree); xmlFreeDoc(doctree);
xsltCleanupGlobals(); xsltCleanupGlobals();
xmlCleanupParser(); xmlCleanupParser();
elog_error(ERROR, "failed to parse stylesheet", 0); elog_error("failed to parse stylesheet", false);
PG_RETURN_NULL(); PG_RETURN_NULL();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment