diff options
Diffstat (limited to 'xinclude.c')
-rw-r--r-- | xinclude.c | 33 |
1 files changed, 16 insertions, 17 deletions
@@ -79,7 +79,7 @@ struct _xmlXIncludeCtxt { * * Add a new node to process to an XInclude context */ -void +static void xmlXIncludeAddNode(xmlXIncludeCtxtPtr ctxt, xmlNodePtr node) { if (ctxt->incMax == 0) { ctxt->incMax = 4; @@ -128,7 +128,7 @@ xmlXIncludeAddNode(xmlXIncludeCtxtPtr ctxt, xmlNodePtr node) { * * Add a new document to the list */ -void +static void xmlXIncludeAddDoc(xmlXIncludeCtxtPtr ctxt, xmlDocPtr doc, const xmlURL url) { if (ctxt->docMax == 0) { ctxt->docMax = 4; @@ -177,7 +177,7 @@ xmlXIncludeAddDoc(xmlXIncludeCtxtPtr ctxt, xmlDocPtr doc, const xmlURL url) { * * Add a new txtument to the list */ -void +static void xmlXIncludeAddTxt(xmlXIncludeCtxtPtr ctxt, xmlNodePtr txt, const xmlURL url) { if (ctxt->txtMax == 0) { ctxt->txtMax = 4; @@ -226,7 +226,7 @@ xmlXIncludeAddTxt(xmlXIncludeCtxtPtr ctxt, xmlNodePtr txt, const xmlURL url) { * * Returns the new set */ -xmlXIncludeCtxtPtr +static xmlXIncludeCtxtPtr xmlXIncludeNewContext(xmlDocPtr doc) { xmlXIncludeCtxtPtr ret; @@ -254,7 +254,7 @@ xmlXIncludeNewContext(xmlDocPtr doc) { * * Free an XInclude context */ -void +static void xmlXIncludeFreeContext(xmlXIncludeCtxtPtr ctxt) { int i; @@ -299,7 +299,7 @@ xmlXIncludeFreeContext(xmlXIncludeCtxtPtr ctxt) { * * Load the document, and store the result in the XInclude context */ -void +static void xmlXIncludeLoadDoc(xmlXIncludeCtxtPtr ctxt, const xmlChar *url, int nr) { xmlDocPtr doc; xmlURIPtr uri; @@ -417,7 +417,7 @@ loaded: * * Load the content, and store the result in the XInclude context */ -void +static void xmlXIncludeLoadTxt(xmlXIncludeCtxtPtr ctxt, const xmlChar *url, int nr) { xmlParserInputBufferPtr buf; xmlNodePtr node; @@ -529,7 +529,7 @@ loaded: * * Returns the result list or NULL in case of error */ -xmlNodePtr +static xmlNodePtr xmlXIncludePreProcessNode(xmlXIncludeCtxtPtr ctxt, xmlNodePtr node) { xmlXIncludeAddNode(ctxt, node); return(0); @@ -544,7 +544,7 @@ xmlXIncludePreProcessNode(xmlXIncludeCtxtPtr ctxt, xmlNodePtr node) { * * Returns 0 if substition succeeded, -1 if some processing failed */ -int +static int xmlXIncludeLoadNode(xmlXIncludeCtxtPtr ctxt, int nr) { xmlNodePtr cur; xmlChar *href; @@ -668,7 +668,7 @@ xmlXIncludeLoadNode(xmlXIncludeCtxtPtr ctxt, int nr) { * * Returns 0 if substition succeeded, -1 if some processing failed */ -int +static int xmlXIncludeIncludeNode(xmlXIncludeCtxtPtr ctxt, int nr) { xmlNodePtr cur, end, list; @@ -710,15 +710,14 @@ xmlXIncludeIncludeNode(xmlXIncludeCtxtPtr ctxt, int nr) { /** * xmlXIncludeTestNode: - * @doc: an XML document * @node: an XInclude node * * test if the node is an XInclude node * * Returns 1 true, 0 otherwise */ -int -xmlXIncludeTestNode(xmlDocPtr doc, xmlNodePtr node) { +static int +xmlXIncludeTestNode(xmlNodePtr node) { if (node == NULL) return(0); if (node->ns == NULL) @@ -754,18 +753,18 @@ xmlXIncludeProcess(xmlDocPtr doc) { * First phase: lookup the elements in the document */ cur = xmlDocGetRootElement(doc); - if (xmlXIncludeTestNode(doc, cur)) + if (xmlXIncludeTestNode(cur)) xmlXIncludePreProcessNode(ctxt, cur); while (cur != NULL) { /* TODO: need to work on entities -> stack */ if ((cur->children != NULL) && (cur->children->type != XML_ENTITY_DECL)) { cur = cur->children; - if (xmlXIncludeTestNode(doc, cur)) + if (xmlXIncludeTestNode(cur)) xmlXIncludePreProcessNode(ctxt, cur); } else if (cur->next != NULL) { cur = cur->next; - if (xmlXIncludeTestNode(doc, cur)) + if (xmlXIncludeTestNode(cur)) xmlXIncludePreProcessNode(ctxt, cur); } else { do { @@ -773,7 +772,7 @@ xmlXIncludeProcess(xmlDocPtr doc) { if (cur == NULL) break; /* do */ if (cur->next != NULL) { cur = cur->next; - if (xmlXIncludeTestNode(doc, cur)) + if (xmlXIncludeTestNode(cur)) xmlXIncludePreProcessNode(ctxt, cur); break; /* do */ } |