From 290e19f8147d9b3c0166d3520e718ae5603e4cef Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 18 Nov 2012 06:17:03 -0500 Subject: drop support for pre ISO-C compilers This drops __signed, __volatile, and __const. Only the latter was used in the code base, and for uClibc, not consistently. Much of the code used plain "const" which meant "__const" was useless. Really, the point of this is to stay in sync with what glibc did. Signed-off-by: Mike Frysinger --- include/string.h | 106 +++++++++++++++++++++++++++---------------------------- 1 file changed, 53 insertions(+), 53 deletions(-) (limited to 'include/string.h') diff --git a/include/string.h b/include/string.h index f260c909b..1d75f449f 100644 --- a/include/string.h +++ b/include/string.h @@ -35,12 +35,12 @@ __BEGIN_DECLS __BEGIN_NAMESPACE_STD /* Copy N bytes of SRC to DEST. */ extern void *memcpy (void *__restrict __dest, - __const void *__restrict __src, size_t __n) + const void *__restrict __src, size_t __n) __THROW __nonnull ((1, 2)); libc_hidden_proto(memcpy) /* Copy N bytes of SRC to DEST, guaranteeing correct behavior for overlapping strings. */ -extern void *memmove (void *__dest, __const void *__src, size_t __n) +extern void *memmove (void *__dest, const void *__src, size_t __n) __THROW __nonnull ((1, 2)); libc_hidden_proto(memmove) __END_NAMESPACE_STD @@ -49,7 +49,7 @@ __END_NAMESPACE_STD Return the position in DEST one byte past where C was copied, or NULL if C was not found in the first N bytes of SRC. */ #if defined __USE_SVID || defined __USE_BSD || defined __USE_XOPEN -extern void *memccpy (void *__restrict __dest, __const void *__restrict __src, +extern void *memccpy (void *__restrict __dest, const void *__restrict __src, int __c, size_t __n) __THROW __nonnull ((1, 2)); libc_hidden_proto(memccpy) @@ -62,12 +62,12 @@ extern void *memset (void *__s, int __c, size_t __n) __THROW __nonnull ((1)); libc_hidden_proto(memset) /* Compare N bytes of S1 and S2. */ -extern int memcmp (__const void *__s1, __const void *__s2, size_t __n) +extern int memcmp (const void *__s1, const void *__s2, size_t __n) __THROW __attribute_pure__ __nonnull ((1, 2)); libc_hidden_proto(memcmp) /* Search N bytes of S for C. */ -extern void *memchr (__const void *__s, int __c, size_t __n) +extern void *memchr (const void *__s, int __c, size_t __n) __THROW __attribute_pure__ __nonnull ((1)); libc_hidden_proto(memchr) __END_NAMESPACE_STD @@ -75,12 +75,12 @@ __END_NAMESPACE_STD #ifdef __USE_GNU /* Search in S for C. This is similar to `memchr' but there is no length limit. */ -extern void *rawmemchr (__const void *__s, int __c) +extern void *rawmemchr (const void *__s, int __c) __THROW __attribute_pure__ __nonnull ((1)); libc_hidden_proto(rawmemchr) /* Search N bytes of S for the final occurrence of C. */ -extern void *memrchr (__const void *__s, int __c, size_t __n) +extern void *memrchr (const void *__s, int __c, size_t __n) __THROW __attribute_pure__ __nonnull ((1)); libc_hidden_proto(memrchr) #endif @@ -88,40 +88,40 @@ libc_hidden_proto(memrchr) __BEGIN_NAMESPACE_STD /* Copy SRC to DEST. */ -extern char *strcpy (char *__restrict __dest, __const char *__restrict __src) +extern char *strcpy (char *__restrict __dest, const char *__restrict __src) __THROW __nonnull ((1, 2)); libc_hidden_proto(strcpy) /* Copy no more than N characters of SRC to DEST. */ extern char *strncpy (char *__restrict __dest, - __const char *__restrict __src, size_t __n) + const char *__restrict __src, size_t __n) __THROW __nonnull ((1, 2)); libc_hidden_proto(strncpy) /* Append SRC onto DEST. */ -extern char *strcat (char *__restrict __dest, __const char *__restrict __src) +extern char *strcat (char *__restrict __dest, const char *__restrict __src) __THROW __nonnull ((1, 2)); libc_hidden_proto(strcat) /* Append no more than N characters from SRC onto DEST. */ -extern char *strncat (char *__restrict __dest, __const char *__restrict __src, +extern char *strncat (char *__restrict __dest, const char *__restrict __src, size_t __n) __THROW __nonnull ((1, 2)); libc_hidden_proto(strncat) /* Compare S1 and S2. */ -extern int strcmp (__const char *__s1, __const char *__s2) +extern int strcmp (const char *__s1, const char *__s2) __THROW __attribute_pure__ __nonnull ((1, 2)); libc_hidden_proto(strcmp) /* Compare N characters of S1 and S2. */ -extern int strncmp (__const char *__s1, __const char *__s2, size_t __n) +extern int strncmp (const char *__s1, const char *__s2, size_t __n) __THROW __attribute_pure__ __nonnull ((1, 2)); libc_hidden_proto(strncmp) /* Compare the collated forms of S1 and S2. */ -extern int strcoll (__const char *__s1, __const char *__s2) +extern int strcoll (const char *__s1, const char *__s2) __THROW __attribute_pure__ __nonnull ((1, 2)); libc_hidden_proto(strcoll) /* Put a transformation of SRC into no more than N bytes of DEST. */ extern size_t strxfrm (char *__restrict __dest, - __const char *__restrict __src, size_t __n) + const char *__restrict __src, size_t __n) __THROW __nonnull ((2)); __END_NAMESPACE_STD @@ -132,18 +132,18 @@ __END_NAMESPACE_STD # include /* Compare the collated forms of S1 and S2 using 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)); libc_hidden_proto(strcoll_l) /* Put a transformation of SRC into no more than N bytes of DEST. */ -extern size_t strxfrm_l (char *__dest, __const char *__src, size_t __n, +extern size_t strxfrm_l (char *__dest, const char *__src, size_t __n, __locale_t __l) __THROW __nonnull ((2, 4)); libc_hidden_proto(strxfrm_l) #endif #if defined __USE_SVID || defined __USE_BSD || defined __USE_XOPEN_EXTENDED /* Duplicate S, returning an identical malloc'd string. */ -extern char *strdup (__const char *__s) +extern char *strdup (const char *__s) __THROW __attribute_malloc__ __nonnull ((1)); libc_hidden_proto(strdup) #endif @@ -152,7 +152,7 @@ libc_hidden_proto(strdup) resultant string is terminated even if no null terminator appears before STRING[N]. */ #if defined __USE_XOPEN2K8 -extern char *strndup (__const char *__string, size_t __n) +extern char *strndup (const char *__string, size_t __n) __THROW __attribute_malloc__ __nonnull ((1)); libc_hidden_proto(strndup) #endif @@ -162,7 +162,7 @@ libc_hidden_proto(strndup) # define strdupa(s) \ (__extension__ \ ({ \ - __const char *__old = (s); \ + const char *__old = (s); \ size_t __len = strlen (__old) + 1; \ char *__new = (char *) __builtin_alloca (__len); \ (char *) memcpy (__new, __old, __len); \ @@ -172,7 +172,7 @@ libc_hidden_proto(strndup) # define strndupa(s, n) \ (__extension__ \ ({ \ - __const char *__old = (s); \ + const char *__old = (s); \ size_t __len = strnlen (__old, (n)); \ char *__new = (char *) __builtin_alloca (__len + 1); \ __new[__len] = '\0'; \ @@ -182,11 +182,11 @@ libc_hidden_proto(strndup) __BEGIN_NAMESPACE_STD /* Find the first occurrence of C in S. */ -extern char *strchr (__const char *__s, int __c) +extern char *strchr (const char *__s, int __c) __THROW __attribute_pure__ __nonnull ((1)); libc_hidden_proto(strchr) /* Find the last occurrence of C in S. */ -extern char *strrchr (__const char *__s, int __c) +extern char *strrchr (const char *__s, int __c) __THROW __attribute_pure__ __nonnull ((1)); libc_hidden_proto(strrchr) __END_NAMESPACE_STD @@ -194,7 +194,7 @@ __END_NAMESPACE_STD #ifdef __USE_GNU /* This function is similar to `strchr'. But it returns a pointer to the closing NUL byte in case C is not found in S. */ -extern char *strchrnul (__const char *__s, int __c) +extern char *strchrnul (const char *__s, int __c) __THROW __attribute_pure__ __nonnull ((1)); libc_hidden_proto(strchrnul) #endif @@ -202,26 +202,26 @@ libc_hidden_proto(strchrnul) __BEGIN_NAMESPACE_STD /* Return the length of the initial segment of S which consists entirely of characters not in REJECT. */ -extern size_t strcspn (__const char *__s, __const char *__reject) +extern size_t strcspn (const char *__s, const char *__reject) __THROW __attribute_pure__ __nonnull ((1, 2)); libc_hidden_proto(strcspn) /* Return the length of the initial segment of S which consists entirely of characters in ACCEPT. */ -extern size_t strspn (__const char *__s, __const char *__accept) +extern size_t strspn (const char *__s, const char *__accept) __THROW __attribute_pure__ __nonnull ((1, 2)); libc_hidden_proto(strspn) /* Find the first occurrence in S of any character in ACCEPT. */ -extern char *strpbrk (__const char *__s, __const char *__accept) +extern char *strpbrk (const char *__s, const char *__accept) __THROW __attribute_pure__ __nonnull ((1, 2)); libc_hidden_proto(strpbrk) /* Find the first occurrence of NEEDLE in HAYSTACK. */ -extern char *strstr (__const char *__haystack, __const char *__needle) +extern char *strstr (const char *__haystack, const char *__needle) __THROW __attribute_pure__ __nonnull ((1, 2)); libc_hidden_proto(strstr) /* Divide S into tokens separated by characters in DELIM. */ -extern char *strtok (char *__restrict __s, __const char *__restrict __delim) +extern char *strtok (char *__restrict __s, const char *__restrict __delim) __THROW __nonnull ((2)); libc_hidden_proto(strtok) __END_NAMESPACE_STD @@ -230,12 +230,12 @@ __END_NAMESPACE_STD passed between calls are stored in SAVE_PTR. */ #if 0 /* uClibc: disabled */ extern char *__strtok_r (char *__restrict __s, - __const char *__restrict __delim, + const char *__restrict __delim, char **__restrict __save_ptr) __THROW __nonnull ((2, 3)); #endif #if defined __USE_POSIX || defined __USE_MISC -extern char *strtok_r (char *__restrict __s, __const char *__restrict __delim, +extern char *strtok_r (char *__restrict __s, const char *__restrict __delim, char **__restrict __save_ptr) __THROW __nonnull ((2, 3)); libc_hidden_proto(strtok_r) @@ -243,7 +243,7 @@ libc_hidden_proto(strtok_r) #ifdef __USE_GNU /* Similar to `strstr' but this function ignores the case of both strings. */ -extern char *strcasestr (__const char *__haystack, __const char *__needle) +extern char *strcasestr (const char *__haystack, const char *__needle) __THROW __attribute_pure__ __nonnull ((1, 2)); libc_hidden_proto(strcasestr) #endif @@ -252,19 +252,19 @@ libc_hidden_proto(strcasestr) /* Find the first occurrence of NEEDLE in HAYSTACK. NEEDLE is NEEDLELEN bytes long; HAYSTACK is HAYSTACKLEN bytes long. */ -extern void *memmem (__const void *__haystack, size_t __haystacklen, - __const void *__needle, size_t __needlelen) +extern void *memmem (const void *__haystack, size_t __haystacklen, + const void *__needle, size_t __needlelen) __THROW __attribute_pure__ __nonnull ((1, 3)); /* Copy N bytes of SRC to DEST, return pointer to bytes after the last written byte. */ #if 0 /* uClibc: disabled */ extern void *__mempcpy (void *__restrict __dest, - __const void *__restrict __src, size_t __n) + const void *__restrict __src, size_t __n) __THROW __nonnull ((1, 2)); #endif extern void *mempcpy (void *__restrict __dest, - __const void *__restrict __src, size_t __n) + const void *__restrict __src, size_t __n) __THROW __nonnull ((1, 2)); libc_hidden_proto(mempcpy) #endif @@ -272,7 +272,7 @@ libc_hidden_proto(mempcpy) __BEGIN_NAMESPACE_STD /* Return the length of S. */ -extern size_t strlen (__const char *__s) +extern size_t strlen (const char *__s) __THROW __attribute_pure__ __nonnull ((1)); libc_hidden_proto(strlen) __END_NAMESPACE_STD @@ -280,7 +280,7 @@ __END_NAMESPACE_STD #ifdef __USE_XOPEN2K8 /* Find the length of STRING, but scan at most MAXLEN characters. If no '\0' terminator is found in that many characters, return MAXLEN. */ -extern size_t strnlen (__const char *__string, size_t __maxlen) +extern size_t strnlen (const char *__string, size_t __maxlen) __THROW __attribute_pure__ __nonnull ((1)); libc_hidden_proto(strnlen) #endif @@ -343,22 +343,22 @@ extern void __bzero (void *__s, size_t __n) __THROW __nonnull ((1)); #ifdef __USE_BSD # ifdef __UCLIBC_SUSV3_LEGACY__ /* Copy N bytes of SRC to DEST (like memmove, but args reversed). */ -extern void bcopy (__const void *__src, void *__dest, size_t __n) +extern void bcopy (const void *__src, void *__dest, size_t __n) __THROW __nonnull ((1, 2)); /* Set N bytes of S to 0. */ extern void bzero (void *__s, size_t __n) __THROW __nonnull ((1)); /* Compare N bytes of S1 and S2 (same as memcmp). */ -extern int bcmp (__const void *__s1, __const void *__s2, size_t __n) +extern int bcmp (const void *__s1, const void *__s2, size_t __n) __THROW __attribute_pure__ __nonnull ((1, 2)); /* Find the first occurrence of C in S (same as strchr). */ -extern char *index (__const char *__s, int __c) +extern char *index (const char *__s, int __c) __THROW __attribute_pure__ __nonnull ((1)); /* Find the last occurrence of C in S (same as strrchr). */ -extern char *rindex (__const char *__s, int __c) +extern char *rindex (const char *__s, int __c) __THROW __attribute_pure__ __nonnull ((1)); # else # ifdef __UCLIBC_SUSV3_LEGACY_MACROS__ @@ -390,12 +390,12 @@ __extension__ extern int ffsll (long long int __ll) # endif /* Compare S1 and S2, ignoring case. */ -extern int strcasecmp (__const char *__s1, __const char *__s2) +extern int strcasecmp (const char *__s1, const char *__s2) __THROW __attribute_pure__ __nonnull ((1, 2)); libc_hidden_proto(strcasecmp) /* Compare no more than N chars of S1 and S2, ignoring case. */ -extern int strncasecmp (__const char *__s1, __const char *__s2, size_t __n) +extern int strncasecmp (const char *__s1, const char *__s2, size_t __n) __THROW __attribute_pure__ __nonnull ((1, 2)); libc_hidden_proto(strncasecmp) #endif /* Use BSD. */ @@ -403,12 +403,12 @@ libc_hidden_proto(strncasecmp) #if defined __USE_XOPEN2K8 && defined __UCLIBC_HAS_XLOCALE__ /* Again versions of a few functions which use the given locale instead of the global one. */ -extern int strcasecmp_l (__const char *__s1, __const char *__s2, +extern int strcasecmp_l (const char *__s1, const char *__s2, __locale_t __loc) __THROW __attribute_pure__ __nonnull ((1, 2, 3)); libc_hidden_proto(strcasecmp_l) -extern int strncasecmp_l (__const char *__s1, __const char *__s2, +extern int strncasecmp_l (const char *__s1, const char *__s2, size_t __n, __locale_t __loc) __THROW __attribute_pure__ __nonnull ((1, 2, 4)); libc_hidden_proto(strncasecmp_l) @@ -418,7 +418,7 @@ libc_hidden_proto(strncasecmp_l) /* Return the next DELIM-delimited token from *STRINGP, terminating it with a '\0', and update *STRINGP to point past it. */ extern char *strsep (char **__restrict __stringp, - __const char *__restrict __delim) + const char *__restrict __delim) __THROW __nonnull ((1, 2)); libc_hidden_proto(strsep) #endif @@ -430,10 +430,10 @@ libc_hidden_proto(strsignal) /* Copy SRC to DEST, returning the address of the terminating '\0' in DEST. */ # if 0 /* uClibc: disabled */ -extern char *__stpcpy (char *__restrict __dest, __const char *__restrict __src) +extern char *__stpcpy (char *__restrict __dest, const char *__restrict __src) __THROW __nonnull ((1, 2)); # endif -extern char *stpcpy (char *__restrict __dest, __const char *__restrict __src) +extern char *stpcpy (char *__restrict __dest, const char *__restrict __src) __THROW __nonnull ((1, 2)); libc_hidden_proto(stpcpy) @@ -441,17 +441,17 @@ libc_hidden_proto(stpcpy) the last character written into DEST. */ # if 0 /* uClibc: disabled */ extern char *__stpncpy (char *__restrict __dest, - __const char *__restrict __src, size_t __n) + const char *__restrict __src, size_t __n) __THROW __nonnull ((1, 2)); # endif extern char *stpncpy (char *__restrict __dest, - __const char *__restrict __src, size_t __n) + const char *__restrict __src, size_t __n) __THROW __nonnull ((1, 2)); #endif #ifdef __USE_GNU /* Compare S1 and S2 as strings holding name & indices/version numbers. */ -extern int strverscmp (__const char *__s1, __const char *__s2) +extern int strverscmp (const char *__s1, const char *__s2) __THROW __attribute_pure__ __nonnull ((1, 2)); libc_hidden_proto(strverscmp) @@ -468,7 +468,7 @@ extern void *memfrob (void *__s, size_t __n) __THROW __nonnull ((1)); declare the function if the `basename' macro is available (defined in ) which makes the XPG version of this function available. */ -extern char *basename (__const char *__filename) __THROW __nonnull ((1)); +extern char *basename (const char *__filename) __THROW __nonnull ((1)); # endif #endif /* __USE_GNU */ -- cgit v1.2.3