summaryrefslogtreecommitdiff
path: root/bindings/xml
diff options
context:
space:
mode:
Diffstat (limited to 'bindings/xml')
-rw-r--r--bindings/xml/xmlbinding.c10
-rw-r--r--bindings/xml/xmlerror.h6
-rw-r--r--bindings/xml/xmlparser.c12
3 files changed, 14 insertions, 14 deletions
diff --git a/bindings/xml/xmlbinding.c b/bindings/xml/xmlbinding.c
index 6172954..2bbfb7b 100644
--- a/bindings/xml/xmlbinding.c
+++ b/bindings/xml/xmlbinding.c
@@ -381,7 +381,7 @@ void xml_dom_implementation_destroy(struct dom_implementation *impl)
*
* \param alloc Pointer to memory (de)allocation function
* \param pw Pointer to client-specific private data
- * \return XML_OK on success, XML_NOMEM on memory exhaustion
+ * \return DOM_XML_OK on success, DOM_XML_NOMEM on memory exhaustion
*/
dom_xml_error dom_xml_binding_initialise(dom_alloc alloc, void *pw)
{
@@ -389,19 +389,19 @@ dom_xml_error dom_xml_binding_initialise(dom_alloc alloc, void *pw)
err = dom_register_source(&xml_dom_impl_src, alloc, pw);
if (err != DOM_NO_ERR)
- return XML_NOMEM;
+ return DOM_XML_NOMEM;
- return XML_OK;
+ return DOM_XML_OK;
}
/**
* Finalise the XML DOM binding
*
- * \return XML_OK on success.
+ * \return DOM_XML_OK on success.
*/
dom_xml_error dom_xml_binding_finalise(void)
{
- return XML_OK;
+ return DOM_XML_OK;
}
diff --git a/bindings/xml/xmlerror.h b/bindings/xml/xmlerror.h
index f674182..ca42f2b 100644
--- a/bindings/xml/xmlerror.h
+++ b/bindings/xml/xmlerror.h
@@ -9,11 +9,11 @@
#define xml_xmlerror_h_
typedef enum {
- XML_OK = 0,
+ DOM_XML_OK = 0,
- XML_NOMEM = 1,
+ DOM_XML_NOMEM = 1,
- XML_LIBXML_ERR = (1<<16),
+ DOM_XML_LIBXML_ERR = (1<<16),
} dom_xml_error;
#endif
diff --git a/bindings/xml/xmlparser.c b/bindings/xml/xmlparser.c
index 1c45f9b..743a826 100644
--- a/bindings/xml/xmlparser.c
+++ b/bindings/xml/xmlparser.c
@@ -255,7 +255,7 @@ void dom_xml_parser_destroy(dom_xml_parser *parser)
* \param parser The XML parser instance to use for parsing
* \param data Pointer to data chunk
* \param len Byte length of data chunk
- * \return XML_OK on success, XML_LIBXML_ERR | <libxml error> on failure
+ * \return DOM_XML_OK on success, DOM_XML_LIBXML_ERR | <libxml error> on failure
*/
dom_xml_error dom_xml_parser_parse_chunk(dom_xml_parser *parser,
uint8_t *data, size_t len)
@@ -266,17 +266,17 @@ dom_xml_error dom_xml_parser_parse_chunk(dom_xml_parser *parser,
if (err != XML_ERR_OK) {
parser->msg(DOM_MSG_ERROR, parser->mctx,
"xmlParseChunk failed: %d", err);
- return XML_LIBXML_ERR | err;
+ return DOM_XML_LIBXML_ERR | err;
}
- return XML_OK;
+ return DOM_XML_OK;
}
/**
* Notify parser that datastream is empty
*
* \param parser The XML parser instance to notify
- * \return XML_OK on success, XML_LIBXML_ERR | <libxml error> on failure
+ * \return DOM_XML_OK on success, DOM_XML_LIBXML_ERR | <libxml error> on failure
*
* This will force any remaining data through the parser
*/
@@ -288,12 +288,12 @@ dom_xml_error dom_xml_parser_completed(dom_xml_parser *parser)
if (err != XML_ERR_OK) {
parser->msg(DOM_MSG_ERROR, parser->mctx,
"xmlParseChunk failed: %d", err);
- return XML_LIBXML_ERR | err;
+ return DOM_XML_LIBXML_ERR | err;
}
parser->complete = true;
- return XML_OK;
+ return DOM_XML_OK;
}
/**