lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-24 13:33:01 +03:00
Code Activity

Cleanup function xmlBufResetInput() to set input from Buffer

Browse Source 
This was scattered in a number of modules, xmlParserInputPtr
have usually their base, cur and end pointer set from an
xmlBuf used as input.
* buf.c buf.h: add a new function implementing this setup
* parser.c HTMLparser.c catalog.c parserInternals.c xmlreader.c
  use the new function instead of digging into the buffer in
  all those modules
This commit is contained in:
Daniel Veillard
2012-07-16 16:28:47 +08:00
parent 145477d8ab
commit 61551a1eb7
7 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
HTMLparser.c
View File

@@ -3519,9 +3519,7 @@ htmlCheckEncodingDirect(htmlParserCtxtPtr ctxt, const xmlChar *encoding) {
"htmlCheckEncoding: encoder error\n",
NULL, NULL);
}
ctxt->input->base =
ctxt->input->cur = xmlBufContent(ctxt->input->buf->buffer);
ctxt->input->end = xmlBufEnd(ctxt->input->buf->buffer);
xmlBufResetInput(ctxt->input->buf->buffer, ctxt->input);
}
}
}
@@ -4906,9 +4904,7 @@ htmlCreateMemoryParserCtxt(const char *buffer, int size) {
input->filename = NULL;
input->buf = buf;
input->cur =
input->base = xmlBufContent(input->buf->buffer);
input->end = xmlBufEnd(input->buf->buffer);
xmlBufResetInput(buf->buffer, input);
inputPush(ctxt, input);
return(ctxt);
@@ -6106,9 +6102,7 @@ htmlCreatePushParserCtxt(htmlSAXHandlerPtr sax, void *user_data,
inputStream->filename = (char *)
xmlCanonicPath((const xmlChar *) filename);
inputStream->buf = buf;
inputStream->cur =
inputStream->base = xmlBufContent(buf->buffer);
inputStream->end = xmlBufEnd(buf->buffer);
xmlBufResetInput(buf->buffer, inputStream);
inputPush(ctxt, inputStream);