rdata.c: (ldns_rdf_new_frm_data) Const correctness, order of parameters.

(ldns_rdf_new_frm_str) Order of parameters.

diff --git a/dname.c b/dname.c
index 93aacb7da45eac4c27838564718d0dc6938fe2dc..a64303dcb3e863478e185b09e3c224a443b8378e 100644 (file)
--- a/dname.c
+++ b/dname.c
@@ -109,8 +109,7 @@ ldns_rdf_dname_label_count(ldns_rdf *r)
 ldns_rdf *
 ldns_dname_new_frm_str(const char *str)
 {
-       return 
-               ldns_rdf_new_frm_str(str, LDNS_RDF_TYPE_DNAME);
+       return ldns_rdf_new_frm_str(LDNS_RDF_TYPE_DNAME, str);
 }
 
 /**

diff --git a/ldns/rdata.h b/ldns/rdata.h
index b73fdf58f6f703f46d162722d73da2f2ddfe8351..c9b3d09f721f5217668c18d9d40ec5179eca0766 100644 (file)
--- a/ldns/rdata.h
+++ b/ldns/rdata.h
@@ -102,12 +102,12 @@ void            ldns_rdf_set_type(ldns_rdf *, ldns_rdf_type);
 void            ldns_rdf_set_data(ldns_rdf *, void *);
 ldns_rdf_type   ldns_rdf_get_type(const ldns_rdf *);
 ldns_rdf       *ldns_rdf_new(uint16_t, ldns_rdf_type, void *);
-ldns_rdf       *ldns_rdf_new_frm_data(uint16_t, ldns_rdf_type, void *);
+ldns_rdf       *ldns_rdf_new_frm_data(ldns_rdf_type, uint16_t, const void *);
+ldns_rdf       *ldns_rdf_new_frm_str(ldns_rdf_type, const char *);
 ldns_status     ldns_octet(char *word, size_t *length);
 uint8_t         *ldns_rdf_data(const ldns_rdf *);
 void            ldns_rdf_free(ldns_rdf *);
 void            ldns_rdf_free_data(ldns_rdf *);
-ldns_rdf       *ldns_rdf_new_frm_str(const char *, ldns_rdf_type);
 struct sockaddr_storage * ldns_rdf2native_sockaddr_storage(ldns_rdf *);
 ldns_rdf       *ldns_rdf_clone(const ldns_rdf *);
 int            ldns_rdf_compare(const ldns_rdf *, const ldns_rdf *);

diff --git a/rdata.c b/rdata.c
index 91e5171f9ece61426dc3c9f28e5f74360aebeb25..8f9b361e35ade96d45875b41ac2148825dc2967a 100644 (file)
--- a/rdata.c
+++ b/rdata.c
@@ -195,22 +195,22 @@ ldns_rdf_new(uint16_t s, ldns_rdf_type t, void *d)
  * \return the new rdf structure or NULL on failure
  */
 ldns_rdf *
