From: Bruno Haible <bruno@clisp.org>
Date: Mon, 18 Dec 2006 13:19:48 +0000 (+0000)
Subject: Merge with fixes from gettext.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cdb29e693899080d47f3949a7495fe7038646b5;p=thirdparty%2Fgnulib.git

Merge with fixes from gettext.
---

diff --git a/lib/fstrcmp.c b/lib/fstrcmp.c
index 36b19bf50e..69311e114e 100644
--- a/lib/fstrcmp.c
+++ b/lib/fstrcmp.c
@@ -553,7 +553,7 @@ keys_init (void)
 }
 
 /* Ensure that keys_init is called once only.  */
-gl_once_define(static, keys_init_once);
+gl_once_define(static, keys_init_once)
 
 
 /* NAME
@@ -620,7 +620,7 @@ fstrcmp (const char *string1, const char *string2)
 	 to be preserved.  */
       if (buffer != NULL)
 	free (buffer);
-      buffer = (int *) xmalloc (bufmax * (2 * sizeof (int)));
+      buffer = (int *) xnmalloc (bufmax, 2 * sizeof (int));
       gl_tls_set (buffer_key, buffer);
       gl_tls_set (bufmax_key, (void *) (uintptr_t) bufmax);
     }