From abd6c6c29f82ddcc7c86c67519b79d2381622ed9 Mon Sep 17 00:00:00 2001
From: "Peter S. Mazinger" <ps.m@gmx.net>
Date: Wed, 9 Mar 2011 23:20:16 +0100
Subject: remove unused hidden functions

Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
---
 include/stdio.h         | 1 -
 include/string.h        | 1 -
 include/wchar.h         | 3 ---
 libc/stdio/_scanf.c     | 1 -
 libc/stdio/fwprintf.c   | 1 -
 libc/string/stpncpy.c   | 4 ----
 libc/string/strchr.c    | 7 ++++---
 libc/string/strchrnul.c | 2 ++
 libc/string/strcpy.c    | 4 +---
 9 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/include/stdio.h b/include/stdio.h
index 3c86f256b..45d3e4991 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -450,7 +450,6 @@ libc_hidden_proto(vfscanf)
    marked with __THROW.  */
 extern int vscanf (__const char *__restrict __format, __gnuc_va_list __arg)
      __attribute__ ((__format__ (__scanf__, 1, 0))) __wur;
-libc_hidden_proto(vscanf)
 
 /* Read formatted input from S into argument list ARG.  */
 extern int vsscanf (__const char *__restrict __s,
diff --git a/include/string.h b/include/string.h
index cfd423b9f..f11a7269c 100644
--- a/include/string.h
+++ b/include/string.h
@@ -447,7 +447,6 @@ extern char *__stpncpy (char *__restrict __dest,
 extern char *stpncpy (char *__restrict __dest,
 		      __const char *__restrict __src, size_t __n)
      __THROW __nonnull ((1, 2));
-libc_hidden_proto(stpncpy)
 
 # if 0			/* uClibc does not support strfry or memfrob. */
 /* Sautee STRING briskly.  */
diff --git a/include/wchar.h b/include/wchar.h
index 0603089f1..53959e0cb 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -228,7 +228,6 @@ __BEGIN_NAMESPACE_C99
 /* Find the first occurrence of WC in WCS.  */
 extern wchar_t *wcschr (__const wchar_t *__wcs, wchar_t __wc)
      __THROW __attribute_pure__;
-libc_hidden_proto(wcschr)
 /* Find the last occurrence of WC in WCS.  */
 extern wchar_t *wcsrchr (__const wchar_t *__wcs, wchar_t __wc)
      __THROW __attribute_pure__;
@@ -239,7 +238,6 @@ __END_NAMESPACE_C99
    the closing NUL wide character in case C is not found in S.  */
 extern wchar_t *wcschrnul (__const wchar_t *__s, wchar_t __wc)
      __THROW __attribute_pure__;
-libc_hidden_proto(wcschrnul)
 #endif
 
 __BEGIN_NAMESPACE_C99
@@ -544,7 +542,6 @@ extern int fwide (__FILE *__fp, int __mode) __THROW;
 extern int fwprintf (__FILE *__restrict __stream,
 		     __const wchar_t *__restrict __format, ...)
      /* __attribute__ ((__format__ (__wprintf__, 2, 3))) */;
-libc_hidden_proto(fwprintf)
 /* Write formatted output to stdout.
 
    This function is a possible cancellation point and therefore not
diff --git a/libc/stdio/_scanf.c b/libc/stdio/_scanf.c
index 1ad81cbe3..f38e72b5c 100644
--- a/libc/stdio/_scanf.c
+++ b/libc/stdio/_scanf.c
@@ -198,7 +198,6 @@ int vscanf(const char * __restrict format, va_list arg)
 {
 	return vfscanf(stdin, format, arg);
 }
-libc_hidden_def(vscanf)
 
 #endif
 /**********************************************************************/
diff --git a/libc/stdio/fwprintf.c b/libc/stdio/fwprintf.c
index 2f2dddc10..954970867 100644
--- a/libc/stdio/fwprintf.c
+++ b/libc/stdio/fwprintf.c
@@ -21,4 +21,3 @@ int fwprintf(FILE * __restrict stream, const wchar_t * __restrict format, ...)
 
 	return rv;
 }
-libc_hidden_def(fwprintf)
diff --git a/libc/string/stpncpy.c b/libc/string/stpncpy.c
index 088145dea..50d83a131 100644
--- a/libc/string/stpncpy.c
+++ b/libc/string/stpncpy.c
@@ -27,7 +27,3 @@ Wchar *Wstpncpy(register Wchar * __restrict s1,
 	}
 	return s1 + (s2 - p);
 }
-
-#ifndef WANT_WIDE
-libc_hidden_def(stpncpy)
-#endif
diff --git a/libc/string/strchr.c b/libc/string/strchr.c
index 462b7b1f1..7ea477362 100644
--- a/libc/string/strchr.c
+++ b/libc/string/strchr.c
@@ -23,8 +23,9 @@ Wchar *Wstrchr(register const Wchar *s, Wint c)
 
 	return NULL;
 }
-libc_hidden_def(Wstrchr)
-
-#if !defined WANT_WIDE && defined __UCLIBC_SUSV3_LEGACY__
+#ifndef WANT_WIDE
+libc_hidden_def(strchr)
+# ifdef __UCLIBC_SUSV3_LEGACY__
 weak_alias(strchr,index)
+# endif
 #endif
diff --git a/libc/string/strchrnul.c b/libc/string/strchrnul.c
index d2d7df307..4751971bc 100644
--- a/libc/string/strchrnul.c
+++ b/libc/string/strchrnul.c
@@ -21,5 +21,7 @@ Wchar *Wstrchrnul(register const Wchar *s, Wint c)
 	while (*++s && (*s != ((Wchar)c)));
 	return (Wchar *) s;
 }
+# ifndef WANT_WIDE
 libc_hidden_def(Wstrchrnul)
+# endif
 #endif
diff --git a/libc/string/strcpy.c b/libc/string/strcpy.c
index bb5a16872..549360c22 100644
--- a/libc/string/strcpy.c
+++ b/libc/string/strcpy.c
@@ -22,8 +22,6 @@ Wchar *Wstrcpy(Wchar * __restrict s1, const Wchar * __restrict s2)
 	return s1;
 }
 
-#ifdef WANT_WIDE
-/* wcscpy does not need libc_hidden_def */
-#else
+#ifndef WANT_WIDE
 libc_hidden_def(strcpy)
 #endif
-- 
cgit v1.2.3