From 125773133f0fe2425ab3d8305ed880e9010f6803 Mon Sep 17 00:00:00 2001
From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Mon, 19 May 2008 22:57:34 +0000
Subject: Moving libc_hidden_proto's into #ifdef UCLIBC_INTERNAL block in
 string.h and strings.h. This caught unguarded string ops in
 libc/inet/ethers.c __ether_line_w() function.

I will wait for fallout reports for a week or so,
then continue converting more libc_hidden_proto's.
---
 libc/unistd/confstr.c         | 2 +-
 libc/unistd/exec.c            | 8 ++++----
 libc/unistd/getlogin.c        | 4 ++--
 libc/unistd/getopt-susv3.c    | 2 +-
 libc/unistd/getopt.c          | 8 ++++----
 libc/unistd/getpass.c         | 2 +-
 libc/unistd/getsubopt-susv3.c | 6 +++---
 libc/unistd/getsubopt.c       | 6 +++---
 8 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'libc/unistd')

diff --git a/libc/unistd/confstr.c b/libc/unistd/confstr.c
index 34ae98483..67a9d585a 100644
--- a/libc/unistd/confstr.c
+++ b/libc/unistd/confstr.c
@@ -22,7 +22,7 @@
 #include <unistd.h>
 #include <string.h>
 
-libc_hidden_proto(memcpy)
+/* Experimentally off - libc_hidden_proto(memcpy) */
 
 #define CS_PATH "/bin:/usr/bin"
 
diff --git a/libc/unistd/exec.c b/libc/unistd/exec.c
index 1006ac3c4..9134e4370 100644
--- a/libc/unistd/exec.c
+++ b/libc/unistd/exec.c
@@ -33,9 +33,9 @@ libc_hidden_proto(execlp)
 libc_hidden_proto(execv)
 libc_hidden_proto(execvp)
 
-libc_hidden_proto(memcpy)
-libc_hidden_proto(strchr)
-libc_hidden_proto(strlen)
+/* Experimentally off - libc_hidden_proto(memcpy) */
+/* Experimentally off - libc_hidden_proto(strchr) */
+/* Experimentally off - libc_hidden_proto(strlen) */
 libc_hidden_proto(execve)
 libc_hidden_proto(mmap)
 libc_hidden_proto(munmap)
@@ -233,7 +233,7 @@ libc_hidden_def(execlp)
 /**********************************************************************/
 #ifdef L_execvp
 
-libc_hidden_proto(strchrnul)
+/* Experimentally off - libc_hidden_proto(strchrnul) */
 
 /* Use a default path that matches glibc behavior, since SUSv3 says
  * this is implementation-defined.  The default is current working dir,
diff --git a/libc/unistd/getlogin.c b/libc/unistd/getlogin.c
index 42438b327..1998a7fc8 100644
--- a/libc/unistd/getlogin.c
+++ b/libc/unistd/getlogin.c
@@ -10,8 +10,8 @@
 #include <unistd.h>
 #include <stdio.h>
 
-libc_hidden_proto(strcpy)
-libc_hidden_proto(strncpy)
+/* Experimentally off - libc_hidden_proto(strcpy) */
+/* Experimentally off - libc_hidden_proto(strncpy) */
 libc_hidden_proto(getenv)
 
 /* uClibc makes it policy to not mess with the utmp file whenever
diff --git a/libc/unistd/getopt-susv3.c b/libc/unistd/getopt-susv3.c
index b13368c38..73d7a7e38 100644
--- a/libc/unistd/getopt-susv3.c
+++ b/libc/unistd/getopt-susv3.c
@@ -24,7 +24,7 @@
 #include <getopt.h>
 
 libc_hidden_proto(fprintf)
-libc_hidden_proto(strchr)
+/* Experimentally off - libc_hidden_proto(strchr) */
 
 #ifdef __UCLIBC_MJN3_ONLY__
 #warning TODO: Enable gettext awareness.
diff --git a/libc/unistd/getopt.c b/libc/unistd/getopt.c
index 0c30032c9..754e86f25 100644
--- a/libc/unistd/getopt.c
+++ b/libc/unistd/getopt.c
@@ -121,10 +121,10 @@
 #include <getopt.h>
 #include "getopt_int.h"
 
-libc_hidden_proto(strchr)
-libc_hidden_proto(strcmp)
-libc_hidden_proto(strlen)
-libc_hidden_proto(strncmp)
+/* Experimentally off - libc_hidden_proto(strchr) */
+/* Experimentally off - libc_hidden_proto(strcmp) */
+/* Experimentally off - libc_hidden_proto(strlen) */
+/* Experimentally off - libc_hidden_proto(strncmp) */
 libc_hidden_proto(getenv)
 libc_hidden_proto(fprintf)
 
diff --git a/libc/unistd/getpass.c b/libc/unistd/getpass.c
index 2521853e6..c9daaaadd 100644
--- a/libc/unistd/getpass.c
+++ b/libc/unistd/getpass.c
@@ -24,7 +24,7 @@
 
 #if defined __USE_BSD || (defined __USE_XOPEN && !defined __USE_XOPEN2K)
 
-libc_hidden_proto(strlen)
+/* Experimentally off - libc_hidden_proto(strlen) */
 libc_hidden_proto(tcsetattr)
 libc_hidden_proto(tcgetattr)
 libc_hidden_proto(setvbuf)
diff --git a/libc/unistd/getsubopt-susv3.c b/libc/unistd/getsubopt-susv3.c
index 464223c42..10c97ca9a 100644
--- a/libc/unistd/getsubopt-susv3.c
+++ b/libc/unistd/getsubopt-susv3.c
@@ -7,9 +7,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-libc_hidden_proto(strchr)
-libc_hidden_proto(strlen)
-libc_hidden_proto(strncmp)
+/* Experimentally off - libc_hidden_proto(strchr) */
+/* Experimentally off - libc_hidden_proto(strlen) */
+/* Experimentally off - libc_hidden_proto(strncmp) */
 
 int getsubopt(char **opt, char *const *keys, char **val)
 {
diff --git a/libc/unistd/getsubopt.c b/libc/unistd/getsubopt.c
index 3cac432ec..301410232 100644
--- a/libc/unistd/getsubopt.c
+++ b/libc/unistd/getsubopt.c
@@ -21,9 +21,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-libc_hidden_proto(memchr)
-libc_hidden_proto(strncmp)
-libc_hidden_proto(strchrnul)
+/* Experimentally off - libc_hidden_proto(memchr) */
+/* Experimentally off - libc_hidden_proto(strncmp) */
+/* Experimentally off - libc_hidden_proto(strchrnul) */
 
 /* Parse comma separated suboption from *OPTIONP and match against
    strings in TOKENS.  If found return index and set *VALUEP to
-- 
cgit v1.2.3