From: Michał Kępień <michal@isc.org>
Date: Wed, 9 May 2018 11:12:08 +0000 (+0200)
Subject: Rename dns_test_rdata_fromstring() to dns_test_rdatafromstring()
X-Git-Tag: v9.9.13rc1~28^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1eec107a94d70e33b57cfe663a42db7a3f649168;p=thirdparty%2Fbind9.git

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.

(cherry picked from commit 2980cbd55f4fc56b5a4115ccd2e6d46ada6dcdf9)
(cherry picked from commit 107102d3338812196e4f940de438774c8e24c024)
(cherry picked from commit 5097723d1b2b8b5b19c50f19bf4fe1e5a94bd7e7)
(cherry picked from commit 94caf8ebdb0b0af37b1a594a5ce78ba9ceeb084e)
---

diff --git a/lib/dns/tests/dnstest.c b/lib/dns/tests/dnstest.c
index bb17dc834e4..8a26c2f6ef6 100644
--- a/lib/dns/tests/dnstest.c
+++ b/lib/dns/tests/dnstest.c
@@ -31,6 +31,7 @@
 #include <isc/lex.h>
 #include <isc/mem.h>
 #include <isc/os.h>
+#include <isc/stdio.h>
 #include <isc/string.h>
 #include <isc/socket.h>
 #include <isc/task.h>
@@ -383,9 +384,9 @@ dns_test_tohex(const unsigned char *data, size_t len, char *buf, size_t buflen)
 }
 
 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 c4e154ceea1..5f6a54cb53a 100644
--- a/lib/dns/tests/dnstest.h
+++ b/lib/dns/tests/dnstest.h
@@ -107,9 +107,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 4c602c1cb2c..19fe25ced02 100644
--- a/lib/dns/tests/nsec3_test.c
+++ b/lib/dns/tests/nsec3_test.c
@@ -14,8 +14,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id$ */
-
 /*! \file */
 
 #include <config.h>
@@ -80,10 +78,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 1d547239fea..9cfd945b14e 100644
--- a/lib/dns/tests/rdata_test.c
+++ b/lib/dns/tests/rdata_test.c
@@ -158,9 +158,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.
 	 */