Update.

2002-03-13  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/ttyname.c: Comment out definition and
	use of __ttyname.

	* posix/regcomp.c (__re_error_msgid): Renamed from re_error_msgid.
	Define as hidden.
	(__re_error_msgid_idx): Renamed from re_error_msgid_idx.  Define as
	hidden.  Change all users of these variables.

	* posix/regex_internal.h (__re_error_msgid): Renamed from
	re_error_msgid.  Declare as hidden.
	(__re_error_msgid_idx): Renamed from re_error_msgid_idx.  Declare as
	hidden.

	* stdio-common/reg-printf.c (__printf_arginfo_table): Define as hidden.
	(__printf_function_table): Likewise.
	* stdio-common/printf-parse.h (__printf_arginfo_table): Declare as
	hidden.
	(__printf_function_table): Likewise.

	* nscd/nscd_proto.h: Declare __nss_not_use_nscd_passwd,
	__nss_not_use_nscd_group, and __nss_not_use_nscd_hosts as hidden.

	* nss/XXX-lookup.c (DATABASE_NAME_SYMBOL): Define as hidden.
	* nss/nsswitch.c: Declare _nss_*_database as hidden.

	* stdlib/wctomb.c (__no_r_state): Declare as hidden.
	* stdlib/mbtowc.c (__no_r_state): Define as hidden.

11 files changed, 68 insertions, 31 deletions

diff --git a/ChangeLog b/ChangeLog
index b1596784ee..4b68663645 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+2002-03-13  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/ttyname.c: Comment out definition and
+	use of __ttyname.
+
+	* posix/regcomp.c (__re_error_msgid): Renamed from re_error_msgid.
+	Define as hidden.
+	(__re_error_msgid_idx): Renamed from re_error_msgid_idx.  Define as
+	hidden.  Change all users of these variables.
+
+	* posix/regex_internal.h (__re_error_msgid): Renamed from
+	re_error_msgid.  Declare as hidden.
+	(__re_error_msgid_idx): Renamed from re_error_msgid_idx.  Declare as
+	hidden.
+
+	* stdio-common/reg-printf.c (__printf_arginfo_table): Define as hidden.
+	(__printf_function_table): Likewise.
+	* stdio-common/printf-parse.h (__printf_arginfo_table): Declare as
+	hidden.
+	(__printf_function_table): Likewise.
+
+	* nscd/nscd_proto.h: Declare __nss_not_use_nscd_passwd,
+	__nss_not_use_nscd_group, and __nss_not_use_nscd_hosts as hidden.
+
+	* nss/XXX-lookup.c (DATABASE_NAME_SYMBOL): Define as hidden.
+	* nss/nsswitch.c: Declare _nss_*_database as hidden.
+
+	* stdlib/wctomb.c (__no_r_state): Declare as hidden.
+	* stdlib/mbtowc.c (__no_r_state): Define as hidden.
+
 2002-03-12  Ulrich Drepper  <drepper@redhat.com>
 
 	* ctype/ctype-info.c: Declare _nl_C_LC_CTYPE_class,
diff --git a/nscd/nscd_proto.h b/nscd/nscd_proto.h
index 0d62d6b557..0a02938bf5 100644
--- a/nscd/nscd_proto.h
+++ b/nscd/nscd_proto.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Thorsten Kukuk <kukuk@suse.de>, 1998.
 
@@ -25,9 +25,9 @@
 #include <pwd.h>
 
 /* Variables for communication between NSCD handler functions and NSS.  */
-extern int __nss_not_use_nscd_passwd;
-extern int __nss_not_use_nscd_group;
-extern int __nss_not_use_nscd_hosts;
+extern int __nss_not_use_nscd_passwd attribute_hidden;
+extern int __nss_not_use_nscd_group attribute_hidden;
+extern int __nss_not_use_nscd_hosts attribute_hidden;
 
 extern int __nscd_getpwnam_r (const char *name, struct passwd *resultbuf,
 			      char *buffer, size_t buflen);
diff --git a/nss/XXX-lookup.c b/nss/XXX-lookup.c
index c20210cf3b..79985e674d 100644
--- a/nss/XXX-lookup.c
+++ b/nss/XXX-lookup.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1999, 2000  Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -53,9 +53,10 @@
 #define DEFAULT_CONFIG NULL
 #endif
 
-service_user *DATABASE_NAME_SYMBOL;
+service_user *DATABASE_NAME_SYMBOL attribute_hidden;
 
