This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH COMMITTED] resolv: Make __res_vinit hidden
- From: fweimer at redhat dot com (Florian Weimer)
- To: libc-alpha at sourceware dot org
- Date: Mon, 19 Jun 2017 14:26:38 +0200
- Subject: [PATCH COMMITTED] resolv: Make __res_vinit hidden
- Authentication-results: sourceware.org; auth=none
- Authentication-results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com
- Authentication-results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=fweimer at redhat dot com
- Dkim-filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 5D6F681241
- Dmarc-filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 5D6F681241
And remove unnecessary separate declarations.
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.
diff --git a/include/resolv.h b/include/resolv.h
index e8f477c..37e4047 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 23676e9..57223b4 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 c8f158d..3bf3887 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,