diff options
| author | Daniel Veillard <veillard@src.gnome.org> | 2002-03-20 21:55:57 +0000 |
|---|---|---|
| committer | Daniel Veillard <veillard@src.gnome.org> | 2002-03-20 21:55:57 +0000 |
| commit | 561b7f883e93197f8e99b430e6fac3f21fbba830 (patch) | |
| tree | 7de21a414606400f9b4d232959f72bcc88ad69e3 /HTMLparser.c | |
| parent | e50f3b5d54496e3afb411a9c3012c697b75eb34e (diff) | |
| download | android_external_libxml2-561b7f883e93197f8e99b430e6fac3f21fbba830.tar.gz android_external_libxml2-561b7f883e93197f8e99b430e6fac3f21fbba830.tar.bz2 android_external_libxml2-561b7f883e93197f8e99b430e6fac3f21fbba830.zip | |
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
Diffstat (limited to 'HTMLparser.c')
| -rw-r--r-- | HTMLparser.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/HTMLparser.c b/HTMLparser.c index f5da2983..4c819d1b 100644 --- a/HTMLparser.c +++ b/HTMLparser.c @@ -147,12 +147,11 @@ PUSH_AND_POP(static, xmlChar*, name) /* 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 @@ htmlParseStartTag(htmlParserCtxtPtr ctxt) { 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 @@ htmlParseChunk(htmlParserCtxtPtr ctxt, const char *chunk, int size, 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 |