use cat_clone. Todo: make _cat only use pointer copies

diff --git a/dname.c b/dname.c
index 2fcacbcbadb4389523310d109def25b84f489629..4f28d73637ec5e389208c1bceb7ed540f177b9a0 100644 (file)
--- 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 3476701024358a5500b2e5d2ae590b0bc26768cb..9ac4aede33b3d6c19af838db8b96039011b1c3ba 100644 (file)
--- 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 a8324d487ad23e487342430832bccccfdaf0be19..68d7eb73ffd4fdbe5c1f84e81c90d5ae2acb09a4 100644 (file)
--- 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 0d17f1194fe99d7b29c6736e3e7fc5df67d03bab..7d890a680181cabb60f8b4043033492bb614c3cf 100644 (file)
--- 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 f8bb6132216caa2ee826f7f99a62114de1872cb1..dd67b18e7cca40f7277a17c8bbecad499c15e603 100644 (file)
--- 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 cffc00255ed9bfa2d671fb44f552060185c30a17..98c48f271670df5d9bef42a9d3fab6631069c433 100644 (file)
--- 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 374f9d5108039d6074bd9a3af3cd182624809157..da8130d2a82687716f191f7c56455855db9ee001 100644 (file)
--- 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;
        }