diff options
Diffstat (limited to 'wcsmbs')
-rw-r--r-- | wcsmbs/btowc.c | 3 | ||||
-rw-r--r-- | wcsmbs/mbrlen.c | 5 | ||||
-rw-r--r-- | wcsmbs/mbsinit.c | 3 | ||||
-rw-r--r-- | wcsmbs/mbsrtowcs.c | 6 | ||||
-rw-r--r-- | wcsmbs/wcpcpy.c | 4 | ||||
-rw-r--r-- | wcsmbs/wcpncpy.c | 5 | ||||
-rw-r--r-- | wcsmbs/wcscat.c | 4 | ||||
-rw-r--r-- | wcsmbs/wcschrnul.c | 4 | ||||
-rw-r--r-- | wcsmbs/wcscmp.c | 4 | ||||
-rw-r--r-- | wcsmbs/wcscpy.c | 4 | ||||
-rw-r--r-- | wcsmbs/wcscspn.c | 4 | ||||
-rw-r--r-- | wcsmbs/wcsdup.c | 3 | ||||
-rw-r--r-- | wcsmbs/wcslen.c | 3 | ||||
-rw-r--r-- | wcsmbs/wcsncat.c | 5 | ||||
-rw-r--r-- | wcsmbs/wcsncmp.c | 5 | ||||
-rw-r--r-- | wcsmbs/wcsncpy.c | 5 | ||||
-rw-r--r-- | wcsmbs/wcsnlen.c | 4 | ||||
-rw-r--r-- | wcsmbs/wcspbrk.c | 4 | ||||
-rw-r--r-- | wcsmbs/wcsrchr.c | 4 | ||||
-rw-r--r-- | wcsmbs/wcsspn.c | 4 | ||||
-rw-r--r-- | wcsmbs/wcsstr.c | 4 | ||||
-rw-r--r-- | wcsmbs/wcstok.c | 5 | ||||
-rw-r--r-- | wcsmbs/wctob.c | 3 | ||||
-rw-r--r-- | wcsmbs/wmemchr.c | 5 | ||||
-rw-r--r-- | wcsmbs/wmemcmp.c | 5 | ||||
-rw-r--r-- | wcsmbs/wmemcpy.c | 5 | ||||
-rw-r--r-- | wcsmbs/wmemmove.c | 5 | ||||
-rw-r--r-- | wcsmbs/wmempcpy.c | 5 | ||||
-rw-r--r-- | wcsmbs/wmemset.c | 5 |
29 files changed, 29 insertions, 96 deletions
diff --git a/wcsmbs/btowc.c b/wcsmbs/btowc.c index 9bb03f35df..fe27f3413f 100644 --- a/wcsmbs/btowc.c +++ b/wcsmbs/btowc.c @@ -29,8 +29,7 @@ wint_t -__btowc (c) - int c; +__btowc (int c) { const struct gconv_fcts *fcts; diff --git a/wcsmbs/mbrlen.c b/wcsmbs/mbrlen.c index 25f6f4571f..8464266d24 100644 --- a/wcsmbs/mbrlen.c +++ b/wcsmbs/mbrlen.c @@ -24,10 +24,7 @@ static mbstate_t internal; size_t -__mbrlen (s, n, ps) - const char *s; - size_t n; - mbstate_t *ps; +__mbrlen (const char *s, size_t n, mbstate_t *ps) { return __mbrtowc (NULL, s, n, ps ?: &internal); } diff --git a/wcsmbs/mbsinit.c b/wcsmbs/mbsinit.c index 4e337341ba..79323b5017 100644 --- a/wcsmbs/mbsinit.c +++ b/wcsmbs/mbsinit.c @@ -31,8 +31,7 @@ value collected so far. Especially, we don't have different shift states. */ int -__mbsinit (ps) - const mbstate_t *ps; +__mbsinit (const mbstate_t *ps) { return ps == NULL || ps->__count == 0; } diff --git a/wcsmbs/mbsrtowcs.c b/wcsmbs/mbsrtowcs.c index 7e468b6565..e2566385b9 100644 --- a/wcsmbs/mbsrtowcs.c +++ b/wcsmbs/mbsrtowcs.c @@ -24,11 +24,7 @@ static mbstate_t state; size_t -__mbsrtowcs (dst, src, len, ps) - wchar_t *dst; - const char **src; - size_t len; - mbstate_t *ps; +__mbsrtowcs (wchar_t *dst, const char **src, size_t len, mbstate_t *ps) { return __mbsrtowcs_l (dst, src, len, ps ?: &state, _NL_CURRENT_LOCALE); } diff --git a/wcsmbs/wcpcpy.c b/wcsmbs/wcpcpy.c index 0c8ded32e0..a4bcfc5959 100644 --- a/wcsmbs/wcpcpy.c +++ b/wcsmbs/wcpcpy.c @@ -27,9 +27,7 @@ /* Copy SRC to DEST, returning the address of the terminating L'\0' in DEST. */ wchar_t * -__wcpcpy (dest, src) - wchar_t *dest; - const wchar_t *src; +__wcpcpy (wchar_t *dest, const wchar_t *src) { wchar_t *wcp = (wchar_t *) dest - 1; wint_t c; diff --git a/wcsmbs/wcpncpy.c b/wcsmbs/wcpncpy.c index e19e44c6c6..2f14090b4c 100644 --- a/wcsmbs/wcpncpy.c +++ b/wcsmbs/wcpncpy.c @@ -25,10 +25,7 @@ /* Copy no more than N wide-characters of SRC to DEST, returning the address of the last character written into DEST. */ wchar_t * -__wcpncpy (dest, src, n) - wchar_t *dest; - const wchar_t *src; - size_t n; +__wcpncpy (wchar_t *dest, const wchar_t *src, size_t n) { wint_t c; wchar_t *const s = dest; diff --git a/wcsmbs/wcscat.c b/wcsmbs/wcscat.c index b0f0873cf4..129f7da17c 100644 --- a/wcsmbs/wcscat.c +++ b/wcsmbs/wcscat.c @@ -24,9 +24,7 @@ /* Append SRC on the end of DEST. */ wchar_t * -__wcscat (dest, src) - wchar_t *dest; - const wchar_t *src; +__wcscat (wchar_t *dest, const wchar_t *src) { wchar_t *s1 = dest; const wchar_t *s2 = src; diff --git a/wcsmbs/wcschrnul.c b/wcsmbs/wcschrnul.c index 97ef3b9dfd..418725f9db 100644 --- a/wcsmbs/wcschrnul.c +++ b/wcsmbs/wcschrnul.c @@ -23,9 +23,7 @@ /* Find the first occurrence of WC in WCS. */ wchar_t * -__wcschrnul (wcs, wc) - const wchar_t *wcs; - const wchar_t wc; +__wcschrnul (const wchar_t *wcs, const wchar_t wc) { while (*wcs != L'\0') if (*wcs == wc) diff --git a/wcsmbs/wcscmp.c b/wcsmbs/wcscmp.c index fcfe0c5bcb..897ac356d2 100644 --- a/wcsmbs/wcscmp.c +++ b/wcsmbs/wcscmp.c @@ -26,9 +26,7 @@ greater than zero if S1 is lexicographically less than, equal to or greater than S2. */ int -WCSCMP (s1, s2) - const wchar_t *s1; - const wchar_t *s2; +WCSCMP (const wchar_t *s1, const wchar_t *s2) { wchar_t c1, c2; diff --git a/wcsmbs/wcscpy.c b/wcsmbs/wcscpy.c index 56e8fc19eb..aa3a313ca2 100644 --- a/wcsmbs/wcscpy.c +++ b/wcsmbs/wcscpy.c @@ -26,9 +26,7 @@ /* Copy SRC to DEST. */ wchar_t * -WCSCPY (dest, src) - wchar_t *dest; - const wchar_t *src; +WCSCPY (wchar_t *dest, const wchar_t *src) { wint_t c; wchar_t *wcp; diff --git a/wcsmbs/wcscspn.c b/wcsmbs/wcscspn.c index d735f8c86e..fb21a413c0 100644 --- a/wcsmbs/wcscspn.c +++ b/wcsmbs/wcscspn.c @@ -25,9 +25,7 @@ /* Return the length of the maximum initial segment of WCS which contains only wide-characters not in REJECT. */ size_t -wcscspn (wcs, reject) - const wchar_t *wcs; - const wchar_t *reject; +wcscspn (const wchar_t *wcs, const wchar_t *reject) { size_t count = 0; diff --git a/wcsmbs/wcsdup.c b/wcsmbs/wcsdup.c index 58c2c52af7..eb806e3411 100644 --- a/wcsmbs/wcsdup.c +++ b/wcsmbs/wcsdup.c @@ -23,8 +23,7 @@ /* Duplicate S, returning an identical malloc'd string. */ wchar_t * -wcsdup (s) - const wchar_t *s; +wcsdup (const wchar_t *s) { size_t len = (__wcslen (s) + 1) * sizeof (wchar_t); void *new = malloc (len); diff --git a/wcsmbs/wcslen.c b/wcsmbs/wcslen.c index e0767210d8..94eda2b1b9 100644 --- a/wcsmbs/wcslen.c +++ b/wcsmbs/wcslen.c @@ -24,8 +24,7 @@ #endif size_t -__wcslen (s) - const wchar_t *s; +__wcslen (const wchar_t *s) { size_t len = 0; diff --git a/wcsmbs/wcsncat.c b/wcsmbs/wcsncat.c index 78fe7653fd..3ab88536a2 100644 --- a/wcsmbs/wcsncat.c +++ b/wcsmbs/wcsncat.c @@ -24,10 +24,7 @@ /* Append no more than N wide-character of SRC onto DEST. */ wchar_t * -WCSNCAT (dest, src, n) - wchar_t *dest; - const wchar_t *src; - size_t n; +WCSNCAT (wchar_t *dest, const wchar_t *src, size_t n) { wchar_t c; wchar_t * const s = dest; diff --git a/wcsmbs/wcsncmp.c b/wcsmbs/wcsncmp.c index 4de2ca8c0a..73f054be5f 100644 --- a/wcsmbs/wcsncmp.c +++ b/wcsmbs/wcsncmp.c @@ -27,10 +27,7 @@ if S1 is lexicographically less than, equal to or greater than S2. */ int -WCSNCMP (s1, s2, n) - const wchar_t *s1; - const wchar_t *s2; - size_t n; +WCSNCMP (const wchar_t *s1, const wchar_t *s2, size_t n) { wchar_t c1 = L'\0'; wchar_t c2 = L'\0'; diff --git a/wcsmbs/wcsncpy.c b/wcsmbs/wcsncpy.c index 5ee5ee6bde..306c52b8ba 100644 --- a/wcsmbs/wcsncpy.c +++ b/wcsmbs/wcsncpy.c @@ -24,10 +24,7 @@ /* Copy no more than N wide-characters of SRC to DEST. */ wchar_t * -__wcsncpy (dest, src, n) - wchar_t *dest; - const wchar_t *src; - size_t n; +__wcsncpy (wchar_t *dest, const wchar_t *src, size_t n) { wint_t c; wchar_t *const s = dest; diff --git a/wcsmbs/wcsnlen.c b/wcsmbs/wcsnlen.c index e928ab6961..2d8380fab5 100644 --- a/wcsmbs/wcsnlen.c +++ b/wcsmbs/wcsnlen.c @@ -24,9 +24,7 @@ /* Return length of string S at most maxlen. */ size_t -__wcsnlen (s, maxlen) - const wchar_t *s; - size_t maxlen; +__wcsnlen (const wchar_t *s, size_t maxlen) { size_t len = 0; diff --git a/wcsmbs/wcspbrk.c b/wcsmbs/wcspbrk.c index 9bb43d63ef..81391b777a 100644 --- a/wcsmbs/wcspbrk.c +++ b/wcsmbs/wcspbrk.c @@ -24,9 +24,7 @@ /* Find the first occurrence in WCS of any wide-character in ACCEPT. */ wchar_t * -wcspbrk (wcs, accept) - const wchar_t *wcs; - const wchar_t *accept; +wcspbrk (const wchar_t *wcs, const wchar_t *accept) { while (*wcs != L'\0') if (wcschr (accept, *wcs) == NULL) diff --git a/wcsmbs/wcsrchr.c b/wcsmbs/wcsrchr.c index 72b04fb111..32033be40b 100644 --- a/wcsmbs/wcsrchr.c +++ b/wcsmbs/wcsrchr.c @@ -24,9 +24,7 @@ /* Find the last occurrence of WC in WCS. */ wchar_t * -WCSRCHR (wcs, wc) - const wchar_t *wcs; - const wchar_t wc; +WCSRCHR (const wchar_t *wcs, const wchar_t wc) { const wchar_t *retval = NULL; diff --git a/wcsmbs/wcsspn.c b/wcsmbs/wcsspn.c index 7a3cdf7a21..332b6a6f17 100644 --- a/wcsmbs/wcsspn.c +++ b/wcsmbs/wcsspn.c @@ -25,9 +25,7 @@ /* Return the length of the maximum initial segment of WCS which contains only wide-characters in ACCEPT. */ size_t -wcsspn (wcs, accept) - const wchar_t *wcs; - const wchar_t *accept; +wcsspn (const wchar_t *wcs, const wchar_t *accept) { const wchar_t *p; const wchar_t *a; diff --git a/wcsmbs/wcsstr.c b/wcsmbs/wcsstr.c index a62c29eaec..4fbc7eab9b 100644 --- a/wcsmbs/wcsstr.c +++ b/wcsmbs/wcsstr.c @@ -29,9 +29,7 @@ #include <wchar.h> wchar_t * -wcsstr (haystack, needle) - const wchar_t *haystack; - const wchar_t *needle; +wcsstr (const wchar_t *haystack, const wchar_t *needle) { wchar_t b, c; diff --git a/wcsmbs/wcstok.c b/wcsmbs/wcstok.c index 73610177f5..47a7fd8756 100644 --- a/wcsmbs/wcstok.c +++ b/wcsmbs/wcstok.c @@ -23,10 +23,7 @@ /* Parse WCS into tokens separated by characters in DELIM. If WCS is NULL, the last string wcstok() was called with is used. */ wchar_t * -wcstok (wcs, delim, save_ptr) - wchar_t *wcs; - const wchar_t *delim; - wchar_t **save_ptr; +wcstok (wchar_t *wcs, const wchar_t *delim, wchar_t **save_ptr) { wchar_t *result; diff --git a/wcsmbs/wctob.c b/wcsmbs/wctob.c index 035f045ea0..08d6a42c8e 100644 --- a/wcsmbs/wctob.c +++ b/wcsmbs/wctob.c @@ -27,8 +27,7 @@ int -wctob (c) - wint_t c; +wctob (wint_t c) { unsigned char buf[MB_LEN_MAX]; struct __gconv_step_data data; diff --git a/wcsmbs/wmemchr.c b/wcsmbs/wmemchr.c index 9e8d57bd5d..364a95d8c3 100644 --- a/wcsmbs/wmemchr.c +++ b/wcsmbs/wmemchr.c @@ -23,10 +23,7 @@ #endif wchar_t * -__wmemchr (s, c, n) - const wchar_t *s; - wchar_t c; - size_t n; +__wmemchr (const wchar_t *s, wchar_t c, size_t n) { /* For performance reasons unfold the loop four times. */ while (n >= 4) diff --git a/wcsmbs/wmemcmp.c b/wcsmbs/wmemcmp.c index 5aa934cedc..76a1ccc652 100644 --- a/wcsmbs/wmemcmp.c +++ b/wcsmbs/wmemcmp.c @@ -23,10 +23,7 @@ #endif int -WMEMCMP (s1, s2, n) - const wchar_t *s1; - const wchar_t *s2; - size_t n; +WMEMCMP (const wchar_t *s1, const wchar_t *s2, size_t n) { wchar_t c1; wchar_t c2; diff --git a/wcsmbs/wmemcpy.c b/wcsmbs/wmemcpy.c index 0b75be77f6..c6f6401c72 100644 --- a/wcsmbs/wmemcpy.c +++ b/wcsmbs/wmemcpy.c @@ -21,10 +21,7 @@ wchar_t * -__wmemcpy (s1, s2, n) - wchar_t *s1; - const wchar_t *s2; - size_t n; +__wmemcpy (wchar_t *s1, const wchar_t *s2, size_t n) { return (wchar_t *) memcpy ((char *) s1, (char *) s2, n * sizeof (wchar_t)); } diff --git a/wcsmbs/wmemmove.c b/wcsmbs/wmemmove.c index 68878fa9d6..8a8d920996 100644 --- a/wcsmbs/wmemmove.c +++ b/wcsmbs/wmemmove.c @@ -21,10 +21,7 @@ wchar_t * -__wmemmove (s1, s2, n) - wchar_t *s1; - const wchar_t *s2; - size_t n; +__wmemmove (wchar_t *s1, const wchar_t *s2, size_t n) { return (wchar_t *) memmove ((char *) s1, (char *) s2, n * sizeof (wchar_t)); } diff --git a/wcsmbs/wmempcpy.c b/wcsmbs/wmempcpy.c index 9639c5f444..dd09cd6da3 100644 --- a/wcsmbs/wmempcpy.c +++ b/wcsmbs/wmempcpy.c @@ -21,10 +21,7 @@ wchar_t * -__wmempcpy (s1, s2, n) - wchar_t *s1; - const wchar_t *s2; - size_t n; +__wmempcpy (wchar_t *s1, const wchar_t *s2, size_t n) { return (wchar_t *) __mempcpy ((char *) s1, (char *) s2, n * sizeof (wchar_t)); diff --git a/wcsmbs/wmemset.c b/wcsmbs/wmemset.c index 1eb6b2bc4e..f5a9b089c8 100644 --- a/wcsmbs/wmemset.c +++ b/wcsmbs/wmemset.c @@ -23,10 +23,7 @@ #endif wchar_t * -__wmemset (s, c, n) - wchar_t *s; - wchar_t c; - size_t n; +__wmemset (wchar_t *s, wchar_t c, size_t n) { wchar_t *wp = s; |