+ * Declare flags parameters as enums again, not ints.

@@ -14,6 +14,7 @@
+  * Declare flags parameters as enums again, not ints.

diff --git a/changelog b/changelog
index 0ef286c82fff16c7e9e5124300e9cd4eb48a0efa..2a402b13fb84dba271ed1ed3cb068f4c811b3f6e 100644 (file)
--- a/changelog
+++ b/changelog
@@ -14,6 +14,7 @@ adns (0.6) unstable; urgency=high
   * New adns_if_logpid option (functionality suggested by Tony Finch).
   * Better control of adnshost output and error messages (new -F options).
   * New fanftest test program from Tony Finch.
+  * Declare flags parameters as enums again, not ints.
 
  --
 

diff --git a/src/adns.h b/src/adns.h
index 726d94eda5c28667d02190b8b1e24868c202da1a..bc20a70d797ed325f0b994246f6670808b9d01fb 100644 (file)
--- a/src/adns.h
+++ b/src/adns.h
@@ -337,10 +337,10 @@ typedef struct {
  *  requested.
  */
 
-int adns_init(adns_state *newstate_r, int flags /*adns_initflags*/,
+int adns_init(adns_state *newstate_r, adns_initflags flags,
              FILE *diagfile /*0=>stderr*/);
 
-int adns_init_strcfg(adns_state *newstate_r, int flags /*adns_initflags*/,
+int adns_init_strcfg(adns_state *newstate_r, adns_initflags flags,
                     FILE *diagfile /*0=>discard*/, const char *configtext);
 
 /* Configuration:
@@ -444,7 +444,7 @@ int adns_init_strcfg(adns_state *newstate_r, int flags /*adns_initflags*/,
 int adns_synchronous(adns_state ads,
                     const char *owner,
                     adns_rrtype type,
-                    int flags /*adns_queryflags*/,
+                    adns_queryflags flags,
                     adns_answer **answer_r);
 
 /* NB: if you set adns_if_noautosys then _submit and _check do not
@@ -455,7 +455,7 @@ int adns_synchronous(adns_state ads,
 int adns_submit(adns_state ads,
                const char *owner,
                adns_rrtype type,
-               int flags /*adns_queryflags*/,
+               adns_queryflags flags,
                void *context,
                adns_query *query_r);
 
@@ -494,7 +494,7 @@ void adns_cancel(adns_query query);
 int adns_submit_reverse(adns_state ads,
                        const struct sockaddr *addr,
                        adns_rrtype type,
-                       int flags /*adns_queryflags*/,
+                       adns_queryflags flags,
                        void *context,
                        adns_query *query_r);
 /* type must be _r_ptr or _r_ptr_raw.  _qf_search is ignored.

diff --git a/src/query.c b/src/query.c
index f805c9296565fe8b10920c15d144e31cd34457a9..640d10ceeee8d25144f615ceb107a728c726dfd1 100644 (file)
--- a/src/query.c
+++ b/src/query.c
@@ -195,7 +195,7 @@ static int save_owner(adns_query qu, const char *owner, int ol) {
 int adns_submit(adns_state ads,
                const char *owner,
                adns_rrtype type,
-               int flags,
+               adns_queryflags flags,
                void *context,
                adns_query *query_r) {
   int r, ol, ndots;
@@ -262,7 +262,7 @@ int adns_submit(adns_state ads,
 int adns_submit_reverse(adns_state ads,
                        const struct sockaddr *addr,
                        adns_rrtype type,
-                       int flags,
+                       adns_queryflags flags,
                        void *context,
                        adns_query *query_r) {
   const unsigned char *iaddr;
@@ -283,7 +283,7 @@ int adns_submit_reverse(adns_state ads,
 int adns_synchronous(adns_state ads,
                     const char *owner,
                     adns_rrtype type,
-                    int flags,
+                    adns_queryflags flags,
                     adns_answer **answer_r) {
   adns_query qu;
   int r;

diff --git a/src/setup.c b/src/setup.c
index ba80f14a66a1dceda08929efc80f795eeb0e1982..dca8a193adfc346c41276265080f90dcbf7ce55c 100644 (file)
--- a/src/setup.c
+++ b/src/setup.c
@@ -517,7 +517,7 @@ static void init_abort(adns_state ads) {
   free(ads);
 }
 
-int adns_init(adns_state *ads_r, int flags, FILE *diagfile) {
+int adns_init(adns_state *ads_r, adns_initflags flags, FILE *diagfile) {
   adns_state ads;
   const char *res_options, *adns_res_options;
   int r;
@@ -557,7 +557,7 @@ int adns_init(adns_state *ads_r, int flags, FILE *diagfile) {
   return 0;
 }
 
-int adns_init_strcfg(adns_state *ads_r, int flags,
+int adns_init_strcfg(adns_state *ads_r, adns_initflags flags,
                     FILE *diagfile, const char *configtext) {
   adns_state ads;
   int r;