From 679ff49d885968ad904592ce3a373106a10669e9 Mon Sep 17 00:00:00 2001 From: ian Date: Wed, 13 Oct 1999 01:23:56 +0000 Subject: [PATCH] + * Declare flags parameters as ints not enums because C++ is crap. @@ -45,6 +45,7 @@ + * Declare flags parameters as ints not enums because C++ is crap. --- changelog | 1 + src/adns.h | 10 +++++----- src/query.c | 6 +++--- src/setup.c | 4 ++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/changelog b/changelog index d4fe568..f579dc6 100644 --- 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). + * Declare flags parameters as ints not enums because C++ is crap. -- diff --git a/src/adns.h b/src/adns.h index 29d7ede..b8c5b02 100644 --- a/src/adns.h +++ b/src/adns.h @@ -336,10 +336,10 @@ typedef struct { * 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*/); -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: @@ -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, - adns_queryflags flags, + int flags /*adns_queryflags*/, 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, - adns_queryflags flags, + int flags /*adns_queryflags*/, 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, - 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. diff --git a/src/query.c b/src/query.c index 8d9994b..c092a30 100644 --- 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, - adns_queryflags flags, + int flags, 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, - adns_queryflags flags, + int flags, 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, - adns_queryflags flags, + int flags, adns_answer **answer_r) { adns_query qu; int r; diff --git a/src/setup.c b/src/setup.c index 0e3e7da..8352625 100644 --- a/src/setup.c +++ b/src/setup.c @@ -516,7 +516,7 @@ static void init_abort(adns_state 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; @@ -556,7 +556,7 @@ int adns_init(adns_state *ads_r, adns_initflags flags, FILE *diagfile) { 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; -- 2.30.2