From f777999710878dc9c5cdea3b297c0c1ccd934adc Mon Sep 17 00:00:00 2001 From: Jakob Kaivo Date: Thu, 28 Feb 2019 14:22:04 -0500 Subject: clean up internal locale stuff --- src/nonstd/struct_locale_t.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'src/nonstd/struct_locale_t.c') diff --git a/src/nonstd/struct_locale_t.c b/src/nonstd/struct_locale_t.c index 1981bd8d..5487ae6a 100644 --- a/src/nonstd/struct_locale_t.c +++ b/src/nonstd/struct_locale_t.c @@ -1,22 +1,31 @@ #include struct __locale_t { - int mask; - char *all; - char *collate; - unsigned char *collation; - char *ctype; - unsigned char *ctattr; - unsigned char *ctoupper; - unsigned char *ctolower; - char *message; + char all[UCHAR_MAX]; + + char ctype[UCHAR_MAX]; + struct { + unsigned char ctattr[UCHAR_MAX + 1]; + unsigned char ctoupper[UCHAR_MAX + 1]; + unsigned char ctolower[UCHAR_MAX + 1]; + } lc_ctype; + + char collate[UCHAR_MAX]; + struct collation { + char * sequence; + int weight; + } *lc_collate; + + char messages[UCHAR_MAX]; struct { char *yesexpr; char *noexpr; } lc_messages; + char *monetary; char *numeric; struct lconv mn; + char *time; struct { char *abday[7]; -- cgit v1.2.1