Load /tmp/libxml2-2.6.24 intoupstream/2.6.24.dfsg

libxml2/branches/upstream/current.

1 files changed, 19 insertions, 5 deletions

diff --git a/HTMLparser.c b/HTMLparser.c
index 12afdd8..2e646ad 100644
--- a/HTMLparser.c
+++ b/HTMLparser.c
@@ -3389,9 +3389,9 @@ htmlParseStartTag(htmlParserCtxtPtr ctxt) {
     const xmlChar *name;
     const xmlChar *attname;
     xmlChar *attvalue;
-    const xmlChar **atts = ctxt->atts;
+    const xmlChar **atts;
     int nbatts = 0;
-    int maxatts = ctxt->maxatts;
+    int maxatts;
     int meta = 0;
     int i;
 
@@ -3403,6 +3403,9 @@ htmlParseStartTag(htmlParserCtxtPtr ctxt) {
     if (CUR != '<') return -1;
     NEXT;
 
+    atts = ctxt->atts;
+    maxatts = ctxt->maxatts;
+
     GROW;
     name = htmlParseHTMLName(ctxt);
     if (name == NULL) {
@@ -3753,10 +3756,8 @@ htmlParseReference(htmlParserCtxtPtr ctxt) {
 /**
  * htmlParseContent:
  * @ctxt:  an HTML parser context
- * @name:  the node name
  *
  * Parse a content: comment, sub-element, reference or text.
- *
  */
 
 static void
@@ -3875,6 +3876,19 @@ htmlParseContent(htmlParserCtxtPtr ctxt) {
 }
 
 /**
+ * htmlParseContent:
+ * @ctxt:  an HTML parser context
+ *
+ * Parse a content: comment, sub-element, reference or text.
+ */
+
+void
+__htmlParseContent(void *ctxt) {
+    if (ctxt != NULL)
+	htmlParseContent((htmlParserCtxtPtr) ctxt);
+}
+
+/**
  * htmlParseElement:
  * @ctxt:  an HTML parser context
  *
@@ -3952,7 +3966,7 @@ htmlParseElement(htmlParserCtxtPtr ctxt) {
 	/*
 	 * Capture end position and add node
 	 */
-	if ( currentNode != NULL && ctxt->record_info ) {
+	if (ctxt->record_info) {
 	   node_info.end_pos = ctxt->input->consumed +
 			      (CUR_PTR - ctxt->input->base);
 	   node_info.end_line = ctxt->input->line;