diff options
| author | Mike Hommey <glandium@debian.org> | 2005-07-12 19:58:48 +0000 |
|---|---|---|
| committer | Mike Hommey <glandium@debian.org> | 2005-07-12 19:58:48 +0000 |
| commit | 112cb5bb5475afec1c1cbf1d6728ce4880d0fee8 (patch) | |
| tree | 6c34596134f8665ebc180f29b50915dc70bbe5c1 /parserInternals.c | |
| parent | 0fc063df3ab2ad380d532d210dd1001de473e51b (diff) | |
| download | libxml2-112cb5bb5475afec1c1cbf1d6728ce4880d0fee8.tar.gz | |
Load /tmp/tmp.zfIyNk/libxml2-2.6.20 intoupstream/2.6.20
packages/libxml2/branches/upstream/current.
Diffstat (limited to 'parserInternals.c')
| -rw-r--r-- | parserInternals.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/parserInternals.c b/parserInternals.c index 0e01deb..b5e302e 100644 --- a/parserInternals.c +++ b/parserInternals.c @@ -1267,9 +1267,11 @@ xmlSwitchInputEncoding(xmlParserCtxtPtr ctxt, xmlParserInputPtr input, int xmlSwitchToEncoding(xmlParserCtxtPtr ctxt, xmlCharEncodingHandlerPtr handler) { + int ret = 0; + if (handler != NULL) { if (ctxt->input != NULL) { - xmlSwitchInputEncoding(ctxt, ctxt->input, handler); + ret = xmlSwitchInputEncoding(ctxt, ctxt->input, handler); } else { xmlErrInternal(ctxt, "xmlSwitchToEncoding : no input\n", NULL); @@ -1281,7 +1283,7 @@ xmlSwitchToEncoding(xmlParserCtxtPtr ctxt, xmlCharEncodingHandlerPtr handler) ctxt->charset = XML_CHAR_ENCODING_UTF8; } else return(-1); - return(0); + return(ret); } /************************************************************************ |