Rename dns_test_rdata_fromstring() to dns_test_rdatafromstring()

Remove the underscore from "rdata_fromstring" so that all helper
functions for libdns tests use a common naming covention.

diff --git a/lib/dns/tests/dnstest.c b/lib/dns/tests/dnstest.c
index 8c8e5bfec98565ab161692921eff7b64fc8efa80..83e40256d4cfafa4427ddbbf0e80d435674507d8 100644 (file)
--- a/lib/dns/tests/dnstest.c
+++ b/lib/dns/tests/dnstest.c
@@ -442,9 +442,9 @@ dns_test_getdata(const char *file, unsigned char *buf,
 }
 
 isc_result_t
-dns_test_rdata_fromstring(dns_rdata_t *rdata, dns_rdataclass_t rdclass,
-                         dns_rdatatype_t rdtype, unsigned char *dst,
-                         size_t dstlen, const char *src)
+dns_test_rdatafromstring(dns_rdata_t *rdata, dns_rdataclass_t rdclass,
+                        dns_rdatatype_t rdtype, unsigned char *dst,
+                        size_t dstlen, const char *src)
 {
        isc_buffer_t source, target;
        isc_lex_t *lex = NULL;

diff --git a/lib/dns/tests/dnstest.h b/lib/dns/tests/dnstest.h
index f255493a70d4d55be22ef3a37dafd41b150d762d..492bc42a38564caa0c9d2e1eab041fd008e29edf 100644 (file)
--- a/lib/dns/tests/dnstest.h
+++ b/lib/dns/tests/dnstest.h
@@ -106,9 +106,9 @@ dns_test_tohex(const unsigned char *data, size_t len, char *buf, size_t buflen);
  * uncompressed wire form of that RDATA at "dst", which is "dstlen" bytes long.
  */
 isc_result_t
-dns_test_rdata_fromstring(dns_rdata_t *rdata, dns_rdataclass_t rdclass,
-                         dns_rdatatype_t rdtype, unsigned char *dst,
-                         size_t dstlen, const char *src);
+dns_test_rdatafromstring(dns_rdata_t *rdata, dns_rdataclass_t rdclass,
+                        dns_rdatatype_t rdtype, unsigned char *dst,
+                        size_t dstlen, const char *src);
 
 void
 dns_test_namefromstring(const char *namestr, dns_fixedname_t *fname);

diff --git a/lib/dns/tests/nsec3_test.c b/lib/dns/tests/nsec3_test.c
index e0d802c3f2188873c7978321430bffee19f18785..51f57fdd59eef3984ffeb76943566caf2d421017 100644 (file)
--- a/lib/dns/tests/nsec3_test.c
+++ b/lib/dns/tests/nsec3_test.c
@@ -74,10 +74,10 @@ nsec3param_salttotext_test(const nsec3param_salttotext_test_params_t *params) {
        /*
         * Prepare a dns_rdata_nsec3param_t structure for testing.
         */
-       result = dns_test_rdata_fromstring(&rdata, dns_rdataclass_in,
-                                          dns_rdatatype_nsec3param, buf,
-                                          sizeof(buf),
-                                          params->nsec3param_text);
+       result = dns_test_rdatafromstring(&rdata, dns_rdataclass_in,
+                                         dns_rdatatype_nsec3param, buf,
+                                         sizeof(buf),
+                                         params->nsec3param_text);
        ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
        result = dns_rdata_tostruct(&rdata, &nsec3param, NULL);
        ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);

diff --git a/lib/dns/tests/rdata_test.c b/lib/dns/tests/rdata_test.c
index 0a9b94b2d6f2093a7217ac5fda1c95466a7ff6fa..d145bd5cd8ebf79640c254e10c715567cb4abde4 100644 (file)
--- a/lib/dns/tests/rdata_test.c
+++ b/lib/dns/tests/rdata_test.c
@@ -153,9 +153,9 @@ check_text_ok_single(const text_ok_t *text_ok, dns_rdataclass_t rdclass,
        /*
         * Try converting text form RDATA into uncompressed wire form.
         */
-       result = dns_test_rdata_fromstring(&rdata, rdclass, type, buf_fromtext,
-                                          sizeof(buf_fromtext),
-                                          text_ok->text_in);
+       result = dns_test_rdatafromstring(&rdata, rdclass, type, buf_fromtext,
+                                         sizeof(buf_fromtext),
+                                         text_ok->text_in);
        /*
         * Check whether result is as expected.
         */