Delete obsolete XPointer range-to function.

third_party/libxml/src/xpointer.c

 /*
  * xpointer.c : Code to handle XML Pointer
  *
  * Base implementation was made accordingly to
  * W3C Candidate Recommendation 7 June 2000
  * http://www.w3.org/TR/2000/CR-xptr-20000607
  *
  * Added support for the element() scheme described in:
  * W3C Proposed Recommendation 13 November 2002
  * http://www.w3.org/TR/2002/PR-xptr-element-20021113/
@@ skipping 1314 matching lines @@
 xmlXPtrNewContext(xmlDocPtr doc, xmlNodePtr here, xmlNodePtr origin) {
     xmlXPathContextPtr ret;
 
     ret = xmlXPathNewContext(doc);
     if (ret == NULL)
         return(ret);
     ret->xptr = 1;
     ret->here = here;
     ret->origin = origin;
 
-    xmlXPathRegisterFunc(ret, (xmlChar *)"range-to",
-                         xmlXPtrRangeToFunction);
     xmlXPathRegisterFunc(ret, (xmlChar *)"range",
                          xmlXPtrRangeFunction);
     xmlXPathRegisterFunc(ret, (xmlChar *)"range-inside",
                          xmlXPtrRangeInsideFunction);
     xmlXPathRegisterFunc(ret, (xmlChar *)"string-range",
                          xmlXPtrStringRangeFunction);
     xmlXPathRegisterFunc(ret, (xmlChar *)"start-point",
                          xmlXPtrStartPointFunction);
     xmlXPathRegisterFunc(ret, (xmlChar *)"end-point",
                          xmlXPtrEndPointFunction);
@@ skipping 889 matching lines @@
     valuePush(ctxt, xmlXPtrWrapLocationSet(newset));
     xmlXPathFreeObject(set);
 }
 
 /**
  * xmlXPtrRangeToFunction:
  * @ctxt:  the XPointer Parser context
  * @nargs:  the number of args
  *
  * Implement the range-to() XPointer function
+ *
+ * Obsolete. range-to is not a real function but a special type of location
+ * step which is handled in xpath.c.
  */
 void
-xmlXPtrRangeToFunction(xmlXPathParserContextPtr ctxt, int nargs) {
-    xmlXPathObjectPtr range;
-    const xmlChar *cur;
-    xmlXPathObjectPtr res, obj;
-    xmlXPathObjectPtr tmp;
-    xmlLocationSetPtr newset = NULL;
-    xmlNodeSetPtr oldset;
-    int i;
-
-    if (ctxt == NULL) return;
-    CHECK_ARITY(1);
-    /*
-     * Save the expression pointer since we will have to evaluate
-     * it multiple times. Initialize the new set.
-     */
-    CHECK_TYPE(XPATH_NODESET);
-    obj = valuePop(ctxt);
-    oldset = obj->nodesetval;
-    ctxt->context->node = NULL;
-
-    cur = ctxt->cur;
-    newset = xmlXPtrLocationSetCreate(NULL);
-
-    for (i = 0; i < oldset->nodeNr; i++) {
-        ctxt->cur = cur;
-
-        /*
-         * Run the evaluation with a node list made of a single item
-         * in the nodeset.
-         */
-        ctxt->context->node = oldset->nodeTab[i];
-        tmp = xmlXPathNewNodeSet(ctxt->context->node);
-        valuePush(ctxt, tmp);
-
-        xmlXPathEvalExpr(ctxt);
-        CHECK_ERROR;
-
-        /*
-         * The result of the evaluation need to be tested to
-         * decided whether the filter succeeded or not
-         */
-        res = valuePop(ctxt);
-        range = xmlXPtrNewRangeNodeObject(oldset->nodeTab[i], res);
-        if (range != NULL) {
-            xmlXPtrLocationSetAdd(newset, range);
-        }
-
-        /*
-         * Cleanup
-         */
-        if (res != NULL)
-            xmlXPathFreeObject(res);
-        if (ctxt->value == tmp) {
-            res = valuePop(ctxt);
-            xmlXPathFreeObject(res);
-        }
-
-        ctxt->context->node = NULL;
-    }
-
-    /*
-     * The result is used as the new evaluation set.
-     */
-    xmlXPathFreeObject(obj);
-    ctxt->context->node = NULL;
-    ctxt->context->contextSize = -1;
-    ctxt->context->proximityPosition = -1;
-    valuePush(ctxt, xmlXPtrWrapLocationSet(newset));
+xmlXPtrRangeToFunction(xmlXPathParserContextPtr ctxt,
+                       int nargs ATTRIBUTE_UNUSED) {
+    XP_ERROR(XPATH_EXPR_ERROR);
 }
 
 /**
  * xmlXPtrAdvanceNode:
  * @cur:  the node
  * @level: incremented/decremented to show level in tree
  *
  * Advance to the next element or text node in document order
  * TODO: add a stack for entering/exiting entities
  *
@@ skipping 696 matching lines @@
     }
 
     NEXT;
     SKIP_BLANKS;
 }
 
 #define bottom_xpointer
 #include "elfgcchack.h"
 #endif