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 <rep.dot.nop@gmail.com>

59 files changed, 1 insertions, 596 deletions

diff --git a/libc/inet/addr.c b/libc/inet/addr.c
index b371fa9ae..8bef59ffa 100644
--- a/libc/inet/addr.c
+++ b/libc/inet/addr.c
@@ -44,11 +44,8 @@
  * all else    -> decimal
  */
 #ifdef __UCLIBC_HAS_XLOCALE__
-/* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-/* libc_hidden_proto(__ctype_b) */
 #endif
-/* libc_hidden_proto(inet_aton) */
 int inet_aton(const char *cp, struct in_addr *addrptr)
 {
 	in_addr_t addr;
@@ -103,9 +100,7 @@ libc_hidden_def(inet_aton)
 #endif
 
 #ifdef L_inet_addr
-/* libc_hidden_proto(inet_aton) */
 
-/* libc_hidden_proto(inet_addr) */
 in_addr_t inet_addr(const char *cp)
 {
 	struct in_addr a;
@@ -122,7 +117,6 @@ libc_hidden_def(inet_addr)
 
 #define INET_NTOA_MAX_LEN	16	/* max 12 digits + 3 '.'s + 1 nul */
 
-/* libc_hidden_proto(inet_ntoa_r) */
 char *inet_ntoa_r(struct in_addr in, char buf[INET_NTOA_MAX_LEN])
 {
 	in_addr_t addr = ntohl(in.s_addr);
@@ -144,7 +138,6 @@ char *inet_ntoa_r(struct in_addr in, char buf[INET_NTOA_MAX_LEN])
 }
 libc_hidden_def(inet_ntoa_r)
 
-/* libc_hidden_proto(inet_ntoa) */
 char *inet_ntoa(struct in_addr in)
 {
 	static char buf[INET_NTOA_MAX_LEN];
@@ -156,13 +149,11 @@ libc_hidden_def(inet_ntoa)
 #ifdef L_inet_makeaddr
 
 /* for some reason it does not remove the jump relocation */
-/* Experimentally off - libc_hidden_proto(memmove) */
 
 /*
  * Formulate an Internet address from network + host.  Used in
  * building addresses stored in the ifnet structure.
  */
-/* libc_hidden_proto(inet_makeaddr) */
 struct in_addr inet_makeaddr(in_addr_t net, in_addr_t host)
 {
 	in_addr_t addr;
@@ -206,7 +197,6 @@ in_addr_t inet_lnaof(struct in_addr in)
  * Return the network number from an internet
  * address; handles class a/b/c network #'s.
  */
-/* libc_hidden_proto(inet_netof) */
 in_addr_t
 inet_netof(struct in_addr in)
 {
diff --git a/libc/inet/getaddrinfo.c b/libc/inet/getaddrinfo.c
index 2839bdaf4..a9fe3c884 100644
--- a/libc/inet/getaddrinfo.c
+++ b/libc/inet/getaddrinfo.c
@@ -70,26 +70,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <net/if.h>
 #include <ifaddrs.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* libc_hidden_proto(strcmp) */
-/* libc_hidden_proto(stpcpy) */
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(getservbyname_r) */
-/* libc_hidden_proto(gethostbyname2_r) */
-/* libc_hidden_proto(gethostbyaddr_r) */
-/* libc_hidden_proto(inet_pton) */
-/* libc_hidden_proto(inet_ntop) */
-/* libc_hidden_proto(strtoul) */
-/* libc_hidden_proto(if_nametoindex) */
-/* libc_hidden_proto(__h_errno_location) */
-/* libc_hidden_proto(uname) */
 #ifdef __UCLIBC_HAS_IPV6__
-/* libc_hidden_proto(in6addr_loopback) */
 #endif
 
 #define GAIH_OKIFUNSPEC 0x0100
@@ -783,7 +764,6 @@ static const struct gaih gaih[] = {
 	{ PF_UNSPEC, NULL }
 };
 
-/* libc_hidden_proto(freeaddrinfo) */
 void
 freeaddrinfo(struct addrinfo *ai)
 {
@@ -797,7 +777,6 @@ freeaddrinfo(struct addrinfo *ai)
 }
 libc_hidden_def(freeaddrinfo)
 
-/* libc_hidden_proto(getaddrinfo) */
 int
 getaddrinfo(const char *name, const char *service,
 	     const struct addrinfo *hints, struct addrinfo **pai)
diff --git a/libc/inet/getnetbyad.c b/libc/inet/getnetbyad.c
index 735005a62..a4af1a844 100644
--- a/libc/inet/getnetbyad.c
+++ b/libc/inet/getnetbyad.c
@@ -20,9 +20,6 @@
 #include <netdb.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(setnetent) */
-/* libc_hidden_proto(getnetent) */
-/* libc_hidden_proto(endnetent) */
 
 extern smallint _net_stayopen attribute_hidden;
 
diff --git a/libc/inet/getnetbynm.c b/libc/inet/getnetbynm.c
index d3f283106..eab04045b 100644
--- a/libc/inet/getnetbynm.c
+++ b/libc/inet/getnetbynm.c
@@ -21,10 +21,6 @@
 #include <string.h>
 #include <unistd.h>
 
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* libc_hidden_proto(setnetent) */
-/* libc_hidden_proto(getnetent) */
-/* libc_hidden_proto(endnetent) */
 
 extern smallint _net_stayopen attribute_hidden;
 
diff --git a/libc/inet/getnetent.c b/libc/inet/getnetent.c
index 746f8b704..e9b45ba7e 100644
--- a/libc/inet/getnetent.c
+++ b/libc/inet/getnetent.c
@@ -23,12 +23,6 @@
 #include <arpa/inet.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(fopen) */
-/* libc_hidden_proto(fclose) */
-/* libc_hidden_proto(inet_network) */
-/* libc_hidden_proto(rewind) */
-/* libc_hidden_proto(fgets) */
-/* libc_hidden_proto(abort) */
 
 #include <bits/uClibc_mutex.h>
 __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_MUTEX_INITIALIZER);
@@ -44,7 +38,6 @@ static char *net_aliases[MAXALIASES];
 
 smallint _net_stayopen attribute_hidden;
 
-/* libc_hidden_proto(setnetent) */
 void setnetent(int f)
 {
     __UCLIBC_MUTEX_LOCK(mylock);
@@ -58,7 +51,6 @@ void setnetent(int f)
 }
 libc_hidden_def(setnetent)
 
-/* libc_hidden_proto(endnetent) */
 void endnetent(void)
 {
     __UCLIBC_MUTEX_LOCK(mylock);
@@ -84,7 +76,6 @@ static char * any(register char *cp, char *match)
     return ((char *)0);
 }
 
-/* libc_hidden_proto(getnetent) */
 struct netent *getnetent(void)
 {
     char *p;
diff --git a/libc/inet/getproto.c b/libc/inet/getproto.c
index 837f1315f..c297a6549 100644
--- a/libc/inet/getproto.c
+++ b/libc/inet/getproto.c
@@ -62,14 +62,6 @@
 #include <errno.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(fopen) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strpbrk) */
-/* libc_hidden_proto(atoi) */
-/* libc_hidden_proto(rewind) */
-/* libc_hidden_proto(fgets) */
-/* libc_hidden_proto(fclose) */
-/* libc_hidden_proto(abort) */
 
 #include <bits/uClibc_mutex.h>
 __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP);
@@ -93,7 +85,6 @@ static void __initbuf(void)
     }
 }
 
-/* libc_hidden_proto(setprotoent) */
 void setprotoent(int f)
 {
     __UCLIBC_MUTEX_LOCK(mylock);
@@ -106,7 +97,6 @@ void setprotoent(int f)
 }
 libc_hidden_def(setprotoent)
 
-/* libc_hidden_proto(endprotoent) */
 void endprotoent(void)
 {
     __UCLIBC_MUTEX_LOCK(mylock);
@@ -119,7 +109,6 @@ void endprotoent(void)
 }
 libc_hidden_def(endprotoent)
 
-/* libc_hidden_proto(getprotoent_r) */
 int getprotoent_r(struct protoent *result_buf,
 		  char *buf, size_t buflen,
 		  struct protoent **result)
@@ -210,7 +199,6 @@ struct protoent * getprotoent(void)
 }
 
 
-/* libc_hidden_proto(getprotobyname_r) */
 int getprotobyname_r(const char *name,
 		    struct protoent *result_buf,
 		    char *buf, size_t buflen,
@@ -247,7 +235,6 @@ struct protoent * getprotobyname(const char *name)
 }
 
 
-/* libc_hidden_proto(getprotobynumber_r) */
 int getprotobynumber_r (int proto_num,
 			struct protoent *result_buf,
 			char *buf, size_t buflen,
diff --git a/libc/inet/getservice.c b/libc/inet/getservice.c
index 904f0b79c..6d80a1b07 100644
--- a/libc/inet/getservice.c
+++ b/libc/inet/getservice.c
@@ -64,14 +64,6 @@
 #include <errno.h>
 #include <unistd.h>
 
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strpbrk) */
-/* libc_hidden_proto(fopen) */
-/* libc_hidden_proto(fclose) */
-/* libc_hidden_proto(atoi) */
-/* libc_hidden_proto(rewind) */
-/* libc_hidden_proto(fgets) */
-/* libc_hidden_proto(abort) */
 
 #include <bits/uClibc_mutex.h>
 __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP);
