Update libxml to 2.7.7.

third_party/libxml/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 1134 matching lines @@
  * Parse and evaluate a Full XPtr i.e. possibly a cascade of XPath based
  * expressions or other schemes.
  */
 static void
 xmlXPtrEvalFullXPtr(xmlXPathParserContextPtr ctxt, xmlChar *name) {
     if (name == NULL)
     name = xmlXPathParseName(ctxt);
     if (name == NULL)
         XP_ERROR(XPATH_EXPR_ERROR);
     while (name != NULL) {
+        ctxt->error = XPATH_EXPRESSION_OK;
         xmlXPtrEvalXPtrPart(ctxt, name);
 
         /* in case of syntax error, break here */
-        if (ctxt->error != XPATH_EXPRESSION_OK)
+        if ((ctxt->error != XPATH_EXPRESSION_OK) &&
+            (ctxt->error != XML_XPTR_UNKNOWN_SCHEME))
             return;
 
         /*
          * If the returned value is a non-empty nodeset
          * or location set, return here.
          */
         if (ctxt->value != NULL) {
             xmlXPathObjectPtr obj = ctxt->value;
 
             switch (obj->type) {
@@ skipping 123 matching lines @@
         XP_ERROR(XPATH_EXPR_ERROR);
 }
 
 
 /************************************************************************
  *                                                                      *
  *                      General routines                                *
  *                                                                      *
  ************************************************************************/
 
+static
 void xmlXPtrStringRangeFunction(xmlXPathParserContextPtr ctxt, int nargs);
+static
 void xmlXPtrStartPointFunction(xmlXPathParserContextPtr ctxt, int nargs);
+static
 void xmlXPtrEndPointFunction(xmlXPathParserContextPtr ctxt, int nargs);
+static
 void xmlXPtrHereFunction(xmlXPathParserContextPtr ctxt, int nargs);
+static
 void xmlXPtrOriginFunction(xmlXPathParserContextPtr ctxt, int nargs);
+static
 void xmlXPtrRangeInsideFunction(xmlXPathParserContextPtr ctxt, int nargs);
+static
 void xmlXPtrRangeFunction(xmlXPathParserContextPtr ctxt, int nargs);
 
 /**
  * xmlXPtrNewContext:
  * @doc:  the XML document
  * @here:  the node that directly contains the XPointer being evaluated or NULL
  * @origin:  the element from which a user or program initiated traversal of
  *           the link, or NULL.
  *
  * Create a new XPointer context
@@ skipping 407 matching lines @@
 }
 
 /**
  * xmlXPtrHereFunction:
  * @ctxt:  the XPointer Parser context
  * @nargs:  the number of args
  *
  * Function implementing here() operation 
  * as described in 5.4.3
  */
-void
+static void
 xmlXPtrHereFunction(xmlXPathParserContextPtr ctxt, int nargs) {
     CHECK_ARITY(0);
 
     if (ctxt->context->here == NULL)
         XP_ERROR(XPTR_SYNTAX_ERROR);
     
     valuePush(ctxt, xmlXPtrNewLocationSetNodes(ctxt->context->here, NULL));
 }
 
 /**
  * xmlXPtrOriginFunction:
  * @ctxt:  the XPointer Parser context
  * @nargs:  the number of args
  *
  * Function implementing origin() operation 
  * as described in 5.4.3
  */
-void
+static void
 xmlXPtrOriginFunction(xmlXPathParserContextPtr ctxt, int nargs) {
     CHECK_ARITY(0);
 
     if (ctxt->context->origin == NULL)
         XP_ERROR(XPTR_SYNTAX_ERROR);
     
     valuePush(ctxt, xmlXPtrNewLocationSetNodes(ctxt->context->origin, NULL));
 }
 
 /**
@@ skipping 12 matching lines @@
  *
  * - If x is of type point, the start point is x.
  * - If x is of type range, the start point is the start point of x.
  * - If x is of type root, element, text, comment, or processing instruction,
  * - the container node of the start point is x and the index is 0.
  * - If x is of type attribute or namespace, the function must signal a
  *   syntax error.
  * ----------------
  *
  */
-void
+static void
 xmlXPtrStartPointFunction(xmlXPathParserContextPtr ctxt, int nargs) {
     xmlXPathObjectPtr tmp, obj, point;
     xmlLocationSetPtr newset = NULL;
     xmlLocationSetPtr oldset = NULL;
 
     CHECK_ARITY(1);
     if ((ctxt->value == NULL) ||
         ((ctxt->value->type != XPATH_LOCATIONSET) &&
          (ctxt->value->type != XPATH_NODESET)))
         XP_ERROR(XPATH_INVALID_TYPE)
@@ skipping 73 matching lines @@
  * - If x is of type range, the resulting point is the end point of x.
  * - If x is of type root or element, the container node of the resulting
  *   point is x and the index is the number of location children of x.
  * - If x is of type text, comment, or processing instruction, the container
  *   node of the resulting point is x and the index is the length of the
  *   string-value of x.
  * - If x is of type attribute or namespace, the function must signal a
  *   syntax error.
  * ----------------------------
  */
-void
+static void
 xmlXPtrEndPointFunction(xmlXPathParserContextPtr ctxt, int nargs) {
     xmlXPathObjectPtr tmp, obj, point;
     xmlLocationSetPtr newset = NULL;
     xmlLocationSetPtr oldset = NULL;
 
     CHECK_ARITY(1);
     if ((ctxt->value == NULL) ||
         ((ctxt->value->type != XPATH_LOCATIONSET) &&
          (ctxt->value->type != XPATH_NODESET)))
         XP_ERROR(XPATH_INVALID_TYPE)
@@ skipping 124 matching lines @@
  * @nargs:  the number of args
  *
  * Function implementing the range() function 5.4.3
  *  location-set range(location-set )
  *
  *  The range function returns ranges covering the locations in
  *  the argument location-set. For each location x in the argument
  *  location-set, a range location representing the covering range of
  *  x is added to the result location-set.
  */
-void
+static void
 xmlXPtrRangeFunction(xmlXPathParserContextPtr ctxt, int nargs) {
     int i;
     xmlXPathObjectPtr set;
     xmlLocationSetPtr oldset;
     xmlLocationSetPtr newset;
 
     CHECK_ARITY(1);
     if ((ctxt->value == NULL) ||
         ((ctxt->value->type != XPATH_LOCATIONSET) &&
          (ctxt->value->type != XPATH_NODESET)))
@@ skipping 125 matching lines @@
  *  the argument location-set, a range location is added to the result
  *  location-set. If x is a range location, then x is added to the
  *  result location-set. If x is not a range location, then x is used
  *  as the container location of the start and end points of the range
  *  location to be added; the index of the start point of the range is
  *  zero; if the end point is a character point then its index is the
  *  length of the string-value of x, and otherwise is the number of
  *  location children of x.
  *
  */
-void
+static void
 xmlXPtrRangeInsideFunction(xmlXPathParserContextPtr ctxt, int nargs) {
     int i;
     xmlXPathObjectPtr set;
     xmlLocationSetPtr oldset;
     xmlLocationSetPtr newset;
 
     CHECK_ARITY(1);
     if ((ctxt->value == NULL) ||
         ((ctxt->value->type != XPATH_LOCATIONSET) &&
          (ctxt->value->type != XPATH_NODESET)))
@@ skipping 433 matching lines @@
     xmlNodePtr cur;
     int pos, len = 0;
 
     if ((node == NULL) || (indx == NULL))
         return(-1);
     cur = *node;
     pos = *indx;
 
     if (cur == NULL)
         return(-1);
-    
+
     if ((cur->type == XML_ELEMENT_NODE) ||
         (cur->type == XML_DOCUMENT_NODE) ||
         (cur->type == XML_HTML_DOCUMENT_NODE)) {
         if (pos > 0) {
             cur = xmlXPtrGetNthChild(cur, pos);
-            pos = 0;
         }
     }
     while (cur != NULL) {
         if (cur->last != NULL)
             cur = cur->last;
         else if ((cur->type != XML_ELEMENT_NODE) &&
                  (cur->content != NULL)) {
             len = xmlStrlen(cur->content);
             break;
         } else {
@@ skipping 108 matching lines @@
  *
  * If the string in the second argument is not found in the string-value
  * of the location, or if a value in the third or fourth argument indicates
  * a string that is beyond the beginning or end of the document, the
  * expression fails.
  *
  * The points of the range-locations in the returned location-set will
  * all be character points.
  * ------------------------------
  */
-void
+static void
 xmlXPtrStringRangeFunction(xmlXPathParserContextPtr ctxt, int nargs) {
     int i, startindex, endindex = 0, fendindex;
     xmlNodePtr start, end = 0, fend;
     xmlXPathObjectPtr set;
     xmlLocationSetPtr oldset;
     xmlLocationSetPtr newset;
     xmlXPathObjectPtr string;
     xmlXPathObjectPtr position = NULL;
     xmlXPathObjectPtr number = NULL;
     int found, pos = 0, num = 0;
@@ skipping 223 matching lines @@
     }
 
     NEXT;
     SKIP_BLANKS;
 }
 
 #define bottom_xpointer
 #include "elfgcchack.h"
 #endif