-extern int DB_LOOKUP_FCT (service_user **ni, const char *fct_name, void **fctp);
+extern int DB_LOOKUP_FCT (service_user **ni, const char *fct_name,
+			  void **fctp);
 
 int
 DB_LOOKUP_FCT (service_user **ni, const char *fct_name, void **fctp)
diff --git a/nss/nsswitch.c b/nss/nsswitch.c
index 6cd3d81bb8..b0658e5899 100644
--- a/nss/nsswitch.c
+++ b/nss/nsswitch.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996,1997,1998,1999,2001 Free Software Foundation, Inc.
+/* Copyright (C) 1996,1997,1998,1999,2001,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -51,7 +51,7 @@ static service_library *nss_new_service (name_database *database,
 
 /* Declare external database variables.  */
 #define DEFINE_DATABASE(name)						      \
-  extern service_user *__nss_##name##_database;				      \
+  extern service_user *__nss_##name##_database attribute_hidden;	      \
   weak_extern (__nss_##name##_database)
 #include "databases.def"
 #undef DEFINE_DATABASE
diff --git a/posix/regcomp.c b/posix/regcomp.c
index 930e8a61b5..7e3954fdad 100644
--- a/posix/regcomp.c
+++ b/posix/regcomp.c
@@ -132,7 +132,7 @@ static bin_tree_t *duplicate_tree (const bin_tree_t *src, re_dfa_t *dfa);
    POSIX doesn't require that we do anything for REG_NOERROR,
    but why not be nice?  */
 
-const char re_error_msgid[] =
+const char __re_error_msgid[] attribute_hidden =
   {
 #define REG_NOERROR_IDX	0
     gettext_noop ("Success")	/* REG_NOERROR */
@@ -186,7 +186,7 @@ const char re_error_msgid[] =
     gettext_noop ("Unmatched ) or \\)") /* REG_ERPAREN */
   };
 
-const size_t re_error_msgid_idx[] =
+const size_t __re_error_msgid_idx[] attribute_hidden =
   {
     REG_NOERROR_IDX,
     REG_NOMATCH_IDX,
@@ -241,7 +241,7 @@ re_compile_pattern (pattern, length, bufp)
 
   if (!ret)
     return NULL;
-  return gettext (re_error_msgid + re_error_msgid_idx[(int) ret]);
+  return gettext (__re_error_msgid + __re_error_msgid_idx[(int) ret]);
 }
 #ifdef _LIBC
 weak_alias (__re_compile_pattern, re_compile_pattern)
@@ -483,15 +483,15 @@ regerror (errcode, preg, errbuf, errbuf_size)
   size_t msg_size;
 
   if (BE (errcode < 0
-          || errcode >= (int) (sizeof (re_error_msgid_idx)
-                               / sizeof (re_error_msgid_idx[0])), 0))
+          || errcode >= (int) (sizeof (__re_error_msgid_idx)
+                               / sizeof (__re_error_msgid_idx[0])), 0))
     /* Only error codes returned by the rest of the code should be passed
        to this routine.  If we are given anything else, or if other regex
        code generates an invalid error code, then the program has a bug.
        Dump core so we can fix it.  */
     abort ();
 
-  msg = gettext (re_error_msgid + re_error_msgid_idx[errcode]);
+  msg = gettext (__re_error_msgid + __re_error_msgid_idx[errcode]);
 
   msg_size = strlen (msg) + 1; /* Includes the null.  */
 
@@ -623,8 +623,8 @@ re_comp (s)
     {
       re_comp_buf.fastmap = (char *) malloc (SBC_MAX);
       if (re_comp_buf.fastmap == NULL)
-	return (char *) gettext (re_error_msgid
-				 + re_error_msgid_idx[(int) REG_ESPACE]);
+	return (char *) gettext (__re_error_msgid
+				 + __re_error_msgid_idx[(int) REG_ESPACE]);
     }
 
   /* Since `re_exec' always passes NULL for the `regs' argument, we
@@ -639,7 +639,7 @@ re_comp (s)
     return NULL;
 
   /* Yes, we're discarding `const' here if !HAVE_LIBINTL.  */
-  return (char *) gettext (re_error_msgid + re_error_msgid_idx[(int) ret]);
+  return (char *) gettext (__re_error_msgid + __re_error_msgid_idx[(int) ret]);
 }
 #endif /* _REGEX_RE_COMP */
 
