aboutsummaryrefslogtreecommitdiff
path: root/intl
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2005-03-29 23:41:03 +0000
committerRoland McGrath <roland@gnu.org>2005-03-29 23:41:03 +0000
commitedac424073092fda118fb8514ad524d3a66a9ae6 (patch)
treead48f6b20238582db1e11b62e6fbce0105f7e1c7 /intl
parentedc8cc2a29b53fd6eeb82cd5fae14aa6bbb827dc (diff)
downloadglibc-edac424073092fda118fb8514ad524d3a66a9ae6.tar
glibc-edac424073092fda118fb8514ad524d3a66a9ae6.tar.gz
glibc-edac424073092fda118fb8514ad524d3a66a9ae6.tar.bz2
glibc-edac424073092fda118fb8514ad524d3a66a9ae6.zip
[BZ #661]
2005-03-19 Bruno Haible <bruno@clisp.org> * intl/dcigettext.c (struct known_translation_t): Change type of domainname field to 'const char *'. (DCIGETTEXT): Remove const-cast. [BZ #661] * grp/initgroups.c (internal_getgrouplist): Check if we have enough space before adding the primary group to the list.
Diffstat (limited to 'intl')
-rw-r--r--intl/dcigettext.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/intl/dcigettext.c b/intl/dcigettext.c
index 75762ea18f..8163064edc 100644
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -177,7 +177,7 @@ static void *mempcpy PARAMS ((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;
@@ -436,7 +436,7 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
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;
/* Since tfind/tsearch manage a balanced tree, concurrent tfind and
@@ -632,9 +632,11 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
+ 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;