-ldns_rdf_new_frm_data(uint16_t s, ldns_rdf_type t, void *buf)
+ldns_rdf_new_frm_data(ldns_rdf_type type, uint16_t size, const void *data)
 {
-       ldns_rdf *rd;
-       rd = MALLOC(ldns_rdf);
-       if (!rd) {
+       ldns_rdf *rdf;
+       rdf = MALLOC(ldns_rdf);
+       if (!rdf) {
                return NULL;
        }
-       rd->_data = XMALLOC(uint8_t, s);
-       if (!rd->_data) {
+       rdf->_data = XMALLOC(uint8_t, size);
+       if (!rdf->_data) {
                return NULL;
        }
        
-       ldns_rdf_set_size(rd, s);
-       ldns_rdf_set_type(rd, t);
-       memcpy(rd->_data, buf, s);
-       return rd;
+       ldns_rdf_set_type(rdf, type);
+       ldns_rdf_set_size(rdf, size);
+       memcpy(rdf->_data, data, size);
+       return rdf;
 }
 
 /**
@@ -264,7 +264,7 @@ ldns_rdf_free(ldns_rdf *rd)
  * \return ldns_rdf*
  */
 ldns_rdf *
-ldns_rdf_new_frm_str(const char *str, ldns_rdf_type type)
+ldns_rdf_new_frm_str(ldns_rdf_type type, const char *str)
 {
        ldns_rdf *rdf;
        ldns_status status;

diff --git a/rr.c b/rr.c
index 229fddbe9e1558293f4d1511de880dccb8423515..d2620fd14eea29fbf089d150134d8f3d94881e6b 100644 (file)
--- a/rr.c
+++ b/rr.c
@@ -168,8 +168,9 @@ ldns_rr_new_frm_str(const char *str)
        printf("tot rd [%s]\n", rdata);
 #endif
        for(rd = strtok(rdata, "\t \0"), r_cnt =0; rd; rd = strtok(NULL, "\t \0"), r_cnt++) {
-               r = ldns_rdf_new_frm_str(rd,
-                               ldns_rr_descriptor_field_type(desc, r_cnt));
+               r = ldns_rdf_new_frm_str(
+                       ldns_rr_descriptor_field_type(desc, r_cnt),
+                       rd);
 #ifdef DEBUG
                printf("rd str [%s] %d\n", rd, r_cnt);
 #endif

diff --git a/run-test10.c b/run-test10.c
index 4c4d9906c3853eb09b09362b845480905846316e..69459586e43e3853d4385a77993674e98d43f2b9 100644 (file)
--- a/run-test10.c
+++ b/run-test10.c
@@ -25,7 +25,7 @@ main(void)
         res = ldns_resolver_new(); 
         if (!res)
                 return -1;
-        nameserver  = ldns_rdf_new_frm_str("127.0.0.1", LDNS_RDF_TYPE_A);
+        nameserver  = ldns_rdf_new_frm_str(LDNS_RDF_TYPE_A, "127.0.0.1");
         if (ldns_resolver_push_nameserver(res, nameserver) != LDNS_STATUS_OK) {
                 printf("error push nameserver\n");
                 return -1;

diff --git a/run-test11.c b/run-test11.c
index fb96306a661032fd6f27698ccb5ecfb142e666cc..a73613e261451d0dfd0ca75f539fc4edd9c4b428 100644 (file)
--- a/run-test11.c
+++ b/run-test11.c
@@ -40,7 +40,7 @@ main(int argc, char **argv)
                server_ip = argv[2];
        }
 
-        nameserver  = ldns_rdf_new_frm_str(server_ip, LDNS_RDF_TYPE_A);
+        nameserver  = ldns_rdf_new_frm_str(LDNS_RDF_TYPE_A, server_ip);
        if (!nameserver) {
                printf("Bad server ip\n");
                return -1;
@@ -50,7 +50,7 @@ main(int argc, char **argv)
        ldns_resolver_set_usevc(resolver, true);
        ldns_resolver_push_nameserver(resolver, nameserver);
        
-       domain = ldns_rdf_new_frm_str(name, LDNS_RDF_TYPE_DNAME);
+       domain = ldns_dname_new_frm_str(name);
        if (!domain) {
                printf("Bad domain\n");
        }

diff --git a/run-test4.c b/run-test4.c
index 00dcb5bdb3c5d7889f62867de0e1f5a3cd83efdb..a8243c22d600a7171aba1598692ed4109e72674b 100644 (file)
--- a/run-test4.c
+++ b/run-test4.c
@@ -25,12 +25,12 @@ main(void)
                 return 1;
 
         /* create a default domain and add it */
-        default_dom = ldns_rdf_new_frm_str("miek.nl.", LDNS_RDF_TYPE_DNAME);
+        default_dom = ldns_dname_new_frm_str("miek.nl.");
        if (!default_dom) {
                printf("error default dom\n");
                return 1;
        }
-        nameserver  = ldns_rdf_new_frm_str("127.0.0.1", LDNS_RDF_TYPE_A);
+        nameserver  = ldns_rdf_new_frm_str(LDNS_RDF_TYPE_A, "127.0.0.1");
        if (!nameserver) {
                printf("error default dom\n");
                return 1;
@@ -49,7 +49,7 @@ main(void)
        }
 
         /* setup the question */
-        qname = ldns_rdf_new_frm_str("miekwww", LDNS_RDF_TYPE_DNAME);
+        qname = ldns_dname_new_frm_str("miekwww");
        if (!qname) {
                printf("error making qname\n");
                 return 1;

diff --git a/run-test6.c b/run-test6.c
index ef0802401ddac45f7cfcad3b3c8ec895c05362be..ac4145996215d63974819546600456448a4b1094 100644 (file)
--- a/run-test6.c
+++ b/run-test6.c
@@ -24,13 +24,13 @@ main(void)
                 return 1;
 
         /* create a default domain and add it */
-        default_dom = ldns_rdf_new_frm_str("miek.nl.", LDNS_RDF_TYPE_DNAME);
+        default_dom = ldns_dname_new_frm_str("miek.nl.");
        if (!default_dom) {
                printf("error default dom\n");
                return 1;
        }
-        nameserver  = ldns_rdf_new_frm_str("2001:7b8:206:1:211:2fff:fed7:7378", 
-                       LDNS_RDF_TYPE_AAAA);
+        nameserver  = ldns_rdf_new_frm_str(LDNS_RDF_TYPE_AAAA,
+                                          "2001:7b8:206:1:211:2fff:fed7:7378");
        if (!nameserver) {
                printf("error in making NS\n");
                return 1;
@@ -44,7 +44,7 @@ main(void)
        }
 
         /* setup the question */
-        qname = ldns_rdf_new_frm_str("www.miek.nl", LDNS_RDF_TYPE_DNAME);
+        qname = ldns_dname_new_frm_str("www.miek.nl");
        if (!qname) {
                printf("error making qname\n");
                 return 1;

diff --git a/run-test7.c b/run-test7.c
index 169e0539c6339cf9b0ab77f76e93c1706ec2a6b7..28cc10b607bc0eab11653d039392644610ac7cef 100644 (file)
--- a/run-test7.c
+++ b/run-test7.c
@@ -50,7 +50,7 @@ main(int argc, char **argv)
        ldns_resolver_set_defnames(res, true); /* use the suffix */
 #endif
 
-        nameserver  = ldns_rdf_new_frm_str(server_ip, LDNS_RDF_TYPE_A);
+        nameserver  = ldns_rdf_new_frm_str(LDNS_RDF_TYPE_A, server_ip);
        if (!nameserver) {
                printf("Bad server ip\n");
                return 1;

diff --git a/run-test8.c b/run-test8.c
index 97567822e73f022e55cff94ef319656e3c6e6196..619675e26b04a608ed63879360a6eaf5813bce18 100644 (file)
--- a/run-test8.c
+++ b/run-test8.c
@@ -43,7 +43,7 @@ main(int argc, char **argv)
         if (!res)
                 return -1;
 
-        nameserver  = ldns_rdf_new_frm_str(server_ip, LDNS_RDF_TYPE_A);
+        nameserver  = ldns_rdf_new_frm_str(LDNS_RDF_TYPE_A, server_ip);
        if (!nameserver) {
                printf("Bad server ip\n");
                return -1;
@@ -58,7 +58,7 @@ main(int argc, char **argv)
        }
        /* UDP query */
        ldns_resolver_set_usevc(res, false);
-        qname = ldns_rdf_new_frm_str(name, LDNS_RDF_TYPE_DNAME);
+        qname = ldns_dname_new_frm_str(name);
        if (!qname) {
                printf("error making qname\n");
                return -1;

diff --git a/run-test9.c b/run-test9.c
index 10c0c44af900caa7e3f3755dc34e7485aa10acd8..6b380b6c71f539a7b6068694b2d3c5d052a39081 100644 (file)
--- a/run-test9.c
+++ b/run-test9.c
@@ -38,7 +38,7 @@ main(int argc, char **argv)
        ldns_rr_print(stdout, RR);
        printf("\n");
 
-        nameserver = ldns_rdf_new_frm_str(nameserver_address, LDNS_RDF_TYPE_A);
+        nameserver = ldns_rdf_new_frm_str(LDNS_RDF_TYPE_A, nameserver_address);
         if (ldns_resolver_push_nameserver(res, nameserver) != LDNS_STATUS_OK) {
                printf("error push nameserver\n");
                return -1;