diff options
| author | Mike Hommey <mh@glandium.org> | 2005-02-05 12:06:19 +0000 |
|---|---|---|
| committer | Mike Hommey <mh@glandium.org> | 2005-02-05 12:06:19 +0000 |
| commit | a7457388701e6ccba9091ba3ec09505dc903b758 (patch) | |
| tree | 80a7d0fba3968fee73cc71a62ffe1af039396f29 /parserInternals.c | |
| parent | f51dd67f3a3f472af0620391eb588eeca4533689 (diff) | |
| download | libxml2-a7457388701e6ccba9091ba3ec09505dc903b758.tar.gz | |
Load /tmp/tmp.5kkLmZ/libxml2-2.6.17 intoupstream/2.6.17
packages/libxml2/branches/upstream/current.
Diffstat (limited to 'parserInternals.c')
| -rw-r--r-- | parserInternals.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/parserInternals.c b/parserInternals.c index 994aaa2..27257fc 100644 --- a/parserInternals.c +++ b/parserInternals.c @@ -473,8 +473,7 @@ xmlNextChar(xmlParserCtxtPtr ctxt) * the single character #xA. */ if (*(ctxt->input->cur) == '\n') { - ctxt->input->line++; - ctxt->input->col = 1; + ctxt->input->line++; ctxt->input->col = 1; } else ctxt->input->col++; @@ -551,8 +550,7 @@ xmlNextChar(xmlParserCtxtPtr ctxt) */ if (*(ctxt->input->cur) == '\n') { - ctxt->input->line++; - ctxt->input->col = 1; + ctxt->input->line++; ctxt->input->col = 1; } else ctxt->input->col++; ctxt->input->cur++; @@ -1145,7 +1143,8 @@ xmlSwitchInputEncoding(xmlParserCtxtPtr ctxt, xmlParserInputPtr input, * UTF-16 */ if ((handler->name != NULL) && - (!strcmp(handler->name, "UTF-16LE")) && + (!strcmp(handler->name, "UTF-16LE") || + !strcmp(handler->name, "UTF-16")) && (input->cur[0] == 0xFF) && (input->cur[1] == 0xFE)) { input->cur += 2; } |