From patchwork Thu Apr 28 12:08:36 2016
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Florian Weimer <fweimer@redhat.com>
X-Patchwork-Id: 11930
Received: (qmail 5016 invoked by alias); 28 Apr 2016 12:08:41 -0000
Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <libc-alpha.sourceware.org>
List-Unsubscribe: <mailto:libc-alpha-unsubscribe-##L=##H@sourceware.org>
List-Subscribe: <mailto:libc-alpha-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-help@sourceware.org>,
	<http://sourceware.org/ml/#faqs>
Sender: libc-alpha-owner@sourceware.org
Delivered-To: mailing list libc-alpha@sourceware.org
Received: (qmail 2471 invoked by uid 89); 28 Apr 2016 12:08:39 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=-2.9 required=5.0 tests=BAYES_00,
	RP_MATCHES_RCVD,
	SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=UPDATE
X-HELO: mx1.redhat.com
Date: Thu, 28 Apr 2016 14:08:36 +0200
To: libc-alpha@sourceware.org
Subject: [PATCH COMMITTED] resolv: Remove BIND_UPDATE preprocessor
	conditionals
User-Agent: Heirloom mailx 12.5 7/5/10
MIME-Version: 1.0
Message-Id: <20160428120836.715A1403F10AA@oldenburg.str.redhat.com>
From: fweimer@redhat.com (Florian Weimer)

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 */