aboutsummaryrefslogtreecommitdiffstats
path: root/encoding.c
diff options
context:
space:
mode:
authorDaniel Veillard <veillard@src.gnome.org>2006-10-16 08:31:18 +0000
committerDaniel Veillard <veillard@src.gnome.org>2006-10-16 08:31:18 +0000
commit28aac0b0f47cb70a7fb774bf314134bfce9d2562 (patch)
tree88ffaf439370a153fb227db2eaffa84dae07476b /encoding.c
parentdcec67243945db0bf080a43a09907d99df995550 (diff)
downloadandroid_external_libxml2-28aac0b0f47cb70a7fb774bf314134bfce9d2562.tar.gz
android_external_libxml2-28aac0b0f47cb70a7fb774bf314134bfce9d2562.tar.bz2
android_external_libxml2-28aac0b0f47cb70a7fb774bf314134bfce9d2562.zip
remove a warning check with uppercase for AIX iconv() should fix #352644
* 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
Diffstat (limited to 'encoding.c')
-rw-r--r--encoding.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/encoding.c b/encoding.c
index 6dee212e..ee33df1a 100644
--- a/encoding.c
+++ b/encoding.c
@@ -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));