From: Bruno Haible <bruno@clisp.org>
Date: Thu, 19 May 2005 08:18:30 +0000 (+0000)
Subject: glibc 2004-03-24  Roland McGrath  <roland@redhat.com>
X-Git-Tag: v0.15~523
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11423bef627183074c3752172b79305eba434c0e;p=thirdparty%2Fgettext.git

glibc 2004-03-24  Roland McGrath  <roland@redhat.com>
---

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 0d6667176..4dc5f45ed 100644
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-05  Bruno Haible  <bruno@clisp.org>
+
+	* dcigettext.c (_nl_find_msg) [_LIBC]: Update norm_add_slashes call.
+	2004-03-24  Roland McGrath  <roland@redhat.com>
+		* loadmsgcat.c (_nl_init_domain_conv): Update norm_add_slashes
+		call.
+
 2005-05-05  Bruno Haible  <bruno@clisp.org>
 
 	* localealias.c (read_alias_file): Limit last patch to _LIBC case.
diff --git a/gettext-runtime/intl/dcigettext.c b/gettext-runtime/intl/dcigettext.c
index a5d986592..4065b2bac 100644
--- a/gettext-runtime/intl/dcigettext.c
+++ b/gettext-runtime/intl/dcigettext.c
@@ -986,7 +986,7 @@ _nl_find_msg (struct loaded_l10nfile *domain_file,
 # ifdef _LIBC
 		    /* We always want to use transliteration.  */
 		    outcharset = norm_add_slashes (outcharset, "TRANSLIT");
-		    charset = norm_add_slashes (charset, NULL);
+		    charset = norm_add_slashes (charset, "");
 		    if (__gconv_open (outcharset, charset, &convd->conv,
 				      GCONV_AVOID_NOCONV)
 			!= __GCONV_OK)