move rr and rr_list also to size_t

all counters should now be size_t in stead of uitn16_t

diff --git a/ldns/rr.h b/ldns/rr.h
index 56eb673b48d06c6a29a730614a390b2b77a44b5d..d23bc774b0bf747127c46130b8badc5bb66c5f1e 100644 (file)
--- a/ldns/rr.h
+++ b/ldns/rr.h
@@ -192,7 +192,7 @@ struct ldns_struct_rr
        /**  Time to live  */
        uint32_t        _ttl;   
        /**  Number of data fields */
-       uint16_t        _rd_count;
+       size_t          _rd_count;
        /**  the type of the RR. A, MX etc. */
        ldns_rr_type    _rr_type;       
        /**  Class of the resource record.  */
@@ -211,7 +211,7 @@ typedef struct ldns_struct_rr ldns_rr;
  */
 struct ldns_struct_rr_list
 {
-       uint16_t _rr_count;
+       size_t _rr_count;
        ldns_rr **_rrs;
 };
 typedef struct ldns_struct_rr_list ldns_rr_list;
@@ -316,7 +316,7 @@ void ldns_rr_set_ttl(ldns_rr *rr, uint32_t ttl);
  * \param[in] count set to this count
  * \return void
  */
-void ldns_rr_set_rd_count(ldns_rr *rr, uint16_t count);
+void ldns_rr_set_rd_count(ldns_rr *rr, size_t count);
 
 /**
  * sets the type in the rr.
@@ -342,7 +342,7 @@ void ldns_rr_set_class(ldns_rr *rr, ldns_rr_class rr_class);
  * \param[in] position the position the set the rdf
  * \return  the old value in the rr, NULL on failyre
  */
-ldns_rdf* ldns_rr_set_rdf(ldns_rr *rr, ldns_rdf *f, uint16_t position);
+ldns_rdf* ldns_rr_set_rdf(ldns_rr *rr, ldns_rdf *f, size_t position);
 
 /**
  * sets rd_field member, it will be 
@@ -367,7 +367,7 @@ ldns_rdf* ldns_rr_pop_rdf(ldns_rr *rr);
  * \param[in] nr the number of the rdf to return
  * \return ldns_rdf *
  */
-ldns_rdf* ldns_rr_rdf(const ldns_rr *rr, uint16_t nr);
+ldns_rdf* ldns_rr_rdf(const ldns_rr *rr, size_t nr);
 
 /**
  * returns the owner name of an rr structure.
@@ -388,7 +388,7 @@ uint32_t ldns_rr_ttl(const ldns_rr *rr);
  * \param[in] *rr the rr to read from
  * \return the rd count of the rr
  */
-uint16_t ldns_rr_rd_count(const ldns_rr *rr);
+size_t ldns_rr_rd_count(const ldns_rr *rr);
 
 /**
  * returns the type of the rr.
@@ -411,7 +411,7 @@ ldns_rr_class ldns_rr_get_class(const ldns_rr *rr);
  * \param[in] rr_list  the rr_list to read from
  * \return the number of rr's
  */
-uint16_t ldns_rr_list_rr_count(ldns_rr_list *rr_list);
+size_t ldns_rr_list_rr_count(ldns_rr_list *rr_list);
 
 /**
  * sets the number of rr's in an rr_list.
@@ -419,10 +419,10 @@ uint16_t ldns_rr_list_rr_count(ldns_rr_list *rr_list);
  * \param[in] count the number of rr in this list
  * \return void
  */
-void ldns_rr_list_set_rr_count(ldns_rr_list *rr_list, uint16_t count);
+void ldns_rr_list_set_rr_count(ldns_rr_list *rr_list, size_t count);
 
 /* set a specific rr */
-ldns_rr * ldns_rr_list_set_rr(ldns_rr_list *rr_list, ldns_rr *r, uint16_t count);
+ldns_rr * ldns_rr_list_set_rr(ldns_rr_list *rr_list, ldns_rr *r, size_t count);
 
 /**
  * returns a specific rr of an rrlist.
@@ -430,7 +430,7 @@ ldns_rr * ldns_rr_list_set_rr(ldns_rr_list *rr_list, ldns_rr *r, uint16_t count)
  * \param[in] nr return this rr
  * \return the rr at position nr
  */
-ldns_rr* ldns_rr_list_rr(ldns_rr_list *rr_list, uint16_t nr);
+ldns_rr* ldns_rr_list_rr(ldns_rr_list *rr_list, size_t nr);
 
 /**
  * creates a new rr_list structure.
@@ -663,9 +663,9 @@ ldns_rdf_type ldns_rr_descriptor_field_type(const ldns_rr_descriptor *descriptor
  * \return a new rr list with only the RRs that match 
  *
  */
