From 21730caa6647f645974e132ca8afec79b4eeab2b Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Fri, 18 Sep 2009 20:57:40 +0200 Subject: trim Experimentally off and uncommented hidden sed -i -e '/Experimentally off - /d' $(grep -rl "Experimentally off - " *) sed -i -e '/^\/\*[[:space:]]*libc_hidden_proto(/d' $(grep -rl "libc_hidden_proto" *) should be a nop Signed-off-by: Bernhard Reutner-Fischer --- libc/misc/assert/__assert.c | 3 --- libc/misc/ctype/ctype.c | 19 ------------------- libc/misc/dirent/closedir.c | 2 -- libc/misc/dirent/dirfd.c | 1 - libc/misc/dirent/readdir.c | 1 - libc/misc/dirent/readdir64.c | 1 - libc/misc/dirent/readdir64_r.c | 2 -- libc/misc/dirent/readdir_r.c | 2 -- libc/misc/dirent/rewinddir.c | 1 - libc/misc/dirent/seekdir.c | 1 - libc/misc/error/err.c | 11 +---------- libc/misc/error/error.c | 9 --------- libc/misc/file/lockf.c | 4 ---- libc/misc/file/lockf64.c | 5 ----- libc/misc/fnmatch/fnmatch.c | 29 ----------------------------- libc/misc/fnmatch/fnmatch_old.c | 2 -- libc/misc/ftw/ftw.c | 19 ------------------- libc/misc/glob/glob-susv3.c | 18 ------------------ libc/misc/glob/glob.c | 23 ----------------------- libc/misc/internals/__errno_location.c | 1 - libc/misc/internals/__h_errno_location.c | 1 - libc/misc/internals/__uClibc_main.c | 9 --------- libc/misc/internals/errno.c | 2 -- libc/misc/internals/tempname.c | 11 ----------- libc/misc/locale/locale.c | 26 -------------------------- libc/misc/mntent/mntent.c | 14 +------------- libc/misc/regex/regcomp.c | 1 - libc/misc/search/_hsearch_r.c | 5 ----- libc/misc/search/_lsearch.c | 2 -- libc/misc/search/_tsearch.c | 3 --- libc/misc/search/hsearch.c | 3 --- libc/misc/statfs/fstatfs64.c | 2 -- libc/misc/statfs/fstatvfs.c | 10 ---------- libc/misc/statfs/fstatvfs64.c | 10 ---------- libc/misc/statfs/statfs64.c | 2 -- libc/misc/statfs/statvfs.c | 8 -------- libc/misc/statfs/statvfs64.c | 9 --------- libc/misc/syslog/syslog.c | 25 +------------------------ libc/misc/sysvipc/ftok.c | 1 - libc/misc/sysvipc/shm.c | 1 - libc/misc/time/adjtime.c | 1 - libc/misc/time/ftime.c | 1 - libc/misc/ttyent/getttyent.c | 16 ---------------- libc/misc/wchar/wchar.c | 20 -------------------- libc/misc/wctype/_wctype.c | 19 ------------------- 45 files changed, 3 insertions(+), 353 deletions(-) (limited to 'libc/misc') diff --git a/libc/misc/assert/__assert.c b/libc/misc/assert/__assert.c index c6132924d..ff9e47dcf 100644 --- a/libc/misc/assert/__assert.c +++ b/libc/misc/assert/__assert.c @@ -32,15 +32,12 @@ #include #include -/* libc_hidden_proto(fprintf) */ -/* libc_hidden_proto(abort) */ /* Get the prototype from assert.h as a double-check. */ #undef NDEBUG #include #undef assert -/* libc_hidden_proto(__assert) */ #define ASSERT_SHOW_PROGNAME 1 diff --git a/libc/misc/ctype/ctype.c b/libc/misc/ctype/ctype.c index f90b40537..6abb49ac4 100644 --- a/libc/misc/ctype/ctype.c +++ b/libc/misc/ctype/ctype.c @@ -36,9 +36,7 @@ #include #include #ifdef __UCLIBC_HAS_XLOCALE__ -/* libc_hidden_proto(__ctype_b_loc) */ #elif defined __UCLIBC_HAS_CTYPE_TABLES__ -/* libc_hidden_proto(__ctype_b) */ #endif #ifdef __UCLIBC_HAS_XLOCALE__ @@ -165,8 +163,6 @@ int CTYPE_NAME(NAME) (int c) \ #ifdef L___ctype_assert #ifdef __UCLIBC_HAS_CTYPE_ENFORCED__ -/* libc_hidden_proto(fprintf) */ -/* libc_hidden_proto(abort) */ attribute_hidden void __isctype_assert(int c, int mask) { @@ -281,11 +277,8 @@ IS_FUNC_BODY(xdigit); #undef tolower #ifdef __UCLIBC_HAS_XLOCALE__ -/* libc_hidden_proto(__ctype_tolower_loc) */ #elif defined __UCLIBC_HAS_CTYPE_TABLES__ -/* libc_hidden_proto(__ctype_tolower) */ #endif -/* libc_hidden_proto(tolower) */ #ifdef __UCLIBC_HAS_CTYPE_TABLES__ int tolower(int c) @@ -311,7 +304,6 @@ libc_hidden_def(tolower) #ifdef L_tolower_l #undef tolower_l -/* libc_hidden_proto(tolower_l) */ int tolower_l(int c, __locale_t l) { #if defined(__UCLIBC_HAS_CTYPE_ENFORCED__) @@ -329,11 +321,8 @@ libc_hidden_def(tolower_l) #undef toupper #ifdef __UCLIBC_HAS_XLOCALE__ -/* libc_hidden_proto(__ctype_toupper_loc) */ #elif defined __UCLIBC_HAS_CTYPE_TABLES__ -/* libc_hidden_proto(__ctype_toupper) */ #endif -/* libc_hidden_proto(toupper) */ #ifdef __UCLIBC_HAS_CTYPE_TABLES__ int toupper(int c) @@ -359,7 +348,6 @@ libc_hidden_def(toupper) #ifdef L_toupper_l #undef toupper_l -/* libc_hidden_proto(toupper_l) */ int toupper_l(int c, __locale_t l) { #if defined(__UCLIBC_HAS_CTYPE_ENFORCED__) @@ -446,7 +434,6 @@ libc_hidden_def(__ctype_b_loc) #ifdef __UCLIBC_HAS_XLOCALE__ -/* libc_hidden_proto(__ctype_tolower_loc) */ const __ctype_touplow_t **__ctype_tolower_loc(void) { return &(__UCLIBC_CURLOCALE->__ctype_tolower); @@ -461,7 +448,6 @@ libc_hidden_def(__ctype_tolower_loc) #ifdef __UCLIBC_HAS_XLOCALE__ -/* libc_hidden_proto(__ctype_toupper_loc) */ const __ctype_touplow_t **__ctype_toupper_loc(void) { return &(__UCLIBC_CURLOCALE->__ctype_toupper); @@ -863,7 +849,6 @@ static const __ctype_mask_t __C_ctype_b_data[] = { /* 255 M-^? */ 0 }; -/* libc_hidden_proto(__C_ctype_b) */ const __ctype_mask_t *__C_ctype_b = __C_ctype_b_data + __UCLIBC_CTYPE_B_TBL_OFFSET; libc_hidden_data_def(__C_ctype_b) @@ -979,14 +964,12 @@ static const __ctype_touplow_t __C_ctype_tolower_data[] = { 252, 253, 254, 255 }; -/* libc_hidden_proto(__C_ctype_tolower) */ const __ctype_touplow_t *__C_ctype_tolower = __C_ctype_tolower_data + __UCLIBC_CTYPE_TO_TBL_OFFSET; libc_hidden_data_def(__C_ctype_tolower) #ifndef __UCLIBC_HAS_XLOCALE__ -/* libc_hidden_proto(__ctype_tolower) */ const __ctype_touplow_t *__ctype_tolower = __C_ctype_tolower_data + __UCLIBC_CTYPE_TO_TBL_OFFSET; libc_hidden_data_def(__ctype_tolower) @@ -1098,14 +1081,12 @@ static const __ctype_touplow_t __C_ctype_toupper_data[] = { 252, 253, 254, 255 }; -/* libc_hidden_proto(__C_ctype_toupper) */ const __ctype_touplow_t *__C_ctype_toupper = __C_ctype_toupper_data + __UCLIBC_CTYPE_TO_TBL_OFFSET; libc_hidden_data_def(__C_ctype_toupper) #ifndef __UCLIBC_HAS_XLOCALE__ -/* libc_hidden_proto(__ctype_toupper) */ const __ctype_touplow_t *__ctype_toupper = __C_ctype_toupper_data + __UCLIBC_CTYPE_TO_TBL_OFFSET; libc_hidden_data_def(__ctype_toupper) diff --git a/libc/misc/dirent/closedir.c b/libc/misc/dirent/closedir.c index 466e600ac..cca03b8f7 100644 --- a/libc/misc/dirent/closedir.c +++ b/libc/misc/dirent/closedir.c @@ -10,8 +10,6 @@ #include #include "dirstream.h" -/* libc_hidden_proto(closedir) */ -/* libc_hidden_proto(close) */ int closedir(DIR * dir) { diff --git a/libc/misc/dirent/dirfd.c b/libc/misc/dirent/dirfd.c index e5b41bc6b..649dd4ad8 100644 --- a/libc/misc/dirent/dirfd.c +++ b/libc/misc/dirent/dirfd.c @@ -8,7 +8,6 @@ #include #include "dirstream.h" -/* libc_hidden_proto(dirfd) */ int dirfd(DIR * dir) { diff --git a/libc/misc/dirent/readdir.c b/libc/misc/dirent/readdir.c index e92c4ad58..4fcd1cc72 100644 --- a/libc/misc/dirent/readdir.c +++ b/libc/misc/dirent/readdir.c @@ -13,7 +13,6 @@ #include #include "dirstream.h" -/* libc_hidden_proto(readdir) */ struct dirent *readdir(DIR * dir) { diff --git a/libc/misc/dirent/readdir64.c b/libc/misc/dirent/readdir64.c index 3aaef5139..1264c38b1 100644 --- a/libc/misc/dirent/readdir64.c +++ b/libc/misc/dirent/readdir64.c @@ -13,7 +13,6 @@ #include #include "dirstream.h" -/* libc_hidden_proto(readdir64) */ struct dirent64 *readdir64(DIR * dir) { ssize_t bytes; diff --git a/libc/misc/dirent/readdir64_r.c b/libc/misc/dirent/readdir64_r.c index d394fdb8f..ba726003d 100644 --- a/libc/misc/dirent/readdir64_r.c +++ b/libc/misc/dirent/readdir64_r.c @@ -13,9 +13,7 @@ #include #include "dirstream.h" -/* Experimentally off - libc_hidden_proto(memcpy) */ -/* libc_hidden_proto(readdir64_r) */ int readdir64_r(DIR *dir, struct dirent64 *entry, struct dirent64 **result) { int ret; diff --git a/libc/misc/dirent/readdir_r.c b/libc/misc/dirent/readdir_r.c index 51f483ba5..d08997ffa 100644 --- a/libc/misc/dirent/readdir_r.c +++ b/libc/misc/dirent/readdir_r.c @@ -11,9 +11,7 @@ #include #include "dirstream.h" -/* Experimentally off - libc_hidden_proto(memcpy) */ -/* libc_hidden_proto(readdir_r) */ int readdir_r(DIR *dir, struct dirent *entry, struct dirent **result) { int ret; diff --git a/libc/misc/dirent/rewinddir.c b/libc/misc/dirent/rewinddir.c index 99aa6b263..0a8f14740 100644 --- a/libc/misc/dirent/rewinddir.c +++ b/libc/misc/dirent/rewinddir.c @@ -9,7 +9,6 @@ #include #include "dirstream.h" -/* libc_hidden_proto(lseek) */ /* rewinddir() just does an lseek(fd,0,0) - see close for comments */ void rewinddir(DIR * dir) diff --git a/libc/misc/dirent/seekdir.c b/libc/misc/dirent/seekdir.c index 19661509d..eaf447ea2 100644 --- a/libc/misc/dirent/seekdir.c +++ b/libc/misc/dirent/seekdir.c @@ -9,7 +9,6 @@ #include #include "dirstream.h" -/* libc_hidden_proto(lseek) */ void seekdir(DIR * dir, long int offset) { diff --git a/libc/misc/error/err.c b/libc/misc/error/err.c index d30efbe37..9ddb59624 100644 --- a/libc/misc/error/err.c +++ b/libc/misc/error/err.c @@ -21,16 +21,7 @@ #if defined __USE_BSD -/* libc_hidden_proto(vwarn) */ -/* libc_hidden_proto(vwarnx) */ -/* libc_hidden_proto(verr) */ -/* libc_hidden_proto(verrx) */ - -/* libc_hidden_proto(fprintf) */ -/* libc_hidden_proto(vfprintf) */ -/* libc_hidden_proto(__xpg_strerror_r) */ -/* libc_hidden_proto(exit) */ -/* libc_hidden_proto(vfprintf) */ + static void vwarn_work(const char *format, va_list args, int showerr) { diff --git a/libc/misc/error/error.c b/libc/misc/error/error.c index 7518ff5e5..a30a4decf 100644 --- a/libc/misc/error/error.c +++ b/libc/misc/error/error.c @@ -26,15 +26,6 @@ #include #include -/* Experimentally off - libc_hidden_proto(strcmp) */ -/* Experimentally off - libc_hidden_proto(strerror) */ -/* libc_hidden_proto(fprintf) */ -/* libc_hidden_proto(exit) */ -/* libc_hidden_proto(putc) */ -/* libc_hidden_proto(vfprintf) */ -/* libc_hidden_proto(fflush) */ -/* libc_hidden_proto(fputc) */ -/* libc_hidden_proto(__fputc_unlocked) */ /* This variable is incremented each time `error' is called. */ unsigned int error_message_count = 0; diff --git a/libc/misc/file/lockf.c b/libc/misc/file/lockf.c index 58fcdad0a..b37ace408 100644 --- a/libc/misc/file/lockf.c +++ b/libc/misc/file/lockf.c @@ -24,11 +24,7 @@ #include #include -/* libc_hidden_proto(lockf) */ -/* Experimentally off - libc_hidden_proto(memset) */ -/* libc_hidden_proto(fcntl) */ -/* libc_hidden_proto(getpid) */ /* lockf is a simplified interface to fcntl's locking facilities. */ diff --git a/libc/misc/file/lockf64.c b/libc/misc/file/lockf64.c index e4f6f5cce..177942445 100644 --- a/libc/misc/file/lockf64.c +++ b/libc/misc/file/lockf64.c @@ -32,17 +32,12 @@ #define F_GETLK F_GETLK64 #undef F_SETLK #define F_SETLK F_SETLK64 -/* libc_hidden_proto(fcntl64) */ #else -/* libc_hidden_proto(fcntl) */ #endif -/* Experimentally off - libc_hidden_proto(memset) */ -/* libc_hidden_proto(getpid) */ /* lockf is a simplified interface to fcntl's locking facilities. */ -/* libc_hidden_proto(lockf64) */ int lockf64 (int fd, int cmd, off64_t len64) { struct flock fl; diff --git a/libc/misc/fnmatch/fnmatch.c b/libc/misc/fnmatch/fnmatch.c index cf3086715..28f744a26 100644 --- a/libc/misc/fnmatch/fnmatch.c +++ b/libc/misc/fnmatch/fnmatch.c @@ -62,25 +62,9 @@ #ifdef __UCLIBC__ #define __memset memset -/* Experimentally off - libc_hidden_proto(memchr) */ -/* Experimentally off - libc_hidden_proto(memset) */ -/* Experimentally off - libc_hidden_proto(mempcpy) */ -/* Experimentally off - libc_hidden_proto(strcat) */ -/* Experimentally off - libc_hidden_proto(strcmp) */ -/*libc_hidden_proto(strchr)*/ -/*libc_hidden_proto(strchrnul)*/ -/* Experimentally off - libc_hidden_proto(strlen) */ -/* Experimentally off - libc_hidden_proto(strcoll) */ #ifdef __UCLIBC_HAS_XLOCALE__ -/* libc_hidden_proto(__ctype_b_loc) */ -/* libc_hidden_proto(__ctype_tolower_loc) */ #elif defined __UCLIBC_HAS_CTYPE_TABLES__ -/* libc_hidden_proto(__ctype_b) */ -/* libc_hidden_proto(__ctype_tolower) */ #endif -/* libc_hidden_proto(tolower) */ -/* libc_hidden_proto(fnmatch) */ -/* libc_hidden_proto(getenv) */ #endif /* For platform which support the ISO C amendement 1 functionality we @@ -90,19 +74,7 @@ # include # include # ifdef __UCLIBC__ -/* libc_hidden_proto(wctype) */ -/* libc_hidden_proto(iswctype) */ -/* libc_hidden_proto(btowc) */ # ifdef __UCLIBC_HAS_LOCALE__ -/* libc_hidden_proto(wmemchr) */ -/* libc_hidden_proto(wmempcpy) */ -/* libc_hidden_proto(wcscat) */ -/* libc_hidden_proto(wcschr) */ -/* libc_hidden_proto(wcschrnul) */ -/* libc_hidden_proto(wcslen) */ -/* libc_hidden_proto(wcscoll) */ -/* libc_hidden_proto(towlower) */ -/* libc_hidden_proto(mbsrtowcs) */ # endif # endif #endif @@ -376,7 +348,6 @@ is_char_class (const wchar_t *wcs) # endif #ifdef __UCLIBC_HAS_WCHAR__ -/* libc_hidden_proto(_stdlib_mb_cur_max) */ #else #undef MB_CUR_MAX #define MB_CUR_MAX 1 diff --git a/libc/misc/fnmatch/fnmatch_old.c b/libc/misc/fnmatch/fnmatch_old.c index 69a8ede50..2dece85dc 100644 --- a/libc/misc/fnmatch/fnmatch_old.c +++ b/libc/misc/fnmatch/fnmatch_old.c @@ -23,9 +23,7 @@ Cambridge, MA 02139, USA. */ #include #include -/* libc_hidden_proto(fnmatch) */ -/* libc_hidden_proto(tolower) */ /* Comment out all this code if we are using the GNU C Library, and are not actually compiling the library itself. This code is part of the GNU C Library, but also included in many other GNU distributions. Compiling diff --git a/libc/misc/ftw/ftw.c b/libc/misc/ftw/ftw.c index 9325ab745..74f6e1354 100644 --- a/libc/misc/ftw/ftw.c +++ b/libc/misc/ftw/ftw.c @@ -83,27 +83,8 @@ char *alloca (); # include #endif -/* Experimentally off - libc_hidden_proto(memset) */ -/* Experimentally off - libc_hidden_proto(strchr) */ -/* Experimentally off - libc_hidden_proto(strlen) */ -/* libc_hidden_proto(dirfd) */ -/* libc_hidden_proto(tsearch) */ -/* libc_hidden_proto(tfind) */ -/* libc_hidden_proto(tdestroy) */ -/* libc_hidden_proto(getcwd) */ -/* libc_hidden_proto(chdir) */ -/* libc_hidden_proto(fchdir) */ -/* Experimentally off - libc_hidden_proto(mempcpy) */ -/* libc_hidden_proto(opendir) */ #ifdef __UCLIBC_HAS_LFS__ -/* libc_hidden_proto(readdir64) */ -/* libc_hidden_proto(lstat64) */ -/* libc_hidden_proto(stat64) */ #endif -/* libc_hidden_proto(closedir) */ -/* Experimentally off - libc_hidden_proto(stpcpy) */ -/* libc_hidden_proto(lstat) */ -/* libc_hidden_proto(stat) */ #if !defined _LIBC && !HAVE_DECL_STPCPY && !defined stpcpy char *stpcpy (); diff --git a/libc/misc/glob/glob-susv3.c b/libc/misc/glob/glob-susv3.c index 8ee0f1a37..b242a45fa 100644 --- a/libc/misc/glob/glob-susv3.c +++ b/libc/misc/glob/glob-susv3.c @@ -23,16 +23,6 @@ #include #include -/* Experimentally off - libc_hidden_proto(memcpy) */ -/* Experimentally off - libc_hidden_proto(strcat) */ -/* Experimentally off - libc_hidden_proto(strchr) */ -/* Experimentally off - libc_hidden_proto(strcmp) */ -/* Experimentally off - libc_hidden_proto(strcpy) */ -/* Experimentally off - libc_hidden_proto(strlen) */ -/* libc_hidden_proto(opendir) */ -/* libc_hidden_proto(closedir) */ -/* libc_hidden_proto(qsort) */ -/* libc_hidden_proto(fnmatch) */ struct match { @@ -53,12 +43,8 @@ extern int __glob_match_in_dir(const char *d, const char *p, int flags, int (*er # define stat stat64 # define readdir_r readdir64_r # define dirent dirent64 -/* libc_hidden_proto(readdir64_r) */ -/* libc_hidden_proto(stat64) */ # define struct_stat struct stat64 #else -/* libc_hidden_proto(readdir_r) */ -/* libc_hidden_proto(stat) */ # define struct_stat struct stat #endif @@ -224,9 +210,7 @@ int __glob_sort(const void *a, const void *b) #endif /* !__GLOB64 */ #ifdef __GLOB64 -/* libc_hidden_proto(glob64) */ #else -/* libc_hidden_proto(glob) */ #endif int glob(const char *pat, int flags, int (*errfunc)(const char *path, int err), glob_t *g) { @@ -302,9 +286,7 @@ libc_hidden_def(glob) #endif #ifdef __GLOB64 -/* libc_hidden_proto(globfree64) */ #else -/* libc_hidden_proto(globfree) */ #endif void globfree(glob_t *g) { diff --git a/libc/misc/glob/glob.c b/libc/misc/glob/glob.c index 5736f4981..8f27443ff 100644 --- a/libc/misc/glob/glob.c +++ b/libc/misc/glob/glob.c @@ -31,24 +31,10 @@ #include #include -/* libc_hidden_proto(closedir) */ -/* libc_hidden_proto(fnmatch) */ -/* Experimentally off - libc_hidden_proto(memcpy) */ -/* Experimentally off - libc_hidden_proto(mempcpy) */ -/* libc_hidden_proto(opendir) */ -/* libc_hidden_proto(qsort) */ -/* libc_hidden_proto(readdir) */ -/* Experimentally off - libc_hidden_proto(strchr) */ -/* Experimentally off - libc_hidden_proto(strcoll) */ -/* Experimentally off - libc_hidden_proto(strcpy) */ -/* Experimentally off - libc_hidden_proto(strdup) */ -/* Experimentally off - libc_hidden_proto(strlen) */ -/* Experimentally off - libc_hidden_proto(strrchr) */ #ifdef ENABLE_GLOB_TILDE_EXPANSION #include -/* libc_hidden_proto(getpwnam_r) */ #endif #ifdef COMPILE_GLOB64 @@ -62,19 +48,15 @@ #define glob_t glob64_t #define glob(pattern, flags, errfunc, pglob) glob64 (pattern, flags, errfunc, pglob) #define globfree(pglob) globfree64 (pglob) -/* libc_hidden_proto(stat64) */ -/* libc_hidden_proto(readdir64) */ #else #define __readdir readdir #ifdef __UCLIBC_HAS_LFS__ #define __readdir64 readdir64 -/* libc_hidden_proto(readdir64) */ #else #define __readdir64 readdir #endif #define struct_stat64 struct stat #define __stat64(fname, buf) stat (fname, buf) -/* libc_hidden_proto(stat) */ #endif @@ -132,7 +114,6 @@ extern int __prefix_array (const char *dirname, char **array, size_t n) attribut extern const char *__next_brace_sub (const char *cp, int flags) attribute_hidden; #endif -/* libc_hidden_proto(glob_pattern_p) */ #ifndef COMPILE_GLOB64 /* Return nonzero if PATTERN contains any metacharacters. Metacharacters can be quoted with backslashes if QUOTE is nonzero. */ @@ -489,11 +470,7 @@ static int glob_in_dir (const char *pattern, const char *directory, int flags, } #ifdef COMPILE_GLOB64 -/* libc_hidden_proto(glob64) */ -/* libc_hidden_proto(globfree64) */ #else -/* libc_hidden_proto(glob) */ -/* libc_hidden_proto(globfree) */ #endif /* Do glob searching for PATTERN, placing results in PGLOB. The bits defined above may be set in FLAGS. diff --git a/libc/misc/internals/__errno_location.c b/libc/misc/internals/__errno_location.c index 4401ba249..487a9c2c5 100644 --- a/libc/misc/internals/__errno_location.c +++ b/libc/misc/internals/__errno_location.c @@ -7,7 +7,6 @@ #include "internal_errno.h" /* psm: moved to bits/errno.h: */ -/* libc_hidden_proto(__errno_location) */ int * weak_const_function __errno_location (void) { return &errno; diff --git a/libc/misc/internals/__h_errno_location.c b/libc/misc/internals/__h_errno_location.c index f4a587e96..213d39894 100644 --- a/libc/misc/internals/__h_errno_location.c +++ b/libc/misc/internals/__h_errno_location.c @@ -6,7 +6,6 @@ #include "internal_errno.h" -/* libc_hidden_proto(__h_errno_location) */ int * weak_const_function __h_errno_location (void) { return &h_errno; diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c index 7de372387..3588768a3 100644 --- a/libc/misc/internals/__uClibc_main.c +++ b/libc/misc/internals/__uClibc_main.c @@ -27,19 +27,10 @@ #include #include -/* libc_hidden_proto(exit) */ #ifdef __UCLIBC_HAS_PROGRAM_INVOCATION_NAME__ -/* Experimentally off - libc_hidden_proto(strrchr) */ #endif #ifndef __ARCH_HAS_NO_LDSO__ -/* Experimentally off - libc_hidden_proto(memcpy) */ -/* libc_hidden_proto(getgid) */ -/* libc_hidden_proto(getuid) */ -/* libc_hidden_proto(getegid) */ -/* libc_hidden_proto(geteuid) */ -/* libc_hidden_proto(fstat) */ -/* libc_hidden_proto(abort) */ #endif diff --git a/libc/misc/internals/errno.c b/libc/misc/internals/errno.c index 20b26b2b6..65728f863 100644 --- a/libc/misc/internals/errno.c +++ b/libc/misc/internals/errno.c @@ -1,8 +1,6 @@ #include "internal_errno.h" #ifdef __UCLIBC_HAS_THREADS__ -/* libc_hidden_proto(errno) */ -/* libc_hidden_proto(h_errno) */ #endif int errno = 0; int h_errno = 0; diff --git a/libc/misc/internals/tempname.c b/libc/misc/internals/tempname.c index 10d00041c..e0bf922c4 100644 --- a/libc/misc/internals/tempname.c +++ b/libc/misc/internals/tempname.c @@ -45,19 +45,8 @@ #include #include "tempname.h" -/* Experimentally off - libc_hidden_proto(strlen) */ -/* Experimentally off - libc_hidden_proto(strcmp) */ -/* libc_hidden_proto(sprintf) */ -/* libc_hidden_proto(mkdir) */ -/* libc_hidden_proto(open) */ #ifdef __UCLIBC_HAS_LFS__ -/* libc_hidden_proto(open64) */ #endif -/* libc_hidden_proto(read) */ -/* libc_hidden_proto(close) */ -/* libc_hidden_proto(getpid) */ -/* libc_hidden_proto(stat) */ -/* libc_hidden_proto(gettimeofday) */ /* Return nonzero if DIR is an existent directory. */ static int direxists (const char *dir) diff --git a/libc/misc/locale/locale.c b/libc/misc/locale/locale.c index ec6189279..a9fd952f9 100644 --- a/libc/misc/locale/locale.c +++ b/libc/misc/locale/locale.c @@ -58,19 +58,8 @@ #include #include -/* Experimentally off - libc_hidden_proto(memcpy) */ -/* Experimentally off - libc_hidden_proto(memset) */ -/* Experimentally off - libc_hidden_proto(strtok_r) */ -/* Experimentally off - libc_hidden_proto(strlen) */ -/* Experimentally off - libc_hidden_proto(strcmp) */ -/* Experimentally off - libc_hidden_proto(strcpy) */ -/* Experimentally off - libc_hidden_proto(strncmp) */ -/* Experimentally off - libc_hidden_proto(strchr) */ -/* libc_hidden_proto(getenv) */ #ifdef __UCLIBC_HAS_CTYPE_TABLES__ -/* libc_hidden_proto(__C_ctype_toupper) */ #endif -/*libc_hidden_proto(fflush)*/ #ifdef __UCLIBC_MJN3_ONLY__ #ifdef L_setlocale @@ -193,8 +182,6 @@ static const char utf8[] = "UTF-8"; */ static char hr_locale[(MAX_LOCALE_CATEGORY_STR * LC_ALL) + MAX_LOCALE_STR]; -/* Experimentally off - libc_hidden_proto(stpcpy) */ -/* libc_hidden_proto(newlocale) */ static void update_hr_locale(const unsigned char *spec) { @@ -304,7 +291,6 @@ char *setlocale(int category, const char *locale) * placement of the fields in the struct. If necessary, we could ensure * this usings an array of offsets but at some size cost. */ -/* libc_hidden_proto(localeconv) */ #ifdef __LOCALE_C_ONLY @@ -365,12 +351,7 @@ libc_hidden_def(localeconv) /**********************************************************************/ #if defined(L__locale_init) && !defined(__LOCALE_C_ONLY) -/* libc_hidden_proto(__C_ctype_b) */ -/* libc_hidden_proto(__C_ctype_tolower) */ #ifndef __UCLIBC_HAS_XLOCALE__ -/* libc_hidden_proto(__ctype_b) */ -/* libc_hidden_proto(__ctype_tolower) */ -/* libc_hidden_proto(__ctype_toupper) */ #endif struct __uclibc_locale_struct __global_locale_data; @@ -1027,7 +1008,6 @@ static const unsigned char nl_data[C_LC_ALL + 1 + 90 + 320] = { ']', '\x00', '^', '[', 'n', 'N', ']', '\x00', }; -/* libc_hidden_proto(nl_langinfo) */ char *nl_langinfo(nl_item item) { unsigned int c; @@ -1047,9 +1027,7 @@ libc_hidden_def(nl_langinfo) #if defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE) -/* libc_hidden_proto(nl_langinfo) */ -/* libc_hidden_proto(nl_langinfo_l) */ char *nl_langinfo(nl_item item) { @@ -1085,8 +1063,6 @@ libc_hidden_def(__XL_NPP(nl_langinfo)) /**********************************************************************/ #ifdef L_newlocale -/* Experimentally off - libc_hidden_proto(stpcpy) */ -/* libc_hidden_proto(newlocale) */ #ifdef __UCLIBC_MJN3_ONLY__ #warning TODO: Move posix and utf8 strings. @@ -1338,7 +1314,6 @@ libc_hidden_def(newlocale) /**********************************************************************/ #ifdef L_duplocale -/* libc_hidden_proto(duplocale) */ #ifdef __UCLIBC_MJN3_ONLY__ #warning REMINDER: When we allocate ctype tables, remember to dup them. @@ -1390,7 +1365,6 @@ void freelocale(__locale_t dataset) /**********************************************************************/ #ifdef L_uselocale -/* libc_hidden_proto(uselocale) */ __locale_t uselocale(__locale_t dataset) { __locale_t old; diff --git a/libc/misc/mntent/mntent.c b/libc/misc/mntent/mntent.c index 55f672a3c..608f84c1a 100644 --- a/libc/misc/mntent/mntent.c +++ b/libc/misc/mntent/mntent.c @@ -12,19 +12,7 @@ __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_MUTEX_INITIALIZER); -/* libc_hidden_proto(getmntent_r) */ -/* libc_hidden_proto(setmntent) */ -/* libc_hidden_proto(endmntent) */ - -/* Experimentally off - libc_hidden_proto(strstr) */ -/* Experimentally off - libc_hidden_proto(strtok_r) */ -/* libc_hidden_proto(atoi) */ -/* libc_hidden_proto(fopen) */ -/* libc_hidden_proto(fclose) */ -/* libc_hidden_proto(fseek) */ -/* libc_hidden_proto(fgets) */ -/* libc_hidden_proto(abort) */ -/* libc_hidden_proto(fprintf) */ + /* Reentrant version of getmntent. */ struct mntent *getmntent_r (FILE *filep, diff --git a/libc/misc/regex/regcomp.c b/libc/misc/regex/regcomp.c index 0c348a48d..ada380632 100644 --- a/libc/misc/regex/regcomp.c +++ b/libc/misc/regex/regcomp.c @@ -792,7 +792,6 @@ re_compile_internal (regex_t *preg, const char * pattern, size_t length, as the initial length of some arrays. */ #ifdef __UCLIBC_HAS_WCHAR__ -/* libc_hidden_proto(_stdlib_mb_cur_max) */ #endif static reg_errcode_t diff --git a/libc/misc/search/_hsearch_r.c b/libc/misc/search/_hsearch_r.c index 85475cf5e..aef12e61b 100644 --- a/libc/misc/search/_hsearch_r.c +++ b/libc/misc/search/_hsearch_r.c @@ -64,7 +64,6 @@ static int isprime (unsigned int number) indexing as explained in the comment for the hsearch function. The contents of the table is zeroed, especially the field used becomes zero. */ -/* libc_hidden_proto(hcreate_r) */ int hcreate_r (size_t nel, struct hsearch_data *htab) { /* Test for correct arguments. */ @@ -100,7 +99,6 @@ libc_hidden_def(hcreate_r) #ifdef L_hdestroy_r /* After using the hash table it has to be destroyed. The used memory can be freed and the local static variable can be marked as not used. */ -/* libc_hidden_proto(hdestroy_r) */ void hdestroy_r (struct hsearch_data *htab) { /* Test for correct arguments. */ @@ -134,10 +132,7 @@ libc_hidden_def(hdestroy_r) equality of the stored and the parameter value. This helps to prevent unnecessary expensive calls of strcmp. */ -/* Experimentally off - libc_hidden_proto(strcmp) */ -/* Experimentally off - libc_hidden_proto(strlen) */ -/* libc_hidden_proto(hsearch_r) */ int hsearch_r (ENTRY item, ACTION action, ENTRY **retval, struct hsearch_data *htab) { diff --git a/libc/misc/search/_lsearch.c b/libc/misc/search/_lsearch.c index da737bab4..0cf496e26 100644 --- a/libc/misc/search/_lsearch.c +++ b/libc/misc/search/_lsearch.c @@ -12,7 +12,6 @@ #include #include -/* libc_hidden_proto(lfind) */ #ifdef L_lfind @@ -34,7 +33,6 @@ libc_hidden_def(lfind) #ifdef L_lsearch -/* Experimentally off - libc_hidden_proto(memcpy) */ void *lsearch(const void *key, void *base, size_t *nmemb, size_t size, int (*compar)(const void *, const void *)) diff --git a/libc/misc/search/_tsearch.c b/libc/misc/search/_tsearch.c index 5f3706d64..20b04af78 100644 --- a/libc/misc/search/_tsearch.c +++ b/libc/misc/search/_tsearch.c @@ -50,7 +50,6 @@ register node **rootp; address of tree root int (*compar)(); ordering function */ -/* libc_hidden_proto(tsearch) */ void *tsearch(__const void *key, void **vrootp, __compar_fn_t compar) { register node *q; @@ -81,7 +80,6 @@ libc_hidden_def(tsearch) #endif #ifdef L_tfind -/* libc_hidden_proto(tfind) */ void *tfind(__const void *key, void * __const *vrootp, __compar_fn_t compar) { register node **rootp = (node **) vrootp; @@ -208,7 +206,6 @@ tdestroy_recurse (node *root, __free_fn_t freefct) free (root); } -/* libc_hidden_proto(tdestroy) */ void tdestroy (void *vroot, __free_fn_t freefct) { node *root = (node *) vroot; diff --git a/libc/misc/search/hsearch.c b/libc/misc/search/hsearch.c index 3ecc42567..d011997bb 100644 --- a/libc/misc/search/hsearch.c +++ b/libc/misc/search/hsearch.c @@ -19,9 +19,6 @@ #include -/* libc_hidden_proto(hdestroy_r) */ -/* libc_hidden_proto(hsearch_r) */ -/* libc_hidden_proto(hcreate_r) */ /* The non-reentrant version use a global space for storing the table. */ static struct hsearch_data htab; diff --git a/libc/misc/statfs/fstatfs64.c b/libc/misc/statfs/fstatfs64.c index 6bcc86540..27bb8d602 100644 --- a/libc/misc/statfs/fstatfs64.c +++ b/libc/misc/statfs/fstatfs64.c @@ -25,11 +25,9 @@ #include #include -/* Experimentally off - libc_hidden_proto(memcpy) */ extern __typeof(fstatfs) __libc_fstatfs; /* Return information about the filesystem on which FD resides. */ -/* libc_hidden_proto(fstatfs64) */ int fstatfs64 (int fd, struct statfs64 *buf) { struct statfs buf32; diff --git a/libc/misc/statfs/fstatvfs.c b/libc/misc/statfs/fstatvfs.c index 3f3d76a8b..63fce0fa0 100644 --- a/libc/misc/statfs/fstatvfs.c +++ b/libc/misc/statfs/fstatvfs.c @@ -27,13 +27,6 @@ #include #include -/* Experimentally off - libc_hidden_proto(memset) */ -/* Experimentally off - libc_hidden_proto(strcmp) */ -/* Experimentally off - libc_hidden_proto(strsep) */ -/* libc_hidden_proto(setmntent) */ -/* libc_hidden_proto(getmntent_r) */ -/* libc_hidden_proto(endmntent) */ -/* libc_hidden_proto(stat) */ #ifndef __USE_FILE_OFFSET64 extern int fstatfs (int __fildes, struct statfs *__buf) @@ -48,9 +41,6 @@ extern int __REDIRECT_NTH (fstatfs, (int __fildes, struct statfs *__buf), #endif extern __typeof(fstatfs) __libc_fstatfs; -/* libc_hidden_proto(fstat) */ -/* libc_hidden_proto(stat) */ -/* libc_hidden_proto(fstatvfs) */ int fstatvfs (int fd, struct statvfs *buf) { diff --git a/libc/misc/statfs/fstatvfs64.c b/libc/misc/statfs/fstatvfs64.c index f06836265..efaea03c2 100644 --- a/libc/misc/statfs/fstatvfs64.c +++ b/libc/misc/statfs/fstatvfs64.c @@ -29,22 +29,12 @@ #include -/* Experimentally off - libc_hidden_proto(memset) */ -/* Experimentally off - libc_hidden_proto(strcmp) */ -/* Experimentally off - libc_hidden_proto(strsep) */ -/* libc_hidden_proto(setmntent) */ -/* libc_hidden_proto(getmntent_r) */ -/* libc_hidden_proto(endmntent) */ #undef stat #define stat stat64 #if !defined __UCLIBC_LINUX_SPECIFIC__ -/* libc_hidden_proto(fstatvfs) */ #else -/* libc_hidden_proto(fstatfs64) */ #endif -/* libc_hidden_proto(fstat64) */ -/* libc_hidden_proto(stat) */ int fstatvfs64 (int fd, struct statvfs64 *buf) { diff --git a/libc/misc/statfs/statfs64.c b/libc/misc/statfs/statfs64.c index 8bb1ad9ed..0cc8595d6 100644 --- a/libc/misc/statfs/statfs64.c +++ b/libc/misc/statfs/statfs64.c @@ -23,11 +23,9 @@ #include #include -/* Experimentally off - libc_hidden_proto(memcpy) */ extern __typeof(statfs) __libc_statfs; /* Return information about the filesystem on which FILE resides. */ -/* libc_hidden_proto(statfs64) */ int statfs64 (const char *file, struct statfs64 *buf) { struct statfs buf32; diff --git a/libc/misc/statfs/statvfs.c b/libc/misc/statfs/statvfs.c index 42d2d0d17..5ac38ed59 100644 --- a/libc/misc/statfs/statvfs.c +++ b/libc/misc/statfs/statvfs.c @@ -27,17 +27,9 @@ #include #include -/* Experimentally off - libc_hidden_proto(memset) */ -/* Experimentally off - libc_hidden_proto(strcmp) */ -/* Experimentally off - libc_hidden_proto(strsep) */ -/* libc_hidden_proto(setmntent) */ -/* libc_hidden_proto(getmntent_r) */ -/* libc_hidden_proto(endmntent) */ extern __typeof(statfs) __libc_statfs; -/* libc_hidden_proto(stat) */ -/* libc_hidden_proto(statvfs) */ int statvfs (const char *file, struct statvfs *buf) { struct statfs fsbuf; diff --git a/libc/misc/statfs/statvfs64.c b/libc/misc/statfs/statvfs64.c index 3f1defefc..8716b1517 100644 --- a/libc/misc/statfs/statvfs64.c +++ b/libc/misc/statfs/statvfs64.c @@ -28,21 +28,12 @@ #include #include -/* Experimentally off - libc_hidden_proto(memset) */ -/* Experimentally off - libc_hidden_proto(strcmp) */ -/* Experimentally off - libc_hidden_proto(strsep) */ -/* libc_hidden_proto(setmntent) */ -/* libc_hidden_proto(getmntent_r) */ -/* libc_hidden_proto(endmntent) */ #undef stat #define stat stat64 #if defined __UCLIBC_LINUX_SPECIFIC__ -/* libc_hidden_proto(statfs64) */ #else -/* libc_hidden_proto(statvfs) */ #endif -/* libc_hidden_proto(stat64) */ int statvfs64 (const char *file, struct statvfs64 *buf) { diff --git a/libc/misc/syslog/syslog.c b/libc/misc/syslog/syslog.c index dbb1e0d01..794c0c17f 100644 --- a/libc/misc/syslog/syslog.c +++ b/libc/misc/syslog/syslog.c @@ -79,30 +79,7 @@ #include #include -/* libc_hidden_proto(openlog) */ -/* libc_hidden_proto(syslog) */ -/* libc_hidden_proto(vsyslog) */ -/* libc_hidden_proto(closelog) */ - -/* Experimentally off - libc_hidden_proto(memset) */ -/* Experimentally off - libc_hidden_proto(memcpy) */ -/* Experimentally off - libc_hidden_proto(memmove) */ -/* Experimentally off - libc_hidden_proto(strchr) */ -/* Experimentally off - libc_hidden_proto(strlen) */ -/* Experimentally off - libc_hidden_proto(strncpy) */ -/* libc_hidden_proto(open) */ -/* libc_hidden_proto(fcntl) */ -/* libc_hidden_proto(socket) */ -/* libc_hidden_proto(close) */ -/* libc_hidden_proto(write) */ -/* libc_hidden_proto(getpid) */ -/* libc_hidden_proto(ctime) */ -/* libc_hidden_proto(sigaction) */ -/* libc_hidden_proto(sigemptyset) */ -/* libc_hidden_proto(connect) */ -/* libc_hidden_proto(sprintf) */ -/* libc_hidden_proto(vsnprintf) */ -/* Experimentally off - libc_hidden_proto(time) */ + #include __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP); diff --git a/libc/misc/sysvipc/ftok.c b/libc/misc/sysvipc/ftok.c index 200d5cf90..d855e3d28 100644 --- a/libc/misc/sysvipc/ftok.c +++ b/libc/misc/sysvipc/ftok.c @@ -20,7 +20,6 @@ #include #include -/* libc_hidden_proto(stat) */ key_t ftok (const char *pathname, int proj_id) { diff --git a/libc/misc/sysvipc/shm.c b/libc/misc/sysvipc/shm.c index 164580efe..4b7ea0753 100644 --- a/libc/misc/sysvipc/shm.c +++ b/libc/misc/sysvipc/shm.c @@ -38,7 +38,6 @@ _syscall3(void *, shmat, int, shmid, const void *,shmaddr, int, shmflg) #else /* psm: don't remove this, else mips will fail */ #include -/* libc_hidden_proto(getpagesize) */ void * shmat (int shmid, const void *shmaddr, int shmflg) { diff --git a/libc/misc/time/adjtime.c b/libc/misc/time/adjtime.c index 808046eef..1e8087104 100644 --- a/libc/misc/time/adjtime.c +++ b/libc/misc/time/adjtime.c @@ -9,7 +9,6 @@ #include #include -/* libc_hidden_proto(adjtimex) */ #define MAX_SEC (LONG_MAX / 1000000L - 2) #define MIN_SEC (LONG_MIN / 1000000L + 2) diff --git a/libc/misc/time/ftime.c b/libc/misc/time/ftime.c index 867f4fd2f..b2273860c 100644 --- a/libc/misc/time/ftime.c +++ b/libc/misc/time/ftime.c @@ -19,7 +19,6 @@ #include #include -/* libc_hidden_proto(gettimeofday) */ int ftime(struct timeb *timebuf) { diff --git a/libc/misc/ttyent/getttyent.c b/libc/misc/ttyent/getttyent.c index dd6d9ad62..f28385d35 100644 --- a/libc/misc/ttyent/getttyent.c +++ b/libc/misc/ttyent/getttyent.c @@ -38,21 +38,8 @@ #include #endif -/* Experimentally off - libc_hidden_proto(strchr) */ -/* Experimentally off - libc_hidden_proto(strcmp) */ -/* Experimentally off - libc_hidden_proto(strncmp) */ -/* libc_hidden_proto(__fsetlocking) */ -/* libc_hidden_proto(rewind) */ -/* libc_hidden_proto(fgets_unlocked) */ -/* libc_hidden_proto(getc_unlocked) */ -/* libc_hidden_proto(__fgetc_unlocked) */ -/* libc_hidden_proto(fopen) */ -/* libc_hidden_proto(fclose) */ -/* libc_hidden_proto(abort) */ #ifdef __UCLIBC_HAS_XLOCALE__ -/* libc_hidden_proto(__ctype_b_loc) */ #elif defined __UCLIBC_HAS_CTYPE_TABLES__ -/* libc_hidden_proto(__ctype_b) */ #endif static char zapchar; @@ -102,7 +89,6 @@ static char * value(register char *p) return ((p = strchr(p, '=')) ? ++p : NULL); } -/* libc_hidden_proto(setttyent) */ int setttyent(void) { @@ -120,7 +106,6 @@ int setttyent(void) } libc_hidden_def(setttyent) -/* libc_hidden_proto(getttyent) */ struct ttyent * getttyent(void) { register int c; @@ -201,7 +186,6 @@ struct ttyent * getttyent(void) } libc_hidden_def(getttyent) -/* libc_hidden_proto(endttyent) */ int endttyent(void) { int rval; diff --git a/libc/misc/wchar/wchar.c b/libc/misc/wchar/wchar.c index 9b7196238..448baafa1 100644 --- a/libc/misc/wchar/wchar.c +++ b/libc/misc/wchar/wchar.c @@ -174,9 +174,7 @@ extern size_t _wchar_wcsntoutf8s(char *__restrict s, size_t n, /**********************************************************************/ #ifdef L_btowc -/* libc_hidden_proto(mbrtowc) */ -/* libc_hidden_proto(btowc) */ wint_t btowc(int c) { #ifdef __CTYPE_HAS_8_BIT_LOCALES @@ -215,7 +213,6 @@ libc_hidden_def(btowc) /* Note: We completely ignore ps in all currently supported conversions. */ -/* libc_hidden_proto(wcrtomb) */ int wctob(wint_t c) { @@ -246,7 +243,6 @@ int wctob(wint_t c) /**********************************************************************/ #ifdef L_mbsinit -/* libc_hidden_proto(mbsinit) */ int mbsinit(const mbstate_t *ps) { return !ps || !ps->__mask; @@ -257,9 +253,7 @@ libc_hidden_def(mbsinit) /**********************************************************************/ #ifdef L_mbrlen -/* libc_hidden_proto(mbrtowc) */ -/* libc_hidden_proto(mbrlen) */ size_t mbrlen(const char *__restrict s, size_t n, mbstate_t *__restrict ps) { static mbstate_t mbstate; /* Rely on bss 0-init. */ @@ -272,9 +266,7 @@ libc_hidden_def(mbrlen) /**********************************************************************/ #ifdef L_mbrtowc -/* libc_hidden_proto(mbsnrtowcs) */ -/* libc_hidden_proto(mbrtowc) */ size_t mbrtowc(wchar_t *__restrict pwc, const char *__restrict s, size_t n, mbstate_t *__restrict ps) { @@ -338,12 +330,10 @@ libc_hidden_def(mbrtowc) /**********************************************************************/ #ifdef L_wcrtomb -/* libc_hidden_proto(wcsnrtombs) */ /* Note: We completely ignore ps in all currently supported conversions. */ /* TODO: Check for valid state anyway? */ -/* libc_hidden_proto(wcrtomb) */ size_t wcrtomb(register char *__restrict s, wchar_t wc, mbstate_t *__restrict ps) { @@ -372,9 +362,7 @@ libc_hidden_def(wcrtomb) /**********************************************************************/ #ifdef L_mbsrtowcs -/* libc_hidden_proto(mbsnrtowcs) */ -/* libc_hidden_proto(mbsrtowcs) */ size_t mbsrtowcs(wchar_t *__restrict dst, const char **__restrict src, size_t len, mbstate_t *__restrict ps) { @@ -393,9 +381,7 @@ libc_hidden_def(mbsrtowcs) * TODO: Check for valid state anyway? */ -/* libc_hidden_proto(wcsnrtombs) */ -/* libc_hidden_proto(wcsrtombs) */ size_t wcsrtombs(char *__restrict dst, const wchar_t **__restrict src, size_t len, mbstate_t *__restrict ps) { @@ -700,7 +686,6 @@ size_t attribute_hidden _wchar_wcsntoutf8s(char *__restrict s, size_t n, /* WARNING: We treat len as SIZE_MAX when dst is NULL! */ -/* libc_hidden_proto(mbsnrtowcs) */ size_t mbsnrtowcs(wchar_t *__restrict dst, const char **__restrict src, size_t NMC, size_t len, mbstate_t *__restrict ps) { @@ -810,7 +795,6 @@ libc_hidden_def(mbsnrtowcs) /* Note: We completely ignore ps in all currently supported conversions. * TODO: Check for valid state anyway? */ -/* libc_hidden_proto(wcsnrtombs) */ size_t wcsnrtombs(char *__restrict dst, const wchar_t **__restrict src, size_t NWC, size_t len, mbstate_t *__restrict ps) { @@ -924,7 +908,6 @@ libc_hidden_def(wcsnrtombs) /**********************************************************************/ #ifdef L_wcswidth -/* libc_hidden_proto(wcswidth) */ #ifdef __UCLIBC_MJN3_ONLY__ #warning REMINDER: If we start doing translit, wcwidth and wcswidth will need updating. @@ -1040,7 +1023,6 @@ static const signed char new_wtbl[] = { 0, 2, 1, 2, 1, 0, 1, }; -/* libc_hidden_proto(wcsnrtombs) */ int wcswidth(const wchar_t *pwcs, size_t n) { @@ -1175,7 +1157,6 @@ libc_hidden_def(wcswidth) /**********************************************************************/ #ifdef L_wcwidth -/* libc_hidden_proto(wcswidth) */ int wcwidth(wchar_t wc) { @@ -1288,7 +1269,6 @@ enum { IC_ASCII = 1 }; -/* Experimentally off - libc_hidden_proto(strcasecmp) */ static int find_codeset(const char *name) { diff --git a/libc/misc/wctype/_wctype.c b/libc/misc/wctype/_wctype.c index 0b7bd5c2c..6ab6bab77 100644 --- a/libc/misc/wctype/_wctype.c +++ b/libc/misc/wctype/_wctype.c @@ -37,13 +37,6 @@ #include #include -/* Experimentally off - libc_hidden_proto(strcmp) */ -/* libc_hidden_proto(tolower) */ -/* libc_hidden_proto(toupper) */ -/* libc_hidden_proto(towlower) */ -/* libc_hidden_proto(towupper) */ -/* libc_hidden_proto(towctrans) */ -/* libc_hidden_proto(iswctype) */ #if defined(__LOCALE_C_ONLY) && defined(__UCLIBC_DO_XLOCALE) #error xlocale functionality is not supported in stub locale mode. @@ -51,17 +44,10 @@ #ifdef __UCLIBC_HAS_XLOCALE__ #include -/* libc_hidden_proto(towlower_l) */ -/* libc_hidden_proto(towupper_l) */ -/* libc_hidden_proto(towctrans_l) */ -/* libc_hidden_proto(iswctype_l) */ #elif defined __UCLIBC_HAS_CTYPE_TABLES__ -/* libc_hidden_proto(__ctype_b) */ #endif /* __UCLIBC_HAS_XLOCALE__ */ #ifdef __UCLIBC_HAS_CTYPE_TABLES__ -/* libc_hidden_proto(__C_ctype_tolower) */ -/* libc_hidden_proto(__C_ctype_toupper) */ #endif /* We know wide char support is enabled. We wouldn't be here otherwise. */ @@ -465,7 +451,6 @@ libc_hidden_def(towupper) static const unsigned char typestring[] = __CTYPE_TYPESTRING; -/* libc_hidden_proto(wctype) */ wctype_t wctype(const char *property) { const unsigned char *p; @@ -494,9 +479,7 @@ libc_hidden_def(wctype) #warning REMINDER: Currently wctype_l simply calls wctype. #endif /* __UCLIBC_MJN3_ONLY__ */ -/* libc_hidden_proto(wctype) */ -/* libc_hidden_proto(wctype_l) */ wctype_t wctype_l (const char *property, __locale_t locale) { return wctype(property); @@ -861,7 +844,6 @@ libc_hidden_def(towctrans) static const char transstring[] = __CTYPE_TRANSTRING; -/* libc_hidden_proto(wctrans) */ wctrans_t wctrans(const char *property) { const unsigned char *p; @@ -890,7 +872,6 @@ libc_hidden_def(wctrans) #warning REMINDER: Currently wctrans_l simply calls wctrans. #endif /* __UCLIBC_MJN3_ONLY__ */ -/* libc_hidden_proto(wctrans) */ wctrans_t wctrans_l(const char *property, __locale_t locale) { -- cgit v1.2.3