From: Tatuya JINMEI 神明達哉 <jinmei@isc.org>
Date: Tue, 3 Feb 2009 22:33:13 +0000 (+0000)
Subject: 2544.	[cleanup]	Removed unused structure members in adb.c. [RT #19225]
X-Git-Tag: v9.3.6-P2~4^2~62
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=5d0984f4fd3133c869b0736adb5291e6fca34a0c;p=thirdparty%2Fbind9.git

2544.	[cleanup]	Removed unused structure members in adb.c. [RT #19225]
---

diff --git a/CHANGES b/CHANGES
index 12e5aa98076..4a9f56dcefe 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2544.	[cleanup]	Removed unused structure members in adb.c. [RT #19225]
+
 2543.	[contrib]	Update contrib/zkt to version 0.98. [RT #19113]
 
 2542.	[doc]		Update the description of dig +adflag. [RT #19290]
diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index 29203cb81c9..2e1c607ae5b 100644
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: adb.c,v 1.246 2009/01/28 23:20:23 jinmei Exp $ */
+/* $Id: adb.c,v 1.247 2009/02/03 22:33:13 jinmei Exp $ */
 
 /*! \file
  *
@@ -199,8 +199,6 @@ struct dns_adbname {
 /*% The adbfetch structure */
 struct dns_adbfetch {
 	unsigned int                    magic;
-	dns_adbnamehook_t              *namehook;
-	dns_adbentry_t                 *entry;
 	dns_fetch_t                    *fetch;
 	dns_rdataset_t                  rdataset;
 };
@@ -1496,31 +1494,13 @@ new_adbfetch(dns_adb_t *adb) {
 		return (NULL);
 
 	f->magic = 0;
-	f->namehook = NULL;
-	f->entry = NULL;
 	f->fetch = NULL;
 
-	f->namehook = new_adbnamehook(adb, NULL);
-	if (f->namehook == NULL)
-		goto err;
-
-	f->entry = new_adbentry(adb);
-	if (f->entry == NULL)
-		goto err;
-
 	dns_rdataset_init(&f->rdataset);
 
 	f->magic = DNS_ADBFETCH_MAGIC;
 
 	return (f);
-
- err:
-	if (f->namehook != NULL)
-		free_adbnamehook(adb, &f->namehook);
-	if (f->entry != NULL)
-		free_adbentry(adb, &f->entry);
-	isc_mempool_put(adb->afmp, f);
-	return (NULL);
 }
 
 static inline void
@@ -1533,11 +1513,6 @@ free_adbfetch(dns_adb_t *adb, dns_adbfetch_t **fetch) {
 
 	f->magic = 0;
 
-	if (f->namehook != NULL)
-		free_adbnamehook(adb, &f->namehook);
-	if (f->entry != NULL)
-		free_adbentry(adb, &f->entry);
-
 	if (dns_rdataset_isassociated(&f->rdataset))
 		dns_rdataset_disassociate(&f->rdataset);
 
@@ -2974,8 +2949,8 @@ print_namehook_list(FILE *f, const char *legend, dns_adbnamehooklist_t *list,
 
 static inline void
 print_fetch(FILE *f, dns_adbfetch_t *ft, const char *type) {
-	fprintf(f, "\t\tFetch(%s): %p -> { nh %p, entry %p, fetch %p }\n",
-		type, ft, ft->namehook, ft->entry, ft->fetch);
+	fprintf(f, "\t\tFetch(%s): %p -> { fetch %p }\n",
+		type, ft, ft->fetch);
 }
 
 static void