aboutsummaryrefslogtreecommitdiff
path: root/locale/programs/ld-monetary.c
diff options
context:
space:
mode:
Diffstat (limited to 'locale/programs/ld-monetary.c')
-rw-r--r--locale/programs/ld-monetary.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/locale/programs/ld-monetary.c b/locale/programs/ld-monetary.c
index cd30125..d202d76 100644
--- a/locale/programs/ld-monetary.c
+++ b/locale/programs/ld-monetary.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
@@ -35,8 +35,8 @@
#include "localeinfo.h"
#include "stringtrans.h"
-void *xmalloc (size_t __n);
-void *xrealloc (void *__ptr, size_t __n);
+extern void *xmalloc (size_t __n);
+extern void *xrealloc (void *__ptr, size_t __n);
/* The real definition of the struct for the LC_NUMERIC locale. */
@@ -129,9 +129,12 @@ monetary_finish (struct localedef_t *locale)
/* The international currency symbol must come from ISO 4217. */
if (monetary->int_curr_symbol != NULL)
{
- if (strlen (monetary->int_curr_symbol) != 4 && !be_quiet)
- error (0, 0, _("\
+ if (strlen (monetary->int_curr_symbol) != 4)
+ {
+ if (!be_quiet)
+ error (0, 0, _("\
value of field `int_curr_symbol' in category `LC_MONETARY' has wrong length"));
+ }
else if (bsearch (monetary->int_curr_symbol, valid_int_curr,
NR_VALID_INT_CURR, sizeof (const char *),
(comparison_fn_t) curr_strcmp) == NULL