Roll libxml to 8effcb578e0590cc01bbcab0f9dccefc6bdbcdbd

third_party/libxml/src/xmlreader.c

 /*
  * xmlreader.c: implements the xmlTextReader streaming node API
  *
  * NOTE:
  *   XmlTextReader.Normalization Property won't be supported, since
  *     it makes the parser non compliant to the XML recommendation
  *
  * See Copyright for the status of this software.
  *
  * daniel@veillard.com
@@ skipping 124 matching lines @@
     charactersSAXFunc           characters;
     cdataBlockSAXFunc           cdataBlock;
     unsigned int                base;   /* base of the segment in the input */
     unsigned int                cur;    /* current position in the input */
     xmlNodePtr                  node;   /* current node */
     xmlNodePtr                  curnode;/* current attribute node */
     int                         depth;  /* depth of the current node */
     xmlNodePtr                  faketext;/* fake xmlNs chld */
     int                         preserve;/* preserve the resulting document */
     xmlBufPtr                   buffer; /* used to return const xmlChar * */
-    xmlDictPtr                  dict;   /* the context dictionnary */
+    xmlDictPtr                  dict;   /* the context dictionary */
 
     /* entity stack when traversing entities content */
     xmlNodePtr         ent;          /* Current Entity Ref Node */
     int                entNr;        /* Depth of the entities stack */
     int                entMax;       /* Max depth of the entities stack */
     xmlNodePtr        *entTab;       /* array of entities */
 
     /* error handling */
     xmlTextReaderErrorFunc errorFunc;    /* callback function */
     void                  *errorFuncArg; /* callback function user argument */
@@ skipping 47 matching lines @@
 
 /************************************************************************
  *                                                                      *
  *      Our own version of the freeing routines as we recycle nodes     *
  *                                                                      *
  ************************************************************************/
 /**
  * DICT_FREE:
  * @str:  a string
  *
- * Free a string if it is not owned by the "dict" dictionnary in the
+ * Free a string if it is not owned by the "dict" dictionary in the
  * current scope
  */
 #define DICT_FREE(str)                                          \
         if ((str) && ((!dict) ||                                \
             (xmlDictOwns(dict, (const xmlChar *)(str)) == 0)))  \
             xmlFree((char *)(str));
 
 static void xmlTextReaderFreeNode(xmlTextReaderPtr reader, xmlNodePtr cur);
 static void xmlTextReaderFreeNodeList(xmlTextReaderPtr reader, xmlNodePtr cur);
 
@@ skipping 1927 matching lines @@
         xmlFree(ret->sax);
         xmlFree(ret);
         return(NULL);
     }
     ret->ctxt->parseMode = XML_PARSE_READER;
     ret->ctxt->_private = ret;
     ret->ctxt->linenumbers = 1;
     ret->ctxt->dictNames = 1;
     ret->allocs = XML_TEXTREADER_CTXT;
     /*
-     * use the parser dictionnary to allocate all elements and attributes names
+     * use the parser dictionary to allocate all elements and attributes names
      */
     ret->ctxt->docdict = 1;
     ret->dict = ret->ctxt->dict;
 #ifdef LIBXML_XINCLUDE_ENABLED
     ret->xinclude = 0;
 #endif
 #ifdef LIBXML_PATTERN_ENABLED
     ret->patternMax = 0;
     ret->patternTab = NULL;
 #endif
@@ skipping 3070 matching lines @@
         }
     } else {
         if (reader->ctxt->dict == NULL)
             reader->ctxt->dict = xmlDictCreate();
         reader->dict = reader->ctxt->dict;
     }
     reader->ctxt->_private = reader;
     reader->ctxt->linenumbers = 1;
     reader->ctxt->dictNames = 1;
     /*
-     * use the parser dictionnary to allocate all elements and attributes names
+     * use the parser dictionary to allocate all elements and attributes names
      */
     reader->ctxt->docdict = 1;
     reader->ctxt->parseMode = XML_PARSE_READER;
 
 #ifdef LIBXML_XINCLUDE_ENABLED
     if (reader->xincctxt != NULL) {
         xmlXIncludeFreeContext(reader->xincctxt);
         reader->xincctxt = NULL;
     }
     if (options & XML_PARSE_XINCLUDE) {
@@ skipping 678 matching lines @@
     printf("ret: %d, cons: %ld , prod: %ld, output: '%s'\n", ret, cons,
            prod, output3);
     return (0);
 
 }
 #endif
 #endif /* NOT_USED_YET */
 #define bottom_xmlreader
 #include "elfgcchack.h"
 #endif /* LIBXML_READER_ENABLED */