From d1f34ef40058aa76ff63215024eff508e0247713 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 7 Sep 2017 12:48:16 +1000
Subject: [PATCH] 4702.   [func]          Update function declarations to use  
                       dns_masterstyle_flags_t for style flags. [RT #45924]

---
 CHANGES                          |  3 +++
 lib/dns/include/dns/masterdump.h | 14 ++++++++------
 lib/dns/include/dns/rdata.h      |  2 +-
 lib/dns/masterdump.c             |  6 ++++--
 lib/dns/rdata.c                  |  4 ++--
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/CHANGES b/CHANGES
index 6c6d1f44fa..409c638ce1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4702.	[func]		Update function declarations to use
+			dns_masterstyle_flags_t for style flags. [RT #45924]
+
 4701.	[cleanup]	Refactored lib/dns/tsig.c to reduce code
 			duplication and simplify the disabling of MD5.
 			[RT #45490]
diff --git a/lib/dns/include/dns/masterdump.h b/lib/dns/include/dns/masterdump.h
index 402c8c0e86..f1fd5a634c 100644
--- a/lib/dns/include/dns/masterdump.h
+++ b/lib/dns/include/dns/masterdump.h
@@ -406,18 +406,20 @@ dns_masterstyle_flags_t
 dns_master_styleflags(const dns_master_style_t *style);
 
 isc_result_t
-dns_master_stylecreate(dns_master_style_t **style, unsigned int flags,
+dns_master_stylecreate(dns_master_style_t **style,
+		       dns_masterstyle_flags_t flags,
 		       unsigned int ttl_column, unsigned int class_column,
 		       unsigned int type_column, unsigned int rdata_column,
 		       unsigned int line_length, unsigned int tab_width,
 		       isc_mem_t *mctx);
 
 isc_result_t
-dns_master_stylecreate2(dns_master_style_t **style, unsigned int flags,
-		       unsigned int ttl_column, unsigned int class_column,
-		       unsigned int type_column, unsigned int rdata_column,
-		       unsigned int line_length, unsigned int tab_width,
-		       unsigned int split_width, isc_mem_t *mctx);
+dns_master_stylecreate2(dns_master_style_t **style,
+		        dns_masterstyle_flags_t flags,
+		        unsigned int ttl_column, unsigned int class_column,
+		        unsigned int type_column, unsigned int rdata_column,
+		        unsigned int line_length, unsigned int tab_width,
+		        unsigned int split_width, isc_mem_t *mctx);
 
 void
 dns_master_styledestroy(dns_master_style_t **style, isc_mem_t *mctx);
diff --git a/lib/dns/include/dns/rdata.h b/lib/dns/include/dns/rdata.h
index 72ae077b07..376da655de 100644
--- a/lib/dns/include/dns/rdata.h
+++ b/lib/dns/include/dns/rdata.h
@@ -435,7 +435,7 @@ dns_rdata_totext(dns_rdata_t *rdata, const dns_name_t *origin,
 
 isc_result_t
 dns_rdata_tofmttext(dns_rdata_t *rdata, const dns_name_t *origin,
-		    unsigned int flags, unsigned int width,
+		    dns_masterstyle_flags_t flags, unsigned int width,
 		    unsigned int split_width, const char *linebreak,
 		    isc_buffer_t *target);
 /*%<
diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c
index 145382503d..24d655dd8c 100644
--- a/lib/dns/masterdump.c
+++ b/lib/dns/masterdump.c
@@ -2090,7 +2090,8 @@ dns_master_styleflags(const dns_master_style_t *style) {
 }
 
 isc_result_t
-dns_master_stylecreate(dns_master_style_t **stylep, unsigned int flags,
+dns_master_stylecreate(dns_master_style_t **stylep,
+		       dns_masterstyle_flags_t flags,
 		       unsigned int ttl_column, unsigned int class_column,
 		       unsigned int type_column, unsigned int rdata_column,
 		       unsigned int line_length, unsigned int tab_width,
@@ -2103,7 +2104,8 @@ dns_master_stylecreate(dns_master_style_t **stylep, unsigned int flags,
 }
 
 isc_result_t
-dns_master_stylecreate2(dns_master_style_t **stylep, unsigned int flags,
+dns_master_stylecreate2(dns_master_style_t **stylep,
+		        dns_masterstyle_flags_t flags,
 			unsigned int ttl_column, unsigned int class_column,
 			unsigned int type_column, unsigned int rdata_column,
 			unsigned int line_length, unsigned int tab_width,
diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c
index 5cc4b5840e..b2e0819174 100644
--- a/lib/dns/rdata.c
+++ b/lib/dns/rdata.c
@@ -116,7 +116,7 @@
  */
 typedef struct dns_rdata_textctx {
 	const dns_name_t *origin;	/*%< Current origin, or NULL. */
-	unsigned int flags;	/*%< DNS_STYLEFLAG_*  */
+	dns_masterstyle_flags_t flags;	/*%< DNS_STYLEFLAG_*  */
 	unsigned int width;	/*%< Width of rdata column. */
 	const char *linebreak;	/*%< Line break string. */
 } dns_rdata_textctx_t;
@@ -1142,7 +1142,7 @@ dns_rdata_totext(dns_rdata_t *rdata, const dns_name_t *origin,
 
 isc_result_t
 dns_rdata_tofmttext(dns_rdata_t *rdata, const dns_name_t *origin,
-		    unsigned int flags, unsigned int width,
+		    dns_masterstyle_flags_t flags, unsigned int width,
 		    unsigned int split_width, const char *linebreak,
 		    isc_buffer_t *target)
 {