X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fquery.c;h=cf85bcf62a126eced0f617cc6299a9b71fb1bbfa;hb=7b4b431450c6056f7d419d28951194517f0f0b03;hp=d6271a39e8b8e80fb1bf77dcf8480c933179322e;hpb=0b062eccea099e977fddf82c4d08167c638a10aa;p=adns.git

diff --git a/src/query.c b/src/query.c
index d6271a3..cf85bcf 100644
--- a/src/query.c
+++ b/src/query.c
@@ -133,17 +133,17 @@ static adns_status check_domain_name(adns_state ads, adns_queryflags flags,
 				     const byte *dgram, int dglen)
 {
   findlabel_state fls;
-  adns_status err;
+  adns_status st;
   int labnum= 0, labstart, lablen;
   union checklabel_state cls;
 
   adns__findlabel_start(&fls,ads, -1,0, dgram,dglen,dglen, DNS_HDRSIZE,0);
   do {
-    err= adns__findlabel_next(&fls, &lablen,&labstart);
-    assert(!err); assert(lablen >= 0);
-    err= typei->checklabel(ads,flags, &cls,ctx,
+    st= adns__findlabel_next(&fls, &lablen,&labstart);
+    assert(!st); assert(lablen >= 0);
+    st= typei->checklabel(ads,flags, &cls,ctx,
 			   labnum++, dgram,labstart,lablen);
-    if (err) return err;
+    if (st) return st;
   } while (lablen);
   return adns_s_ok;
 }
@@ -155,12 +155,12 @@ adns_status adns__internal_submit(adns_state ads, adns_query *query_r,
 				  adns_queryflags flags, struct timeval now,
 				  qcontext *ctx) {
   adns_query qu;
-  adns_status err;
+  adns_status st;
 
-  err= check_domain_name(ads, flags,ctx,typei, qumsg_vb->buf,qumsg_vb->used);
-  if (err) goto x_err;
+  st= check_domain_name(ads, flags,ctx,typei, qumsg_vb->buf,qumsg_vb->used);
+  if (st) goto x_err;
   qu= query_alloc(ads,typei,type,flags,now);
-  if (!qu) { err = adns_s_nomemory; goto x_err; }
+  if (!qu) { st = adns_s_nomemory; goto x_err; }
   *query_r= qu;
 
   qu->parent= parent;
@@ -172,7 +172,7 @@ adns_status adns__internal_submit(adns_state ads, adns_query *query_r,
 
 x_err:
   adns__vbuf_free(qumsg_vb);
-  return err;
+  return st;
 }
 
 static void query_simple(adns_state ads, adns_query qu,
@@ -181,22 +181,22 @@ static void query_simple(adns_state ads, adns_query qu,
 			 struct timeval now) {
   vbuf vb_new;
   int id;
-  adns_status stat;
+  adns_status st;
 
-  stat= adns__mkquery(ads,&qu->vb,&id, owner,ol,
+  st= adns__mkquery(ads,&qu->vb,&id, owner,ol,
 		      typei,qu->answer->type, flags);
-  if (stat) {
-    if (stat == adns_s_querydomaintoolong && (flags & adns_qf_search)) {
+  if (st) {
+    if (st == adns_s_querydomaintoolong && (flags & adns_qf_search)) {
       adns__search_next(ads,qu,now);
       return;
     } else {
-      adns__query_fail(qu,stat);
+      adns__query_fail(qu,st);
       return;
     }
   }
 
-  stat= check_domain_name(ads, flags,&qu->ctx,typei, qu->vb.buf,qu->vb.used);
-  if (stat) { adns__query_fail(qu,stat); return; }
+  st= check_domain_name(ads, flags,&qu->ctx,typei, qu->vb.buf,qu->vb.used);
+  if (st) { adns__query_fail(qu,st); return; }
 
   vb_new= qu->vb;
   adns__vbuf_init(&qu->vb);
@@ -205,7 +205,7 @@ static void query_simple(adns_state ads, adns_query qu,
 
 void adns__search_next(adns_state ads, adns_query qu, struct timeval now) {
   const char *nextentry;
-  adns_status stat;
+  adns_status st;
   
   if (qu->search_doneabs<0) {
     nextentry= 0;
@@ -214,7 +214,7 @@ void adns__search_next(adns_state ads, adns_query qu, struct timeval now) {
     if (qu->search_pos >= ads->nsearchlist) {
       if (qu->search_doneabs) {
 	qu->search_vb.used= qu->search_origlen;
-	stat= adns_s_nxdomain; goto x_fail;
+	st= adns_s_nxdomain; goto x_fail;
       } else {
 	nextentry= 0;
 	qu->search_doneabs= 1;
@@ -239,9 +239,9 @@ void adns__search_next(adns_state ads, adns_query qu, struct timeval now) {
   return;
 
 x_nomemory:
-  stat= adns_s_nomemory;
+  st= adns_s_nomemory;
 x_fail:
-  adns__query_fail(qu,stat);
+  adns__query_fail(qu,st);
 }
 
 static int save_owner(adns_query qu, const char *owner, int ol) {
@@ -267,7 +267,7 @@ int adns_submit(adns_state ads,
 		void *context,
 		adns_query *query_r) {
   int r, ol, ndots;
-  adns_status stat;
+  adns_status st;
   const typeinfo *typei;
   struct timeval now;
   adns_query qu;
@@ -289,8 +289,8 @@ int adns_submit(adns_state ads,
   *query_r= qu;
 
   ol= strlen(owner);
-  if (!ol) { stat= adns_s_querydomaininvalid; goto x_adnsfail; }
-  if (ol>DNS_MAXDOMAIN+1) { stat= adns_s_querydomaintoolong; goto x_adnsfail; }
+  if (!ol) { st= adns_s_querydomaininvalid; goto x_adnsfail; }
+  if (ol>DNS_MAXDOMAIN+1) { st= adns_s_querydomaintoolong; goto x_adnsfail; }
 				 
   if (ol>=1 && owner[ol-1]=='.' && (ol<2 || owner[ol-2]!='\\')) {
     flags &= ~adns_qf_search;
@@ -300,7 +300,7 @@ int adns_submit(adns_state ads,
 
   if (flags & adns_qf_search) {
     r= adns__vbuf_append(&qu->search_vb,owner,ol);
-    if (!r) { stat= adns_s_nomemory; goto x_adnsfail; }
+    if (!r) { st= adns_s_nomemory; goto x_adnsfail; }
 
     for (ndots=0, p=owner; (p= strchr(p,'.')); p++, ndots++);
     qu->search_doneabs= (ndots >= ads->searchndots) ? -1 : 0;
@@ -308,7 +308,7 @@ int adns_submit(adns_state ads,
     adns__search_next(ads,qu,now);
   } else {
     if (flags & adns_qf_owner) {
-      if (!save_owner(qu,owner,ol)) { stat= adns_s_nomemory; goto x_adnsfail; }
+      if (!save_owner(qu,owner,ol)) { st= adns_s_nomemory; goto x_adnsfail; }
     }
     query_simple(ads,qu, owner,ol, typei,flags, now);
   }
@@ -317,7 +317,7 @@ int adns_submit(adns_state ads,
   return 0;
 
  x_adnsfail:
-  adns__query_fail(qu,stat);
+  adns__query_fail(qu,st);
   adns__returning(ads,qu);
   return 0;
 
@@ -641,9 +641,9 @@ void adns__query_done(adns_query qu) {
   }
 }
 
-void adns__query_fail(adns_query qu, adns_status stat) {
+void adns__query_fail(adns_query qu, adns_status st) {
   adns__reset_preserved(qu);
-  qu->answer->status= stat;
+  qu->answer->status= st;
   adns__query_done(qu);
 }