From: Miek Gieben <miekg@NLnetLabs.nl>
Date: Wed, 8 Jun 2005 09:37:34 +0000 (+0000)
Subject: use cat_clone. Todo: make _cat only use pointer copies
X-Git-Tag: release-0.65~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5ec7e43922086d44c8a6ee6a35f1fc6d733bd437;p=thirdparty%2Fldns.git

use cat_clone. Todo: make _cat only use pointer copies
---

diff --git a/dname.c b/dname.c
index 2fcacbcb..4f28d736 100644
--- a/dname.c
+++ b/dname.c
@@ -22,7 +22,7 @@
 
 
 ldns_rdf *
-ldns_dname_cat(ldns_rdf *rd1, ldns_rdf *rd2)
+ldns_dname_cat_clone(ldns_rdf *rd1, ldns_rdf *rd2)
 {
 	ldns_rdf *new;
 	uint16_t new_size;
diff --git a/dnssec.c b/dnssec.c
index 34767010..9ac4aede 100644
--- a/dnssec.c
+++ b/dnssec.c
@@ -99,7 +99,7 @@ ldns_verify(ldns_rr_list *rrset, ldns_rr_list *rrsig, ldns_rr_list *keys)
 
 		if (keys_verified) {
 			valid = true;
-			result = ldns_rr_list_cat(result, keys_verified);
+			result = ldns_rr_list_cat_clone(result, keys_verified);
 		}
 	}
 	if (valid) {
diff --git a/higher.c b/higher.c
index a8324d48..68d7eb73 100644
--- a/higher.c
+++ b/higher.c
@@ -55,7 +55,7 @@ ldns_get_rr_list_addr_by_name(ldns_resolver *res, ldns_rdf *name, ldns_rr_class
 		ldns_pkt_free(pkt);
 	}
 
-	result = ldns_rr_list_cat(aaaa, a);
+	result = ldns_rr_list_cat_clone(aaaa, a);
 
 	ldns_rr_list_deep_free(aaaa);
 	ldns_rr_list_deep_free(a);
diff --git a/ldns/dname.h b/ldns/dname.h
index 0d17f119..7d890a68 100644
--- a/ldns/dname.h
+++ b/ldns/dname.h
@@ -25,7 +25,7 @@
  * \param[in] rd2 the rightside
  * \return a new rdf with leftside/rightside
  */
-ldns_rdf 	*ldns_dname_cat(ldns_rdf *rd1, ldns_rdf *rd2);
+ldns_rdf 	*ldns_dname_cat_clone(ldns_rdf *rd1, ldns_rdf *rd2);
 /**
  * chop one label off a dname. so 
  * wwww.nlnetlabs.nl, becomes nlnetlabs.nl
diff --git a/packet.c b/packet.c
index f8bb6132..dd67b18e 100644
--- a/packet.c
+++ b/packet.c
@@ -137,12 +137,12 @@ ldns_pkt_all(ldns_pkt *packet)
 {
 	ldns_rr_list *all;
 
-	all = ldns_rr_list_cat(
+	all = ldns_rr_list_cat_clone(
 			ldns_pkt_xxsection(packet, LDNS_SECTION_QUESTION),
 			ldns_pkt_xxsection(packet, LDNS_SECTION_ANSWER));
-	all = ldns_rr_list_cat(all,
+	all = ldns_rr_list_cat_clone(all,
 			ldns_pkt_xxsection(packet, LDNS_SECTION_AUTHORITY));
-	all = ldns_rr_list_cat(all,
+	all = ldns_rr_list_cat_clone(all,
 			ldns_pkt_xxsection(packet, LDNS_SECTION_ADDITIONAL));
 	return all;
 }
@@ -152,10 +152,10 @@ ldns_pkt_all_noquestion(ldns_pkt *packet)
 {
 	ldns_rr_list *all, *all2;
 
-	all = ldns_rr_list_cat(
+	all = ldns_rr_list_cat_clone(
 			ldns_pkt_xxsection(packet, LDNS_SECTION_ANSWER),
 			ldns_pkt_xxsection(packet, LDNS_SECTION_AUTHORITY));
-	all2 = ldns_rr_list_cat(all,
+	all2 = ldns_rr_list_cat_clone(all,
 			ldns_pkt_xxsection(packet, LDNS_SECTION_ADDITIONAL));
 	
 	ldns_rr_list_free(all);
diff --git a/rdata.c b/rdata.c
index cffc0025..98c48f27 100644
--- a/rdata.c
+++ b/rdata.c
@@ -446,7 +446,7 @@ ldns_rdf_address_reverse(ldns_rdf *rdf)
 			break;
 	}
 	/* add the suffix */
-	rev = ldns_dname_cat(ret_dname, in_addr);
+	rev = ldns_dname_cat_clone(ret_dname, in_addr);
 	
 	ldns_rdf_free(ret_dname);
 	ldns_rdf_free(in_addr);
diff --git a/resolver.c b/resolver.c
index 374f9d51..da8130d2 100644
--- a/resolver.c
+++ b/resolver.c
@@ -622,7 +622,7 @@ ldns_resolver_query(ldns_resolver *r, ldns_rdf *name, ldns_rr_type type, ldns_rr
 		return pkt;
 	}
 
-	newname = ldns_dname_cat(name, ldns_resolver_domain(r));
+	newname = ldns_dname_cat_clone(name, ldns_resolver_domain(r));
 	if (!newname) {
 		return NULL;
 	}