@@ -96,7 +88,6 @@ static void __initbuf(void)
     }
 }
 
-/* libc_hidden_proto(setservent) */
 void setservent(int f)
 {
     __UCLIBC_MUTEX_LOCK(mylock);
@@ -109,7 +100,6 @@ void setservent(int f)
 }
 libc_hidden_def(setservent)
 
-/* libc_hidden_proto(endservent) */
 void endservent(void)
 {
     __UCLIBC_MUTEX_LOCK(mylock);
@@ -122,7 +112,6 @@ void endservent(void)
 }
 libc_hidden_def(endservent)
 
-/* libc_hidden_proto(getservent_r) */
 int getservent_r(struct servent * result_buf,
 		 char * buf, size_t buflen,
 		 struct servent ** result)
@@ -213,7 +202,6 @@ struct servent * getservent(void)
     return result;
 }
 
-/* libc_hidden_proto(getservbyname_r) */
 int getservbyname_r(const char *name, const char *proto,
 	struct servent * result_buf, char * buf, size_t buflen,
 	struct servent ** result)
@@ -251,7 +239,6 @@ struct servent *getservbyname(const char *name, const char *proto)
 }
 
 
-/* libc_hidden_proto(getservbyport_r) */
 int getservbyport_r(int port, const char *proto,
 	struct servent * result_buf, char * buf,
 	size_t buflen, struct servent ** result)
