4702. [func] Update function declarations to use

                        dns_masterstyle_flags_t for style flags. [RT #45924]

diff --git a/CHANGES b/CHANGES
index 6c6d1f44fa1960c71810186cc24cdbdd74420555..409c638ce162c157a34e9a0e59c2ab3272afa1b9 100644 (file)
--- 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 402c8c0e86149dbbf4742d8d0db7e7155173911c..f1fd5a634c77883d719827ef91b752c14bf349ff 100644 (file)
--- 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 72ae077b07cf76684f056aa0b2729eb1bbb3c874..376da655de1e8c2c96091ad8f008afae8568cc4a 100644 (file)
--- 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 145382503d6a6eadf872916124eba3f941297bf9..24d655dd8c438ce7ec7b01a637b99d23dc069746 100644 (file)
--- 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 5cc4b5840e3a87ee0220c9a172e076a538c69b44..b2e0819174dc744b3dc8f1f25ffb6d44e2dd7ff6 100644 (file)
--- 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)
 {