From: Miek Gieben Date: Tue, 14 Feb 2006 12:24:04 +0000 (+0000) Subject: kill LDNS_RR_MAX which wasn't used and where it was X-Git-Tag: release-1.1.0~346 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5fed5933f89e222d63b2070c2a377fe15752cbc;p=thirdparty%2Fldns.git kill LDNS_RR_MAX which wasn't used and where it was used it does not make sense --- diff --git a/ldns/rr.h b/ldns/rr.h index 6e17a9e8..c0573c5e 100644 --- a/ldns/rr.h +++ b/ldns/rr.h @@ -21,8 +21,6 @@ #define LDNS_MAX_DOMAINLEN 255 /** Maximum number of pointers in 1 dname */ #define LDNS_MAX_POINTERS 65535 -/** Maximum number of rr's in a rr_list */ -#define LDNS_MAX_RR 65535 /** The bytes TTL, CLASS and length use up in an rr */ #define LDNS_RR_OVERHEAD 10 diff --git a/rr.c b/rr.c index 9a27fb77..a17ab92a 100644 --- a/rr.c +++ b/rr.c @@ -714,21 +714,18 @@ ldns_rr_list_cat(ldns_rr_list *left, ldns_rr_list *right) if (left) { l_rr_count = ldns_rr_list_rr_count(left); + printf("left %d\n", l_rr_count); } else { return false; } if (right) { r_rr_count = ldns_rr_list_rr_count(right); + printf("right %d\n", r_rr_count); } else { r_rr_count = 0; } - if (l_rr_count + r_rr_count > LDNS_MAX_RR ) { - /* overflow error */ - return false; - } - /* push right to left */ for(i = 0; i < r_rr_count; i++) { ldns_rr_list_push_rr(left, ldns_rr_list_rr(right, i)); @@ -758,11 +755,6 @@ ldns_rr_list_cat_clone(ldns_rr_list *left, ldns_rr_list *right) r_rr_count = 0; } - if (l_rr_count + r_rr_count > LDNS_MAX_RR ) { - /* overflow error */ - return NULL; - } - cat = ldns_rr_list_new(); if (!cat) {