diff options
author | Yaakov Selkowitz <yselkowi@redhat.com> | 2017-12-04 04:31:41 +0300 |
---|---|---|
committer | Yaakov Selkowitz <yselkowi@redhat.com> | 2018-01-17 20:47:05 +0300 |
commit | 6783860a2e4e4183c073f62e4bb938cea0e096c3 (patch) | |
tree | ab2289b4902fdfc7266edcb8bcfbd8f5601948bd /newlib/libc/string | |
parent | 1e39db3062f941778e748f833e1f88dd5c7399a3 (diff) |
ansification: remove _AND
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
Diffstat (limited to 'newlib/libc/string')
77 files changed, 124 insertions, 124 deletions
diff --git a/newlib/libc/string/bcmp.c b/newlib/libc/string/bcmp.c index 86aada10c..342237742 100644 --- a/newlib/libc/string/bcmp.c +++ b/newlib/libc/string/bcmp.c @@ -33,8 +33,8 @@ QUICKREF int _DEFUN (bcmp, (m1, m2, n), - _CONST void *m1 _AND - _CONST void *m2 _AND + _CONST void *m1, + _CONST void *m2, size_t n) { diff --git a/newlib/libc/string/bcopy.c b/newlib/libc/string/bcopy.c index 22a7f1bfe..1ad8b3e41 100644 --- a/newlib/libc/string/bcopy.c +++ b/newlib/libc/string/bcopy.c @@ -25,8 +25,8 @@ QUICKREF void _DEFUN (bcopy, (b1, b2, length), - _CONST void *b1 _AND - void *b2 _AND + _CONST void *b1, + void *b2, size_t length) { memmove (b2, b1, length); diff --git a/newlib/libc/string/index.c b/newlib/libc/string/index.c index 2c4b49016..756bbff3e 100644 --- a/newlib/libc/string/index.c +++ b/newlib/libc/string/index.c @@ -32,7 +32,7 @@ QUICKREF char * _DEFUN (index, (s, c), - _CONST char *s _AND + _CONST char *s, int c) { return strchr (s, c); diff --git a/newlib/libc/string/memccpy.c b/newlib/libc/string/memccpy.c index 219aa5cfe..6e49a1c6d 100644 --- a/newlib/libc/string/memccpy.c +++ b/newlib/libc/string/memccpy.c @@ -57,9 +57,9 @@ PORTABILITY _PTR _DEFUN (memccpy, (dst0, src0, endchar, len0), - _PTR __restrict dst0 _AND - _CONST _PTR __restrict src0 _AND - int endchar0 _AND + _PTR __restrict dst0, + _CONST _PTR __restrict src0, + int endchar0, size_t len0) { diff --git a/newlib/libc/string/memchr.c b/newlib/libc/string/memchr.c index 152cd718a..a6c5556d7 100644 --- a/newlib/libc/string/memchr.c +++ b/newlib/libc/string/memchr.c @@ -63,8 +63,8 @@ QUICKREF _PTR _DEFUN (memchr, (src_void, c, length), - _CONST _PTR src_void _AND - int c _AND + _CONST _PTR src_void, + int c, size_t length) { _CONST unsigned char *src = (_CONST unsigned char *) src_void; diff --git a/newlib/libc/string/memcmp.c b/newlib/libc/string/memcmp.c index 8f86e7afd..1af9219de 100644 --- a/newlib/libc/string/memcmp.c +++ b/newlib/libc/string/memcmp.c @@ -44,8 +44,8 @@ QUICKREF int _DEFUN (memcmp, (m1, m2, n), - _CONST _PTR m1 _AND - _CONST _PTR m2 _AND + _CONST _PTR m1, + _CONST _PTR m2, size_t n) { #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__) diff --git a/newlib/libc/string/memcpy.c b/newlib/libc/string/memcpy.c index c76ab484f..3d0dca209 100644 --- a/newlib/libc/string/memcpy.c +++ b/newlib/libc/string/memcpy.c @@ -45,8 +45,8 @@ QUICKREF _PTR _DEFUN (memcpy, (dst0, src0, len0), - _PTR __restrict dst0 _AND - _CONST _PTR __restrict src0 _AND + _PTR __restrict dst0, + _CONST _PTR __restrict src0, size_t len0) { #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__) diff --git a/newlib/libc/string/memmem.c b/newlib/libc/string/memmem.c index 59e19d245..5588b9f59 100644 --- a/newlib/libc/string/memmem.c +++ b/newlib/libc/string/memmem.c @@ -47,9 +47,9 @@ QUICKREF void * _DEFUN (memmem, (haystack_start, haystack_len, needle_start, needle_len), - const void *haystack_start _AND - size_t haystack_len _AND - const void *needle_start _AND + const void *haystack_start, + size_t haystack_len, + const void *needle_start, size_t needle_len) { /* Abstract memory is considered to be an array of 'unsigned char' values, diff --git a/newlib/libc/string/memmove.c b/newlib/libc/string/memmove.c index e6275a7e1..10a3dfd2b 100644 --- a/newlib/libc/string/memmove.c +++ b/newlib/libc/string/memmove.c @@ -51,8 +51,8 @@ QUICKREF _PTR __inhibit_loop_to_libcall _DEFUN (memmove, (dst_void, src_void, length), - _PTR dst_void _AND - _CONST _PTR src_void _AND + _PTR dst_void, + _CONST _PTR src_void, size_t length) { #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__) diff --git a/newlib/libc/string/mempcpy.c b/newlib/libc/string/mempcpy.c index 1a8e7cd34..74c453b47 100644 --- a/newlib/libc/string/mempcpy.c +++ b/newlib/libc/string/mempcpy.c @@ -44,8 +44,8 @@ PORTABILITY _PTR _DEFUN (mempcpy, (dst0, src0, len0), - _PTR dst0 _AND - _CONST _PTR src0 _AND + _PTR dst0, + _CONST _PTR src0, size_t len0) { #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__) diff --git a/newlib/libc/string/memrchr.c b/newlib/libc/string/memrchr.c index 974cebc16..6a2c03e4e 100644 --- a/newlib/libc/string/memrchr.c +++ b/newlib/libc/string/memrchr.c @@ -63,8 +63,8 @@ QUICKREF _PTR _DEFUN (memrchr, (src_void, c, length), - _CONST _PTR src_void _AND - int c _AND + _CONST _PTR src_void, + int c, size_t length) { _CONST unsigned char *src = (_CONST unsigned char *) src_void + length - 1; diff --git a/newlib/libc/string/memset.c b/newlib/libc/string/memset.c index 7d05478eb..284c36e2c 100644 --- a/newlib/libc/string/memset.c +++ b/newlib/libc/string/memset.c @@ -36,8 +36,8 @@ QUICKREF _PTR __inhibit_loop_to_libcall _DEFUN (memset, (m, c, n), - _PTR m _AND - int c _AND + _PTR m, + int c, size_t n) { char *s = (char *) m; diff --git a/newlib/libc/string/rawmemchr.c b/newlib/libc/string/rawmemchr.c index c1b360dd3..51fe8e37e 100644 --- a/newlib/libc/string/rawmemchr.c +++ b/newlib/libc/string/rawmemchr.c @@ -62,7 +62,7 @@ QUICKREF _PTR _DEFUN (rawmemchr, (src_void, c), - _CONST _PTR src_void _AND + _CONST _PTR src_void, int c) { _CONST unsigned char *src = (_CONST unsigned char *) src_void; diff --git a/newlib/libc/string/rindex.c b/newlib/libc/string/rindex.c index 3284361f8..e18fcb667 100644 --- a/newlib/libc/string/rindex.c +++ b/newlib/libc/string/rindex.c @@ -32,7 +32,7 @@ QUICKREF char * _DEFUN (rindex, (s, c), - _CONST char *s _AND + _CONST char *s, int c) { return strrchr (s, c); diff --git a/newlib/libc/string/stpcpy.c b/newlib/libc/string/stpcpy.c index 6272f1da6..5e00b24a2 100644 --- a/newlib/libc/string/stpcpy.c +++ b/newlib/libc/string/stpcpy.c @@ -54,7 +54,7 @@ QUICKREF char* _DEFUN (stpcpy, (dst, src), - char *__restrict dst _AND + char *__restrict dst, _CONST char *__restrict src) { #if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__) diff --git a/newlib/libc/string/stpncpy.c b/newlib/libc/string/stpncpy.c index aa5acd45f..9e8a12950 100644 --- a/newlib/libc/string/stpncpy.c +++ b/newlib/libc/string/stpncpy.c @@ -62,8 +62,8 @@ QUICKREF char * _DEFUN (stpncpy, (dst, src), - char *__restrict dst _AND - _CONST char *__restrict src _AND + char *__restrict dst, + _CONST char *__restrict src, size_t count) { char *ret = NULL; diff --git a/newlib/libc/string/strcasecmp.c b/newlib/libc/string/strcasecmp.c index a6c34862f..1ee8f0ebf 100644 --- a/newlib/libc/string/strcasecmp.c +++ b/newlib/libc/string/strcasecmp.c @@ -37,7 +37,7 @@ QUICKREF int _DEFUN (strcasecmp, (s1, s2), - _CONST char *s1 _AND + _CONST char *s1, _CONST char *s2) { int d = 0; diff --git a/newlib/libc/string/strcasestr.c b/newlib/libc/string/strcasestr.c index 599f50227..71ade6664 100644 --- a/newlib/libc/string/strcasestr.c +++ b/newlib/libc/string/strcasestr.c @@ -91,7 +91,7 @@ QUICKREF */ char * _DEFUN (strcasestr, (s, find), - _CONST char *s _AND + _CONST char *s, _CONST char *find) { #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__) diff --git a/newlib/libc/string/strcat.c b/newlib/libc/string/strcat.c index 44b6b03f0..96de39ba2 100644 --- a/newlib/libc/string/strcat.c +++ b/newlib/libc/string/strcat.c @@ -55,7 +55,7 @@ QUICKREF char * _DEFUN (strcat, (s1, s2), - char *__restrict s1 _AND + char *__restrict s1, _CONST char *__restrict s2) { #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__) diff --git a/newlib/libc/string/strchr.c b/newlib/libc/string/strchr.c index 7147bd457..f293612d5 100644 --- a/newlib/libc/string/strchr.c +++ b/newlib/libc/string/strchr.c @@ -53,7 +53,7 @@ QUICKREF char * _DEFUN (strchr, (s1, i), - _CONST char *s1 _AND + _CONST char *s1, int i) { _CONST unsigned char *s = (_CONST unsigned char *)s1; diff --git a/newlib/libc/string/strchrnul.c b/newlib/libc/string/strchrnul.c index 3b6cd62fb..3d110b920 100644 --- a/newlib/libc/string/strchrnul.c +++ b/newlib/libc/string/strchrnul.c @@ -32,7 +32,7 @@ QUICKREF char * _DEFUN (strchrnul, (s1, i), - _CONST char *s1 _AND + _CONST char *s1, int i) { char *s = strchr(s1, i); diff --git a/newlib/libc/string/strcmp.c b/newlib/libc/string/strcmp.c index d5e9148ef..c117c38ff 100644 --- a/newlib/libc/string/strcmp.c +++ b/newlib/libc/string/strcmp.c @@ -53,7 +53,7 @@ QUICKREF int _DEFUN (strcmp, (s1, s2), - _CONST char *s1 _AND + _CONST char *s1, _CONST char *s2) { #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__) diff --git a/newlib/libc/string/strcoll.c b/newlib/libc/string/strcoll.c index 551ede65b..d95a42e2b 100644 --- a/newlib/libc/string/strcoll.c +++ b/newlib/libc/string/strcoll.c @@ -37,7 +37,7 @@ QUICKREF int _DEFUN (strcoll, (a, b), - _CONST char *a _AND + _CONST char *a, _CONST char *b) { diff --git a/newlib/libc/string/strcpy.c b/newlib/libc/string/strcpy.c index 9670d2c13..4354472d3 100644 --- a/newlib/libc/string/strcpy.c +++ b/newlib/libc/string/strcpy.c @@ -53,7 +53,7 @@ QUICKREF char* _DEFUN (strcpy, (dst0, src0), - char *dst0 _AND + char *dst0, _CONST char *src0) { #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__) diff --git a/newlib/libc/string/strcspn.c b/newlib/libc/string/strcspn.c index f80b61f37..f0e30c80c 100644 --- a/newlib/libc/string/strcspn.c +++ b/newlib/libc/string/strcspn.c @@ -27,7 +27,7 @@ PORTABILITY size_t _DEFUN (strcspn, (s1, s2), - _CONST char *s1 _AND + _CONST char *s1, _CONST char *s2) { _CONST char *s = s1; diff --git a/newlib/libc/string/strdup_r.c b/newlib/libc/string/strdup_r.c index ef77a58eb..474ec9668 100644 --- a/newlib/libc/string/strdup_r.c +++ b/newlib/libc/string/strdup_r.c @@ -4,7 +4,7 @@ char * _DEFUN (_strdup_r, (reent_ptr, str), - struct _reent *reent_ptr _AND + struct _reent *reent_ptr, _CONST char *str) { size_t len = strlen (str) + 1; diff --git a/newlib/libc/string/strerror.c b/newlib/libc/string/strerror.c index 8da7d5185..43fa1f592 100644 --- a/newlib/libc/string/strerror.c +++ b/newlib/libc/string/strerror.c @@ -386,9 +386,9 @@ QUICKREF char * _DEFUN (_strerror_r, (ptr, errnum, internal, errptr), - struct _reent *ptr _AND - int errnum _AND - int internal _AND + struct _reent *ptr, + int errnum, + int internal, int *errptr) { char *error; diff --git a/newlib/libc/string/strerror_r.c b/newlib/libc/string/strerror_r.c index af9337563..c888f9ff3 100644 --- a/newlib/libc/string/strerror_r.c +++ b/newlib/libc/string/strerror_r.c @@ -66,8 +66,8 @@ a non-empty alternate string without assigning into its third argument. see xpg_strerror_r.c for the POSIX version. */ char * _DEFUN (strerror_r, (errnum, buffer, n), - int errnum _AND - char *buffer _AND + int errnum, + char *buffer, size_t n) { char *error = _strerror_r (_REENT, errnum, 1, NULL); diff --git a/newlib/libc/string/strlcat.c b/newlib/libc/string/strlcat.c index 0c47bd527..c606f3b30 100644 --- a/newlib/libc/string/strlcat.c +++ b/newlib/libc/string/strlcat.c @@ -43,8 +43,8 @@ static char *rcsid = "$OpenBSD: strlcat.c,v 1.8 2001/05/13 15:40:15 deraadt Exp */ size_t _DEFUN (strlcat, (dst, src, siz), - char *dst _AND - _CONST char *src _AND + char *dst, + _CONST char *src, size_t siz) { register char *d = dst; diff --git a/newlib/libc/string/strlcpy.c b/newlib/libc/string/strlcpy.c index c31001642..300ac82c1 100644 --- a/newlib/libc/string/strlcpy.c +++ b/newlib/libc/string/strlcpy.c @@ -41,8 +41,8 @@ static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp */ size_t _DEFUN (strlcpy, (dst, src, siz), - char *dst _AND - _CONST char *src _AND + char *dst, + _CONST char *src, size_t siz) { register char *d = dst; diff --git a/newlib/libc/string/strncasecmp.c b/newlib/libc/string/strncasecmp.c index c06294232..a30fccf81 100644 --- a/newlib/libc/string/strncasecmp.c +++ b/newlib/libc/string/strncasecmp.c @@ -38,8 +38,8 @@ QUICKREF int _DEFUN (strncasecmp, (s1, s2, n), - _CONST char *s1 _AND - _CONST char *s2 _AND + _CONST char *s1, + _CONST char *s2, size_t n) { int d = 0; diff --git a/newlib/libc/string/strncat.c b/newlib/libc/string/strncat.c index 761cf87a7..f800221c6 100644 --- a/newlib/libc/string/strncat.c +++ b/newlib/libc/string/strncat.c @@ -59,8 +59,8 @@ QUICKREF char * _DEFUN (strncat, (s1, s2, n), - char *__restrict s1 _AND - _CONST char *__restrict s2 _AND + char *__restrict s1, + _CONST char *__restrict s2, size_t n) { #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__) diff --git a/newlib/libc/string/strncmp.c b/newlib/libc/string/strncmp.c index 3bbe47bcc..98a31d32b 100644 --- a/newlib/libc/string/strncmp.c +++ b/newlib/libc/string/strncmp.c @@ -53,8 +53,8 @@ QUICKREF int _DEFUN (strncmp, (s1, s2, n), - _CONST char *s1 _AND - _CONST char *s2 _AND + _CONST char *s1, + _CONST char *s2, size_t n) { #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__) diff --git a/newlib/libc/string/strncpy.c b/newlib/libc/string/strncpy.c index 83596f408..91b274590 100644 --- a/newlib/libc/string/strncpy.c +++ b/newlib/libc/string/strncpy.c @@ -60,8 +60,8 @@ QUICKREF char * _DEFUN (strncpy, (dst0, src0), - char *__restrict dst0 _AND - _CONST char *__restrict src0 _AND + char *__restrict dst0, + _CONST char *__restrict src0, size_t count) { #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__) diff --git a/newlib/libc/string/strndup.c b/newlib/libc/string/strndup.c index caa1b68b7..64e9ae68e 100644 --- a/newlib/libc/string/strndup.c +++ b/newlib/libc/string/strndup.c @@ -7,7 +7,7 @@ char * _DEFUN (strndup, (str, n), - _CONST char *str _AND + _CONST char *str, size_t n) { return _strndup_r (_REENT, str, n); diff --git a/newlib/libc/string/strndup_r.c b/newlib/libc/string/strndup_r.c index 2acf63dec..c8ec072fa 100644 --- a/newlib/libc/string/strndup_r.c +++ b/newlib/libc/string/strndup_r.c @@ -4,8 +4,8 @@ char * _DEFUN (_strndup_r, (reent_ptr, str, n), - struct _reent *reent_ptr _AND - _CONST char *str _AND + struct _reent *reent_ptr, + _CONST char *str, size_t n) { _CONST char *ptr = str; diff --git a/newlib/libc/string/strnlen.c b/newlib/libc/string/strnlen.c index 07ece0d8b..4978f726d 100644 --- a/newlib/libc/string/strnlen.c +++ b/newlib/libc/string/strnlen.c @@ -31,7 +31,7 @@ PORTABILITY size_t _DEFUN (strnlen, (str, n), - _CONST char *str _AND + _CONST char *str, size_t n) { _CONST char *start = str; diff --git a/newlib/libc/string/strpbrk.c b/newlib/libc/string/strpbrk.c index 4507a86a4..f589fbdac 100644 --- a/newlib/libc/string/strpbrk.c +++ b/newlib/libc/string/strpbrk.c @@ -26,7 +26,7 @@ PORTABILITY char * _DEFUN (strpbrk, (s1, s2), - _CONST char *s1 _AND + _CONST char *s1, _CONST char *s2) { _CONST char *c = s2; diff --git a/newlib/libc/string/strrchr.c b/newlib/libc/string/strrchr.c index 8217c6df3..721bb91dc 100644 --- a/newlib/libc/string/strrchr.c +++ b/newlib/libc/string/strrchr.c @@ -31,7 +31,7 @@ QUICKREF char * _DEFUN (strrchr, (s, i), - _CONST char *s _AND + _CONST char *s, int i) { _CONST char *last = NULL; diff --git a/newlib/libc/string/strsep.c b/newlib/libc/string/strsep.c index d3d0ad0a9..e59782795 100644 --- a/newlib/libc/string/strsep.c +++ b/newlib/libc/string/strsep.c @@ -12,7 +12,7 @@ extern char *__strtok_r (char *, const char *, char **, int); char * _DEFUN (strsep, (source_ptr, delim), - register char **source_ptr _AND + register char **source_ptr, register const char *delim) { return __strtok_r (*source_ptr, delim, source_ptr, 0); diff --git a/newlib/libc/string/strspn.c b/newlib/libc/string/strspn.c index 3f43b8f82..287da4d7e 100644 --- a/newlib/libc/string/strspn.c +++ b/newlib/libc/string/strspn.c @@ -31,7 +31,7 @@ QUICKREF size_t _DEFUN (strspn, (s1, s2), - _CONST char *s1 _AND + _CONST char *s1, _CONST char *s2) { _CONST char *s = s1; diff --git a/newlib/libc/string/strstr.c b/newlib/libc/string/strstr.c index 288c74466..94fe297e7 100644 --- a/newlib/libc/string/strstr.c +++ b/newlib/libc/string/strstr.c @@ -40,7 +40,7 @@ QUICKREF char * _DEFUN (strstr, (searchee, lookfor), - _CONST char *searchee _AND + _CONST char *searchee, _CONST char *lookfor) { #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__) diff --git a/newlib/libc/string/strtok.c b/newlib/libc/string/strtok.c index a24c538e4..92c801731 100644 --- a/newlib/libc/string/strtok.c +++ b/newlib/libc/string/strtok.c @@ -80,7 +80,7 @@ extern char *__strtok_r (char *, const char *, char **, int); char * _DEFUN (strtok, (s, delim), - register char *__restrict s _AND + register char *__restrict s, register const char *__restrict delim) { struct _reent *reent = _REENT; diff --git a/newlib/libc/string/strtok_r.c b/newlib/libc/string/strtok_r.c index 6ace7008b..0d01dcaad 100644 --- a/newlib/libc/string/strtok_r.c +++ b/newlib/libc/string/strtok_r.c @@ -31,9 +31,9 @@ char * _DEFUN (__strtok_r, (s, delim, lasts, skip_leading_delim), - register char *s _AND - register const char *delim _AND - char **lasts _AND + register char *s, + register const char *delim, + char **lasts, int skip_leading_delim) { register char *spanp; @@ -91,8 +91,8 @@ cont: char * _DEFUN (strtok_r, (s, delim, lasts), - register char *__restrict s _AND - register const char *__restrict delim _AND + register char *__restrict s, + register const char *__restrict delim, char **__restrict lasts) { return __strtok_r (s, delim, lasts, 1); diff --git a/newlib/libc/string/strxfrm.c b/newlib/libc/string/strxfrm.c index de397210b..55b81b335 100644 --- a/newlib/libc/string/strxfrm.c +++ b/newlib/libc/string/strxfrm.c @@ -47,8 +47,8 @@ QUICKREF size_t _DEFUN (strxfrm, (s1, s2, n), - char *__restrict s1 _AND - _CONST char *__restrict s2 _AND + char *__restrict s1, + _CONST char *__restrict s2, size_t n) { size_t res; diff --git a/newlib/libc/string/swab.c b/newlib/libc/string/swab.c index ecf5abed9..b08066875 100644 --- a/newlib/libc/string/swab.c +++ b/newlib/libc/string/swab.c @@ -19,8 +19,8 @@ PORTABILITY void _DEFUN (swab, (b1, b2, length), - _CONST void *b1 _AND - void *b2 _AND + _CONST void *b1, + void *b2, ssize_t length) { const char *from = b1; diff --git a/newlib/libc/string/u_strerr.c b/newlib/libc/string/u_strerr.c index 2978df0cf..d3204df72 100644 --- a/newlib/libc/string/u_strerr.c +++ b/newlib/libc/string/u_strerr.c @@ -2,8 +2,8 @@ char * _DEFUN(_user_strerror, (errnum, internal, errptr), - int errnum _AND - int internal _AND + int errnum, + int internal, int *errptr) { /* prevent warning about unused parameters */ diff --git a/newlib/libc/string/wcpcpy.c b/newlib/libc/string/wcpcpy.c index f0f9c4a08..0fda226e7 100644 --- a/newlib/libc/string/wcpcpy.c +++ b/newlib/libc/string/wcpcpy.c @@ -27,7 +27,7 @@ No supporting OS subroutines are required. wchar_t * _DEFUN (wcpcpy, (s1, s2), - wchar_t *__restrict s1 _AND + wchar_t *__restrict s1, _CONST wchar_t *__restrict s2) { while ((*s1++ = *s2++)) diff --git a/newlib/libc/string/wcpncpy.c b/newlib/libc/string/wcpncpy.c index 8f7ee796f..f643b1e43 100644 --- a/newlib/libc/string/wcpncpy.c +++ b/newlib/libc/string/wcpncpy.c @@ -34,8 +34,8 @@ No supporting OS subroutines are required. wchar_t * _DEFUN (wcpncpy, (dst, src, count), - wchar_t *__restrict dst _AND - _CONST wchar_t *__restrict src _AND + wchar_t *__restrict dst, + _CONST wchar_t *__restrict src, size_t count) { wchar_t *ret = NULL; diff --git a/newlib/libc/string/wcscasecmp.c b/newlib/libc/string/wcscasecmp.c index 26c7cc237..f23e37227 100644 --- a/newlib/libc/string/wcscasecmp.c +++ b/newlib/libc/string/wcscasecmp.c @@ -37,7 +37,7 @@ QUICKREF int _DEFUN (wcscasecmp, (s1, s2), - _CONST wchar_t *s1 _AND + _CONST wchar_t *s1, _CONST wchar_t *s2) { int d = 0; diff --git a/newlib/libc/string/wcscat.c b/newlib/libc/string/wcscat.c index 586512d0f..900c3cc52 100644 --- a/newlib/libc/string/wcscat.c +++ b/newlib/libc/string/wcscat.c @@ -62,7 +62,7 @@ No supporting OS subroutines are required. wchar_t * _DEFUN (wcscat, (s1, s2), - wchar_t *__restrict s1 _AND + wchar_t *__restrict s1, _CONST wchar_t *__restrict s2) { wchar_t *p; diff --git a/newlib/libc/string/wcschr.c b/newlib/libc/string/wcschr.c index c705a08d5..7590009e9 100644 --- a/newlib/libc/string/wcschr.c +++ b/newlib/libc/string/wcschr.c @@ -59,7 +59,7 @@ No supporting OS subroutines are required. wchar_t * _DEFUN (wcschr, (s, c), - _CONST wchar_t * s _AND + _CONST wchar_t * s, wchar_t c) { _CONST wchar_t *p; diff --git a/newlib/libc/string/wcscmp.c b/newlib/libc/string/wcscmp.c index 8155742b8..f14eb5d8d 100644 --- a/newlib/libc/string/wcscmp.c +++ b/newlib/libc/string/wcscmp.c @@ -68,7 +68,7 @@ No supporting OS subroutines are required. */ int _DEFUN (wcscmp, (s1, s2), - _CONST wchar_t * s1 _AND + _CONST wchar_t * s1, _CONST wchar_t * s2) { diff --git a/newlib/libc/string/wcscoll.c b/newlib/libc/string/wcscoll.c index 020f7e57f..27a12456e 100644 --- a/newlib/libc/string/wcscoll.c +++ b/newlib/libc/string/wcscoll.c @@ -34,7 +34,7 @@ PORTABILITY int _DEFUN (wcscoll, (a, b), - _CONST wchar_t *a _AND + _CONST wchar_t *a, _CONST wchar_t *b) { diff --git a/newlib/libc/string/wcscpy.c b/newlib/libc/string/wcscpy.c index 79f065ca0..2dff63996 100644 --- a/newlib/libc/string/wcscpy.c +++ b/newlib/libc/string/wcscpy.c @@ -58,7 +58,7 @@ No supporting OS subroutines are required. wchar_t * _DEFUN (wcscpy, (s1, s2), - wchar_t *__restrict s1 _AND + wchar_t *__restrict s1, _CONST wchar_t *__restrict s2) { wchar_t *p; diff --git a/newlib/libc/string/wcscspn.c b/newlib/libc/string/wcscspn.c index 7be5f5eee..355499699 100644 --- a/newlib/libc/string/wcscspn.c +++ b/newlib/libc/string/wcscspn.c @@ -57,7 +57,7 @@ No supporting OS subroutines are required. size_t _DEFUN (wcscspn, (s, set), - _CONST wchar_t * s _AND + _CONST wchar_t * s, _CONST wchar_t * set) { _CONST wchar_t *p; diff --git a/newlib/libc/string/wcslcat.c b/newlib/libc/string/wcslcat.c index 2caa58820..1015c4c36 100644 --- a/newlib/libc/string/wcslcat.c +++ b/newlib/libc/string/wcslcat.c @@ -69,8 +69,8 @@ No supporting OS subroutines are required. */ size_t _DEFUN (wcslcat, (dst, src, siz), - wchar_t * dst _AND - _CONST wchar_t * src _AND + wchar_t * dst, + _CONST wchar_t * src, size_t siz) { wchar_t *d = dst; diff --git a/newlib/libc/string/wcslcpy.c b/newlib/libc/string/wcslcpy.c index 34352fb9d..396dda71a 100644 --- a/newlib/libc/string/wcslcpy.c +++ b/newlib/libc/string/wcslcpy.c @@ -63,8 +63,8 @@ No supporting OS subroutines are required. */ size_t _DEFUN (wcslcpy, (dst, src, siz), - wchar_t * dst _AND - _CONST wchar_t * src _AND + wchar_t * dst, + _CONST wchar_t * src, size_t siz) { wchar_t *d = dst; diff --git a/newlib/libc/string/wcsncasecmp.c b/newlib/libc/string/wcsncasecmp.c index a339bbfa5..90f310158 100644 --- a/newlib/libc/string/wcsncasecmp.c +++ b/newlib/libc/string/wcsncasecmp.c @@ -38,8 +38,8 @@ QUICKREF int _DEFUN (wcsncasecmp, (s1, s2, n), - _CONST wchar_t *s1 _AND - _CONST wchar_t *s2 _AND + _CONST wchar_t *s1, + _CONST wchar_t *s2, size_t n) { int d = 0; diff --git a/newlib/libc/string/wcsncat.c b/newlib/libc/string/wcsncat.c index 34a694790..57dc9031b 100644 --- a/newlib/libc/string/wcsncat.c +++ b/newlib/libc/string/wcsncat.c @@ -63,8 +63,8 @@ No supporting OS subroutines are required. wchar_t * _DEFUN (wcsncat, (s1, s2, n), - wchar_t *__restrict s1 _AND - _CONST wchar_t *__restrict s2 _AND + wchar_t *__restrict s1, + _CONST wchar_t *__restrict s2, size_t n) { wchar_t *p; diff --git a/newlib/libc/string/wcsncmp.c b/newlib/libc/string/wcsncmp.c index 72c5d1291..83b899d84 100644 --- a/newlib/libc/string/wcsncmp.c +++ b/newlib/libc/string/wcsncmp.c @@ -64,8 +64,8 @@ No supporting OS subroutines are required. int _DEFUN (wcsncmp, (s1, s2, n), - _CONST wchar_t * s1 _AND - _CONST wchar_t * s2 _AND + _CONST wchar_t * s1, + _CONST wchar_t * s2, size_t n) { diff --git a/newlib/libc/string/wcsncpy.c b/newlib/libc/string/wcsncpy.c index 793e522da..d09b95df7 100644 --- a/newlib/libc/string/wcsncpy.c +++ b/newlib/libc/string/wcsncpy.c @@ -36,8 +36,8 @@ No supporting OS subroutines are required. wchar_t * _DEFUN (wcsncpy, (s1, s2, n), - wchar_t *__restrict s1 _AND - _CONST wchar_t *__restrict s2 _AND + wchar_t *__restrict s1, + _CONST wchar_t *__restrict s2, size_t n) { wchar_t *dscan=s1; diff --git a/newlib/libc/string/wcsnlen.c b/newlib/libc/string/wcsnlen.c index 77aad65a3..e9715e749 100644 --- a/newlib/libc/string/wcsnlen.c +++ b/newlib/libc/string/wcsnlen.c @@ -53,7 +53,7 @@ PORTABILITY size_t _DEFUN(wcsnlen, (s, maxlen), - _CONST wchar_t *s _AND + _CONST wchar_t *s, size_t maxlen) { _CONST wchar_t *p; diff --git a/newlib/libc/string/wcspbrk.c b/newlib/libc/string/wcspbrk.c index 55401f1a9..b4d8230cc 100644 --- a/newlib/libc/string/wcspbrk.c +++ b/newlib/libc/string/wcspbrk.c @@ -58,7 +58,7 @@ No supporting OS subroutines are required. wchar_t * _DEFUN (wcspbrk, (s, set), - _CONST wchar_t * s _AND + _CONST wchar_t * s, _CONST wchar_t * set) { _CONST wchar_t *p; diff --git a/newlib/libc/string/wcsrchr.c b/newlib/libc/string/wcsrchr.c index b99cb9760..68f1e28b6 100644 --- a/newlib/libc/string/wcsrchr.c +++ b/newlib/libc/string/wcsrchr.c @@ -61,7 +61,7 @@ No supporting OS subroutines are required. wchar_t * _DEFUN (wcsrchr, (s, c), - _CONST wchar_t * s _AND + _CONST wchar_t * s, wchar_t c) { _CONST wchar_t *p; diff --git a/newlib/libc/string/wcsspn.c b/newlib/libc/string/wcsspn.c index 652d971dd..8e8ce6c69 100644 --- a/newlib/libc/string/wcsspn.c +++ b/newlib/libc/string/wcsspn.c @@ -57,7 +57,7 @@ No supporting OS subroutines are required. size_t _DEFUN (wcsspn, (s, set), - _CONST wchar_t * s _AND + _CONST wchar_t * s, _CONST wchar_t * set) { _CONST wchar_t *p; diff --git a/newlib/libc/string/wcsstr.c b/newlib/libc/string/wcsstr.c index bb6e3eda8..2fdec0f97 100644 --- a/newlib/libc/string/wcsstr.c +++ b/newlib/libc/string/wcsstr.c @@ -62,7 +62,7 @@ PORTABILITY wchar_t * _DEFUN (wcsstr, (big, little), - _CONST wchar_t *__restrict big _AND + _CONST wchar_t *__restrict big, _CONST wchar_t *__restrict little) { _CONST wchar_t *p; diff --git a/newlib/libc/string/wcstok.c b/newlib/libc/string/wcstok.c index 091f4bd3e..2467704fd 100644 --- a/newlib/libc/string/wcstok.c +++ b/newlib/libc/string/wcstok.c @@ -91,8 +91,8 @@ QUICKREF wchar_t * _DEFUN (wcstok, (s, delim, lasts), - register wchar_t *__restrict s _AND - register const wchar_t *__restrict delim _AND + register wchar_t *__restrict s, + register const wchar_t *__restrict delim, wchar_t **__restrict lasts) { register const wchar_t *spanp; diff --git a/newlib/libc/string/wcswidth.c b/newlib/libc/string/wcswidth.c index 4cb8fa812..3764883a9 100644 --- a/newlib/libc/string/wcswidth.c +++ b/newlib/libc/string/wcswidth.c @@ -35,7 +35,7 @@ PORTABILITY int _DEFUN (wcswidth, (pwcs, n), - _CONST wchar_t *pwcs _AND + _CONST wchar_t *pwcs, size_t n) { diff --git a/newlib/libc/string/wcsxfrm.c b/newlib/libc/string/wcsxfrm.c index e11516ff4..6911b21e2 100644 --- a/newlib/libc/string/wcsxfrm.c +++ b/newlib/libc/string/wcsxfrm.c @@ -37,8 +37,8 @@ PORTABILITY size_t _DEFUN (wcsxfrm, (a, b, n), - wchar_t *__restrict a _AND - _CONST wchar_t *__restrict b _AND + wchar_t *__restrict a, + _CONST wchar_t *__restrict b, size_t n) { diff --git a/newlib/libc/string/wmemchr.c b/newlib/libc/string/wmemchr.c index 097e47a03..2a6f8e1a4 100644 --- a/newlib/libc/string/wmemchr.c +++ b/newlib/libc/string/wmemchr.c @@ -64,8 +64,8 @@ No supporting OS subroutines are required. wchar_t * _DEFUN (wmemchr, (s, c, n), - _CONST wchar_t * s _AND - wchar_t c _AND + _CONST wchar_t * s, + wchar_t c, size_t n) { size_t i; diff --git a/newlib/libc/string/wmemcmp.c b/newlib/libc/string/wmemcmp.c index a01bf32f1..bfe1e69b4 100644 --- a/newlib/libc/string/wmemcmp.c +++ b/newlib/libc/string/wmemcmp.c @@ -63,8 +63,8 @@ No supporting OS subroutines are required. int _DEFUN (wmemcmp, (s1, s2, n), - _CONST wchar_t * s1 _AND - _CONST wchar_t * s2 _AND + _CONST wchar_t * s1, + _CONST wchar_t * s2, size_t n) { size_t i; diff --git a/newlib/libc/string/wmemcpy.c b/newlib/libc/string/wmemcpy.c index 0e8d6e494..9e4fdc517 100644 --- a/newlib/libc/string/wmemcpy.c +++ b/newlib/libc/string/wmemcpy.c @@ -62,8 +62,8 @@ No supporting OS subroutines are required. wchar_t * _DEFUN (wmemcpy, (d, s, n), - wchar_t *__restrict d _AND - _CONST wchar_t *__restrict s _AND + wchar_t *__restrict d, + _CONST wchar_t *__restrict s, size_t n) { diff --git a/newlib/libc/string/wmemmove.c b/newlib/libc/string/wmemmove.c index 18d2a2bfd..567f55afd 100644 --- a/newlib/libc/string/wmemmove.c +++ b/newlib/libc/string/wmemmove.c @@ -67,8 +67,8 @@ No supporting OS subroutines are required. wchar_t * _DEFUN (wmemmove, (d, s, n), - wchar_t * d _AND - _CONST wchar_t * s _AND + wchar_t * d, + _CONST wchar_t * s, size_t n) { diff --git a/newlib/libc/string/wmempcpy.c b/newlib/libc/string/wmempcpy.c index a3b2ce637..f11485262 100644 --- a/newlib/libc/string/wmempcpy.c +++ b/newlib/libc/string/wmempcpy.c @@ -35,8 +35,8 @@ No supporting OS subroutines are required. wchar_t * _DEFUN (wmempcpy, (d, s, n), - wchar_t *__restrict d _AND - _CONST wchar_t *__restrict s _AND + wchar_t *__restrict d, + _CONST wchar_t *__restrict s, size_t n) { return (wchar_t *) mempcpy (d, s, n * sizeof (wchar_t)); diff --git a/newlib/libc/string/wmemset.c b/newlib/libc/string/wmemset.c index 377fbee1f..f9ec361cd 100644 --- a/newlib/libc/string/wmemset.c +++ b/newlib/libc/string/wmemset.c @@ -60,8 +60,8 @@ No supporting OS subroutines are required. wchar_t * _DEFUN(wmemset, (s, c, n), - wchar_t *s _AND - wchar_t c _AND + wchar_t *s, + wchar_t c, size_t n) { size_t i; diff --git a/newlib/libc/string/xpg_strerror_r.c b/newlib/libc/string/xpg_strerror_r.c index e503880b0..bc1858738 100644 --- a/newlib/libc/string/xpg_strerror_r.c +++ b/newlib/libc/string/xpg_strerror_r.c @@ -5,8 +5,8 @@ int _DEFUN (__xpg_strerror_r, (errnum, buffer, n), - int errnum _AND - char *buffer _AND + int errnum, + char *buffer, size_t n) { char *error; |