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>

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)
 {

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)

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;
 

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;
 

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;

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,

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;

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[] = ": ";

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"
 

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)

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)

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)

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)
 {

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)
 {

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)
 {

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)
 {

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)
 {

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)
 {

libc/inet/rpc/clnt_generic.c

@@ -40,16 +40,6 @@
 #include <sys/socket.h>
 #include <netdb.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* libc_hidden_proto(clnttcp_create) */
-/* libc_hidden_proto(clntudp_create) */
-/* libc_hidden_proto(clntunix_create) */
-/* libc_hidden_proto(getprotobyname_r) */
-/* libc_hidden_proto(gethostbyname_r) */
-/* libc_hidden_proto(__rpc_thread_createerr) */
 
 /*
  * Generic client creation: takes (hostname, program-number, protocol) and

libc/inet/rpc/clnt_perror.c

@@ -51,13 +51,7 @@ static char sccsid[] = "@(#)clnt_perror.c 1.15 87/10/07 Copyr 1984 Sun Micro";
 # define fputs(s, f) _IO_fputs (s, f)
 #endif
 
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(sprintf) */
-/* libc_hidden_proto(__glibc_strerror_r) */
-/* libc_hidden_proto(fputs) */
 #ifdef USE_IN_LIBIO
-/* libc_hidden_proto(fwprintf) */
 #endif
 
 static char *auth_errmsg (enum auth_stat stat) internal_function;
@@ -186,7 +180,6 @@ static const struct rpc_errtab rpc_errlist[] =
 /*
  * This interface for use by clntrpc
  */
-/* libc_hidden_proto(clnt_sperrno) */
 char *
 clnt_sperrno (enum clnt_stat stat)
 {
@@ -217,7 +210,6 @@ clnt_perrno (enum clnt_stat num)
 /*
  * Print reply error info
  */
-/* libc_hidden_proto(clnt_sperror) */
 char *
 clnt_sperror (CLIENT * rpch, const char *msg)
 {
@@ -303,7 +295,6 @@ clnt_sperror (CLIENT * rpch, const char *msg)
 }
 libc_hidden_def(clnt_sperror)
 
-/* libc_hidden_proto(clnt_perror) */
 void
 clnt_perror (CLIENT * rpch, const char *msg)
 {
@@ -316,7 +307,6 @@ clnt_perror (CLIENT * rpch, const char *msg)
 }
 libc_hidden_def(clnt_perror)
 
-/* libc_hidden_proto(clnt_spcreateerror) */
 char *
 clnt_spcreateerror (const char *msg)
 {

libc/inet/rpc/clnt_raw.c

@@ -48,14 +48,6 @@ static char sccsid[] = "@(#)clnt_raw.c 1.22 87/08/11 Copyr 1984 Sun Micro";
 #include <rpc/svc.h>
 #include <rpc/xdr.h>
 
-/* libc_hidden_proto(perror) */
-/* libc_hidden_proto(authnone_create) */
-/* libc_hidden_proto(xdrmem_create) */
-/* libc_hidden_proto(xdr_callhdr) */
-/* libc_hidden_proto(xdr_replymsg) */
-/* libc_hidden_proto(xdr_opaque_auth) */
-/* libc_hidden_proto(svc_getreq) */
-/* libc_hidden_proto(_seterr_reply) */
 
 #define MCALL_MSG_SIZE 24
 

libc/inet/rpc/clnt_simple.c

@@ -50,12 +50,6 @@ static char sccsid[] = "@(#)clnt_simple.c 1.35 87/08/11 Copyr 1984 Sun Micro";
 #include <netdb.h>
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strncpy) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(clntudp_create) */
-/* libc_hidden_proto(gethostbyname_r) */
 
 struct callrpc_private_s
   {

libc/inet/rpc/clnt_tcp.c

@@ -65,28 +65,7 @@ static char sccsid[] = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro";
 # include <wchar.h>
 #endif
 
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(read) */
-/* libc_hidden_proto(write) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(authnone_create) */
-/* libc_hidden_proto(xdrrec_create) */
-/* libc_hidden_proto(xdrrec_endofrecord) */
-/* libc_hidden_proto(xdrrec_skiprecord) */
-/* libc_hidden_proto(xdr_callhdr) */
-/* libc_hidden_proto(xdr_replymsg) */
-/* libc_hidden_proto(xdr_opaque_auth) */
-/* libc_hidden_proto(xdrmem_create) */
-/* libc_hidden_proto(xdr_void) */
-/* libc_hidden_proto(pmap_getport) */
-/* libc_hidden_proto(_seterr_reply) */
-/* libc_hidden_proto(connect) */
-/* libc_hidden_proto(bindresvport) */
-/* libc_hidden_proto(poll) */
-/* libc_hidden_proto(fputs) */
-/* libc_hidden_proto(__rpc_thread_createerr) */
 #ifdef USE_IN_LIBIO
-/* libc_hidden_proto(fwprintf) */
 #endif
 
 extern u_long _create_xid (void) attribute_hidden;
@@ -141,7 +120,6 @@ static const struct clnt_ops tcp_ops =
  * NB: The rpch->cl_auth is set null authentication.  Caller may wish to set this
  * something more useful.
  */
-/* libc_hidden_proto(clnttcp_create) */
 CLIENT *
 clnttcp_create (struct sockaddr_in *raddr, u_long prog, u_long vers,
 		int *sockp, u_int sendsz, u_int recvsz)

libc/inet/rpc/clnt_udp.c

@@ -54,7 +54,6 @@ static char sccsid[] = "@(#)clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro";
 #include <net/if.h>
 #ifdef USE_IN_LIBIO
 # include <wchar.h>
-/* libc_hidden_proto(fwprintf) */
 #endif
 
 #ifdef IP_RECVERR
@@ -62,28 +61,8 @@ static char sccsid[] = "@(#)clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro";
 #include <sys/uio.h>
 #endif
 
-/* Experimentally off - libc_hidden_proto(memcmp) */
-/* libc_hidden_proto(ioctl) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
 /* CMSG_NXTHDR is using it */
-/* libc_hidden_proto(__cmsg_nxthdr) */
-
-/* libc_hidden_proto(authnone_create) */
-/* libc_hidden_proto(xdrmem_create) */
-/* libc_hidden_proto(xdr_callhdr) */
-/* libc_hidden_proto(xdr_replymsg) */
-/* libc_hidden_proto(xdr_opaque_auth) */
-/* libc_hidden_proto(pmap_getport) */
-/* libc_hidden_proto(_seterr_reply) */
-/* libc_hidden_proto(setsockopt) */
-/* libc_hidden_proto(bindresvport) */
-/* libc_hidden_proto(recvfrom) */
-/* libc_hidden_proto(sendto) */
-/* libc_hidden_proto(recvmsg) */
-/* libc_hidden_proto(poll) */
-/* libc_hidden_proto(fputs) */
-/* libc_hidden_proto(__rpc_thread_createerr) */
+
 
 extern u_long _create_xid (void) attribute_hidden;
 
@@ -144,7 +123,6 @@ struct cu_data
  * sendsz and recvsz are the maximum allowable packet sizes that can be
  * sent and received.
  */
-/* libc_hidden_proto(clntudp_bufcreate) */
 CLIENT *
 clntudp_bufcreate (struct sockaddr_in *raddr, u_long program, u_long version,
 		   struct timeval wait, int *sockp, u_int sendsz,
@@ -245,7 +223,6 @@ fooy:
 }
 libc_hidden_def(clntudp_bufcreate)
 
-/* libc_hidden_proto(clntudp_create) */
 CLIENT *
 clntudp_create (struct sockaddr_in *raddr, u_long program, u_long version, struct timeval wait, int *sockp)
 {

libc/inet/rpc/clnt_unix.c

@@ -60,33 +60,8 @@
 #include <rpc/pmap_clnt.h>
 #ifdef USE_IN_LIBIO
 # include <wchar.h>
-/* libc_hidden_proto(fwprintf) */
 #endif
 
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(getpid) */
-/* libc_hidden_proto(authnone_create) */
-/* libc_hidden_proto(xdrrec_create) */
-/* libc_hidden_proto(xdrrec_endofrecord) */
-/* libc_hidden_proto(xdrrec_skiprecord) */
-/* libc_hidden_proto(xdr_callhdr) */
-/* libc_hidden_proto(xdr_replymsg) */
-/* libc_hidden_proto(xdr_opaque_auth) */
-/* libc_hidden_proto(xdrmem_create) */
-/* libc_hidden_proto(xdr_void) */
-/* libc_hidden_proto(getegid) */
-/* libc_hidden_proto(geteuid) */
-/* libc_hidden_proto(_seterr_reply) */
-/* libc_hidden_proto(setsockopt) */
-/* libc_hidden_proto(connect) */
-/* libc_hidden_proto(recvmsg) */
-/* libc_hidden_proto(sendmsg) */
-/* libc_hidden_proto(poll) */
-/* libc_hidden_proto(fputs) */
-/* libc_hidden_proto(__rpc_thread_createerr) */
 
 extern u_long _create_xid (void) attribute_hidden;
 
@@ -140,7 +115,6 @@ static const struct clnt_ops unix_ops =
  * NB: The rpch->cl_auth is set null authentication.  Caller may wish to set this
  * something more useful.
  */
-/* libc_hidden_proto(clntunix_create) */
 CLIENT *
 clntunix_create (struct sockaddr_un *raddr, u_long prog, u_long vers,
 		 int *sockp, u_int sendsz, u_int recvsz)

libc/inet/rpc/create_xid.c

@@ -25,9 +25,6 @@
 #include <sys/time.h>
 #include <rpc/rpc.h>
 
-/* libc_hidden_proto(lrand48_r) */
-/* libc_hidden_proto(srand48_r) */
-/* libc_hidden_proto(gettimeofday) */
 
 /* The RPC code is not threadsafe, but new code should be threadsafe. */
 

libc/inet/rpc/get_myaddress.c

@@ -50,11 +50,6 @@ static char sccsid[] = "@(#)get_myaddress.c 1.4 87/08/11 Copyr 1984 Sun Micro";
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-/* libc_hidden_proto(ioctl) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(perror) */
-/* libc_hidden_proto(exit) */
 
 /*
  * don't use gethostbyname, which would invoke yellow pages

libc/inet/rpc/getrpcent.c

@@ -44,16 +44,6 @@
 #include <arpa/inet.h>
 #include <errno.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(fopen) */
-/* libc_hidden_proto(fclose) */
-/* libc_hidden_proto(atoi) */
-/* libc_hidden_proto(rewind) */
-/* libc_hidden_proto(fgets) */
 
 /*
  * Internet version.
@@ -84,7 +74,6 @@ static struct rpcdata *_rpcdata(void)
 	return d;
 }
 
-/* libc_hidden_proto(endrpcent) */
 void endrpcent(void)
 {
 	register struct rpcdata *d = _rpcdata();
@@ -102,7 +91,6 @@ void endrpcent(void)
 }
 libc_hidden_def(endrpcent)
 
-/* libc_hidden_proto(setrpcent) */
 void setrpcent(int f)
 {
 	register struct rpcdata *d = _rpcdata();
@@ -128,7 +116,6 @@ static struct rpcent *__get_next_rpcent(struct rpcdata *d)
 	return interpret(d);
 }
 
-/* libc_hidden_proto(getrpcent) */
 struct rpcent *getrpcent(void)
 {
 	register struct rpcdata *d = _rpcdata();
@@ -141,7 +128,6 @@ struct rpcent *getrpcent(void)
 }
 libc_hidden_def(getrpcent)
 
-/* libc_hidden_proto(getrpcbynumber) */
 struct rpcent *getrpcbynumber(register int number)
 {
 	register struct rpcdata *d = _rpcdata();
@@ -159,7 +145,6 @@ struct rpcent *getrpcbynumber(register int number)
 }
 libc_hidden_def(getrpcbynumber)
 
-/* libc_hidden_proto(getrpcbyname) */
 struct rpcent *getrpcbyname(const char *name)
 {
 	struct rpcent *rpc;

libc/inet/rpc/getrpcport.c

@@ -48,9 +48,6 @@ static  char sccsid[] = "@(#)getrpcport.c 1.3 87/08/11 SMI";
 #include <rpc/pmap_clnt.h>
 #include <sys/socket.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(pmap_getport) */
-/* libc_hidden_proto(gethostbyname_r) */
 
 int
 getrpcport (const char *host, u_long prognum, u_long versnum, u_int proto)

libc/inet/rpc/pm_getmaps.c

@@ -48,11 +48,6 @@ static char sccsid[] = "@(#)pmap_getmaps.c 1.10 87/08/11 Copyr 1984 Sun Micro";
 #include <errno.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(clnt_perror) */
-/* libc_hidden_proto(clnttcp_create) */
-/* libc_hidden_proto(xdr_pmap) */
-/* libc_hidden_proto(xdr_pmaplist) */
-/* libc_hidden_proto(xdr_void) */
 
 /*
  * Get a copy of the current port maps.

libc/inet/rpc/pm_getport.c

@@ -44,10 +44,6 @@ static char sccsid[] = "@(#)pmap_getport.c 1.9 87/08/11 Copyr 1984 Sun Micro";
 #include <rpc/pmap_prot.h>
 #include <rpc/pmap_clnt.h>
 
-/* libc_hidden_proto(clntudp_bufcreate) */
-/* libc_hidden_proto(__rpc_thread_createerr) */
-/* libc_hidden_proto(xdr_u_short) */
-/* libc_hidden_proto(xdr_pmap) */
 
 static const struct timeval timeout =
 {5, 0};
@@ -59,7 +55,6 @@ static const struct timeval tottimeout =
  * Calls the pmap service remotely to do the lookup.
  * Returns 0 if no map exists.
  */
-/* libc_hidden_proto(pmap_getport) */
 u_short
 pmap_getport (address, program, version, protocol)
      struct sockaddr_in *address;

libc/inet/rpc/pmap_clnt.c

@@ -48,15 +48,6 @@
 #include <rpc/pmap_prot.h>
 #include <rpc/pmap_clnt.h>
 
-/* libc_hidden_proto(ioctl) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(perror) */
-/* libc_hidden_proto(exit) */
-/* libc_hidden_proto(clnt_perror) */
-/* libc_hidden_proto(clntudp_bufcreate) */
-/* libc_hidden_proto(xdr_bool) */
-/* libc_hidden_proto(xdr_pmap) */
 
 /*
  * Same as get_myaddress, but we try to use the loopback
@@ -122,7 +113,6 @@ static const struct timeval tottimeout = {60, 0};
  * Set a mapping between program,version and port.
  * Calls the pmap service remotely to do the mapping.
  */
-/* libc_hidden_proto(pmap_set) */
 bool_t
 pmap_set (u_long program, u_long version, int protocol, u_short port)
 {
@@ -159,7 +149,6 @@ libc_hidden_def (pmap_set)
  * Remove the mapping between program,version and port.
  * Calls the pmap service remotely to do the un-mapping.
  */
-/* libc_hidden_proto(pmap_unset) */
 bool_t
 pmap_unset (u_long program, u_long version)
 {

libc/inet/rpc/pmap_prot.c

@@ -42,9 +42,7 @@ static char sccsid[] = "@(#)pmap_prot.c 1.17 87/08/11 Copyr 1984 Sun Micro";
 #include <rpc/xdr.h>
 #include <rpc/pmap_prot.h>
 
-/* libc_hidden_proto(xdr_u_long) */
 
-/* libc_hidden_proto(xdr_pmap) */
 bool_t
 xdr_pmap (xdrs, regs)
      XDR *xdrs;

libc/inet/rpc/pmap_prot2.c

@@ -42,9 +42,6 @@ static char sccsid[] = "@(#)pmap_prot2.c 1.3 87/08/11 Copyr 1984 Sun Micro";
 #include <rpc/xdr.h>
 #include <rpc/pmap_prot.h>
 
-/* libc_hidden_proto(xdr_bool) */
-/* libc_hidden_proto(xdr_reference) */
-/* libc_hidden_proto(xdr_pmap) */
 
 /*
  * What is going on with linked lists? (!)
@@ -84,7 +81,6 @@ static char sccsid[] = "@(#)pmap_prot2.c 1.3 87/08/11 Copyr 1984 Sun Micro";
  * the net, yet is the data that the pointer points to which is interesting;
  * this sounds like a job for xdr_reference!
  */
-/* libc_hidden_proto(xdr_pmaplist) */
 bool_t
 xdr_pmaplist (xdrs, rp)
      XDR *xdrs;

libc/inet/rpc/pmap_rmt.c

@@ -59,28 +59,6 @@ static char sccsid[] = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";
 #include <arpa/inet.h>
 #define MAX_BROADCAST_SIZE 1400
 
-/* Experimentally off - libc_hidden_proto(memset) */
-/* libc_hidden_proto(ioctl) */
-/* libc_hidden_proto(perror) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(authunix_create_default) */
-/* libc_hidden_proto(xdrmem_create) */
-/* libc_hidden_proto(xdr_callmsg) */
-/* libc_hidden_proto(xdr_replymsg) */
-/* libc_hidden_proto(xdr_reference) */
-/* libc_hidden_proto(xdr_u_long) */
-/* libc_hidden_proto(xdr_void) */
-/* libc_hidden_proto(xdr_rmtcallres) */
-/* libc_hidden_proto(xdr_rmtcall_args) */
-/* libc_hidden_proto(inet_makeaddr) */
-/* libc_hidden_proto(inet_netof) */
-/* libc_hidden_proto(clntudp_create) */
-/* libc_hidden_proto(setsockopt) */
-/* libc_hidden_proto(recvfrom) */
-/* libc_hidden_proto(sendto) */
-/* libc_hidden_proto(poll) */
-/* libc_hidden_proto(fprintf) */
 
 
 extern u_long _create_xid (void) attribute_hidden;

libc/inet/rpc/rcmd.c

@@ -87,59 +87,10 @@ static char sccsid[] = "@(#)rcmd.c	8.3 (Berkeley) 3/26/94";
 #endif
 #include <sys/uio.h>
 
-/* Experimentally off - libc_hidden_proto(memcmp) */
-/* 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) */
-/* Experimentally off - libc_hidden_proto(strncmp) */
-/* Experimentally off - libc_hidden_proto(memmove) */
-/* libc_hidden_proto(getpid) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(fcntl) */
-/* libc_hidden_proto(read) */
-/* libc_hidden_proto(write) */
-/* libc_hidden_proto(perror) */
-/* libc_hidden_proto(lstat) */
-/* libc_hidden_proto(fstat) */
-/* libc_hidden_proto(tolower) */
-/* libc_hidden_proto(sysconf) */
-/* libc_hidden_proto(getline) */
-/* libc_hidden_proto(geteuid) */
-/* libc_hidden_proto(seteuid) */
-/* libc_hidden_proto(getpwnam_r) */
-/* libc_hidden_proto(gethostbyname) */
-/* libc_hidden_proto(gethostbyname_r) */
-/* libc_hidden_proto(fileno) */
-/* libc_hidden_proto(sleep) */
-/* libc_hidden_proto(inet_addr) */
-/* libc_hidden_proto(inet_ntoa) */
-/* libc_hidden_proto(herror) */
-/* libc_hidden_proto(bind) */
-/* libc_hidden_proto(connect) */
-/* libc_hidden_proto(sigblock) */
-/* libc_hidden_proto(snprintf) */
-/* libc_hidden_proto(poll) */
-/* libc_hidden_proto(accept) */
-/* libc_hidden_proto(listen) */
-/* libc_hidden_proto(sigsetmask) */
-/* libc_hidden_proto(getc_unlocked) */
-/* libc_hidden_proto(__fgetc_unlocked) */
-/* libc_hidden_proto(fopen) */
-/* libc_hidden_proto(fclose) */
-/* libc_hidden_proto(fprintf) */
-/* libc_hidden_proto(__h_errno_location) */
 #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(rresvport) */
 
 /* some forward declarations */
 static int __ivaliduser2(FILE *hostf, u_int32_t raddr,

libc/inet/rpc/rpc_cmsg.c

@@ -45,17 +45,10 @@ static char sccsid[] = "@(#)rpc_callmsg.c 1.4 87/08/11 Copyr 1984 Sun Micro";
 #include <sys/param.h>
 #include <rpc/rpc.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(xdr_enum) */
-/* libc_hidden_proto(xdr_opaque) */
-/* libc_hidden_proto(xdr_u_int) */
-/* libc_hidden_proto(xdr_u_long) */
-/* libc_hidden_proto(xdr_opaque_auth) */
 
 /*
  * XDR a call message
  */
-/* libc_hidden_proto(xdr_callmsg) */
 bool_t
 xdr_callmsg (XDR *xdrs, struct rpc_msg *cmsg)
 {

libc/inet/rpc/rpc_dtablesize.c

@@ -38,13 +38,11 @@ static char sccsid[] = "@(#)rpc_dtablesize.c 1.2 87/08/11 Copyr 1987 Sun Micro";
 #include <unistd.h>
 #include <rpc/clnt.h>
 
-/* libc_hidden_proto(getdtablesize) */
 
 /*
  * Cache the result of getdtablesize(), so we don't have to do an
  * expensive system call every time.
  */
-/* libc_hidden_proto(_rpc_dtablesize) */
 int
 _rpc_dtablesize(void)
 {

libc/inet/rpc/rpc_private.h

@@ -4,7 +4,6 @@
 /* Now define the internal interfaces.  */
 extern u_long _create_xid (void) attribute_hidden;
 
-/* libc_hidden_proto(__rpc_thread_createerr) */
 
 /*
  * Multi-threaded support

libc/inet/rpc/rpc_prot.c

@@ -51,11 +51,6 @@ static char sccsid[] = "@(#)rpc_prot.c 1.36 87/08/11 Copyr 1984 Sun Micro";
 
 #include <rpc/rpc.h>
 
-/* libc_hidden_proto(xdr_bytes) */
-/* libc_hidden_proto(xdr_union) */
-/* libc_hidden_proto(xdr_enum) */
-/* libc_hidden_proto(xdr_opaque) */
-/* libc_hidden_proto(xdr_u_long) */
 
 /* * * * * * * * * * * * * * XDR Authentication * * * * * * * * * * * */
 
@@ -63,7 +58,6 @@ static char sccsid[] = "@(#)rpc_prot.c 1.36 87/08/11 Copyr 1984 Sun Micro";
  * XDR an opaque authentication struct
  * (see auth.h)
  */
-/* libc_hidden_proto(xdr_opaque_auth) */
 bool_t
 xdr_opaque_auth (XDR *xdrs, struct opaque_auth *ap)
 {
@@ -89,7 +83,6 @@ xdr_des_block (XDR *xdrs, des_block *blkp)
 /*
  * XDR the MSG_ACCEPTED part of a reply message union
  */
-/* libc_hidden_proto(xdr_accepted_reply) */
 bool_t
 xdr_accepted_reply (XDR *xdrs, struct accepted_reply *ar)
 {
@@ -116,7 +109,6 @@ libc_hidden_def(xdr_accepted_reply)
 /*
  * XDR the MSG_DENIED part of a reply message union
  */
-/* libc_hidden_proto(xdr_rejected_reply) */
 bool_t
 xdr_rejected_reply (XDR *xdrs, struct rejected_reply *rr)
 {
@@ -146,7 +138,6 @@ static const struct xdr_discrim reply_dscrm[3] =
 /*
  * XDR a reply message
  */
-/* libc_hidden_proto(xdr_replymsg) */
 bool_t
 xdr_replymsg (XDR *xdrs, struct rpc_msg *rmsg)
 {
@@ -166,7 +157,6 @@ libc_hidden_def(xdr_replymsg)
  * The fields include: rm_xid, rm_direction, rpcvers, prog, and vers.
  * The rm_xid is not really static, but the user can easily munge on the fly.
  */
-/* libc_hidden_proto(xdr_callhdr) */
 bool_t
 xdr_callhdr (XDR *xdrs, struct rpc_msg *cmsg)
 {
@@ -247,7 +237,6 @@ rejected (enum reject_stat rjct_stat,
 /*
  * given a reply message, fills in the error
  */
-/* libc_hidden_proto(_seterr_reply) */
 void
 _seterr_reply (struct rpc_msg *msg,
 	       struct rpc_err *error)

libc/inet/rpc/rpc_thread.c

@@ -10,10 +10,6 @@
 #include <assert.h>
 #include "rpc_private.h"
 
-/* libc_hidden_proto(__rpc_thread_svc_fdset) */
-/* libc_hidden_proto(__rpc_thread_createerr) */
-/* libc_hidden_proto(__rpc_thread_svc_pollfd) */
-/* libc_hidden_proto(__rpc_thread_svc_max_pollfd) */
 
 #ifdef __UCLIBC_HAS_THREADS__
 

libc/inet/rpc/rtime.c

@@ -58,14 +58,6 @@ static char sccsid[] = "@(#)rtime.c	2.2 88/08/10 4.0 RPCSRC; from 1.8 88/02/08 S
 #include <errno.h>
 #include <netinet/in.h>
 
-/* libc_hidden_proto(read) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(connect) */
-/* libc_hidden_proto(recvfrom) */
-/* libc_hidden_proto(sendto) */
-/* libc_hidden_proto(poll) */
-/* libc_hidden_proto(rtime) */
 
 #define NYEARS	(u_long)(1970 - 1900)
 #define TOFFSET (u_long)(60*60*24*(365*NYEARS + (NYEARS/4)))

libc/inet/rpc/ruserpass.c

@@ -42,27 +42,6 @@
 #include <string.h>
 #include <unistd.h>
 
-/* 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) */
-/* Experimentally off - libc_hidden_proto(strcasecmp) */
-/* Experimentally off - libc_hidden_proto(strncasecmp) */
-/* libc_hidden_proto(getenv) */
-/* libc_hidden_proto(printf) */
-/* libc_hidden_proto(fstat) */
-/* libc_hidden_proto(__fsetlocking) */
-/* libc_hidden_proto(getgid) */
-/* libc_hidden_proto(getuid) */
-/* libc_hidden_proto(getegid) */
-/* libc_hidden_proto(geteuid) */
-/* libc_hidden_proto(gethostname) */
-/* libc_hidden_proto(fileno) */
-/* libc_hidden_proto(fopen) */
-/* libc_hidden_proto(fclose) */
-/* libc_hidden_proto(getc_unlocked) */
-/* libc_hidden_proto(__fgetc_unlocked) */
 
 #define _(X)  (X)
 /* #include "ftp_var.h" */
@@ -114,7 +93,6 @@ static const struct toktab {
 
 /* ruserpass - remote password check.
    This function also exists in glibc but is undocumented */
-/* libc_hidden_proto(ruserpass) */
 int ruserpass(const char *host, const char **aname, const char **apass)
 {
 	char *hdir, *buf, *tmp;

libc/inet/rpc/svc.c

@@ -46,16 +46,8 @@
 #include <rpc/pmap_clnt.h>
 #include <sys/poll.h>
 
-/* Experimentally off - libc_hidden_proto(ffs) */
-/* libc_hidden_proto(pmap_set) */
-/* libc_hidden_proto(pmap_unset) */
-/* libc_hidden_proto(_authenticate) */
-/* libc_hidden_proto(_rpc_dtablesize) */
 /* used by svc_[max_]pollfd */
-/* libc_hidden_proto(__rpc_thread_svc_pollfd) */
-/* libc_hidden_proto(__rpc_thread_svc_max_pollfd) */
 /* used by svc_fdset */
-/* libc_hidden_proto(__rpc_thread_svc_fdset) */
 
 #ifdef __UCLIBC_HAS_THREADS__
 #define xports (*(SVCXPRT ***)&RPC_THREAD_VARIABLE(svc_xports_s))
@@ -85,7 +77,6 @@ static struct svc_callout *svc_head;
 /* ***************  SVCXPRT related stuff **************** */
 
 /* Activate a transport handle. */
-/* libc_hidden_proto(xprt_register) */
 void
 xprt_register (SVCXPRT *xprt)
 {
@@ -129,7 +120,6 @@ xprt_register (SVCXPRT *xprt)
 libc_hidden_def(xprt_register)
 
 /* De-activate a transport handle. */
-/* libc_hidden_proto(xprt_unregister) */
 void
 xprt_unregister (SVCXPRT *xprt)
 {
@@ -175,7 +165,6 @@ done:
 /* Add a service program to the callout list.
    The dispatch routine will be called when a rpc request for this
    program number comes in. */
-/* libc_hidden_proto(svc_register) */
 bool_t
 svc_register (SVCXPRT * xprt, rpcprog_t prog, rpcvers_t vers,
 	      void (*dispatch) (struct svc_req *, SVCXPRT *),
@@ -210,7 +199,6 @@ pmap_it:
 libc_hidden_def(svc_register)
 
 /* Remove a service program from the callout list. */
-/* libc_hidden_proto(svc_unregister) */
 void
 svc_unregister (rpcprog_t prog, rpcvers_t vers)
 {
@@ -235,7 +223,6 @@ libc_hidden_def(svc_unregister)
 /* ******************* REPLY GENERATION ROUTINES  ************ */
 
 /* Send a reply to an rpc request */
-/* libc_hidden_proto(svc_sendreply) */
 bool_t
 svc_sendreply (register SVCXPRT *xprt, xdrproc_t xdr_results,
 	       caddr_t xdr_location)
@@ -266,7 +253,6 @@ svcerr_noproc (register SVCXPRT *xprt)
 }
 
 /* Can't decode args error reply */
-/* libc_hidden_proto(svcerr_decode) */
 void
 svcerr_decode (register SVCXPRT *xprt)
 {
@@ -294,7 +280,6 @@ svcerr_systemerr (register SVCXPRT *xprt)
 }
 
 /* Authentication error reply */
-/* libc_hidden_proto(svcerr_auth) */
 void
 svcerr_auth (SVCXPRT *xprt, enum auth_stat why)
 {
@@ -316,7 +301,6 @@ svcerr_weakauth (SVCXPRT *xprt)
 }
 
 /* Program unavailable error reply */
-/* libc_hidden_proto(svcerr_noprog) */
 void
 svcerr_noprog (register SVCXPRT *xprt)
 {
@@ -331,7 +315,6 @@ svcerr_noprog (register SVCXPRT *xprt)
 libc_hidden_def(svcerr_noprog)
 
 /* Program version mismatch error reply */
-/* libc_hidden_proto(svcerr_progvers) */
 void
 svcerr_progvers (register SVCXPRT *xprt, rpcvers_t low_vers,
 		 rpcvers_t high_vers)
@@ -366,7 +349,6 @@ libc_hidden_def(svcerr_progvers)
  * is mallocated in kernel land.
  */
 
-/* libc_hidden_proto(svc_getreq_common) */
 void
 svc_getreq_common (const int fd)
 {
@@ -458,7 +440,6 @@ svc_getreq_common (const int fd)
 }
 libc_hidden_def(svc_getreq_common)
 
-/* libc_hidden_proto(svc_getreqset) */
 void
 svc_getreqset (fd_set *readfds)
 {
@@ -476,7 +457,6 @@ svc_getreqset (fd_set *readfds)
 }
 libc_hidden_def(svc_getreqset)
 
-/* libc_hidden_proto(svc_getreq) */
 void
 svc_getreq (int rdfds)
 {
@@ -488,7 +468,6 @@ svc_getreq (int rdfds)
 }
 libc_hidden_def(svc_getreq)
 
-/* libc_hidden_proto(svc_getreq_poll) */
 void
 svc_getreq_poll (struct pollfd *pfdp, int pollretval)
 {

libc/inet/rpc/svc_auth.c

@@ -101,7 +101,6 @@ svcauthsw[] =
  * There is an assumption that any flavour less than AUTH_NULL is
  * invalid.
  */
-/* libc_hidden_proto(_authenticate) */
 enum auth_stat
 _authenticate (register struct svc_req *rqst, struct rpc_msg *msg)
 {

libc/inet/rpc/svc_authux.c

@@ -46,10 +46,6 @@
 #include <rpc/rpc.h>
 #include <rpc/svc.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(printf) */
-/* libc_hidden_proto(xdrmem_create) */
-/* libc_hidden_proto(xdr_authunix_parms) */
 
 /*
  * Unix longhand authenticator

libc/inet/rpc/svc_raw.c

@@ -45,9 +45,6 @@ static char sccsid[] = "@(#)svc_raw.c 1.15 87/08/11 Copyr 1984 Sun Micro";
 #include "rpc_private.h"
 #include <rpc/svc.h>
 
-/* libc_hidden_proto(xdrmem_create) */
-/* libc_hidden_proto(xdr_callmsg) */
-/* libc_hidden_proto(xdr_replymsg) */
 
 /*
  * This is the "network" that we will be moving data over

libc/inet/rpc/svc_run.c

@@ -39,12 +39,7 @@
 #include <sys/poll.h>
 #include <rpc/rpc.h>
 
-/* libc_hidden_proto(perror) */
-/* libc_hidden_proto(svc_getreq_poll) */
-/* libc_hidden_proto(poll) */
 /* used by svc_[max_]pollfd */
-/* libc_hidden_proto(__rpc_thread_svc_pollfd) */
-/* libc_hidden_proto(__rpc_thread_svc_max_pollfd) */
 
 /* This function can be used as a signal handler to terminate the
    server loop.  */

libc/inet/rpc/svc_simple.c

@@ -55,18 +55,6 @@ static char sccsid[] = "@(#)svc_simple.c 1.18 87/08/11 Copyr 1984 Sun Micro";
 # define fputs(s, f) _IO_fputs (s, f)
 #endif
 
-/* Experimentally off - libc_hidden_proto(strdup) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* libc_hidden_proto(asprintf) */
-/* libc_hidden_proto(fputs) */
-/* libc_hidden_proto(write) */
-/* libc_hidden_proto(exit) */
-/* libc_hidden_proto(svc_sendreply) */
-/* libc_hidden_proto(svc_register) */
-/* libc_hidden_proto(svcerr_decode) */
-/* libc_hidden_proto(svcudp_create) */
-/* libc_hidden_proto(pmap_unset) */
-/* libc_hidden_proto(xdr_void) */
 
 struct proglst_
   {

libc/inet/rpc/svc_tcp.c

@@ -59,30 +59,6 @@ static char sccsid[] = "@(#)svc_tcp.c 1.21 87/08/11 Copyr 1984 Sun Micro";
 # define fputs(s, f) _IO_fputs (s, f)
 #endif
 
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(read) */
-/* libc_hidden_proto(write) */
-/* libc_hidden_proto(perror) */
-/* libc_hidden_proto(xdrrec_create) */
-/* libc_hidden_proto(xdrrec_endofrecord) */
-/* libc_hidden_proto(xdrrec_skiprecord) */
-/* libc_hidden_proto(xdrrec_eof) */
-/* libc_hidden_proto(xdr_callmsg) */
-/* libc_hidden_proto(xdr_replymsg) */
-/* libc_hidden_proto(xprt_register) */
-/* libc_hidden_proto(xprt_unregister) */
-/* libc_hidden_proto(getsockname) */
-/* libc_hidden_proto(bind) */
-/* libc_hidden_proto(bindresvport) */
-/* libc_hidden_proto(poll) */
-/* libc_hidden_proto(accept) */
-/* libc_hidden_proto(listen) */
-/* libc_hidden_proto(fputs) */
-/* libc_hidden_proto(fclose) */
-/* libc_hidden_proto(abort) */
 
 /*
  * Ops vector for TCP/IP based rpc service handle

libc/inet/rpc/svc_udp.c

@@ -57,30 +57,8 @@ static char sccsid[] = "@(#)svc_udp.c 1.24 87/08/11 Copyr 1984 Sun Micro";
 # include <wchar.h>
 # include <libio/iolibio.h>
 # define fputs(s, f) _IO_fputs (s, f)
-/* libc_hidden_proto(fwprintf) */
 #endif
 
-/* Experimentally off - libc_hidden_proto(memcmp) */
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* libc_hidden_proto(perror) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(xprt_register) */
-/* libc_hidden_proto(xprt_unregister) */
-/* libc_hidden_proto(xdrmem_create) */
-/* libc_hidden_proto(xdr_callmsg) */
-/* libc_hidden_proto(xdr_replymsg) */
-/* libc_hidden_proto(getsockname) */
-/* libc_hidden_proto(setsockopt) */
-/* libc_hidden_proto(bind) */
-/* libc_hidden_proto(bindresvport) */
-/* libc_hidden_proto(recvfrom) */
-/* libc_hidden_proto(sendto) */
-/* libc_hidden_proto(recvmsg) */
-/* libc_hidden_proto(sendmsg) */
-/* libc_hidden_proto(fputs) */
-/* libc_hidden_proto(fprintf) */
 
 #define rpc_buffer(xprt) ((xprt)->xp_p1)
 #ifndef MAX
@@ -134,7 +112,6 @@ struct svcudp_data
  * see (svc.h, xprt_register).
  * The routines returns NULL if a problem occurred.
  */
-/* libc_hidden_proto(svcudp_bufcreate) */
 SVCXPRT *
 svcudp_bufcreate (int sock, u_int sendsz, u_int recvsz)
 {
@@ -226,7 +203,6 @@ svcudp_bufcreate (int sock, u_int sendsz, u_int recvsz)
 }
 libc_hidden_def(svcudp_bufcreate)
 
-/* libc_hidden_proto(svcudp_create) */
 SVCXPRT *
 svcudp_create (int sock)
 {

libc/inet/rpc/svc_unix.c

@@ -55,33 +55,6 @@
 # include <wchar.h>
 #endif
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(perror) */
-/* libc_hidden_proto(getpid) */
-/* libc_hidden_proto(xdrrec_create) */
-/* libc_hidden_proto(xdrrec_endofrecord) */
-/* libc_hidden_proto(xdrrec_skiprecord) */
-/* libc_hidden_proto(xdrrec_eof) */
-/* libc_hidden_proto(xdr_callmsg) */
-/* libc_hidden_proto(xdr_replymsg) */
-/* libc_hidden_proto(xprt_register) */
-/* libc_hidden_proto(xprt_unregister) */
-/* libc_hidden_proto(getegid) */
-/* libc_hidden_proto(geteuid) */
-/* libc_hidden_proto(getsockname) */
-/* libc_hidden_proto(setsockopt) */
-/* libc_hidden_proto(bind) */
-/* libc_hidden_proto(recvmsg) */
-/* libc_hidden_proto(sendmsg) */
-/* libc_hidden_proto(poll) */
-/* libc_hidden_proto(accept) */
-/* libc_hidden_proto(listen) */
-/* libc_hidden_proto(fputs) */
-/* libc_hidden_proto(abort) */
 
 /*
  * Ops vector for AF_UNIX based rpc service handle

libc/inet/rpc/xdr.c

@@ -53,11 +53,8 @@ static char sccsid[] = "@(#)xdr.c 1.35 87/08/12";
 
 #ifdef USE_IN_LIBIO
 # include <wchar.h>
-/* libc_hidden_proto(fwprintf) */
 #endif
 
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(fputs) */
 
 /*
  * constants specific to the xdr "protocol"
@@ -87,7 +84,6 @@ xdr_free (xdrproc_t proc, char *objp)
 /*
  * XDR nothing
  */
-/* libc_hidden_proto(xdr_void) */
 bool_t
 xdr_void (void)
 {
@@ -100,7 +96,6 @@ libc_hidden_def(xdr_void)
  * The definition of xdr_long() is kept for backward
  * compatibility. Instead xdr_int() should be used.
  */
-/* libc_hidden_proto(xdr_long) */
 bool_t
 xdr_long (XDR *xdrs, long *lp)
 {
@@ -122,7 +117,6 @@ libc_hidden_def(xdr_long)
 /*
  * XDR short integers
  */
-/* libc_hidden_proto(xdr_short) */
 bool_t
 xdr_short (XDR *xdrs, short *sp)
 {
@@ -152,7 +146,6 @@ libc_hidden_def(xdr_short)
 /*
  * XDR integers
  */
-/* libc_hidden_proto(xdr_int) */
 bool_t
 xdr_int (XDR *xdrs, int *ip)
 {
@@ -191,7 +184,6 @@ libc_hidden_def(xdr_int)
  * The definition of xdr_u_long() is kept for backward
  * compatibility. Instead xdr_u_int() should be used.
  */
-/* libc_hidden_proto(xdr_u_long) */
 bool_t
 xdr_u_long (XDR *xdrs, u_long *ulp)
 {
@@ -225,7 +217,6 @@ libc_hidden_def(xdr_u_long)
 /*
  * XDR unsigned integers
  */
-/* libc_hidden_proto(xdr_u_int) */
 bool_t
 xdr_u_int (XDR *xdrs, u_int *up)
 {
@@ -262,7 +253,6 @@ libc_hidden_def(xdr_u_int)
  * XDR hyper integers
  * same as xdr_u_hyper - open coded to save a proc call!
  */
-/* libc_hidden_proto(xdr_hyper) */
 bool_t
 xdr_hyper (XDR *xdrs, quad_t *llp)
 {
@@ -298,7 +288,6 @@ libc_hidden_def(xdr_hyper)
  * XDR hyper integers
  * same as xdr_hyper - open coded to save a proc call!
  */
-/* libc_hidden_proto(xdr_u_hyper) */
 bool_t
 xdr_u_hyper (XDR *xdrs, u_quad_t *ullp)
 {
@@ -343,7 +332,6 @@ xdr_u_longlong_t (XDR *xdrs, u_quad_t *ullp)
 /*
  * XDR unsigned short integers
  */
-/* libc_hidden_proto(xdr_u_short) */
 bool_t
 xdr_u_short (XDR *xdrs, u_short *usp)
 {
@@ -408,7 +396,6 @@ xdr_u_char (XDR *xdrs, u_char *cp)
 /*
  * XDR booleans
  */
-/* libc_hidden_proto(xdr_bool) */
 bool_t
 xdr_bool (XDR *xdrs, bool_t *bp)
 {
@@ -438,7 +425,6 @@ libc_hidden_def(xdr_bool)
 /*
  * XDR enumerations
  */
-/* libc_hidden_proto(xdr_enum) */
 bool_t
 xdr_enum (XDR *xdrs, enum_t *ep)
 {
@@ -492,7 +478,6 @@ libc_hidden_def(xdr_enum)
  * Allows the specification of a fixed size sequence of opaque bytes.
  * cp points to the opaque object and cnt gives the byte length.
  */
-/* libc_hidden_proto(xdr_opaque) */
 bool_t
 xdr_opaque (XDR *xdrs, caddr_t cp, u_int cnt)
 {
@@ -544,7 +529,6 @@ libc_hidden_def(xdr_opaque)
  * *cpp is a pointer to the bytes, *sizep is the count.
  * If *cpp is NULL maxsize bytes are allocated
  */
-/* libc_hidden_proto(xdr_bytes) */
 bool_t
 xdr_bytes (XDR *xdrs, char **cpp, u_int *sizep, u_int maxsize)
 {
@@ -628,7 +612,6 @@ xdr_netobj (xdrs, np)
  * routine may be called.
  * If there is no specific or default routine an error is returned.
  */
-/* libc_hidden_proto(xdr_union) */
 bool_t
 xdr_union (XDR *xdrs, enum_t *dscmp, char *unp, const struct xdr_discrim *choices, xdrproc_t dfault)
 {
@@ -675,7 +658,6 @@ libc_hidden_def(xdr_union)
  * storage is allocated.  The last parameter is the max allowed length
  * of the string as specified by a protocol.
  */
-/* libc_hidden_proto(xdr_string) */
 bool_t
 xdr_string (XDR *xdrs, char **cpp, u_int maxsize)
 {

libc/inet/rpc/xdr_array.c

@@ -51,12 +51,8 @@ static char sccsid[] = "@(#)xdr_array.c 1.10 87/08/11 Copyr 1984 Sun Micro";
 
 #ifdef USE_IN_LIBIO
 # include <wchar.h>
-/* libc_hidden_proto(fwprintf) */
 #endif
 
-/* Experimentally off - libc_hidden_proto(memset) */
-/* libc_hidden_proto(fputs) */
-/* libc_hidden_proto(xdr_u_int) */
 
 #define LASTUNSIGNED	((u_int)0-1)
 
@@ -68,7 +64,6 @@ static char sccsid[] = "@(#)xdr_array.c 1.10 87/08/11 Copyr 1984 Sun Micro";
  * elsize is the size (in bytes) of each element, and elproc is the
  * xdr procedure to call to handle each element of the array.
  */
-/* libc_hidden_proto(xdr_array) */
 bool_t
 xdr_array (XDR *xdrs, caddr_t *addrp, u_int *sizep, u_int maxsize, u_int elsize, xdrproc_t elproc)
 {

libc/inet/rpc/xdr_mem.c

@@ -43,7 +43,6 @@
 #include <limits.h>
 #include <rpc/rpc.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
 
 static bool_t xdrmem_getlong (XDR *, long *);
 static bool_t xdrmem_putlong (XDR *, const long *);
@@ -74,7 +73,6 @@ static const struct xdr_ops xdrmem_ops =
  * The procedure xdrmem_create initializes a stream descriptor for a
  * memory buffer.
  */
-/* libc_hidden_proto(xdrmem_create) */
 void
 xdrmem_create (XDR *xdrs, const caddr_t addr, u_int size, enum xdr_op op)
 {

libc/inet/rpc/xdr_rec.c

@@ -57,12 +57,8 @@
 # include <wchar.h>
 # include <libio/iolibio.h>
 # define fputs(s, f) _IO_fputs (s, f)
-/* libc_hidden_proto(fwprintf) */
 #endif
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(fputs) */
-/* libc_hidden_proto(lseek) */
 
 static bool_t xdrrec_getbytes (XDR *, caddr_t, u_int);
 static bool_t xdrrec_putbytes (XDR *, const char *, u_int);
@@ -153,7 +149,6 @@ static bool_t get_input_bytes (RECSTREAM *, caddr_t, int) internal_function;
  * write respectively.   They are like the system
  * calls expect that they take an opaque handle rather than an fd.
  */
-/* libc_hidden_proto(xdrrec_create) */
 void
 xdrrec_create (XDR *xdrs, u_int sendsize,
 	       u_int recvsize, caddr_t tcp_handle,
@@ -460,7 +455,6 @@ xdrrec_destroy (XDR *xdrs)
  * Before reading (deserializing from the stream, one should always call
  * this procedure to guarantee proper record alignment.
  */
-/* libc_hidden_proto(xdrrec_skiprecord) */
 bool_t
 xdrrec_skiprecord (XDR *xdrs)
 {
@@ -484,7 +478,6 @@ libc_hidden_def(xdrrec_skiprecord)
  * Returns TRUE iff there is no more input in the buffer
  * after consuming the rest of the current record.
  */
-/* libc_hidden_proto(xdrrec_eof) */
 bool_t
 xdrrec_eof (XDR *xdrs)
 {
@@ -510,7 +503,6 @@ libc_hidden_def(xdrrec_eof)
  * (output) tcp stream.  (This lets the package support batched or
  * pipelined procedure calls.)  TRUE => immediate flush to tcp connection.
  */
-/* libc_hidden_proto(xdrrec_endofrecord) */
 bool_t
 xdrrec_endofrecord (XDR *xdrs, bool_t sendnow)
 {

libc/inet/rpc/xdr_reference.c

@@ -52,12 +52,8 @@ static char sccsid[] = "@(#)xdr_reference.c 1.11 87/08/11 SMI";
 # include <wchar.h>
 # include <libio/iolibio.h>
 # define fputs(s, f) _IO_fputs (s, f)
-/* libc_hidden_proto(fwprintf) */
 #endif
 
-/* Experimentally off - libc_hidden_proto(memset) */
-/* libc_hidden_proto(xdr_bool) */
-/* libc_hidden_proto(fputs) */
 
 #define LASTUNSIGNED	((u_int)0-1)
 
@@ -70,7 +66,6 @@ static char sccsid[] = "@(#)xdr_reference.c 1.11 87/08/11 SMI";
  * size is the size of the referneced structure.
  * proc is the routine to handle the referenced structure.
  */
-/* libc_hidden_proto(xdr_reference) */
 bool_t
 xdr_reference (XDR *xdrs, caddr_t *pp, u_int size, xdrproc_t proc)
 {

libc/inet/rpc/xdr_stdio.c

@@ -49,11 +49,6 @@
 # define fwrite(p, m, n, s) _IO_fwrite (p, m, n, s)
 #endif
 
-/* libc_hidden_proto(fread) */
-/* libc_hidden_proto(fwrite) */
-/* libc_hidden_proto(fseek) */
-/* libc_hidden_proto(fflush) */
-/* libc_hidden_proto(ftell) */
 
 static bool_t xdrstdio_getlong (XDR *, long *);
 static bool_t xdrstdio_putlong (XDR *, const long *);

libc/inet/socketcalls.c

@@ -57,7 +57,6 @@ strong_alias(accept,__libc_accept)
 #endif
 
 #ifdef L_bind
-/* libc_hidden_proto(bind) */
 #ifdef __NR_bind
 _syscall3(int, bind, int, sockfd, const struct sockaddr *, myaddr, socklen_t, addrlen)
 #elif defined(__NR_socketcall)
@@ -113,7 +112,6 @@ int getpeername(int sockfd, struct sockaddr *addr, socklen_t * paddrlen)
 #endif
 
 #ifdef L_getsockname
-/* libc_hidden_proto(getsockname) */
 #ifdef __NR_getsockname
 _syscall3(int, getsockname, int, sockfd, struct sockaddr *, addr, socklen_t *,paddrlen)
 #elif defined(__NR_socketcall)
@@ -150,7 +148,6 @@ int getsockopt(int fd, int level, int optname, __ptr_t optval,
 #endif
 
 #ifdef L_listen
-/* libc_hidden_proto(listen) */
 #ifdef __NR_listen
 _syscall2(int, listen, int, sockfd, int, backlog)
 #elif defined(__NR_socketcall)
@@ -326,7 +323,6 @@ strong_alias(sendto,__libc_sendto)
 #endif
 
 #ifdef L_setsockopt
-/* libc_hidden_proto(setsockopt) */
 #ifdef __NR_setsockopt
 _syscall5(int, setsockopt, int, fd, int, level, int, optname, const void *, optval, socklen_t, optlen)
 #elif defined(__NR_socketcall)
@@ -364,7 +360,6 @@ int shutdown(int sockfd, int how)
 #endif
 
 #ifdef L_socket
-/* libc_hidden_proto(socket) */
 #ifdef __NR_socket
 _syscall3(int, socket, int, family, int, type, int, protocol)
 #elif defined(__NR_socketcall)

libc/misc/assert/__assert.c

@@ -32,15 +32,12 @@
 #include <unistd.h>
 #include <bits/uClibc_uintmaxtostr.h>
 
-/* libc_hidden_proto(fprintf) */
-/* libc_hidden_proto(abort) */
 
 /* Get the prototype from assert.h as a double-check. */
 #undef NDEBUG
 #include <assert.h>
 #undef assert
 
-/* libc_hidden_proto(__assert) */
 
 #define ASSERT_SHOW_PROGNAME 1
 

libc/misc/ctype/ctype.c

@@ -36,9 +36,7 @@
 #include <assert.h>
 #include <locale.h>
 #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)

libc/misc/dirent/closedir.c

@@ -10,8 +10,6 @@
 #include <unistd.h>
 #include "dirstream.h"
 
-/* libc_hidden_proto(closedir) */
-/* libc_hidden_proto(close) */
 
 int closedir(DIR * dir)
 {

libc/misc/dirent/dirfd.c

@@ -8,7 +8,6 @@
 #include <errno.h>
 #include "dirstream.h"
 
-/* libc_hidden_proto(dirfd) */
 
 int dirfd(DIR * dir)
 {

libc/misc/dirent/readdir.c

@@ -13,7 +13,6 @@
 #include <dirent.h>
 #include "dirstream.h"
 
-/* libc_hidden_proto(readdir) */
 
 struct dirent *readdir(DIR * dir)
 {

libc/misc/dirent/readdir64.c

@@ -13,7 +13,6 @@
 #include <dirent.h>
 #include "dirstream.h"
 
-/* libc_hidden_proto(readdir64) */
 struct dirent64 *readdir64(DIR * dir)
 {
 	ssize_t bytes;

libc/misc/dirent/readdir64_r.c

@@ -13,9 +13,7 @@
 #include <dirent.h>
 #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;

libc/misc/dirent/readdir_r.c

@@ -11,9 +11,7 @@
 #include <dirent.h>
 #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;

libc/misc/dirent/rewinddir.c

@@ -9,7 +9,6 @@
 #include <unistd.h>
 #include "dirstream.h"
 
-/* libc_hidden_proto(lseek) */
 
 /* rewinddir() just does an lseek(fd,0,0) - see close for comments */
 void rewinddir(DIR * dir)

libc/misc/dirent/seekdir.c

@@ -9,7 +9,6 @@
 #include <unistd.h>
 #include "dirstream.h"
 
-/* libc_hidden_proto(lseek) */
 
 void seekdir(DIR * dir, long int offset)
 {

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)
 {

libc/misc/error/error.c

@@ -26,15 +26,6 @@
 #include <string.h>
 #include <error.h>
 
-/* 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;

libc/misc/file/lockf.c

@@ -24,11 +24,7 @@
 #include <errno.h>
 #include <string.h>
 
-/* 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.  */
 

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;

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 <wchar.h>
 # include <wctype.h>
 # 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

libc/misc/fnmatch/fnmatch_old.c

@@ -23,9 +23,7 @@ Cambridge, MA 02139, USA.  */
 #include <fnmatch.h>
 #include <ctype.h>
 
-/* 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

libc/misc/ftw/ftw.c

@@ -83,27 +83,8 @@ char *alloca ();
 # include <sys/stat.h>
 #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 ();

libc/misc/glob/glob-susv3.c

@@ -23,16 +23,6 @@
 #include <unistd.h>
 #include <stdio.h>
 
-/* 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)
 {

libc/misc/glob/glob.c

@@ -31,24 +31,10 @@
 #include <fnmatch.h>
 #include <glob.h>
 
-/* 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 <pwd.h>
-/* 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.

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;

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;

libc/misc/internals/__uClibc_main.c

@@ -27,19 +27,10 @@
 #include <sys/stat.h>
 #include <sys/sysmacros.h>
 
-/* 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
 

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;

libc/misc/internals/tempname.c

@@ -45,19 +45,8 @@
 #include <sys/time.h>
 #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)

libc/misc/locale/locale.c

@@ -58,19 +58,8 @@
 #include <ctype.h>
 #include <stdio.h>
 
-/* 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;

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,

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

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)
 {

libc/misc/search/_lsearch.c

@@ -12,7 +12,6 @@
 #include <stdio.h>
 #include <search.h>
 
-/* 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 *))

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;

libc/misc/search/hsearch.c

@@ -19,9 +19,6 @@
 
 #include <search.h>
 
-/* 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;

libc/misc/statfs/fstatfs64.c

@@ -25,11 +25,9 @@
 #include <sys/statvfs.h>
 #include <stddef.h>
 
-/* 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;

libc/misc/statfs/fstatvfs.c

@@ -27,13 +27,6 @@
 #include <sys/statfs.h>
 #include <sys/statvfs.h>
 
-/* 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)
 {

libc/misc/statfs/fstatvfs64.c

@@ -29,22 +29,12 @@
 #include <sys/statvfs.h>
 
 
-/* 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)
 {

libc/misc/statfs/statfs64.c

@@ -23,11 +23,9 @@
 #include <stddef.h>
 #include <sys/statfs.h>
 
-/* 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;

libc/misc/statfs/statvfs.c

@@ -27,17 +27,9 @@
 #include <sys/statfs.h>
 #include <sys/statvfs.h>
 
-/* 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;

libc/misc/statfs/statvfs64.c

@@ -28,21 +28,12 @@
 #include <sys/statfs.h>
 #include <sys/statvfs.h>
 
-/* 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)
 {

libc/misc/syslog/syslog.c

@@ -79,30 +79,7 @@
 #include <ctype.h>
 #include <signal.h>
 
-/* 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 <bits/uClibc_mutex.h>
 __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP);

libc/misc/sysvipc/ftok.c

@@ -20,7 +20,6 @@
 #include <sys/ipc.h>
 #include <sys/stat.h>
 
-/* libc_hidden_proto(stat) */
 
 key_t ftok (const char *pathname, int proj_id)
 {

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 <unistd.h>
-/* libc_hidden_proto(getpagesize) */
 
 void * shmat (int shmid, const void *shmaddr, int shmflg)
 {

libc/misc/time/adjtime.c

@@ -9,7 +9,6 @@
 #include <sys/timex.h>
 #include <errno.h>
 
-/* libc_hidden_proto(adjtimex) */
 
 #define MAX_SEC	(LONG_MAX / 1000000L - 2)
 #define MIN_SEC	(LONG_MIN / 1000000L + 2)