@@ -45,6 +45,7 @@

+  * Declare flags parameters as ints not enums because C++ is crap.

diff --git a/changelog b/changelog
index d4fe568232fdf78d1f8dedfce56a666805deee1a..f579dc6dfe1d45b6d4a94efbcfccf74493251e20 100644 (file)
--- a/changelog
+++ b/changelog
@@ -45,6 +45,7 @@ adns (0.5) unstable; urgency=high
   * Remove trailing , from some enums in adns.h.
   * Dynamically linked clients now made with -l, so as to avoid rpath.
   * Do not use $^ in make rules (should help with non-GNU make).
   * Remove trailing , from some enums in adns.h.
   * Dynamically linked clients now made with -l, so as to avoid rpath.
   * Do not use $^ in make rules (should help with non-GNU make).

+  * Declare flags parameters as ints not enums because C++ is crap.

 
  --
 
 
  --
 

diff --git a/src/adns.h b/src/adns.h
index f930639cb634fb412107e01b27f9ffde8d5c75a3..721fd116284480e0fd68b52aaf1ac488e327df50 100644 (file)
--- a/src/adns.h
+++ b/src/adns.h
@@ -51,7 +51,7 @@
  *  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  *
  *  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  *

- *  $Id: adns.h,v 1.69 1999/10/13 00:57:36 ian Exp $
+ *  $Id: adns.h,v 1.70 1999/10/13 01:23:56 ian Exp $

  */
 
 #ifndef ADNS_H_INCLUDED
  */
 
 #ifndef ADNS_H_INCLUDED


@@ -336,10 +336,10 @@ typedef struct {
  *  requested.
  */
 
  *  requested.
  */
 

-int adns_init(adns_state *newstate_r, adns_initflags flags,
+int adns_init(adns_state *newstate_r, int flags /*adns_initflags*/,

              FILE *diagfile /*0=>stderr*/);
 
              FILE *diagfile /*0=>stderr*/);
 

-int adns_init_strcfg(adns_state *newstate_r, adns_initflags flags,
+int adns_init_strcfg(adns_state *newstate_r, int flags /*adns_initflags*/,

                     FILE *diagfile /*0=>discard*/, const char *configtext);
 
 /* Configuration:
                     FILE *diagfile /*0=>discard*/, const char *configtext);
 
 /* Configuration:


@@ -443,7 +443,7 @@ int adns_init_strcfg(adns_state *newstate_r, adns_initflags flags,
 int adns_synchronous(adns_state ads,
                     const char *owner,
                     adns_rrtype type,
 int adns_synchronous(adns_state ads,
                     const char *owner,
                     adns_rrtype type,

-                    adns_queryflags flags,
+                    int flags /*adns_queryflags*/,

                     adns_answer **answer_r);
 
 /* NB: if you set adns_if_noautosys then _submit and _check do not
                     adns_answer **answer_r);
 
 /* NB: if you set adns_if_noautosys then _submit and _check do not


@@ -454,7 +454,7 @@ int adns_synchronous(adns_state ads,
 int adns_submit(adns_state ads,
                const char *owner,
                adns_rrtype type,
 int adns_submit(adns_state ads,
                const char *owner,
                adns_rrtype type,

-               adns_queryflags flags,
+               int flags /*adns_queryflags*/,

                void *context,
                adns_query *query_r);
 
                void *context,
                adns_query *query_r);
 


@@ -493,7 +493,7 @@ void adns_cancel(adns_query query);
 int adns_submit_reverse(adns_state ads,
                        const struct sockaddr *addr,
                        adns_rrtype type,
 int adns_submit_reverse(adns_state ads,
                        const struct sockaddr *addr,
                        adns_rrtype type,

-                       adns_queryflags flags,
+                       int flags /*adns_queryflags*/,

                        void *context,
                        adns_query *query_r);
 /* type must be _r_ptr or _r_ptr_raw.  _qf_search is ignored.
                        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 8d9994b748a8f5ca977ad0768b17028d1a5aa58f..c092a30c25a79a94837510691e5c5a8747767b46 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 adns_submit(adns_state ads,
                const char *owner,
                adns_rrtype type,

-               adns_queryflags flags,
+               int flags,

                void *context,
                adns_query *query_r) {
   int r, ol, ndots;
                void *context,
                adns_query *query_r) {
   int r, ol, ndots;


@@ -261,7 +261,7 @@ int adns_submit(adns_state ads,
 int adns_submit_reverse(adns_state ads,
                        const struct sockaddr *addr,
                        adns_rrtype type,
 int adns_submit_reverse(adns_state ads,
                        const struct sockaddr *addr,
                        adns_rrtype type,

-                       adns_queryflags flags,
+                       int flags,

                        void *context,
                        adns_query *query_r) {
   const unsigned char *iaddr;
                        void *context,
                        adns_query *query_r) {
   const unsigned char *iaddr;


@@ -282,7 +282,7 @@ int adns_submit_reverse(adns_state ads,
 int adns_synchronous(adns_state ads,
                     const char *owner,
                     adns_rrtype type,
 int adns_synchronous(adns_state ads,
                     const char *owner,
                     adns_rrtype type,

-                    adns_queryflags flags,
+                    int flags,

                     adns_answer **answer_r) {
   adns_query qu;
   int r;
                     adns_answer **answer_r) {
   adns_query qu;
   int r;

diff --git a/src/setup.c b/src/setup.c
index 0e3e7da475d6e1cf3a4a9129c9aeeeb59a0fb646..83526251e1ab4c22b19a497eeb9fe133f42909bb 100644 (file)
--- a/src/setup.c
+++ b/src/setup.c
@@ -516,7 +516,7 @@ static void init_abort(adns_state ads) {
   free(ads);
 }
 
   free(ads);
 }
 

-int adns_init(adns_state *ads_r, adns_initflags flags, FILE *diagfile) {
+int adns_init(adns_state *ads_r, int flags, FILE *diagfile) {

   adns_state ads;
   const char *res_options, *adns_res_options;
   int r;
   adns_state ads;
   const char *res_options, *adns_res_options;
   int r;


@@ -556,7 +556,7 @@ int adns_init(adns_state *ads_r, adns_initflags flags, FILE *diagfile) {
   return 0;
 }
 
   return 0;
 }
 

-int adns_init_strcfg(adns_state *ads_r, adns_initflags flags,
+int adns_init_strcfg(adns_state *ads_r, int flags,

                     FILE *diagfile, const char *configtext) {
   adns_state ads;
   int r;
                     FILE *diagfile, const char *configtext) {
   adns_state ads;
   int r;