@@ -273,7 +260,6 @@ int getservbyport_r(int port, const char *proto,
 }
 libc_hidden_def(getservbyport_r)
 
-/* libc_hidden_proto(getservbyport) */
 struct servent * getservbyport(int port, const char *proto)
 {
     struct servent *result;
diff --git a/libc/inet/herror.c b/libc/inet/herror.c
index 8f993a78c..a1f94ad64 100644
--- a/libc/inet/herror.c
+++ b/libc/inet/herror.c
@@ -23,8 +23,6 @@
 #include <string.h>
 #include <netdb.h>
 
-/* libc_hidden_proto(fprintf) */
-/* libc_hidden_proto(__h_errno_location) */
 
 static const char error_msg[] = "Resolver error";
 static const char *const h_errlist[] = {
@@ -39,7 +37,6 @@ static const int h_nerr = { sizeof(h_errlist)/sizeof(h_errlist[0]) };
 /*
  * herror -- print the error indicated by the h_errno value.
  */
-/* libc_hidden_proto(herror) */
 void herror(const char *s)
 {
 	static const char colon_space[] = ": ";
diff --git a/libc/inet/hostid.c b/libc/inet/hostid.c
index cadcd1b28..99346d7f8 100644
--- a/libc/inet/hostid.c
+++ b/libc/inet/hostid.c
@@ -15,15 +15,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(open) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(read) */
-/* libc_hidden_proto(write) */
-/* libc_hidden_proto(getuid) */
-/* libc_hidden_proto(geteuid) */
-/* libc_hidden_proto(gethostbyname_r) */
-/* libc_hidden_proto(gethostname) */
 
 #define HOSTID "/etc/hostid"
 
diff --git a/libc/inet/if_index.c b/libc/inet/if_index.c
index 090b52a15..36012975f 100644
--- a/libc/inet/if_index.c
+++ b/libc/inet/if_index.c
@@ -37,7 +37,6 @@
 
 extern int __opensock(void) attribute_hidden;
 
-/* libc_hidden_proto(if_nametoindex) */
 unsigned int
 if_nametoindex(const char* ifname)
 {
@@ -68,7 +67,6 @@ if_nametoindex(const char* ifname)
 }
 libc_hidden_def(if_nametoindex)
 
-/* libc_hidden_proto(if_freenameindex) */
 void
 if_freenameindex (struct if_nameindex *ifn)
 {
@@ -82,7 +80,6 @@ if_freenameindex (struct if_nameindex *ifn)
 }
 libc_hidden_def(if_freenameindex)
 
-/* libc_hidden_proto(if_nameindex) */
 #if !__ASSUME_NETLINK_SUPPORT
 struct if_nameindex *
 if_nameindex (void)
diff --git a/libc/inet/ifaddrs.c b/libc/inet/ifaddrs.c
index 77ca7ce02..3b8b674c2 100644
--- a/libc/inet/ifaddrs.c
+++ b/libc/inet/ifaddrs.c
@@ -39,17 +39,6 @@
 
 #include "netlinkaccess.h"
 
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* Experimentally off - libc_hidden_proto(time) */
-/* libc_hidden_proto(sendto) */
-/* libc_hidden_proto(recvmsg) */
-/* libc_hidden_proto(bind) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(mempcpy) */
-/* libc_hidden_proto(getsockname) */
-/* libc_hidden_proto(fclose) */
-/* libc_hidden_proto(abort) */
 
 #ifndef __libc_use_alloca
 # define __libc_use_alloca(x) (x < __MAX_ALLOCA_CUTOFF)
diff --git a/libc/inet/in6_addr.c b/libc/inet/in6_addr.c
index eb096f9e3..321a9f66a 100644
--- a/libc/inet/in6_addr.c
+++ b/libc/inet/in6_addr.c
@@ -24,7 +24,6 @@
 #ifdef __UCLIBC_HAS_IPV6__
 const struct in6_addr in6addr_any =
 { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } };
-/* libc_hidden_proto(in6addr_loopback) */
 const struct in6_addr in6addr_loopback =
 { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } };
 libc_hidden_data_def(in6addr_loopback)
diff --git a/libc/inet/inet_net.c b/libc/inet/inet_net.c
index 477d67dc9..6bade8aee 100644
--- a/libc/inet/inet_net.c
+++ b/libc/inet/inet_net.c
@@ -39,9 +39,7 @@
 #include <arpa/inet.h>
 
 #ifdef __UCLIBC_HAS_XLOCALE__
-/* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-/* libc_hidden_proto(__ctype_b) */
 #endif
 
 /*
@@ -49,7 +47,6 @@
  * The library routines call this routine to interpret
  * network numbers.
  */
-/* libc_hidden_proto(inet_network) */
 in_addr_t
 inet_network(const char *cp)
 {
diff --git a/libc/inet/ntop.c b/libc/inet/ntop.c
index 4583fc47f..57a0b8ccd 100644
--- a/libc/inet/ntop.c
+++ b/libc/inet/ntop.c
@@ -30,13 +30,6 @@
 #include <string.h>
 #include <ctype.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(sprintf) */
-/* libc_hidden_proto(tolower) */
 
 /*
  * WARNING: Don't even consider trying to compile this on a system where
@@ -352,7 +345,6 @@ inet_pton6(const char *src, u_char *dst)
  * author:
  *	Paul Vixie, 1996.
  */
-/* libc_hidden_proto(inet_ntop) */
 const char *
 inet_ntop(int af, const void *src, char *dst, socklen_t size)
 {
@@ -383,7 +375,6 @@ libc_hidden_def(inet_ntop)
  * author:
  *	Paul Vixie, 1996.
  */
-/* libc_hidden_proto(inet_pton) */
 int
 inet_pton(int af, const char *src, void *dst)
 {
diff --git a/libc/inet/rpc/auth_none.c b/libc/inet/rpc/auth_none.c
index 478315b8f..c48bbfea9 100644
--- a/libc/inet/rpc/auth_none.c
+++ b/libc/inet/rpc/auth_none.c
@@ -39,8 +39,6 @@
 #include <features.h>
 #include "rpc_private.h"
 
-/* libc_hidden_proto(xdrmem_create) */
-/* libc_hidden_proto(xdr_opaque_auth) */
 
 #define MAX_MARSHAL_SIZE 20
 
@@ -74,7 +72,6 @@ struct authnone_private_s {
 static struct authnone_private_s *authnone_private;
 #endif
 
-/* libc_hidden_proto(authnone_create) */
 AUTH *
 authnone_create (void)
 {
diff --git a/libc/inet/rpc/auth_unix.c b/libc/inet/rpc/auth_unix.c
index 9f5d8b4d7..f71a426f8 100644
--- a/libc/inet/rpc/auth_unix.c
+++ b/libc/inet/rpc/auth_unix.c
@@ -56,21 +56,7 @@
 # include <wchar.h>
 #endif
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(sysconf) */
-/* libc_hidden_proto(getegid) */
-/* libc_hidden_proto(geteuid) */
-/* libc_hidden_proto(getgroups) */
-/* libc_hidden_proto(gethostname) */
-/* libc_hidden_proto(xdrmem_create) */
-/* libc_hidden_proto(xdr_authunix_parms) */
-/* libc_hidden_proto(xdr_opaque_auth) */
-/* libc_hidden_proto(gettimeofday) */
-/* libc_hidden_proto(fputs) */
-/* libc_hidden_proto(perror) */
-/* libc_hidden_proto(abort) */
 #ifdef USE_IN_LIBIO
-/* libc_hidden_proto(fwprintf) */
 #endif
 
 /*
@@ -109,7 +95,6 @@ static bool_t marshal_new_auth (AUTH *) internal_function;
  * Create a unix style authenticator.
  * Returns an auth handle with the given stuff in it.
  */
-/* libc_hidden_proto(authunix_create) */
 AUTH *
 authunix_create (char *machname, uid_t uid, gid_t gid, int len,
 		 gid_t *aup_gids)
@@ -182,7 +167,6 @@ libc_hidden_def(authunix_create)
  * Returns an auth handle with parameters determined by doing lots of
  * syscalls.
  */
-/* libc_hidden_proto(authunix_create_default) */
 AUTH *
 authunix_create_default (void)
 {
diff --git a/libc/inet/rpc/authunix_prot.c b/libc/inet/rpc/authunix_prot.c
index 2739e7658..272990056 100644
--- a/libc/inet/rpc/authunix_prot.c
+++ b/libc/inet/rpc/authunix_prot.c
@@ -39,17 +39,11 @@
 #include <rpc/auth.h>
 #include <rpc/auth_unix.h>
 
-/* libc_hidden_proto(xdr_string) */
-/* libc_hidden_proto(xdr_u_int) */
-/* libc_hidden_proto(xdr_array) */
-/* libc_hidden_proto(xdr_u_long) */
-/* libc_hidden_proto(xdr_u_short) */
 
 /*
  * XDR for unix authentication parameters.
  * Unfortunately, none of these can be declared const.
  */
-/* libc_hidden_proto(xdr_authunix_parms) */
 bool_t
 xdr_authunix_parms (XDR * xdrs, struct authunix_parms *p)
 {
diff --git a/libc/inet/rpc/bindresvport.c b/libc/inet/rpc/bindresvport.c
index b9e77f3cd..fc077af67 100644
--- a/libc/inet/rpc/bindresvport.c
+++ b/libc/inet/rpc/bindresvport.c
@@ -40,14 +40,10 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-/* Experimentally off - libc_hidden_proto(memset) */
-/* libc_hidden_proto(bind) */
-/* libc_hidden_proto(getpid) */
 
 /*
  * Bind a socket to a privileged IP port
  */
-/* libc_hidden_proto(bindresvport) */
 int
 bindresvport (int sd, struct sockaddr_in *sin)
 {
diff --git a/libc/inet/rpc/clnt_generic.c b/libc/inet/rpc/clnt_generic.c
index 165f42aeb..8aeae1ec4 100644
--- a/libc/inet/rpc/clnt_generic.c
+++ b/libc/inet/rpc/clnt_generic.c
@@ -40,16 +40,6 @@
 #include <sys/socket.h>
 #include <netdb.h>