regress: Wrap up fopen() too

[adns.git] / src / query.c

diff --git a/src/query.c b/src/query.c
index 438b4fd21a5f9f658e69185c7259c0a09545ccbd..4eba88871f651c921fbf727206868c9b2f009e3e 100644 (file)
--- a/src/query.c
+++ b/src/query.c
@@ -6,7 +6,7 @@
  */
 /*
  *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016  Ian Jackson
+ *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
  *    Copyright (C) 2014  Mark Wooding
  *    Copyright (C) 1999-2000,2003,2006  Tony Finch
  *    Copyright (C) 1991 Massachusetts Institute of Technology
@@ -72,7 +72,7 @@ static adns_query query_alloc(adns_state ads,
   qu->retries= 0;
   qu->udpnextserver= 0;
   qu->udpsent= 0;
-  timerclear(&qu->timeout);
+  adns__timeout_clear(qu);
   qu->expires= now.tv_sec + MAXTTLBELIEVE;
 
   memset(&qu->ctx,0,sizeof(qu->ctx));
@@ -273,7 +273,7 @@ int adns_submit(adns_state ads,
   adns_query qu;
   const char *p;
 
-  adns__consistency(ads,0,cc_entex);
+  adns__consistency(ads,0,cc_enter);
 
   if (flags & ~(adns_queryflags)0x4009ffff)
     /* 0x40080000 are reserved for `harmless' future expansion
@@ -520,7 +520,7 @@ void adns__intdone_process(adns_state ads) {
 
 void adns__returning(adns_state ads, adns_query qu_for_caller) {
   adns__intdone_process(ads);
-  adns__consistency(ads,qu_for_caller,cc_entex);
+  adns__consistency(ads,qu_for_caller,cc_exit);
 }
 
 void adns__cancel(adns_query qu) {
@@ -558,7 +558,7 @@ void adns_cancel(adns_query qu) {
 
   assert(!qu->parent);
   ads= qu->ads;
-  adns__consistency(ads,qu,cc_entex);
+  adns__consistency(ads,qu,cc_enter);
   adns__cancel(qu);
   adns__returning(ads,0);
 }