diff --git a/posix/regex_internal.h b/posix/regex_internal.h
index f3ae7e1c64..bb28102cc9 100644
--- a/posix/regex_internal.h
+++ b/posix/regex_internal.h
@@ -39,8 +39,8 @@
 # define __mempcpy memcpy
 #endif
 
-extern const char re_error_msgid[];
-extern const size_t re_error_msgid_idx[];
+extern const char __re_error_msgid[] attribute_hidden;
+extern const size_t __re_error_msgid_idx[] attribute_hidden;
 
 /* Number of bits in an unsinged int.  */
 #define UINT_BITS (sizeof (unsigned int) * BYTE_BITS)
diff --git a/stdio-common/printf-parse.h b/stdio-common/printf-parse.h
index 4f8007121e..78811701bb 100644
--- a/stdio-common/printf-parse.h
+++ b/stdio-common/printf-parse.h
@@ -1,5 +1,5 @@
 /* Internal header for parsing printf format strings.
-   Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000, 2002 Free Software Foundation, Inc.
    This file is part of th GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -117,8 +117,8 @@ find_spec (const UCHAR_T *format, mbstate_t *ps)
 
 
 /* These are defined in reg-printf.c.  */
-extern printf_arginfo_function *__printf_arginfo_table[];
-extern printf_function **__printf_function_table;
+extern printf_arginfo_function *__printf_arginfo_table[] attribute_hidden;
+extern printf_function **__printf_function_table attribute_hidden;
 
 
 /* FORMAT must point to a '%' at the beginning of a spec.  Fills in *SPEC
diff --git a/stdio-common/reg-printf.c b/stdio-common/reg-printf.c
index f4ddf21f42..fe49633932 100644
--- a/stdio-common/reg-printf.c
+++ b/stdio-common/reg-printf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1996, 1997, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -22,9 +22,10 @@
 
 /* Array of functions indexed by format character.  */
 static printf_function *printf_funcs[UCHAR_MAX + 1];
-printf_arginfo_function *__printf_arginfo_table[UCHAR_MAX + 1];
+printf_arginfo_function *__printf_arginfo_table[UCHAR_MAX + 1]
+     attribute_hidden;
 
-printf_function **__printf_function_table;
+printf_function **__printf_function_table attribute_hidden;
 
 int __register_printf_function __P ((int, printf_function,
                                      printf_arginfo_function));
diff --git a/stdlib/mbtowc.c b/stdlib/mbtowc.c
index 323adcf599..51fd9ab8f2 100644
--- a/stdlib/mbtowc.c
+++ b/stdlib/mbtowc.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 95, 96, 97, 98, 99 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1995-1999, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -24,7 +24,7 @@
 
 
 /* Common state for all non-restartable conversion functions.  */
-mbstate_t __no_r_state;
+mbstate_t __no_r_state attribute_hidden;
 
 /* Convert the multibyte character at S, which is no longer
    than N characters, to its `wchar_t' representation, placing
diff --git a/stdlib/wctomb.c b/stdlib/wctomb.c
index 61305f8f0a..ae73d5f75d 100644
--- a/stdlib/wctomb.c
+++ b/stdlib/wctomb.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 95, 96, 97, 98, 99 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1995-1999, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@
 #include <wcsmbs/wcsmbsload.h>
 
 
-extern mbstate_t __no_r_state;	/* Defined in mbtowc.c.  */
+extern mbstate_t __no_r_state attribute_hidden;	/* Defined in mbtowc.c.  */
 
 /* Convert WCHAR into its multibyte character representation,
    putting this in S and returning its length.
diff --git a/sysdeps/unix/sysv/linux/ttyname.c b/sysdeps/unix/sysv/linux/ttyname.c
index 5e9c807c77..b5e73bf1af 100644
--- a/sysdeps/unix/sysv/linux/ttyname.c
+++ b/sysdeps/unix/sysv/linux/ttyname.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,93,1996-1999,2000,2001 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,93,1996-2001,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -28,7 +28,10 @@
 
 #include <stdio-common/_itoa.h>
 
+#if 0
+/* Is this used anywhere?  It is not exported.  */
 char *__ttyname;
+#endif
 
 static char *getttyname (const char *dev, dev_t mydev,
 			 ino64_t myino, int save, int *dostat)
@@ -85,7 +88,9 @@ getttyname (const char *dev, dev_t mydev, ino64_t myino, int save, int *dostat)
 	   )
 	  {
 	    (void) __closedir (dirstream);
+#if 0
 	    __ttyname = getttyname_name;
+#endif
 	    __set_errno (save);
 	    return getttyname_name;
 	  }