1447. [bug] We were casting (unsigned int) to and from (void *).

                        rdataset->private4 is now rdataset->privateuint4
                        to reflect a type change.
developer: marka
reviewer: explorer

diff --git a/CHANGES b/CHANGES
index d5df12da25e62159906e946221d9624835df548c..91e5f61f20818cda0284d30e32b0b745b0b71fbd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+1447.  [bug]           We were casting (unsigned int) to and from (void *).
+                       rdataset->private4 is now rdataset->privateuint4
+                       to reflect a type change.
+
 1446.  [func]          Implemented undocumented alternate transfer sources
                        from BIND 8.  See use-alt-transfer-source,
                        alt-transfer-source-v4 and alt-transfer-source-v6.

diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h
index 710e3c83184eb4af91b5a4720e32956338e35321..3ca396f42e9fb70cc11b049bfa8225a75c767c47 100644 (file)
--- a/lib/dns/include/dns/rdataset.h
+++ b/lib/dns/include/dns/rdataset.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdataset.h,v 1.46 2003/01/18 03:18:31 marka Exp $ */
+/* $Id: rdataset.h,v 1.47 2003/02/26 23:52:30 marka Exp $ */
 
 #ifndef DNS_RDATASET_H
 #define DNS_RDATASET_H 1
@@ -104,7 +104,7 @@ struct dns_rdataset {
        void *                          private1;
        void *                          private2;
        void *                          private3;
-       void *                          private4;
+       unsigned int                    privateuint4;
        void *                          private5;
 };
 

diff --git a/lib/dns/ncache.c b/lib/dns/ncache.c
index d9e3221c815bf4da819cc07b65e0d42934afa6d3..67a029fbe67c859d97bbc6a4587b837c18564a46 100644 (file)
--- a/lib/dns/ncache.c
+++ b/lib/dns/ncache.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ncache.c,v 1.31 2003/01/18 03:18:30 marka Exp $ */
+/* $Id: ncache.c,v 1.32 2003/02/26 23:52:29 marka Exp $ */
 
 #include <config.h>
 
@@ -398,12 +398,12 @@ rdataset_first(dns_rdataset_t *rdataset) {
        }
        raw += 2;
        /*
-        * The private4 field is the number of rdata beyond the cursor
+        * The privateuint4 field is the number of rdata beyond the cursor
         * position, so we decrement the total count by one before storing
         * it.
         */
        count--;
-       rdataset->private4 = (void *)count;
+       rdataset->privateuint4 = count;
        rdataset->private5 = raw;
 
        return (ISC_R_SUCCESS);
@@ -415,11 +415,11 @@ rdataset_next(dns_rdataset_t *rdataset) {
        unsigned int length;
        unsigned char *raw;
 
-       count = (unsigned int)rdataset->private4;
+       count = rdataset->privateuint4;
        if (count == 0)
                return (ISC_R_NOMORE);
        count--;
-       rdataset->private4 = (void *)count;
+       rdataset->privateuint4 = count;
        raw = rdataset->private5;
        length = raw[0] * 256 + raw[1];
        raw += length + 2;
@@ -448,7 +448,7 @@ rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target) {
        /*
         * Reset iterator state.
         */
-       target->private4 = NULL;
+       target->privateuint4 = 0;
        target->private5 = NULL;
 }
 
@@ -543,7 +543,7 @@ dns_ncache_getrdataset(dns_rdataset_t *ncacherdataset, dns_name_t *name,
        /*
         * Reset iterator state.
         */
-       rdataset->private4 = NULL;
+       rdataset->privateuint4 = 0;
        rdataset->private5 = NULL;
        return (ISC_R_SUCCESS);
 }

diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index 9120f1c29605abc08973d2de7625740046abed5d..b10ccb501760fd2c0536682500f43b769b7217c6 100644 (file)
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbtdb.c,v 1.184 2003/01/18 03:18:30 marka Exp $ */
+/* $Id: rbtdb.c,v 1.185 2003/02/26 23:52:29 marka Exp $ */
 
 /*
  * Principal Author: Bob Halley
@@ -1320,7 +1320,7 @@ bind_rdataset(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node,
        /*
         * Reset iterator state.
         */
-       rdataset->private4 = NULL;
+       rdataset->privateuint4 = 0;
        rdataset->private5 = NULL;
 }
 
@@ -4622,12 +4622,12 @@ rdataset_first(dns_rdataset_t *rdataset) {
        }
        raw += 2;
        /*
-        * The private4 field is the number of rdata beyond the cursor
+        * The privateuint4 field is the number of rdata beyond the cursor
         * position, so we decrement the total count by one before storing
         * it.
         */
        count--;
-       rdataset->private4 = (void *)count;
+       rdataset->privateuint4 = count;
        rdataset->private5 = raw;
 
        return (ISC_R_SUCCESS);
