From: Bruno Haible <bruno@clisp.org>
Date: Sat, 13 Oct 2007 15:48:22 +0000 (+0000)
Subject: From glibc: 2007-07-19  Jakub Jelinek  <jakub@redhat.com>
X-Git-Tag: v0.17~137
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c2840bc5a3e8adc86536cca2bdbb6becfe0601f;p=thirdparty%2Fgettext.git

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

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 8f668ba33..857bea4d5 100644
--- 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 e84c809cb..f81b5dcd9 100644
--- 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;