-ldns_rr_list *ldns_rr_list_subtype_by_rdf(ldns_rr_list *l, ldns_rdf *r, uint16_t pos);
+ldns_rr_list *ldns_rr_list_subtype_by_rdf(ldns_rr_list *l, ldns_rdf *r, size_t pos);
 
 /* added while doing lua */
-bool ldns_rr_list_insert_rr(ldns_rr_list *rr_list, ldns_rr *r, uint16_t count);
+bool ldns_rr_list_insert_rr(ldns_rr_list *rr_list, ldns_rr *r, size_t count);
 
 #endif /* _LDNS_RR_H */

diff --git a/rr.c b/rr.c
index ae29cb9c941270f8a424e9ed451133b9833e6419..76e8b86031a186163b339d940da6d00e3f5c8918 100644 (file)
--- a/rr.c
+++ b/rr.c
@@ -36,7 +36,7 @@ ldns_rr_new_frm_type(ldns_rr_type t)
 {
        ldns_rr *rr;
        const ldns_rr_descriptor *desc;
-       uint16_t i;
+       size_t i;
 
        rr = LDNS_MALLOC(ldns_rr);
         if (!rr) {
@@ -63,7 +63,7 @@ ldns_rr_new_frm_type(ldns_rr_type t)
 void
 ldns_rr_free(ldns_rr *rr)
 {
-       uint16_t i;
+       size_t i;
        if (rr) {
                if (ldns_rr_owner(rr)) {
                        ldns_rdf_deep_free(ldns_rr_owner(rr));
@@ -444,7 +444,7 @@ ldns_rr_set_ttl(ldns_rr *rr, uint32_t ttl)
 }
 
 void
-ldns_rr_set_rd_count(ldns_rr *rr, uint16_t count)
+ldns_rr_set_rd_count(ldns_rr *rr, size_t count)
 {
        rr->_rd_count = count;
 }
@@ -462,9 +462,9 @@ ldns_rr_set_class(ldns_rr *rr, ldns_rr_class rr_class)
 }
 
 ldns_rdf *
-ldns_rr_set_rdf(ldns_rr *rr, ldns_rdf *f, uint16_t position)
+ldns_rr_set_rdf(ldns_rr *rr, ldns_rdf *f, size_t position)
 {
-       uint16_t rd_count;
+       size_t rd_count;
        ldns_rdf *pop;
        ldns_rdf **rdata_fields;
 
@@ -483,7 +483,7 @@ ldns_rr_set_rdf(ldns_rr *rr, ldns_rdf *f, uint16_t position)
 bool
 ldns_rr_push_rdf(ldns_rr *rr, ldns_rdf *f)
 {
-       uint16_t rd_count;
+       size_t rd_count;
        ldns_rdf **rdata_fields;
        
        rd_count = ldns_rr_rd_count(rr);
@@ -506,7 +506,7 @@ ldns_rr_push_rdf(ldns_rr *rr, ldns_rdf *f)
 ldns_rdf *
 ldns_rr_pop_rdf(ldns_rr *rr)
 {
-       uint16_t rd_count;
+       size_t rd_count;
        ldns_rdf *pop;
        
        rd_count = ldns_rr_rd_count(rr);
@@ -526,7 +526,7 @@ ldns_rr_pop_rdf(ldns_rr *rr)
 }
 
 ldns_rdf *
-ldns_rr_rdf(const ldns_rr *rr, uint16_t nr)
+ldns_rr_rdf(const ldns_rr *rr, size_t nr)
 {
        if (nr < ldns_rr_rd_count(rr)) {
                return rr->_rdata_fields[nr];
@@ -547,7 +547,7 @@ ldns_rr_ttl(const ldns_rr *rr)
        return rr->_ttl;
 }
 
-uint16_t
+size_t
 ldns_rr_rd_count(const ldns_rr *rr)
 {
        return rr->_rd_count;
@@ -567,7 +567,7 @@ ldns_rr_get_class(const ldns_rr *rr)
 
 /* rr_lists */
 
-uint16_t
+size_t
 ldns_rr_list_rr_count(ldns_rr_list *rr_list)
 {
        if (rr_list) {
@@ -578,7 +578,7 @@ ldns_rr_list_rr_count(ldns_rr_list *rr_list)
 }
 
 ldns_rr *
-ldns_rr_list_set_rr(ldns_rr_list *rr_list, ldns_rr *r, uint16_t count)
+ldns_rr_list_set_rr(ldns_rr_list *rr_list, ldns_rr *r, size_t count)
 {
        ldns_rr *old;
 
@@ -594,7 +594,7 @@ ldns_rr_list_set_rr(ldns_rr_list *rr_list, ldns_rr *r, uint16_t count)
 }
 
 bool
-ldns_rr_list_insert_rr(ldns_rr_list *rr_list, ldns_rr *r, uint16_t count)
+ldns_rr_list_insert_rr(ldns_rr_list *rr_list, ldns_rr *r, size_t count)
 {
        uint16_t c, i;
        ldns_rr *pop[101]; /* WRONG AMOUNT */
@@ -626,13 +626,13 @@ ldns_rr_list_insert_rr(ldns_rr_list *rr_list, ldns_rr *r, uint16_t count)
 }
 
 void
-ldns_rr_list_set_rr_count(ldns_rr_list *rr_list, uint16_t count)
+ldns_rr_list_set_rr_count(ldns_rr_list *rr_list, size_t count)
 {
        rr_list->_rr_count = count;
 }
 
 ldns_rr *
-ldns_rr_list_rr(ldns_rr_list *rr_list, uint16_t nr)
+ldns_rr_list_rr(ldns_rr_list *rr_list, size_t nr)
 {
        if (nr < ldns_rr_list_rr_count(rr_list)) {
                return rr_list->_rrs[nr];
@@ -709,8 +709,8 @@ ldns_rr_list_cat(ldns_rr_list *left, ldns_rr_list *right)
 ldns_rr_list *
 ldns_rr_list_cat_clone(ldns_rr_list *left, ldns_rr_list *right)
 {
-       uint16_t l_rr_count;
-       uint16_t r_rr_count;
+       size_t l_rr_count;
+       size_t r_rr_count;
        uint16_t i;
        ldns_rr_list *cat;
 
@@ -753,7 +753,7 @@ ldns_rr_list_cat_clone(ldns_rr_list *left, ldns_rr_list *right)
 }
 
 ldns_rr_list *
-ldns_rr_list_subtype_by_rdf(ldns_rr_list *l, ldns_rdf *r, uint16_t pos)
+ldns_rr_list_subtype_by_rdf(ldns_rr_list *l, ldns_rdf *r, size_t pos)
 {
        uint16_t i;
        ldns_rr_list *subtyped;
@@ -787,7 +787,7 @@ ldns_rr_list_subtype_by_rdf(ldns_rr_list *l, ldns_rdf *r, uint16_t pos)
 bool
 ldns_rr_list_push_rr(ldns_rr_list *rr_list, ldns_rr *rr)
 {
-       uint16_t rr_count;
+       size_t rr_count;
        ldns_rr **rrs;
        
        rr_count = ldns_rr_list_rr_count(rr_list);
@@ -811,7 +811,7 @@ ldns_rr_list_push_rr(ldns_rr_list *rr_list, ldns_rr *rr)
 ldns_rr *
 ldns_rr_list_pop_rr(ldns_rr_list *rr_list)
 {
-       uint16_t rr_count;
+       size_t rr_count;
        ldns_rr *pop;
        
        rr_count = ldns_rr_list_rr_count(rr_list);
@@ -869,8 +869,8 @@ ldns_is_rrset(ldns_rr_list *rr_list)
 bool
 ldns_rr_set_push_rr(ldns_rr_list *rr_list, ldns_rr *rr)
 {
-       uint16_t rr_count;
-       uint16_t i;
+       size_t rr_count;
+       size_t i;
        ldns_rr *last;
 
        assert(rr != NULL);
@@ -975,7 +975,7 @@ ldns_rr_list_pop_rrset(ldns_rr_list *rr_list)
 ldns_rr *
 ldns_rr_clone(const ldns_rr *rr)
 {
-       uint16_t i;
+       size_t i;
        ldns_rr *new_rr;
 
        if (!rr) {
@@ -1001,7 +1001,7 @@ ldns_rr_clone(const ldns_rr *rr)
 ldns_rr_list *
 ldns_rr_list_clone(ldns_rr_list *rrlist)
 {
-       uint16_t i;
+       size_t i;
        ldns_rr_list *new_list;
        ldns_rr *r;
 
@@ -1191,7 +1191,7 @@ size_t
 ldns_rr_uncompressed_size(const ldns_rr *r)
 {
        size_t rrsize;
-       uint16_t i;
+       size_t i;
 
        rrsize = 0;
        /* add all the rdf sizes */