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/unistd/confstr.c | 1 - libc/unistd/exec.c | 15 +-------------- libc/unistd/fpathconf.c | 1 - libc/unistd/getlogin.c | 4 ---- libc/unistd/getopt-susv3.c | 3 --- libc/unistd/getopt.c | 6 ------ libc/unistd/getopt_long-simple.c | 1 - libc/unistd/getpass.c | 13 ------------- libc/unistd/getsubopt-susv3.c | 3 --- libc/unistd/getsubopt.c | 3 --- libc/unistd/pathconf.c | 1 - libc/unistd/sleep.c | 5 ----- libc/unistd/sysconf.c | 3 --- libc/unistd/ualarm.c | 1 - libc/unistd/usershell.c | 8 -------- libc/unistd/usleep.c | 2 -- 16 files changed, 1 insertion(+), 69 deletions(-) (limited to 'libc/unistd') diff --git a/libc/unistd/confstr.c b/libc/unistd/confstr.c index 67a9d585a..16b57bee9 100644 --- a/libc/unistd/confstr.c +++ b/libc/unistd/confstr.c @@ -22,7 +22,6 @@ #include #include -/* Experimentally off - libc_hidden_proto(memcpy) */ #define CS_PATH "/bin:/usr/bin" diff --git a/libc/unistd/exec.c b/libc/unistd/exec.c index 91ba7bba8..7d24072e7 100644 --- a/libc/unistd/exec.c +++ b/libc/unistd/exec.c @@ -27,19 +27,7 @@ #include #include -/* libc_hidden_proto(execl) */ -/* libc_hidden_proto(execle) */ -/* libc_hidden_proto(execlp) */ -/* libc_hidden_proto(execv) */ -/* libc_hidden_proto(execvp) */ - -/* Experimentally off - libc_hidden_proto(memcpy) */ -/* Experimentally off - libc_hidden_proto(strchr) */ -/* Experimentally off - libc_hidden_proto(strlen) */ -/* libc_hidden_proto(execve) */ -/* libc_hidden_proto(mmap) */ -/* libc_hidden_proto(munmap) */ -/* libc_hidden_proto(getenv) */ + /**********************************************************************/ #define EXEC_FUNC_COMMON 0 @@ -233,7 +221,6 @@ libc_hidden_def(execlp) /**********************************************************************/ #ifdef L_execvp -/* Experimentally off - libc_hidden_proto(strchrnul) */ /* Use a default path that matches glibc behavior, since SUSv3 says * this is implementation-defined. The default is current working dir, diff --git a/libc/unistd/fpathconf.c b/libc/unistd/fpathconf.c index 439525a2a..6f618ee0c 100644 --- a/libc/unistd/fpathconf.c +++ b/libc/unistd/fpathconf.c @@ -28,7 +28,6 @@ //#include "linux_fsinfo.h" -/* libc_hidden_proto(fstat) */ #ifndef __USE_FILE_OFFSET64 extern int fstatfs (int __fildes, struct statfs *__buf) diff --git a/libc/unistd/getlogin.c b/libc/unistd/getlogin.c index e97b662f1..b855e50ac 100644 --- a/libc/unistd/getlogin.c +++ b/libc/unistd/getlogin.c @@ -10,9 +10,6 @@ #include #include -/* Experimentally off - libc_hidden_proto(strcpy) */ -/* Experimentally off - libc_hidden_proto(strncpy) */ -/* libc_hidden_proto(getenv) */ /* uClibc makes it policy to not mess with the utmp file whenever * possible, since I consider utmp a complete waste of time. Since @@ -20,7 +17,6 @@ * the user specify whatever they want via the LOGNAME environment * variable, or we return NULL if getenv() fails to find anything */ -/* libc_hidden_proto(getlogin) */ char * getlogin(void) { return (getenv("LOGNAME")); diff --git a/libc/unistd/getopt-susv3.c b/libc/unistd/getopt-susv3.c index 00c08d114..d7b8d0dca 100644 --- a/libc/unistd/getopt-susv3.c +++ b/libc/unistd/getopt-susv3.c @@ -23,8 +23,6 @@ #include #include -/* libc_hidden_proto(fprintf) */ -/* Experimentally off - libc_hidden_proto(strchr) */ #ifdef __UCLIBC_MJN3_ONLY__ #warning TODO: Enable gettext awareness. @@ -46,7 +44,6 @@ int optind = 1; int optopt = 0; char *optarg = NULL; -/* libc_hidden_proto(getopt) */ int getopt(int argc, char * const argv[], const char *optstring) { static const char *o; /* multi opt position */ diff --git a/libc/unistd/getopt.c b/libc/unistd/getopt.c index d2020fe03..f4c113092 100644 --- a/libc/unistd/getopt.c +++ b/libc/unistd/getopt.c @@ -121,12 +121,6 @@ #include #include "getopt_int.h" -/* Experimentally off - libc_hidden_proto(strchr) */ -/* Experimentally off - libc_hidden_proto(strcmp) */ -/* Experimentally off - libc_hidden_proto(strlen) */ -/* Experimentally off - libc_hidden_proto(strncmp) */ -/* libc_hidden_proto(getenv) */ -/* libc_hidden_proto(fprintf) */ /* For communication from `getopt' to the caller. When `getopt' finds an option that takes an argument, diff --git a/libc/unistd/getopt_long-simple.c b/libc/unistd/getopt_long-simple.c index 233884438..47612dfe6 100644 --- a/libc/unistd/getopt_long-simple.c +++ b/libc/unistd/getopt_long-simple.c @@ -8,7 +8,6 @@ #include #include -/* libc_hidden_proto(getopt) */ static int __getopt_long(int argc, char *const *argv, const char *optstring, const struct option *longopts, int *idx, int longonly) { diff --git a/libc/unistd/getpass.c b/libc/unistd/getpass.c index ee54429a0..8d8018231 100644 --- a/libc/unistd/getpass.c +++ b/libc/unistd/getpass.c @@ -23,19 +23,6 @@ #if defined __USE_BSD || (defined __USE_XOPEN && !defined __USE_XOPEN2K) -/* Experimentally off - libc_hidden_proto(strlen) */ -/* libc_hidden_proto(tcsetattr) */ -/* libc_hidden_proto(tcgetattr) */ -/* libc_hidden_proto(setvbuf) */ -/* libc_hidden_proto(fopen) */ -/* libc_hidden_proto(fclose) */ -/* libc_hidden_proto(fileno) */ -/* libc_hidden_proto(fflush) */ -/* libc_hidden_proto(fgets) */ -/* libc_hidden_proto(fputs) */ -/* libc_hidden_proto(fputc) */ -/* libc_hidden_proto(putc) */ -/* libc_hidden_proto(__fputc_unlocked) */ /* It is desirable to use this bit on systems that have it. The only bit of terminal state we want to twiddle is echoing, which is diff --git a/libc/unistd/getsubopt-susv3.c b/libc/unistd/getsubopt-susv3.c index 10c97ca9a..9ff33ef11 100644 --- a/libc/unistd/getsubopt-susv3.c +++ b/libc/unistd/getsubopt-susv3.c @@ -7,9 +7,6 @@ #include #include -/* Experimentally off - libc_hidden_proto(strchr) */ -/* Experimentally off - libc_hidden_proto(strlen) */ -/* Experimentally off - libc_hidden_proto(strncmp) */ int getsubopt(char **opt, char *const *keys, char **val) { diff --git a/libc/unistd/getsubopt.c b/libc/unistd/getsubopt.c index 301410232..4ff615b6c 100644 --- a/libc/unistd/getsubopt.c +++ b/libc/unistd/getsubopt.c @@ -21,9 +21,6 @@ #include #include -/* Experimentally off - libc_hidden_proto(memchr) */ -/* Experimentally off - libc_hidden_proto(strncmp) */ -/* Experimentally off - libc_hidden_proto(strchrnul) */ /* Parse comma separated suboption from *OPTIONP and match against strings in TOKENS. If found return index and set *VALUEP to diff --git a/libc/unistd/pathconf.c b/libc/unistd/pathconf.c index 9895e028a..bbdceabcc 100644 --- a/libc/unistd/pathconf.c +++ b/libc/unistd/pathconf.c @@ -32,7 +32,6 @@ //#include extern __typeof(statfs) __libc_statfs; -/* libc_hidden_proto(stat) */ /* The Linux kernel headers mention this as a kind of generic value. */ diff --git a/libc/unistd/sleep.c b/libc/unistd/sleep.c index 4d55d843d..de4c14a24 100644 --- a/libc/unistd/sleep.c +++ b/libc/unistd/sleep.c @@ -23,17 +23,13 @@ #include #include -/* libc_hidden_proto(sleep) */ -/* libc_hidden_proto(sigaction) */ -/* libc_hidden_proto(sigprocmask) */ /* version perusing nanosleep */ #if defined __UCLIBC_HAS_REALTIME__ //libc_hidden_proto(__sigaddset) //libc_hidden_proto(__sigemptyset) //libc_hidden_proto(__sigismember) -/*libc_hidden_proto(nanosleep) need the reloc for cancellation*/ #if 0 /* This is a quick and dirty, but not 100% compliant with @@ -109,7 +105,6 @@ unsigned int sleep (unsigned int seconds) } #endif #else /* __UCLIBC_HAS_REALTIME__ */ -/* libc_hidden_proto(sigaction) */ /* no nanosleep, use signals and alarm() */ static void sleep_alarm_handler(int attribute_unused sig) { diff --git a/libc/unistd/sysconf.c b/libc/unistd/sysconf.c index 82bcf2284..87206648e 100644 --- a/libc/unistd/sysconf.c +++ b/libc/unistd/sysconf.c @@ -44,10 +44,7 @@ # define num_online_cpus() (1) #endif -/* libc_hidden_proto(sysconf) */ -/* libc_hidden_proto(getpagesize) */ -/* libc_hidden_proto(getdtablesize) */ #ifndef __UCLIBC_CLK_TCK_CONST #error __UCLIBC_CLK_TCK_CONST not defined! diff --git a/libc/unistd/ualarm.c b/libc/unistd/ualarm.c index 191f996b5..82eb972b2 100644 --- a/libc/unistd/ualarm.c +++ b/libc/unistd/ualarm.c @@ -9,7 +9,6 @@ #include #include -/* libc_hidden_proto(setitimer) */ useconds_t ualarm(useconds_t value, useconds_t interval) { diff --git a/libc/unistd/usershell.c b/libc/unistd/usershell.c index 9896bd3ef..46b1b98ad 100644 --- a/libc/unistd/usershell.c +++ b/libc/unistd/usershell.c @@ -42,16 +42,8 @@ #if defined __USE_BSD || (defined __USE_XOPEN && !defined __USE_UNIX98) -/* libc_hidden_proto(fstat) */ -/* libc_hidden_proto(fopen) */ -/* libc_hidden_proto(fclose) */ -/* libc_hidden_proto(__fsetlocking) */ -/* libc_hidden_proto(fileno) */ -/* libc_hidden_proto(fgets_unlocked) */ #ifdef __UCLIBC_HAS_XLOCALE__ -/* libc_hidden_proto(__ctype_b_loc) */ #elif defined __UCLIBC_HAS_CTYPE_TABLES__ -/* libc_hidden_proto(__ctype_b) */ #endif /* diff --git a/libc/unistd/usleep.c b/libc/unistd/usleep.c index daeda0982..61ddb900a 100644 --- a/libc/unistd/usleep.c +++ b/libc/unistd/usleep.c @@ -11,7 +11,6 @@ #if defined __USE_BSD || defined __USE_POSIX98 #if defined __UCLIBC_HAS_REALTIME__ -/*libc_hidden_proto(nanosleep) need the reloc for cancellation*/ int usleep (__useconds_t usec) { @@ -22,7 +21,6 @@ int usleep (__useconds_t usec) return(nanosleep(&ts, NULL)); } #else /* __UCLIBC_HAS_REALTIME__ */ -/* libc_hidden_proto(select) */ int usleep (__useconds_t usec) { struct timeval tv; -- cgit v1.2.3