Skip to content

Commit

Permalink
remove references to DocBook (DOCB)
Browse files Browse the repository at this point in the history
Under deprecation in LibXML2. Causing compilation warnings as noted
in #88.
  • Loading branch information
dwarring committed Nov 28, 2022
1 parent ee7a834 commit 93291b6
Showing 1 changed file with 15 additions and 2 deletions.
17 changes: 15 additions & 2 deletions src/dom.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,12 @@ DLLEXPORT void
domClearPSVIInList(xmlNodePtr list);

static int _domIsDoc(xmlNodePtr node) {
return(node->type == XML_DOCUMENT_NODE || node->type == XML_HTML_DOCUMENT_NODE || node->type == XML_DOCB_DOCUMENT_NODE);
return(node->type == XML_DOCUMENT_NODE
|| node->type == XML_HTML_DOCUMENT_NODE
#ifdef LIBXML_DOCB_ENABLED
|| node->type == XML_DOCB_DOCUMENT_NODE
#endif
);
}

DLLEXPORT void
Expand Down Expand Up @@ -747,7 +752,9 @@ domGetNodeName(xmlNodePtr node) {

case XML_DOCUMENT_NODE :
case XML_HTML_DOCUMENT_NODE :
#ifdef LIBXML_DOCB_ENABLED
case XML_DOCB_DOCUMENT_NODE :
#endif
name = (const xmlChar*) "#document";
break;

Expand Down Expand Up @@ -800,7 +807,7 @@ DLLEXPORT const xmlChar*
domGetXPathKey(xmlNodePtr node) {
const xmlChar* name = NULL;

switch (node->type) {
switch ((int)node->type) {
case XML_COMMENT_NODE :
name = (xmlChar*) "comment()";
break;
Expand All @@ -813,7 +820,9 @@ domGetXPathKey(xmlNodePtr node) {
break;
case XML_DOCUMENT_NODE :
case XML_HTML_DOCUMENT_NODE :
#ifdef LIBXML_DOCB_ENABLED
case XML_DOCB_DOCUMENT_NODE :
#endif
case XML_DOCUMENT_FRAG_NODE :
name = (xmlChar*) "document()";
break;
Expand Down Expand Up @@ -845,9 +854,11 @@ domGetASTKey(xmlNodePtr node) {
case XML_HTML_DOCUMENT_NODE :
name = (xmlChar*) "#html";
break;
#ifdef LIBXML_DOCB_ENABLED
case XML_DOCB_DOCUMENT_NODE :
name = (xmlChar*) "#docb";
break;
#endif
case XML_DOCUMENT_FRAG_NODE :
name = (xmlChar*) "#fragment";
break;
Expand Down Expand Up @@ -1362,9 +1373,11 @@ domNodeType(xmlChar* name) {
else if (xmlStrcmp( name, (xmlChar*) "#document-fragment" ) == 0) {
node_type = XML_DOCUMENT_FRAG_NODE;
}
#ifdef LIBXML_DOCB_ENABLED
else if (xmlStrcmp( name, (xmlChar*) "#docbook" ) == 0) {
node_type = XML_DOCB_DOCUMENT_NODE;
}
#endif
break;

case 'h':
Expand Down

0 comments on commit 93291b6

Please sign in to comment.