From 8d6024e7cffbd84fa8d06ce50c60307d7b3b49c2 Mon Sep 17 00:00:00 2001
From: Michael Graff <mgraff@isc.org>
Date: Fri, 30 Apr 1999 21:15:02 +0000
Subject: [PATCH] Move the flags on dns_rdataset_totext() to be together, and
 make a matching change to dns_rdataset_towire()

---
 bin/tests/db_test.c            | 4 ++--
 bin/tests/master_test.c        | 4 ++--
 bin/tests/wire_test.c          | 4 ++--
 lib/dns/include/dns/rdataset.h | 8 ++++----
 lib/dns/message.c              | 5 +++--
 lib/dns/rdataset.c             | 8 ++++----
 6 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/bin/tests/db_test.c b/bin/tests/db_test.c
index 82cb06cbe3..72282f27d6 100644
--- a/bin/tests/db_test.c
+++ b/bin/tests/db_test.c
@@ -82,8 +82,8 @@ print_rdataset(dns_name_t *name, dns_rdataset_t *rdataset) {
 	isc_region_t r;
 
 	isc_buffer_init(&text, t, sizeof t, ISC_BUFFERTYPE_TEXT);
-	result = dns_rdataset_totext(rdataset, name, ISC_FALSE, &text,
-				     ISC_FALSE);
+	result = dns_rdataset_totext(rdataset, name, ISC_FALSE, ISC_FALSE,
+				     &text);
 	isc_buffer_used(&text, &r);
 	if (result == DNS_R_SUCCESS)
 		printf("%.*s", (int)r.length, (char *)r.base);
diff --git a/bin/tests/master_test.c b/bin/tests/master_test.c
index 2a45d1f3d8..7720037a3a 100644
--- a/bin/tests/master_test.c
+++ b/bin/tests/master_test.c
@@ -45,8 +45,8 @@ print_dataset(dns_rdatacallbacks_t *callbacks, dns_name_t *owner,
 	callbacks = callbacks;	/*unused*/
 
 	isc_buffer_init(&target, buf, 64*1024, ISC_BUFFERTYPE_TEXT);
-	result = dns_rdataset_totext(dataset, owner, ISC_FALSE, &target,
-				     ISC_FALSE);
+	result = dns_rdataset_totext(dataset, owner, ISC_FALSE, ISC_FALSE,
+				     &target);
 	if (result == DNS_R_SUCCESS)
 		fprintf(stdout, "%.*s\n", (int)target.used,
 					  (char*)target.base);
diff --git a/bin/tests/wire_test.c b/bin/tests/wire_test.c
index bdc2aa8485..c3f590e976 100644
--- a/bin/tests/wire_test.c
+++ b/bin/tests/wire_test.c
@@ -160,8 +160,8 @@ printsection(dns_message_t *msg, dns_section_t sectionid, char *section_name)
 		     rdataset != NULL;
 		     rdataset = ISC_LIST_NEXT(rdataset, link)) {
 			result = dns_rdataset_totext(rdataset, print_name,
-						     ISC_FALSE, &target,
-						     no_rdata);
+						     ISC_FALSE, no_rdata,
+						     &target);
 			if (result != DNS_R_SUCCESS)
 				return (result);
 #ifdef USEINITALWS
diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h
index f334132d20..499779bab0 100644
--- a/lib/dns/include/dns/rdataset.h
+++ b/lib/dns/include/dns/rdataset.h
@@ -189,8 +189,8 @@ dns_result_t
 dns_rdataset_totext(dns_rdataset_t *rdataset,
 		    dns_name_t *owner_name,
 		    isc_boolean_t omit_final_dot,
-		    isc_buffer_t *target,
-		    isc_boolean_t no_rdata_or_ttl);
+		    isc_boolean_t no_rdata_or_ttl,
+		    isc_buffer_t *target);
 /*
  * Convert 'rdataset' to text format, storing the result in 'target'.
  *
@@ -215,9 +215,9 @@ dns_result_t
 dns_rdataset_towire(dns_rdataset_t *rdataset,
 		    dns_name_t *owner_name,
 		    dns_compress_t *cctx,
+		    isc_boolean_t no_rdata_or_ttl,
 		    isc_buffer_t *target,
-		    unsigned int *countp,
-		    isc_boolean_t no_rdata_or_ttl);
+		    unsigned int *countp);
 /*
  * Convert 'rdataset' to wire format, compressing names as specified
  * in cctx, and storing the result in 'target'.
diff --git a/lib/dns/message.c b/lib/dns/message.c
index 3288b84514..1fc52f5d34 100644
--- a/lib/dns/message.c
+++ b/lib/dns/message.c
@@ -1150,8 +1150,9 @@ dns_message_rendersection(dns_message_t *msg, dns_section_t sectionid,
 			count = 0;
 
 			result = dns_rdataset_towire(rdataset, name,
-						     &msg->cctx, &subbuffer,
-						     &count, no_render_rdata);
+						     &msg->cctx,
+						     no_render_rdata,
+						     &subbuffer, &count);
 
 			/*
 			 * If out of space, record stats on what we rendered
diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c
index d92bb046e6..08cea447b0 100644
--- a/lib/dns/rdataset.c
+++ b/lib/dns/rdataset.c
@@ -160,8 +160,8 @@ dns_result_t
 dns_rdataset_totext(dns_rdataset_t *rdataset,
 		    dns_name_t *owner_name,
 		    isc_boolean_t omit_final_dot,
-		    isc_buffer_t *target,
-		    isc_boolean_t no_rdata_or_ttl)
+		    isc_boolean_t no_rdata_or_ttl,
+		    isc_buffer_t *target)
 {
 	dns_result_t result;
 	unsigned int common_start, common_length, length, ntabs, ttabs;
@@ -281,9 +281,9 @@ dns_result_t
 dns_rdataset_towire(dns_rdataset_t *rdataset,
 		    dns_name_t *owner_name,
 		    dns_compress_t *cctx,
+		    isc_boolean_t no_rdata_or_ttl,
 		    isc_buffer_t *target,
-		    unsigned int *countp,
-		    isc_boolean_t no_rdata_or_ttl)
+		    unsigned int *countp)
 {
 	dns_rdata_t rdata;
 	isc_region_t r;