diff options
Diffstat (limited to 'string')
| -rw-r--r-- | string/strcasecmp.c | 4 | ||||
| -rw-r--r-- | string/strcoll_l.c | 2 | ||||
| -rw-r--r-- | string/string.h | 6 | ||||
| -rw-r--r-- | string/strings.h | 4 | ||||
| -rw-r--r-- | string/strncase.c | 4 | ||||
| -rw-r--r-- | string/strxfrm_l.c | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/string/strcasecmp.c b/string/strcasecmp.c index 2d6ae0fa9d..d7399638a6 100644 --- a/string/strcasecmp.c +++ b/string/strcasecmp.c @@ -34,7 +34,7 @@ #endif #ifdef USE_IN_EXTENDED_LOCALE_MODEL -# define LOCALE_PARAM , __locale_t loc +# define LOCALE_PARAM , locale_t loc #else # define LOCALE_PARAM #endif @@ -46,7 +46,7 @@ int __strcasecmp (const char *s1, const char *s2 LOCALE_PARAM) { #if defined _LIBC && !defined USE_IN_EXTENDED_LOCALE_MODEL - __locale_t loc = _NL_CURRENT_LOCALE; + locale_t loc = _NL_CURRENT_LOCALE; #endif const unsigned char *p1 = (const unsigned char *) s1; const unsigned char *p2 = (const unsigned char *) s2; diff --git a/string/strcoll_l.c b/string/strcoll_l.c index 8fd55b000a..d46932c1cb 100644 --- a/string/strcoll_l.c +++ b/string/strcoll_l.c @@ -254,7 +254,7 @@ out: } int -STRCOLL (const STRING_TYPE *s1, const STRING_TYPE *s2, __locale_t l) +STRCOLL (const STRING_TYPE *s1, const STRING_TYPE *s2, locale_t l) { struct __locale_data *current = l->__locales[LC_COLLATE]; uint_fast32_t nrules = current->values[_NL_ITEM_INDEX (_NL_COLLATE_NRULES)].word; diff --git a/string/string.h b/string/string.h index fb073d0b03..79f8345c3a 100644 --- a/string/string.h +++ b/string/string.h @@ -152,12 +152,12 @@ extern size_t strxfrm (char *__restrict __dest, # include <bits/types/locale_t.h> /* Compare the collated forms of S1 and S2, using sorting rules from L. */ -extern int strcoll_l (const char *__s1, const char *__s2, __locale_t __l) +extern int strcoll_l (const char *__s1, const char *__s2, locale_t __l) __THROW __attribute_pure__ __nonnull ((1, 2, 3)); /* Put a transformation of SRC into no more than N bytes of DEST, using sorting rules from L. */ extern size_t strxfrm_l (char *__dest, const char *__src, size_t __n, - __locale_t __l) __THROW __nonnull ((2, 4)); + locale_t __l) __THROW __nonnull ((2, 4)); #endif #if (defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8 \ @@ -424,7 +424,7 @@ extern char *strerror_r (int __errnum, char *__buf, size_t __buflen) #ifdef __USE_XOPEN2K8 /* Translate error number to string according to the locale L. */ -extern char *strerror_l (int __errnum, __locale_t __l) __THROW; +extern char *strerror_l (int __errnum, locale_t __l) __THROW; #endif #ifdef __USE_MISC diff --git a/string/strings.h b/string/strings.h index 53d1b5c944..630b3adc23 100644 --- a/string/strings.h +++ b/string/strings.h @@ -125,13 +125,13 @@ extern int strncasecmp (const char *__s1, const char *__s2, size_t __n) # include <bits/types/locale_t.h> /* Compare S1 and S2, ignoring case, using collation rules from LOC. */ -extern int strcasecmp_l (const char *__s1, const char *__s2, __locale_t __loc) +extern int strcasecmp_l (const char *__s1, const char *__s2, locale_t __loc) __THROW __attribute_pure__ __nonnull ((1, 2, 3)); /* Compare no more than N chars of S1 and S2, ignoring case, using collation rules from LOC. */ extern int strncasecmp_l (const char *__s1, const char *__s2, - size_t __n, __locale_t __loc) + size_t __n, locale_t __loc) __THROW __attribute_pure__ __nonnull ((1, 2, 4)); #endif diff --git a/string/strncase.c b/string/strncase.c index 6cb996cf91..ba42b61bc5 100644 --- a/string/strncase.c +++ b/string/strncase.c @@ -36,7 +36,7 @@ #endif #ifdef USE_IN_EXTENDED_LOCALE_MODEL -# define LOCALE_PARAM , __locale_t loc +# define LOCALE_PARAM , locale_t loc #else # define LOCALE_PARAM #endif @@ -49,7 +49,7 @@ int __strncasecmp (const char *s1, const char *s2, size_t n LOCALE_PARAM) { #if defined _LIBC && !defined USE_IN_EXTENDED_LOCALE_MODEL - __locale_t loc = _NL_CURRENT_LOCALE; + locale_t loc = _NL_CURRENT_LOCALE; #endif const unsigned char *p1 = (const unsigned char *) s1; const unsigned char *p2 = (const unsigned char *) s2; diff --git a/string/strxfrm_l.c b/string/strxfrm_l.c index dd98a4caaf..7e04bfc14a 100644 --- a/string/strxfrm_l.c +++ b/string/strxfrm_l.c @@ -665,7 +665,7 @@ do_xfrm_cached (STRING_TYPE *dest, size_t n, const locale_data_t *l_data, } size_t -STRXFRM (STRING_TYPE *dest, const STRING_TYPE *src, size_t n, __locale_t l) +STRXFRM (STRING_TYPE *dest, const STRING_TYPE *src, size_t n, locale_t l) { locale_data_t l_data; struct __locale_data *current = l->__locales[LC_COLLATE]; |