@@ -4639,11 +4639,11 @@ rdataset_next(dns_rdataset_t *rdataset) {
        unsigned int length;
        unsigned char *raw;
 
-       count = (unsigned int)rdataset->private4;
+       count = rdataset->privateuint4;
        if (count == 0)
                return (ISC_R_NOMORE);
        count--;
-       rdataset->private4 = (void *)count;
+       rdataset->privateuint4 = count;
        raw = rdataset->private5;
        length = raw[0] * 256 + raw[1];
        raw += length + 2;
@@ -4677,7 +4677,7 @@ rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target) {
        /*
         * Reset iterator state.
         */
-       target->private4 = NULL;
+       target->privateuint4 = 0;
        target->private5 = NULL;
 }
 

diff --git a/lib/dns/rdatalist.c b/lib/dns/rdatalist.c
index f8b84dcae5cca7a6e06e3b71f684d9ff7922a7a1..2fd0c9041bb54a023ba049396c737c4d7f29c3d3 100644 (file)
--- a/lib/dns/rdatalist.c
+++ b/lib/dns/rdatalist.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatalist.c,v 1.25 2001/01/09 21:51:21 bwelling Exp $ */
+/* $Id: rdatalist.c,v 1.26 2003/02/26 23:52:29 marka Exp $ */
 
 #include <config.h>
 
@@ -74,7 +74,7 @@ dns_rdatalist_tordataset(dns_rdatalist_t *rdatalist,
        rdataset->private1 = rdatalist;
        rdataset->private2 = NULL;
        rdataset->private3 = NULL;
-       rdataset->private4 = NULL;
+       rdataset->privateuint4 = 0;
        rdataset->private5 = NULL;
 
        return (ISC_R_SUCCESS);

diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c
index 7f0069617b39c17e5e14f3974baa6bad8ab3cbda..20dde2baf1a5e7ddf9f8484689cbaf080728e51b 100644 (file)
--- a/lib/dns/rdataset.c
+++ b/lib/dns/rdataset.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdataset.c,v 1.66 2002/12/05 04:36:26 marka Exp $ */
+/* $Id: rdataset.c,v 1.67 2003/02/26 23:52:29 marka Exp $ */
 
 #include <config.h>
 
@@ -52,7 +52,7 @@ dns_rdataset_init(dns_rdataset_t *rdataset) {
        rdataset->private1 = NULL;
        rdataset->private2 = NULL;
        rdataset->private3 = NULL;
-       rdataset->private4 = NULL;
+       rdataset->privateuint4 = 0;
        rdataset->private5 = NULL;
 }
 
@@ -77,7 +77,7 @@ dns_rdataset_invalidate(dns_rdataset_t *rdataset) {
        rdataset->private1 = NULL;
        rdataset->private2 = NULL;
        rdataset->private3 = NULL;
-       rdataset->private4 = NULL;
+       rdataset->privateuint4 = 0;
        rdataset->private5 = NULL;
 }
 
@@ -103,7 +103,7 @@ dns_rdataset_disassociate(dns_rdataset_t *rdataset) {
        rdataset->private1 = NULL;
        rdataset->private2 = NULL;
        rdataset->private3 = NULL;
-       rdataset->private4 = NULL;
+       rdataset->privateuint4 = 0;
        rdataset->private5 = NULL;
 }
 

diff --git a/lib/dns/rdataslab.c b/lib/dns/rdataslab.c
index 42de1891c2de9b68b6203ec6ecab21d814d007bf..0d520f9ff581932a929b354a24052a03f3eb71dd 100644 (file)
--- a/lib/dns/rdataslab.c
+++ b/lib/dns/rdataslab.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdataslab.c,v 1.32 2002/11/12 23:24:45 explorer Exp $ */
+/* $Id: rdataslab.c,v 1.33 2003/02/26 23:52:29 marka Exp $ */
 
 #include <config.h>
 
@@ -169,12 +169,12 @@ rdataset_first(dns_rdataset_t *rdataset) {
        }
        raw += 2;
        /*
-        * The private4 field is the number of rdata beyond the cursor
+        * The privateuint4 field is the number of rdata beyond the cursor
         * position, so we decrement the total count by one before storing
         * it.
         */
        count--;
-       rdataset->private4 = (void *)count;
+       rdataset->privateuint4 = count;
        rdataset->private5 = raw;
 
        return (ISC_R_SUCCESS);
@@ -186,11 +186,11 @@ rdataset_next(dns_rdataset_t *rdataset) {
        unsigned int length;
        unsigned char *raw;
 
-       count = (unsigned int)rdataset->private4;
+       count = rdataset->privateuint4;
        if (count == 0)
                return (ISC_R_NOMORE);
        count--;
-       rdataset->private4 = (void *)count;
+       rdataset->privateuint4 = count;
        raw = rdataset->private5;
        length = raw[0] * 256 + raw[1];
        raw += length + 2;
@@ -219,7 +219,7 @@ rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target) {
        /*
         * Reset iterator state.
         */
-       target->private4 = NULL;
+       target->privateuint4 = 0;
        target->private5 = NULL;
 }
 
@@ -264,7 +264,7 @@ dns_rdataslab_tordataset(unsigned char *slab, unsigned int reservelen,
        /*
         * Reset iterator state.
         */
-       rdataset->private4 = NULL;
+       rdataset->privateuint4 = 0;
        rdataset->private5 = NULL;
 }