diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-05-19 22:57:34 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-05-19 22:57:34 +0000 |
commit | 125773133f0fe2425ab3d8305ed880e9010f6803 (patch) | |
tree | ffba60dc39bff34a6dc51760c022c6945f8fd2b3 /libc/string | |
parent | 498822b67f68710b11d64a5aaf66aa1b865ef86e (diff) |
Moving libc_hidden_proto's into #ifdef UCLIBC_INTERNAL block
in string.h and strings.h. This caught unguarded string ops in
libc/inet/ethers.c __ether_line_w() function.
I will wait for fallout reports for a week or so,
then continue converting more libc_hidden_proto's.
Diffstat (limited to 'libc/string')
80 files changed, 112 insertions, 110 deletions
diff --git a/libc/string/__xpg_strerror_r.c b/libc/string/__xpg_strerror_r.c index f07237287..ce186a061 100644 --- a/libc/string/__xpg_strerror_r.c +++ b/libc/string/__xpg_strerror_r.c @@ -16,8 +16,8 @@ #undef strerror_r libc_hidden_proto(__xpg_strerror_r) -libc_hidden_proto(memcpy) -libc_hidden_proto(strlen) +/* Experimentally off - libc_hidden_proto(memcpy) */ +/* Experimentally off - libc_hidden_proto(strlen) */ #ifdef __UCLIBC_HAS_ERRNO_MESSAGES__ diff --git a/libc/string/_collate.c b/libc/string/_collate.c index 3009e4ebf..64b5d9608 100644 --- a/libc/string/_collate.c +++ b/libc/string/_collate.c @@ -19,10 +19,10 @@ #include <errno.h> #include <assert.h> -libc_hidden_proto(memset) -libc_hidden_proto(memcpy) -libc_hidden_proto(strlcpy) -libc_hidden_proto(strcmp) +/* Experimentally off - libc_hidden_proto(memset) */ +/* Experimentally off - libc_hidden_proto(memcpy) */ +/* Experimentally off - libc_hidden_proto(strlcpy) */ +/* Experimentally off - libc_hidden_proto(strcmp) */ #ifdef WANT_WIDE libc_hidden_proto(wcsxfrm) libc_hidden_proto(wcscmp) diff --git a/libc/string/basename.c b/libc/string/basename.c index 739eaec56..a076c20e9 100644 --- a/libc/string/basename.c +++ b/libc/string/basename.c @@ -8,7 +8,7 @@ #include "_string.h" #ifdef __USE_GNU -libc_hidden_proto(basename) +/* Experimentally off - libc_hidden_proto(basename) */ char *basename(const char *path) { diff --git a/libc/string/bcopy.c b/libc/string/bcopy.c index bd233cb9c..3aa7eab1e 100644 --- a/libc/string/bcopy.c +++ b/libc/string/bcopy.c @@ -9,7 +9,7 @@ #ifdef __UCLIBC_SUSV3_LEGACY__ -libc_hidden_proto(memmove) +/* Experimentally off - libc_hidden_proto(memmove) */ void bcopy(const void *s2, void *s1, size_t n) { diff --git a/libc/string/bzero.c b/libc/string/bzero.c index 519695cab..7498f795f 100644 --- a/libc/string/bzero.c +++ b/libc/string/bzero.c @@ -9,7 +9,7 @@ #ifdef __UCLIBC_SUSV3_LEGACY__ -libc_hidden_proto(memset) +/* Experimentally off - libc_hidden_proto(memset) */ void bzero(void *s, size_t n) { diff --git a/libc/string/cris/memcpy.c b/libc/string/cris/memcpy.c index a00688ab0..0cce37a30 100644 --- a/libc/string/cris/memcpy.c +++ b/libc/string/cris/memcpy.c @@ -66,7 +66,7 @@ void *memcpy(void *, const void *, unsigned int); -libc_hidden_proto(memcpy) +/* Experimentally off - libc_hidden_proto(memcpy) */ void *memcpy(void *pdst, const void *psrc, unsigned int pn) diff --git a/libc/string/cris/memmove.c b/libc/string/cris/memmove.c index 437637078..b6620afe0 100644 --- a/libc/string/cris/memmove.c +++ b/libc/string/cris/memmove.c @@ -27,7 +27,7 @@ #include "memcopy.h" #include "../generic/pagecopy.h" -libc_hidden_proto(memmove) +/* Experimentally off - libc_hidden_proto(memmove) */ void *memmove (void *dest, const void *src, size_t len) { unsigned long int dstp = (long int) dest; diff --git a/libc/string/cris/memset.c b/libc/string/cris/memset.c index 2d1602c5d..9cc959a33 100644 --- a/libc/string/cris/memset.c +++ b/libc/string/cris/memset.c @@ -59,7 +59,7 @@ void *memset(void *, int, unsigned long); -libc_hidden_proto(memset) +/* Experimentally off - libc_hidden_proto(memset) */ void *memset(void *pdst, int c, unsigned long plen) diff --git a/libc/string/cris/strcpy.c b/libc/string/cris/strcpy.c index 0af25253e..955a990b7 100644 --- a/libc/string/cris/strcpy.c +++ b/libc/string/cris/strcpy.c @@ -6,7 +6,7 @@ #include <string.h> -libc_hidden_proto(strcpy) +/* Experimentally off - libc_hidden_proto(strcpy) */ char *strcpy(char *dest, const char *src) { char *ret = dest; diff --git a/libc/string/cris/strncpy.c b/libc/string/cris/strncpy.c index 93a6608bc..3f2775bdd 100644 --- a/libc/string/cris/strncpy.c +++ b/libc/string/cris/strncpy.c @@ -6,9 +6,9 @@ #include <string.h> -libc_hidden_proto(memset) +/* Experimentally off - libc_hidden_proto(memset) */ -libc_hidden_proto(strncpy) +/* Experimentally off - libc_hidden_proto(strncpy) */ char *strncpy(char *dest, const char *src, size_t count) { char *ret = dest; diff --git a/libc/string/ffs.c b/libc/string/ffs.c index 9a68dc302..0857a3220 100644 --- a/libc/string/ffs.c +++ b/libc/string/ffs.c @@ -10,7 +10,7 @@ #include "_string.h" #include <strings.h> -libc_hidden_proto(ffs) +/* Experimentally off - libc_hidden_proto(ffs) */ int ffs(int i) { diff --git a/libc/string/frv/memset.S b/libc/string/frv/memset.S index 4e64550e4..477597dcd 100644 --- a/libc/string/frv/memset.S +++ b/libc/string/frv/memset.S @@ -155,4 +155,4 @@ memset: bralr .size memset, .-memset -libc_hidden_proto(memset) +/* Experimentally off - libc_hidden_proto(memset) */ diff --git a/libc/string/generic/memchr.c b/libc/string/generic/memchr.c index 4b40e4d65..3c7c997bc 100644 --- a/libc/string/generic/memchr.c +++ b/libc/string/generic/memchr.c @@ -25,7 +25,7 @@ #include <stdlib.h> #include <limits.h> -libc_hidden_proto(memchr) +/* Experimentally off - libc_hidden_proto(memchr) */ libc_hidden_proto(abort) #include "memcopy.h" diff --git a/libc/string/generic/memcmp.c b/libc/string/generic/memcmp.c index b0d05cf8a..e9767edef 100644 --- a/libc/string/generic/memcmp.c +++ b/libc/string/generic/memcmp.c @@ -21,7 +21,7 @@ #include <string.h> #include "memcopy.h" -libc_hidden_proto(memcmp) +/* Experimentally off - libc_hidden_proto(memcmp) */ #include <endian.h> diff --git a/libc/string/generic/memcpy.c b/libc/string/generic/memcpy.c index 9d8764105..fa6606ceb 100644 --- a/libc/string/generic/memcpy.c +++ b/libc/string/generic/memcpy.c @@ -23,7 +23,7 @@ #include "memcopy.h" #include "pagecopy.h" -libc_hidden_proto(memcpy) +/* Experimentally off - libc_hidden_proto(memcpy) */ /* _wordcopy_fwd_aligned -- Copy block beginning at SRCP to block beginning at DSTP with LEN `op_t' words (not LEN bytes!). diff --git a/libc/string/generic/memmem.c b/libc/string/generic/memmem.c index 5d4e6f151..c75bb2426 100644 --- a/libc/string/generic/memmem.c +++ b/libc/string/generic/memmem.c @@ -20,8 +20,8 @@ #include <stddef.h> #ifdef __USE_GNU -libc_hidden_proto(memmem) -libc_hidden_proto(memcmp) +/* Experimentally off - libc_hidden_proto(memmem) */ +/* Experimentally off - libc_hidden_proto(memcmp) */ /* Return the first occurrence of NEEDLE in HAYSTACK. */ void *memmem (const void *haystack, size_t haystack_len, diff --git a/libc/string/generic/memmove.c b/libc/string/generic/memmove.c index dca74ae74..b2a017b16 100644 --- a/libc/string/generic/memmove.c +++ b/libc/string/generic/memmove.c @@ -24,8 +24,8 @@ #include "memcopy.h" #include "pagecopy.h" -libc_hidden_proto(memmove) -libc_hidden_proto(memcpy) +/* Experimentally off - libc_hidden_proto(memmove) */ +/* Experimentally off - libc_hidden_proto(memcpy) */ static void _wordcopy_bwd_aligned (long int dstp, long int srcp, size_t len) { diff --git a/libc/string/generic/mempcpy.c b/libc/string/generic/mempcpy.c index c80caac8f..8d7356486 100644 --- a/libc/string/generic/mempcpy.c +++ b/libc/string/generic/mempcpy.c @@ -8,8 +8,8 @@ #include <string.h> #ifdef __USE_GNU -libc_hidden_proto(mempcpy) -libc_hidden_proto(memcpy) +/* Experimentally off - libc_hidden_proto(mempcpy) */ +/* Experimentally off - libc_hidden_proto(memcpy) */ void *mempcpy (void *dstpp, const void *srcpp, size_t len) { diff --git a/libc/string/generic/memrchr.c b/libc/string/generic/memrchr.c index 43439d5ce..9ab805cf7 100644 --- a/libc/string/generic/memrchr.c +++ b/libc/string/generic/memrchr.c @@ -27,7 +27,7 @@ #include <limits.h> #ifdef __USE_GNU -libc_hidden_proto(memrchr) +/* Experimentally off - libc_hidden_proto(memrchr) */ libc_hidden_proto(abort) #include "memcopy.h" diff --git a/libc/string/generic/memset.c b/libc/string/generic/memset.c index 50803cac5..62cc36fe3 100644 --- a/libc/string/generic/memset.c +++ b/libc/string/generic/memset.c @@ -19,7 +19,7 @@ #include <string.h> #include "memcopy.h" -libc_hidden_proto(memset) +/* Experimentally off - libc_hidden_proto(memset) */ void *memset (void *dstpp, int c, size_t len) { long int dstp = (long int) dstpp; diff --git a/libc/string/generic/rawmemchr.c b/libc/string/generic/rawmemchr.c index 6bf245265..f8b97a61d 100644 --- a/libc/string/generic/rawmemchr.c +++ b/libc/string/generic/rawmemchr.c @@ -26,7 +26,7 @@ #include <limits.h> #ifdef __USE_GNU -libc_hidden_proto(rawmemchr) +/* Experimentally off - libc_hidden_proto(rawmemchr) */ libc_hidden_proto(abort) #include "memcopy.h" diff --git a/libc/string/generic/strcat.c b/libc/string/generic/strcat.c index 53c4d0d9e..e00494038 100644 --- a/libc/string/generic/strcat.c +++ b/libc/string/generic/strcat.c @@ -19,7 +19,7 @@ #include <string.h> #include "memcopy.h" -libc_hidden_proto(strcat) +/* Experimentally off - libc_hidden_proto(strcat) */ /* Append SRC on the end of DEST. */ char *strcat (char *dest, const char *src) { diff --git a/libc/string/generic/strchr.c b/libc/string/generic/strchr.c index 985b78b5a..66aed1e25 100644 --- a/libc/string/generic/strchr.c +++ b/libc/string/generic/strchr.c @@ -24,7 +24,7 @@ #include <string.h> #include <stdlib.h> -libc_hidden_proto(strchr) +/* Experimentally off - libc_hidden_proto(strchr) */ libc_hidden_proto(abort) #include "memcopy.h" diff --git a/libc/string/generic/strchrnul.c b/libc/string/generic/strchrnul.c index 17e32ab44..72cab2891 100644 --- a/libc/string/generic/strchrnul.c +++ b/libc/string/generic/strchrnul.c @@ -25,7 +25,7 @@ #include <stdlib.h> #ifdef __USE_GNU -libc_hidden_proto(strchrnul) +/* Experimentally off - libc_hidden_proto(strchrnul) */ libc_hidden_proto(abort) #include "memcopy.h" diff --git a/libc/string/generic/strcmp.c b/libc/string/generic/strcmp.c index 21c896986..50acd3548 100644 --- a/libc/string/generic/strcmp.c +++ b/libc/string/generic/strcmp.c @@ -20,7 +20,7 @@ #include "memcopy.h" -libc_hidden_proto(strcmp) +/* Experimentally off - libc_hidden_proto(strcmp) */ /* Compare S1 and S2, returning less than, equal to or greater than zero if S1 is lexicographically less than, equal to or greater than S2. */ @@ -44,7 +44,7 @@ int strcmp (const char *p1, const char *p2) libc_hidden_weak(strcmp) #ifndef __UCLIBC_HAS_LOCALE__ -libc_hidden_proto(strcoll) +/* Experimentally off - libc_hidden_proto(strcoll) */ strong_alias(strcmp,strcoll) libc_hidden_def(strcoll) #endif diff --git a/libc/string/generic/strcpy.c b/libc/string/generic/strcpy.c index 7e558ead1..99e077139 100644 --- a/libc/string/generic/strcpy.c +++ b/libc/string/generic/strcpy.c @@ -22,7 +22,7 @@ #include "memcopy.h" #include "bp-checks.h" -libc_hidden_proto(strcpy) +/* Experimentally off - libc_hidden_proto(strcpy) */ /* Copy SRC to DEST. */ char *strcpy (cha |