database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-29 13:56:47 +03:00
Code

Export xml.c's libxml-error-handling support so that contrib/xml2 can use it

Browse Source 
too, instead of duplicating the functionality (badly).

I renamed xml_init to pg_xml_init, because the former seemed just a bit too
generic to be safe as a global symbol.  I considered likewise renaming
xml_ereport to pg_xml_ereport, but felt that the reference to ereport probably
made it sufficiently PG-centric already.
This commit is contained in:
Tom Lane 2010-03-03 17:30:01 +00:00
parent dbef717909
commit f821c16e95
2 changed files with 39 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/backend/utils/adt/xml.c
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.68.2.13 2010/03/03 00:32:49 momjian Exp $
* $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.68.2.14 2010/03/03 17:30:01 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -86,7 +86,6 @@ XmlOptionType xmloption;
static StringInfo xml_err_buf = NULL;
static void xml_ereport(int level, int sqlcode, const char *msg);
static void xml_errorHandler(void *ctxt, const char *msg,...);
static void xml_ereport_by_code(int level, int sqlcode,
const char *msg, int errcode);
@ -102,7 +101,6 @@ static void xml_pfree(void *ptr);
static char *xml_pstrdup(const char *string);
#endif /* USE_LIBXMLCONTEXT */
static void xml_init(void);
static xmlChar *xml_text2xmlChar(text *in);
static int parse_xml_decl(const xmlChar *str, size_t *lenp,
xmlChar **version, xmlChar **encoding, int *standalone);
@ -631,7 +629,7 @@ xmlelement(XmlExprState *xmlExpr, ExprContext *econtext)
}
/* now safe to run libxml */
xml_init();
pg_xml_init();
PG_TRY();
{
@ -882,14 +880,23 @@ xml_is_document(xmltype *arg)
#ifdef USE_LIBXML
/*
* Set up for use of libxml --- this should be called by each function that
* is about to use libxml facilities.
* pg_xml_init --- set up for use of libxml
*
* This should be called by each function that is about to use libxml
* facilities. It has two responsibilities: verify compatibility with the
* loaded libxml version (done on first call in a session) and establish
* or re-establish our libxml error handler. The latter needs to be done
* anytime we might have passed control to add-on modules (eg libperl) which
* might have set their own error handler for libxml.
*
* This is exported for use by contrib/xml2, as well as other code that might
* wish to share use of this module's libxml error handler.
*
* TODO: xmlChar is utf8-char, make proper tuning (initdb with enc!=utf8 and
* check)
*/
static void
xml_init(void)
void
pg_xml_init(void)
{
static bool first_time = true;
@ -999,7 +1006,7 @@ parse_xml_decl(const xmlChar *str, size_t *lenp,
int utf8char;
int utf8len;
xml_init();
pg_xml_init();
/* Initialize output arguments to "not present" */
if (version)
@ -1151,7 +1158,7 @@ static bool
print_xml_decl(StringInfo buf, const xmlChar *version,
pg_enc encoding, int standalone)
{
xml_init(); /* why is this here? */
pg_xml_init(); /* why is this here? */
if ((version && strcmp((char *) version, PG_XML_DEFAULT_VERSION) != 0)
|| (encoding && encoding != PG_UTF8)
@ -1215,7 +1222,7 @@ xml_parse(text *data, XmlOptionType xmloption_arg, bool preserve_whitespace,
PG_UTF8);
/* Start up libxml and its parser (no-ops if already done) */
xml_init();
pg_xml_init();
xmlInitParser();
ctxt = xmlNewParserCtxt();
@ -1358,16 +1365,26 @@ xml_pstrdup(const char *string)
/*
* Wrapper for "ereport" function for XML-related errors. The "msg"
* is the SQL-level message; some can be adopted from the SQL/XML
* standard. This function adds libxml's native error messages, if
* any, as detail.
* xml_ereport --- report an XML-related error
*
* The "msg" is the SQL-level message; some can be adopted from the SQL/XML
* standard. This function adds libxml's native error message, if any, as
* detail.
*
* This is exported for modules that want to share the core libxml error
* handler. Note that pg_xml_init() *must* have been called previously.
*/
static void
void
xml_ereport(int level, int sqlcode, const char *msg)
{
char *detail;
/*
* It might seem that we should just pass xml_err_buf->data directly to
* errdetail. However, we want to clean out xml_err_buf before throwing
* error, in case there is another function using libxml further down
* the call stack.
*/
if (xml_err_buf->len > 0)
{
detail = pstrdup(xml_err_buf->data);
@ -1376,11 +1393,11 @@ xml_ereport(int level, int sqlcode, const char *msg)
else
detail = NULL;
/* libxml error messages end in '\n'; get rid of it */
if (detail)
{
size_t len;
/* libxml error messages end in '\n'; get rid of it */
len = strlen(detail);
if (len > 0 && detail[len - 1] == '\n')
detail[len - 1] = '\0';
@ -1789,7 +1806,7 @@ map_sql_value_to_xml_value(Datum value, Oid type)
xmlTextWriterPtr writer = NULL;
char *result;
xml_init();
pg_xml_init();
PG_TRY();
{
@ -3412,7 +3429,7 @@ xpath(PG_FUNCTION_ARGS)
memcpy(string, datastr, len);
string[len] = '\0';
xml_init();
pg_xml_init();
xmlInitParser();
PG_TRY();

4
src/include/utils/xml.h
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $PostgreSQL: pgsql/src/include/utils/xml.h,v 1.23.2.1 2010/03/01 02:21:40 tgl Exp $
* $PostgreSQL: pgsql/src/include/utils/xml.h,v 1.23.2.2 2010/03/03 17:30:01 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -63,6 +63,8 @@ typedef enum
XML_STANDALONE_OMITTED
} XmlStandaloneType;
extern void pg_xml_init(void);
extern void xml_ereport(int level, int sqlcode, const char *msg);
extern xmltype *xmlconcat(List *args);
extern xmltype *xmlelement(XmlExprState *xmlExpr, ExprContext *econtext);
extern xmltype *xmlparse(text *data, XmlOptionType xmloption, bool preserve_whitespace);