resolv: Make __res_vinit hidden

And remove unnecessary separate declarations.

diff --git a/ChangeLog b/ChangeLog
index 9a82a2b0fd89d31cdd22c4ec0521542a3c642aea..388fc429090f1986c03bb90d55d4a69fba64bcc2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-06-19  Florian Weimer  <fweimer@redhat.com>
+
+       * include/resolv.h (__res_vinit): Declare as hidden.
+       * resolv/res_init.c (res_ninit): Remove __res_vinit declaration.
+       * resolv/res_libc.c (res_init): Likewise.
+
 2017-06-19  Joseph Myers  <joseph@codesourcery.com>
 
        [BZ #21457]

diff --git a/include/resolv.h b/include/resolv.h
index e8f477cd86b7be11121e5f3ca8a7b5ac8c146ca2..37e4047ac40c6ae1b388bde7e541bc13eb990296 100644 (file)
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -23,7 +23,7 @@ extern __thread struct __res_state *__resp attribute_tls_model_ie;
 # define _res (*__resp)
 
 /* Now define the internal interfaces.  */
-extern int __res_vinit (res_state, int);
+extern int __res_vinit (res_state, int) attribute_hidden;
 extern int __res_maybe_init (res_state, int);
 extern void _sethtent (int);
 extern struct hostent *_gethtent (void);

diff --git a/resolv/res_init.c b/resolv/res_init.c
index 23676e994dd58be76581e6f008ae64f2065f1137..57223b470af9ba4d1fab5b2080e6fa732248ed9f 100644 (file)
--- a/resolv/res_init.c
+++ b/resolv/res_init.c
@@ -110,8 +110,6 @@ unsigned long long int __res_initstamp attribute_hidden;
  */
 int
 res_ninit(res_state statp) {
-       extern int __res_vinit(res_state, int);
-
        return (__res_vinit(statp, 0));
 }
 libc_hidden_def (__res_ninit)

diff --git a/resolv/res_libc.c b/resolv/res_libc.c
index c8f158d94c277d51833dedd6ef69f143567b03b4..3bf3887b0c5232b1fea7dcc44c3a6973507db248 100644 (file)
--- a/resolv/res_libc.c
+++ b/resolv/res_libc.c
@@ -41,8 +41,6 @@ __libc_lock_define_initialized (static, lock);
 
 int
 res_init(void) {
-       extern int __res_vinit(res_state, int);
-
        /*
         * These three fields used to be statically initialized.  This made
         * it hard to use this code in a shared library.  It is necessary,