diff options
Diffstat (limited to 'wctype')
-rw-r--r-- | wctype/iswctype_l.c | 2 | ||||
-rw-r--r-- | wctype/towctrans_l.c | 2 | ||||
-rw-r--r-- | wctype/wcfuncs_l.c | 6 | ||||
-rw-r--r-- | wctype/wctrans_l.c | 2 | ||||
-rw-r--r-- | wctype/wctype.h | 36 | ||||
-rw-r--r-- | wctype/wctype_l.c | 2 |
6 files changed, 25 insertions, 25 deletions
diff --git a/wctype/iswctype_l.c b/wctype/iswctype_l.c index 9a5daecda5..0f85264087 100644 --- a/wctype/iswctype_l.c +++ b/wctype/iswctype_l.c @@ -24,7 +24,7 @@ int -__iswctype_l (wint_t wc, wctype_t desc, __locale_t locale) +__iswctype_l (wint_t wc, wctype_t desc, locale_t locale) { /* If the user passes in an invalid DESC valid (the one returned from `__wctype_l' in case of an error) simply return 0. */ diff --git a/wctype/towctrans_l.c b/wctype/towctrans_l.c index f45f195f07..1c6589747e 100644 --- a/wctype/towctrans_l.c +++ b/wctype/towctrans_l.c @@ -23,7 +23,7 @@ #include "wchar-lookup.h" wint_t -__towctrans_l (wint_t wc, wctrans_t desc, __locale_t locale) +__towctrans_l (wint_t wc, wctrans_t desc, locale_t locale) { /* If the user passes in an invalid DESC valid (the one returned from `__wctrans_l' in case of an error) simply return the value. */ diff --git a/wctype/wcfuncs_l.c b/wctype/wcfuncs_l.c index 994813bb62..d45dc10324 100644 --- a/wctype/wcfuncs_l.c +++ b/wctype/wcfuncs_l.c @@ -27,7 +27,7 @@ /* Provide real-function versions of all the wctype macros. */ #define func(name, type) \ - int __isw##name (wint_t wc, __locale_t locale) \ + int __isw##name (wint_t wc, locale_t locale) \ { \ if (isascii (wc)) \ return is##name ((int) wc, locale); \ @@ -54,7 +54,7 @@ func (upper_l, __ISwupper) func (xdigit_l, __ISwxdigit) wint_t -(__towlower_l) (wint_t wc, __locale_t locale) +(__towlower_l) (wint_t wc, locale_t locale) { size_t i = locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_MAP_OFFSET)].word + __TOW_tolower; const char *desc = locale->__locales[LC_CTYPE]->values[i].string; @@ -64,7 +64,7 @@ libc_hidden_def (__towlower_l) weak_alias (__towlower_l, towlower_l) wint_t -(__towupper_l) (wint_t wc, __locale_t locale) +(__towupper_l) (wint_t wc, locale_t locale) { size_t i = locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_MAP_OFFSET)].word + __TOW_toupper; const char *desc = locale->__locales[LC_CTYPE]->values[i].string; diff --git a/wctype/wctrans_l.c b/wctype/wctrans_l.c index 10a960bac1..e64c303c85 100644 --- a/wctype/wctrans_l.c +++ b/wctype/wctrans_l.c @@ -21,7 +21,7 @@ #include "../locale/localeinfo.h" wctrans_t -__wctrans_l (const char *property, __locale_t locale) +__wctrans_l (const char *property, locale_t locale) { const char *names; size_t cnt; diff --git a/wctype/wctype.h b/wctype/wctype.h index 7945795b44..3bcf9c6a3a 100644 --- a/wctype/wctype.h +++ b/wctype/wctype.h @@ -60,66 +60,66 @@ extern wint_t towctrans (wint_t __wc, wctrans_t __desc) __THROW; /* Test for any wide character for which `iswalpha' or `iswdigit' is true. */ -extern int iswalnum_l (wint_t __wc, __locale_t __locale) __THROW; +extern int iswalnum_l (wint_t __wc, locale_t __locale) __THROW; /* Test for any wide character for which `iswupper' or 'iswlower' is true, or any wide character that is one of a locale-specific set of wide-characters for which none of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true. */ -extern int iswalpha_l (wint_t __wc, __locale_t __locale) __THROW; +extern int iswalpha_l (wint_t __wc, locale_t __locale) __THROW; /* Test for any control wide character. */ -extern int iswcntrl_l (wint_t __wc, __locale_t __locale) __THROW; +extern int iswcntrl_l (wint_t __wc, locale_t __locale) __THROW; /* Test for any wide character that corresponds to a decimal-digit character. */ -extern int iswdigit_l (wint_t __wc, __locale_t __locale) __THROW; +extern int iswdigit_l (wint_t __wc, locale_t __locale) __THROW; /* Test for any wide character for which `iswprint' is true and `iswspace' is false. */ -extern int iswgraph_l (wint_t __wc, __locale_t __locale) __THROW; +extern int iswgraph_l (wint_t __wc, locale_t __locale) __THROW; /* Test for any wide character that corresponds to a lowercase letter or is one of a locale-specific set of wide characters for which none of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true. */ -extern int iswlower_l (wint_t __wc, __locale_t __locale) __THROW; +extern int iswlower_l (wint_t __wc, locale_t __locale) __THROW; /* Test for any printing wide character. */ -extern int iswprint_l (wint_t __wc, __locale_t __locale) __THROW; +extern int iswprint_l (wint_t __wc, locale_t __locale) __THROW; /* Test for any printing wide character that is one of a locale-specific et of wide characters for which neither `iswspace' nor `iswalnum' is true. */ -extern int iswpunct_l (wint_t __wc, __locale_t __locale) __THROW; +extern int iswpunct_l (wint_t __wc, locale_t __locale) __THROW; /* Test for any wide character that corresponds to a locale-specific set of wide characters for which none of `iswalnum', `iswgraph', or `iswpunct' is true. */ -extern int iswspace_l (wint_t __wc, __locale_t __locale) __THROW; +extern int iswspace_l (wint_t __wc, locale_t __locale) __THROW; /* Test for any wide character that corresponds to an uppercase letter or is one of a locale-specific set of wide character for which none of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true. */ -extern int iswupper_l (wint_t __wc, __locale_t __locale) __THROW; +extern int iswupper_l (wint_t __wc, locale_t __locale) __THROW; /* Test for any wide character that corresponds to a hexadecimal-digit character equivalent to that performed be the functions described in the previous subclause. */ -extern int iswxdigit_l (wint_t __wc, __locale_t __locale) __THROW; +extern int iswxdigit_l (wint_t __wc, locale_t __locale) __THROW; /* Test for any wide character that corresponds to a standard blank wide character or a locale-specific set of wide characters for which `iswalnum' is false. */ -extern int iswblank_l (wint_t __wc, __locale_t __locale) __THROW; +extern int iswblank_l (wint_t __wc, locale_t __locale) __THROW; /* Construct value that describes a class of wide characters identified by the string argument PROPERTY. */ -extern wctype_t wctype_l (const char *__property, __locale_t __locale) +extern wctype_t wctype_l (const char *__property, locale_t __locale) __THROW; /* Determine whether the wide-character WC has the property described by DESC. */ -extern int iswctype_l (wint_t __wc, wctype_t __desc, __locale_t __locale) +extern int iswctype_l (wint_t __wc, wctype_t __desc, locale_t __locale) __THROW; /* @@ -127,19 +127,19 @@ extern int iswctype_l (wint_t __wc, wctype_t __desc, __locale_t __locale) */ /* Converts an uppercase letter to the corresponding lowercase letter. */ -extern wint_t towlower_l (wint_t __wc, __locale_t __locale) __THROW; +extern wint_t towlower_l (wint_t __wc, locale_t __locale) __THROW; /* Converts an lowercase letter to the corresponding uppercase letter. */ -extern wint_t towupper_l (wint_t __wc, __locale_t __locale) __THROW; +extern wint_t towupper_l (wint_t __wc, locale_t __locale) __THROW; /* Construct value that describes a mapping between wide characters identified by the string argument PROPERTY. */ -extern wctrans_t wctrans_l (const char *__property, __locale_t __locale) +extern wctrans_t wctrans_l (const char *__property, locale_t __locale) __THROW; /* Map the wide character WC using the mapping described by DESC. */ extern wint_t towctrans_l (wint_t __wc, wctrans_t __desc, - __locale_t __locale) __THROW; + locale_t __locale) __THROW; # endif /* Use POSIX 2008. */ diff --git a/wctype/wctype_l.c b/wctype/wctype_l.c index c17a1e9ce6..ea60ba315e 100644 --- a/wctype/wctype_l.c +++ b/wctype/wctype_l.c @@ -23,7 +23,7 @@ #include <locale/localeinfo.h> wctype_t -__wctype_l (const char *property, __locale_t locale) +__wctype_l (const char *property, locale_t locale) { const char *names; unsigned int result; |