From 4aae47530548a518e59f2f67645ff1ec43294a0a Mon Sep 17 00:00:00 2001 From: Owen Shepherd Date: Sat, 16 Mar 2013 16:39:02 +0000 Subject: [PATCH] PDCLIB-1 * Change LC_* category numbers to better suit bitfield. * Introduce LC_*_MASK for newlocale. * Add newlocale --- includes/locale.h | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/includes/locale.h b/includes/locale.h index 1fb04e7..3ea5e65 100644 --- a/includes/locale.h +++ b/includes/locale.h @@ -64,18 +64,18 @@ struct lconv TODO: Beware, values might change before v0.6 is released. */ /* Entire locale */ -#define LC_ALL 0 +#define LC_ALL -1 /* Collation (strcoll(), strxfrm()) */ -#define LC_COLLATE 1 +#define LC_COLLATE 0 /* Character types () */ -#define LC_CTYPE 2 +#define LC_CTYPE 1 /* Monetary formatting (as returned by localeconv) */ -#define LC_MONETARY 3 +#define LC_MONETARY 2 /* Decimal-point character (for printf() / scanf() functions), string conversions, nonmonetary formatting as returned by localeconv */ -#define LC_NUMERIC 4 +#define LC_NUMERIC 3 /* Time formats (strftime(), wcsftime()) */ -#define LC_TIME 5 +#define LC_TIME 4 /* The category parameter can be any of the LC_* macros to specify if the call to setlocale() shall affect the entire locale or only a portion thereof. @@ -93,6 +93,14 @@ char * setlocale( int category, const char * locale ) _PDCLIB_nothrow; struct lconv * localeconv( void ) _PDCLIB_nothrow; #if _PDCLIB_POSIX_MIN(2008) +#define LC_COLLATE_MASK (1 << LC_COLLATE) +#define LC_CTYPE_MASK (1 << LC_CTYPE) +#define LC_MONETARY_MASK (1 << LC_MONETARY) +#define LC_NUMERIC_MASK (1 << LC_NUMERIC) +#define LC_TIME_MASK (1 << LC_TIME) +#define LC_ALL_MASK (LC_COLLATE_MASK | LC_CTYPE_MASK | LC_MONETARY_MASK | \ + LC_NUMERIC_MASK | LC_TIME_MASK) + /* POSIX locale type */ typedef _PDCLIB_locale_t locale_t; @@ -101,6 +109,8 @@ typedef _PDCLIB_locale_t locale_t; extern struct _PDCLIB_locale _PDCLIB_global_locale; #define LC_GLOBAL_LOCALE (&_PDCLIB_global_locale) +locale_t newlocale(int category_mask, const char *locale, locale_t base); + /* Set the thread locale to newlocale * * If newlocale is (locale_t)0, then doesn't change the locale and just returns -- 2.40.0