Avoid gcc warning about 'const' cast.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index ea7b44b22d2fe831f6922b8d5c4c7fb9c0563807..b62178133a679ee45416f05b2f2fd868b9402a87 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-19  Bruno Haible  <bruno@clisp.org>
+
+       * dcigettext.c (struct known_translation_t): Change type of domainname
+       field to 'const char *'.
+       (DCIGETTEXT): Remove const-cast.
+
 2005-04-18  Bruno Haible  <bruno@clisp.org>
 
        * libgnuintl.h.in (_INTL_REDIRECT_ASM): Test for __APPLE_CC__ > 1.

diff --git a/gettext-runtime/intl/dcigettext.c b/gettext-runtime/intl/dcigettext.c
index 7f4c12cd60a473653faa50516722939c927d2875..33ff6523357162c387d0ceb80e9634587fb724e9 100644 (file)
--- a/gettext-runtime/intl/dcigettext.c
+++ b/gettext-runtime/intl/dcigettext.c
@@ -221,7 +221,7 @@ static void *mempcpy (void *dest, const void *src, size_t n);
 struct known_translation_t
 {
   /* Domain in which to search.  */
-  char *domainname;
+  const char *domainname;
 
   /* The category.  */
   int category;
@@ -481,7 +481,7 @@ DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
   search = (struct known_translation_t *)
           alloca (offsetof (struct known_translation_t, msgid) + msgid_len);
   memcpy (search->msgid, msgid1, msgid_len);
-  search->domainname = (char *) domainname;
+  search->domainname = domainname;
   search->category = category;
 
   foundp = (struct known_translation_t **) tfind (search, &root, transcmp);
@@ -652,9 +652,11 @@ DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
                            + msgid_len + domainname_len + 1);
                  if (newp != NULL)
                    {
-                     newp->domainname =
-                       mempcpy (newp->msgid, msgid1, msgid_len);
-                     memcpy (newp->domainname, domainname, domainname_len + 1);
+                     char *new_domainname;
+
+                     new_domainname = mempcpy (newp->msgid, msgid1, msgid_len);
+                     memcpy (new_domainname, domainname, domainname_len + 1);
+                     newp->domainname = new_domainname;
                      newp->category = category;
                      newp->counter = _nl_msg_cat_cntr;
                      newp->domain = domain;