about summary refs log tree commit diff
path: root/intl/loadmsgcat.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-11-20 10:08:52 +0000
committerUlrich Drepper <drepper@redhat.com>2000-11-20 10:08:52 +0000
commitad5b53b1075af3514ae5e1c665f95529e4e7818e (patch)
tree67c20f2f1c091728e83ef830c4abd7d9a2c2e28e /intl/loadmsgcat.c
parent17427edd1fc510ae6eb7903cc8664e15500490d6 (diff)
downloadglibc-ad5b53b1075af3514ae5e1c665f95529e4e7818e.tar.gz
glibc-ad5b53b1075af3514ae5e1c665f95529e4e7818e.tar.xz
glibc-ad5b53b1075af3514ae5e1c665f95529e4e7818e.zip
Update.
	* intl/dcigettext.c (transcmp): Make s1 and s2 const.
	(DCIGETTEXT): Make domaindata variable const.
	* intl/loadmsgcat.c (_nl_load_domain): Rearrange domain initialization
	to avoid warning.
Diffstat (limited to 'intl/loadmsgcat.c')
-rw-r--r--intl/loadmsgcat.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
index aad6dfe5db..6b09815437 100644
--- a/intl/loadmsgcat.c
+++ b/intl/loadmsgcat.c
@@ -214,12 +214,11 @@ _nl_load_domain (domain_file)
       return;
     }
 
-  domain_file->data
-    = (struct loaded_domain *) malloc (sizeof (struct loaded_domain));
-  if (domain_file->data == NULL)
+  domain = (struct loaded_domain *) malloc (sizeof (struct loaded_domain));
+  if (domain == NULL)
     return;
+  domain_file->data = domain;
 
-  domain = (struct loaded_domain *) domain_file->data;
   domain->data = (char *) data;
   domain->use_mmap = use_mmap;
   domain->mmap_size = size;