From: Bruno Haible <bruno@clisp.org>
Date: Thu, 28 Apr 2005 18:22:11 +0000 (+0000)
Subject: Avoid gcc warning about 'const' cast.
X-Git-Tag: v0.15~551
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f78941014cd738d5b1ea451f7bd78e11f1c2fa0f;p=thirdparty%2Fgettext.git

Avoid gcc warning about 'const' cast.
---

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index ea7b44b22..b62178133 100644
--- 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 7f4c12cd6..33ff65233 100644
--- 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;