This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH COMMITTED] resolv: Remove BIND_UPDATE preprocessor conditionals
- From: fweimer at redhat dot com (Florian Weimer)
- To: libc-alpha at sourceware dot org
- Date: Thu, 28 Apr 2016 14:08:36 +0200
- Subject: [PATCH COMMITTED] resolv: Remove BIND_UPDATE preprocessor conditionals
- Authentication-results: sourceware.org; auth=none
2016-04-28 Florian Weimer <fweimer@redhat.com>
* resolv/res_data.c: Remove code conditional on BIND_UPDATE. It
is never defined.
diff --git a/resolv/res_data.c b/resolv/res_data.c
index 986fc37..3c196de 100644
--- a/resolv/res_data.c
+++ b/resolv/res_data.c
@@ -27,9 +27,6 @@
#include <ctype.h>
#include <netdb.h>
#include <resolv.h>
-#ifdef BIND_UPDATE
-#include <res_update.h>
-#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -55,15 +52,6 @@ const char *_res_opcodes[] = {
};
libresolv_hidden_data_def (_res_opcodes)
-#ifdef BIND_UPDATE
-const char *_res_sectioncodes[] attribute_hidden = {
- "ZONE",
- "PREREQUISITES",
- "UPDATE",
- "ADDITIONAL",
-};
-#endif
-
#ifndef __BIND_NOSTATIC
void
p_query(const u_char *msg) {
@@ -104,18 +92,6 @@ res_mkquery(int op, /* opcode of query */
newrr_in, buf, buflen));
}
-#ifdef BIND_UPDATE
-int
-res_mkupdate(ns_updrec *rrecp_in, u_char *buf, int buflen) {
- if (__res_maybe_init (&_res, 1) == -1) {
- RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
- return (-1);
- }
-
- return (res_nmkupdate(&_res, rrecp_in, buf, buflen));
-}
-#endif
-
int
res_query(const char *name, /* domain name */
int class, int type, /* class and type of query */
@@ -171,18 +147,6 @@ res_close(void) {
__res_iclose(&_res, false);
}
-#ifdef BIND_UPDATE
-int
-res_update(ns_updrec *rrecp_in) {
- if (__res_maybe_init (&_res, 1) == -1) {
- RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
- return (-1);
- }
-
- return (res_nupdate(&_res, rrecp_in, NULL));
-}
-#endif
-
int
res_search(const char *name, /* domain name */
int class, int type, /* class and type of query */