summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2017-04-13 10:52:27 +0200
committerFlorian Weimer <fweimer@redhat.com>2017-04-13 10:52:42 +0200
commita7ff1da8239a5f0e1927db9d5310f53cfea97fc2 (patch)
tree2b3fbfc1903f7c27fe04707103e05b21f18f7304
parent249dcdb71b79e4c488a46c9027e0014c0bc27044 (diff)
downloadglibc-a7ff1da8239a5f0e1927db9d5310f53cfea97fc2.tar.gz
resolv: Remove internal and unused definitions from <resolv.h>
The RES_F_* constants are only used with the private _res._flags member. RES_EXHAUSTIVE is unused. The removed function declarations refer to functions not actually exported by glibc, so they are unusable by applications.
-rw-r--r--ChangeLog13
-rw-r--r--resolv/res_debug.c4
-rw-r--r--resolv/res_query.c1
-rw-r--r--resolv/res_send.c2
-rw-r--r--resolv/resolv-internal.h6
-rw-r--r--resolv/resolv.h18
6 files changed, 24 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index b310214c74..5b2add0662 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2017-04-13 Florian Weimer <fweimer@redhat.com>
+
+ * resolv/resolv.h (RES_EXHAUSTIVE, p_section, res_npquery)
+ (res_nisourserver): Remove definition.
+ (p_section, res_npquery, res_nisourserver): Remove declaration.
+ (RES_F_VC, RES_F_CONN, RES_F_EDNS0ERR): Move ...
+ * resolv/resolv-internal.h (RES_F_VC, RES_F_CONN, RES_F_EDNS0ERR):
+ ... here.
+ * resolv/res_send.c: Include <resolv/resolv-internal.h> instead of
+ <resolv.h>.
+ * resolv/res_query.c: Likewise.
+ * resolv/res_debug.c (p_section): Define as static.
+
2017-04-13 Rajalakshmi Srinivasaraghavan <raji@linux.vnet.ibm.com>
* sysdeps/powerpc/powerpc64/multiarch/Makefile (sysdep_routines): Add
diff --git a/resolv/res_debug.c b/resolv/res_debug.c
index 14557dd323..e23559bad3 100644
--- a/resolv/res_debug.c
+++ b/resolv/res_debug.c
@@ -115,6 +115,8 @@
extern const char *_res_sectioncodes[] attribute_hidden;
+static const char *p_section(int section, int opcode);
+
/*
* Print the current options.
*/
@@ -512,7 +514,7 @@ libresolv_hidden_def (p_type)
/*
* Return a string for the type.
*/
-const char *
+static const char *
p_section(int section, int opcode) {
const struct res_sym *symbols;
diff --git a/resolv/res_query.c b/resolv/res_query.c
index 07dc6f6583..6f3eada143 100644
--- a/resolv/res_query.c
+++ b/resolv/res_query.c
@@ -74,6 +74,7 @@
#include <errno.h>
#include <netdb.h>
#include <resolv.h>
+#include <resolv/resolv-internal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/resolv/res_send.c b/resolv/res_send.c
index 28c4cabfcb..995e1be730 100644
--- a/resolv/res_send.c
+++ b/resolv/res_send.c
@@ -101,7 +101,7 @@
#include <errno.h>
#include <fcntl.h>
#include <netdb.h>
-#include <resolv.h>
+#include <resolv/resolv-internal.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/resolv/resolv-internal.h b/resolv/resolv-internal.h
index 99fc17c609..d35df1c3d5 100644
--- a/resolv/resolv-internal.h
+++ b/resolv/resolv-internal.h
@@ -22,6 +22,12 @@
#include <resolv.h>
#include <stdbool.h>
+/* Resolver flags. Used for _flags in struct __res_state. */
+#define RES_F_VC 0x00000001 /* Socket is TCP. */
+#define RES_F_CONN 0x00000002 /* Socket is connected. */
+#define RES_F_EDNS0ERR 0x00000004 /* EDNS0 caused errors. */
+
+
/* Internal version of RES_USE_INET6 which does not trigger a
deprecation warning. */
#define DEPRECATED_RES_USE_INET6 0x00002000
diff --git a/resolv/resolv.h b/resolv/resolv.h
index 7809e2eb19..9fef8e9f24 100644
--- a/resolv/resolv.h
+++ b/resolv/resolv.h
@@ -163,16 +163,6 @@ struct res_sym {
};
/*
- * Resolver flags (used to be discrete per-module statics ints).
- */
-#define RES_F_VC 0x00000001 /* socket is TCP */
-#define RES_F_CONN 0x00000002 /* socket is connected */
-#define RES_F_EDNS0ERR 0x00000004 /* EDNS0 caused errors */
-
-/* res_findzonecut() options */
-#define RES_EXHAUSTIVE 0x00000001 /* always do all queries */
-
-/*
* Resolver options (keep these in synch with res_debug.c, please)
*/
#define RES_INIT 0x00000001 /* address initialized */
@@ -285,7 +275,6 @@ __END_DECLS
#define p_fqnname __p_fqnname
#define p_option __p_option
#define p_secstodate __p_secstodate
-#define p_section __p_section
#define p_time __p_time
#define p_type __p_type
#define p_rcode __p_rcode
@@ -299,12 +288,10 @@ __END_DECLS
#define res_nclose __res_nclose
#define res_ninit __res_ninit
#define res_nmkquery __res_nmkquery
-#define res_npquery __res_npquery
#define res_nquery __res_nquery
#define res_nquerydomain __res_nquerydomain
#define res_nsearch __res_nsearch
#define res_nsend __res_nsend
-#define res_nisourserver __res_nisourserver
#define res_ownok __res_ownok
#define res_queriesmatch __res_queriesmatch
#define res_randomid __res_randomid
@@ -356,14 +343,9 @@ int res_queriesmatch (const unsigned char *,
const unsigned char *,
const unsigned char *,
const unsigned char *) __THROW;
-const char * p_section (int __section, int __opcode) __THROW;
/* Things involving a resolver context. */
int res_ninit (res_state) __THROW;
-int res_nisourserver (const res_state,
- const struct sockaddr_in *) __THROW;
void fp_resstat (const res_state, FILE *) __THROW;
-void res_npquery (const res_state, const unsigned char *, int,
- FILE *) __THROW;
const char * res_hostalias (const res_state, const char *, char *, size_t)
__THROW;
int res_nquery (res_state, const char *, int, int,