summaryrefslogtreecommitdiff
path: root/catalog.c
diff options
context:
space:
mode:
authorDaniel Veillard <veillard@redhat.com>2012-07-16 16:28:47 +0800
committerDaniel Veillard <veillard@redhat.com>2012-07-23 14:24:27 +0800
commit61551a1eb75bacb32e5209635c0f3459595af54a (patch)
tree9846870885ca48e74af34a72112c5c4f272f3628 /catalog.c
parent145477d8ab5d6802529b1213220f108ad23d3827 (diff)
downloadlibxml2-61551a1eb75bacb32e5209635c0f3459595af54a.tar.gz
Cleanup function xmlBufResetInput() to set input from Buffer
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
Diffstat (limited to 'catalog.c')
-rw-r--r--catalog.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/catalog.c b/catalog.c
index 401e95c7..1fac0254 100644
--- a/catalog.c
+++ b/catalog.c
@@ -914,9 +914,7 @@ xmlParseCatalogFile(const char *filename) {
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);
if ((ctxt->directory == NULL) && (directory == NULL))