diff options
| author | Florian Weimer <fweimer@redhat.com> | 2017-06-19 13:15:11 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2017-06-19 14:24:23 +0200 |
| commit | ca3d65ff69d5187cb4d6b7f81d414427c7007e22 (patch) | |
| tree | aeedd9e94ac13077f760865a397a89110cf743a0 | |
| parent | 487549c466e1434e812ca8877dd487398bc2df4e (diff) | |
| download | glibc-ca3d65ff69d5187cb4d6b7f81d414427c7007e22.tar.gz | |
resolv: Make __res_vinit hidden
And remove unnecessary separate declarations.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | include/resolv.h | 2 | ||||
| -rw-r--r-- | resolv/res_init.c | 2 | ||||
| -rw-r--r-- | resolv/res_libc.c | 2 |
4 files changed, 7 insertions, 5 deletions
@@ -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 e8f477cd86..37e4047ac4 100644 --- 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 23676e994d..57223b470a 100644 --- 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 c8f158d94c..3bf3887b0c 100644 --- 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, |