dohh I really didn't intended to commit this test version :-( Daniel
* HTMLparser.c error.c parser.c parserInternals.c tree.c xmlIO.c
include/libxml/tree.h: dohh I really didn't intended to commit
this test version :-(
Daniel
diff --git a/HTMLparser.c b/HTMLparser.c
index f5da298..4c819d1 100644
--- a/HTMLparser.c
+++ b/HTMLparser.c
@@ -147,12 +147,11 @@
/* Inported from XML */
-#define CUR ((ctxt->input->cur < ctxt->input->end) ? (*ctxt->input->cur) : 0)
+/* #define CUR (ctxt->token ? ctxt->token : (int) (*ctxt->input->cur)) */
+#define CUR ((int) (*ctxt->input->cur))
#define NEXT xmlNextChar(ctxt),ctxt->nbChars++
-#define AVAIL (ctxt->input->end - ctxt->input->cur)
-#define RAW (ctxt->token ? -1 : \
- (ctxt->input->cur < ctxt->input->end) ? (*ctxt->input->cur) : 0)
+#define RAW (ctxt->token ? -1 : (*ctxt->input->cur))
#define NXT(val) ctxt->input->cur[(val)]
#define CUR_PTR ctxt->input->cur
@@ -3048,8 +3047,8 @@
else {
/* Dump the bogus attribute string up to the next blank or
* the end of the tag. */
- while ((AVAIL > 0) && (IS_CHAR(CUR)) && !(IS_BLANK(CUR)) &&
- (CUR != '>') && ((CUR != '/') || (NXT(1) != '>')))
+ while ((IS_CHAR(CUR)) && !(IS_BLANK(CUR)) && (CUR != '>')
+ && ((CUR != '/') || (NXT(1) != '>')))
NEXT;
}
@@ -4671,8 +4670,6 @@
xmlParserInputBufferPush(ctxt->input->buf, size, chunk);
ctxt->input->base = ctxt->input->buf->buffer->content + base;
ctxt->input->cur = ctxt->input->base + cur;
- ctxt->input->end = ctxt->input->buf->buffer->content +
- ctxt->input->buf->buffer->use;
#ifdef DEBUG_PUSH
xmlGenericError(xmlGenericErrorContext, "HPP: pushed %d\n", size);
#endif