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

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 0d66671764ef775b02d0874e36f2bd35a8b8c377..4dc5f45ed79ca96d9a88621a2152f94105b6bb0b 100644 (file)
--- 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 a5d986592ccfe9295dd30713b00816bc8f91a3a2..4065b2bace89839f87ce1918ab43477a277a61b6 100644 (file)
--- 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)