From glibc: 2007-07-19 Jakub Jelinek <jakub@redhat.com>

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 8f668ba338f37a37f3ed09b420055086cd54acb9..857bea4d5be21fb6a438a2549b7943c35ee388bd 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-19  Jakub Jelinek  <jakub@redhat.com>
+
+       * dcigettext.c (_nl_find_msg): Return NULL even if __gconv_open
+       returns __GCONV_NOCONV, but not for __GCONV_NULCONV.
+
 2007-07-11  Jakub Jelinek  <jakub@redhat.com>
 
        * finddomain.c (_nl_find_domain): If _nl_explode_name returned -1,

diff --git a/gettext-runtime/intl/dcigettext.c b/gettext-runtime/intl/dcigettext.c
index e84c809cbff4d01bd3f9a7ce8fad8c276fb25349..f81b5dcd981a0ba95d1b1d67c710f3da15f5f47c 100644 (file)
--- a/gettext-runtime/intl/dcigettext.c
+++ b/gettext-runtime/intl/dcigettext.c
@@ -1108,7 +1108,7 @@ _nl_find_msg (struct loaded_l10nfile *domain_file,
                        /* If the output encoding is the same there is
                           nothing to do.  Otherwise do not use the
                           translation at all.  */
-                       if (__builtin_expect (r != __GCONV_NOCONV, 1))
+                       if (__builtin_expect (r != __GCONV_NULCONV, 1))
                          return NULL;
 
                        convd->conv = (__gconv_t) -1;