resolv: Make __res_vinit hidden

And remove unnecessary separate declarations.
This commit is contained in:
Florian Weimer 2017-06-19 13:15:11 +02:00
parent 487549c466
commit ca3d65ff69
4 changed files with 7 additions and 5 deletions

View File

@ -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> 2017-06-19 Joseph Myers <joseph@codesourcery.com>
[BZ #21457] [BZ #21457]

View File

@ -23,7 +23,7 @@ extern __thread struct __res_state *__resp attribute_tls_model_ie;
# define _res (*__resp) # define _res (*__resp)
/* Now define the internal interfaces. */ /* 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 int __res_maybe_init (res_state, int);
extern void _sethtent (int); extern void _sethtent (int);
extern struct hostent *_gethtent (void); extern struct hostent *_gethtent (void);

View File

@ -110,8 +110,6 @@ unsigned long long int __res_initstamp attribute_hidden;
*/ */
int int
res_ninit(res_state statp) { res_ninit(res_state statp) {
extern int __res_vinit(res_state, int);
return (__res_vinit(statp, 0)); return (__res_vinit(statp, 0));
} }
libc_hidden_def (__res_ninit) libc_hidden_def (__res_ninit)

View File

@ -41,8 +41,6 @@ __libc_lock_define_initialized (static, lock);
int int
res_init(void) { res_init(void) {
extern int __res_vinit(res_state, int);
/* /*
* These three fields used to be statically initialized. This made * These three fields used to be statically initialized. This made
* it hard to use this code in a shared library. It is necessary, * it hard to use this code in a shared library. It is necessary,