src/: Rename some variables `stat' to `st' (style)

These inconsistencies have been there since the dawn of time.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/src/internal.h b/src/internal.h
index 24c5c829f69162094a67c121337bc179eb5050f8..226c4429f98f36df2d4533c342beacad63bc6764 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -706,7 +706,7 @@ void adns__reset_preserved(adns_query qu);
 
 void adns__cancel(adns_query qu);
 void adns__query_done(adns_query qu);
 
 void adns__cancel(adns_query qu);
 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);

 void adns__cancel_children(adns_query qu);
 
 void adns__returning(adns_state ads, adns_query qu);
 void adns__cancel_children(adns_query qu);
 
 void adns__returning(adns_state ads, adns_query qu);

diff --git a/src/query.c b/src/query.c
index 771a985061fd8da96d0f7e8623662176c4c8271c..cf85bcf62a126eced0f617cc6299a9b71fb1bbfa 100644 (file)
--- a/src/query.c
+++ b/src/query.c
@@ -181,22 +181,22 @@ static void query_simple(adns_state ads, adns_query qu,
                         struct timeval now) {
   vbuf vb_new;
   int id;
                         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);
                      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__search_next(ads,qu,now);
       return;
     } else {

-      adns__query_fail(qu,stat);
+      adns__query_fail(qu,st);

       return;
     }
   }
 
       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);
 
   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;
 
 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;
   
   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;
     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;
       } 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:
   return;
 
 x_nomemory:

-  stat= adns_s_nomemory;
+  st= adns_s_nomemory;

 x_fail:
 x_fail:

-  adns__query_fail(qu,stat);
+  adns__query_fail(qu,st);

 }
 
 static int save_owner(adns_query qu, const char *owner, int ol) {
 }
 
 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;
                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;
   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);
   *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;
                                 
   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 (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;
 
     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) {
     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);
   }
     }
     query_simple(ads,qu, owner,ol, typei,flags, now);
   }


@@ -317,7 +317,7 @@ int adns_submit(adns_state ads,
   return 0;
 
  x_adnsfail:
   return 0;
 
  x_adnsfail:

-  adns__query_fail(qu,stat);
+  adns__query_fail(qu,st);

   adns__returning(ads,qu);
   return 0;
 
   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);
   adns__reset_preserved(qu);

-  qu->answer->status= stat;
+  qu->answer->status= st;

   adns__query_done(qu);
 }
 
   adns__query_done(qu);
 }