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

diff --git a/CHANGES b/CHANGES
index a13fd0d636f340290a01305c82eff9ec9d28e2ee..b8ab01c0d59a76a163daf2fb235f32921a0611e9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2544.  [cleanup]       Removed unused structure members in adb.c. [RT #19225]
+
 2542.  [doc]           Update the description of dig +adflag. [RT #19290]
 
 2539.  [security]      Update the interaction between recursion, allow-query,

diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index ae5dec85ec33b124dd7756768c7a6f509a7b58ca..3a250add16efaa32e3964e211b21761649b58276 100644 (file)
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: adb.c,v 1.215.18.24 2008/10/17 03:35:14 marka Exp $ */
+/* $Id: adb.c,v 1.215.18.25 2009/02/03 22:36:57 jinmei Exp $ */
 
 /*! \file
  *
@@ -202,8 +202,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;
 };
@@ -1463,31 +1461,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
@@ -1500,11 +1480,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);
 
@@ -2953,8 +2928,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