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

remove a warning check with uppercase for AIX iconv() should fix #352644

Browse Source 
* HTMLparser.c: remove a warning
* encoding.c: check with uppercase for AIX iconv() should fix #352644
* doc/examples/Makefile.am: partially handle one bug report
Daniel
This commit is contained in:
Daniel Veillard
2006-10-16 08:31:18 +00:00
parent dcec672439
commit 28aac0b0f4
4 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
Mon Oct 16 09:51:05 CEST 2006 Daniel Veillard <daniel@veillard.com>
* HTMLparser.c: remove a warning
* encoding.c: check with uppercase for AIX iconv() should fix #352644
* doc/examples/Makefile.am: partially handle one bug report
Sun Oct 15 22:31:42 CEST 2006 Daniel Veillard <daniel@veillard.com>
* parser.c: fix the patch for unreproductable #343000 but

2
HTMLparser.c
View File

@@ -1047,7 +1047,7 @@ htmlInitAutoClose(void) {
for (indx = 0;indx < 100;indx ++) htmlStartCloseIndex[indx] = NULL;
indx = 0;
while ((htmlStartClose[i] != NULL) && (indx < 100 - 1)) {
htmlStartCloseIndex[indx++] = &htmlStartClose[i];
htmlStartCloseIndex[indx++] = (const char**) &htmlStartClose[i];
while (htmlStartClose[i] != NULL) i++;
i++;
}

1
doc/examples/Makefile.am
View File

@@ -9,6 +9,7 @@ examples.xml: index.py *.c
-@($(srcdir)/index.py)
index.html: examples.xml examples.xsl
-@(touch index.html)
-@(xsltproc examples.xsl examples.xml && echo "Rebuilt web page" && xmllint --valid --noout index.html)
install-data-local:

6
encoding.c
View File

@@ -1613,6 +1613,12 @@ xmlFindCharEncodingHandler(const char *name) {
/* check whether iconv can handle this */
icv_in = iconv_open("UTF-8", name);
icv_out = iconv_open(name, "UTF-8");
if (icv_in == (iconv_t) -1) {
icv_in = iconv_open("UTF-8", upper);
}
if (icv_out == (iconv_t) -1) {
icv_out = iconv_open(upper, "UTF-8");
}
if ((icv_in != (iconv_t) -1) && (icv_out != (iconv_t) -1)) {
enc = (xmlCharEncodingHandlerPtr)
xmlMalloc(sizeof(xmlCharEncodingHandler));