summaryrefslogtreecommitdiff
path: root/locale/localeconv.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-03-06 03:00:08 +0000
committerRoland McGrath <roland@gnu.org>1995-03-06 03:00:08 +0000
commit933e73facc338fb81f1f72af416ea57fbf439a2f (patch)
tree1a91e86bb27602a860b65afca47cbc6a38223df4 /locale/localeconv.c
parent6408bdde65cac02ef96ae9f2b77f222b534c0e75 (diff)
downloadglibc-933e73facc338fb81f1f72af416ea57fbf439a2f.tar.gz
Sun Mar 5 19:40:13 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* locale/localeinfo.h: Rewritten for new locale system, using locale data files and with <langinfo.h> interface. * locale/setlocale.c: Rewritten to use locale data files. * langinfo.h: New file. * locale/langinfo.h: New file. * locale/nl_langinfo.c: New file. * locale/loadlocale.c: New file. * locale/lc-ctype.c: New file. * locale/lc-messages.c: New file. * locale/lc-monetary.c: New file. * locale/lc-numeric.c: New file. * locale/lc-time.c: New file. * locale/categories.def: New file. * locale/Makefile (headers): Remove localeinfo.h. (distribute): New variable; put localeinfo.h here, and categories.def. (routines): Add loadlocale. (categories): New variable. (aux): Use that to get C-category and lc-category. * ctype/ctype.h (_IS*): Use independent bits for all but _ISalnum. * locale/C-ctype.c, locale/C-messages.c: New files. * locale/C-monetary.c, locale/C-numeric.c, locale/C-time.c: Default "C" locale data updated for new locale system. * locale/C-collate.c: File removed. * locale/C-ctype_ct.c: File removed. * locale/C-ctype_mb.c: File removed. * locale/C-response.c: File removed. * locale/localeconv.c: Use _NL_CURRENT macro to access locale data. * stdio/printf_fp.c, stdio/vfprintf.c, stdio/vfscanf.c, stdlib/strtod.c, time/asctime.c, time/strftime.c: Include ../locale/localeinfo.h and use _NL_CURRENT macro to access locale data. * time/localtime.c: Don't include <localeinfo.h>. * time/tzset.c: Don't use locale items for default TZ value or "GMT" string (use "UTC"). * stdio/vfprintf.c [USE_IN_LIBIO] (PAD): Only call the function if WIDTH>0; update DONE. * malloc/malloc.c (morecore): Fix last change to calculate by blocks instead of bytes.
Diffstat (limited to 'locale/localeconv.c')
-rw-r--r--locale/localeconv.c49
1 files changed, 25 insertions, 24 deletions
diff --git a/locale/localeconv.c b/locale/localeconv.c
index 1f15165fb3..d846210b7b 100644
--- a/locale/localeconv.c
+++ b/locale/localeconv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1995 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -16,36 +16,37 @@ License along with the GNU C Library; see the file COPYING.LIB. If
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
Cambridge, MA 02139, USA. */
-#include <ansidecl.h>
-#include <localeinfo.h>
#include <locale.h>
-
+#include "localeinfo.h"
/* Return monetary and numeric information about the current locale. */
struct lconv *
-DEFUN_VOID(localeconv)
+localeconv __P ((void))
{
static struct lconv result;
- result.decimal_point = (char *) _numeric_info->decimal_point;
- result.thousands_sep = (char *) _numeric_info->thousands_sep;
- result.grouping = (char *) _numeric_info->grouping;
-
- result.int_curr_symbol = (char *) _monetary_info->int_curr_symbol;
- result.currency_symbol = (char *) _monetary_info->currency_symbol;
- result.mon_decimal_point = (char *) _monetary_info->mon_decimal_point;
- result.mon_thousands_sep = (char *) _monetary_info->mon_thousands_sep;
- result.mon_grouping = (char *) _monetary_info->mon_grouping;
- result.positive_sign = (char *) _monetary_info->positive_sign;
- result.negative_sign = (char *) _monetary_info->negative_sign;
- result.int_frac_digits = _monetary_info->int_frac_digits;
- result.frac_digits = _monetary_info->frac_digits;
- result.p_cs_precedes = _monetary_info->p_cs_precedes;
- result.p_sep_by_space = _monetary_info->p_sep_by_space;
- result.n_cs_precedes = _monetary_info->p_cs_precedes;
- result.n_sep_by_space = _monetary_info->n_sep_by_space;
- result.p_sign_posn = _monetary_info->p_sign_posn;
- result.n_sign_posn = _monetary_info->n_sign_posn;
+ result.decimal_point = (char *) _NL_CURRENT (LC_NUMERIC, DECIMAL_POINT);
+ result.thousands_sep = (char *) _NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP);
+ result.grouping = (char *) _NL_CURRENT (LC_NUMERIC, GROUPING);
+
+ result.int_curr_symbol = (char *) _NL_CURRENT (LC_MONETARY, INT_CURR_SYMBOL);
+ result.currency_symbol = (char *) _NL_CURRENT (LC_MONETARY, CURRENCY_SYMBOL);
+ result.mon_decimal_point = (char *) _NL_CURRENT (LC_MONETARY,
+ MON_DECIMAL_POINT);
+ result.mon_thousands_sep = (char *) _NL_CURRENT (LC_MONETARY,
+ MON_THOUSANDS_SEP);
+ result.mon_grouping = (char *) _NL_CURRENT (LC_MONETARY, MON_GROUPING);
+ result.positive_sign = (char *) _NL_CURRENT (LC_MONETARY, POSITIVE_SIGN);
+ result.negative_sign = (char *) _NL_CURRENT (LC_MONETARY, NEGATIVE_SIGN);
+ result.int_frac_digits = *(char *) _NL_CURRENT (LC_MONETARY,
+ INT_FRAC_DIGITS);
+ result.frac_digits = *(char *) _NL_CURRENT (LC_MONETARY, FRAC_DIGITS);
+ result.p_cs_precedes = *(char *) _NL_CURRENT (LC_MONETARY, P_CS_PRECEDES);
+ result.p_sep_by_space = *(char *) _NL_CURRENT (LC_MONETARY, P_SEP_BY_SPACE);
+ result.n_cs_precedes = *(char *) _NL_CURRENT (LC_MONETARY, P_CS_PRECEDES);
+ result.n_sep_by_space = *(char *) _NL_CURRENT (LC_MONETARY, N_SEP_BY_SPACE);
+ result.p_sign_posn = *(char *) _NL_CURRENT (LC_MONETARY, P_SIGN_POSN);
+ result.n_sign_posn = *(char *) _NL_CURRENT (LC_MONETARY, N_SIGN_POSN);
return &result;
}