src/: Rename `udpsocket' and `nudp' (style)

I prefer plurals for arrays and the count should have a near-identical
name.

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

diff --git a/src/check.c b/src/check.c
index c26dbdcd95bc854e04eb71e8ae6864e73e94b146..e9d677182db11ca3136c7d2c727465a124fab12b 100644 (file)
--- a/src/check.c
+++ b/src/check.c
@@ -78,7 +78,7 @@ static void checkc_global(adns_state ads) {
   const struct sortlist *sl;
   int i;
   
-  assert(ads->udpsocket >= 0);
+  assert(ads->udpsockets >= 0);
 
   for (i=0; i<ads->nsortlist; i++) {
     sl= &ads->sortlist[i];

diff --git a/src/event.c b/src/event.c
index ce5276ffd5bcac759771fcbcad13c3d826fa70d6..1652268c9ab658ffc39c6d72448d06804528361f 100644 (file)
--- a/src/event.c
+++ b/src/event.c
@@ -316,8 +316,8 @@ int adns__pollfds(adns_state ads, struct pollfd pollfds_buf[MAX_POLLFDS]) {
 
   assert(MAX_POLLFDS == MAXUDP + 1);
 
-  for (i=0; i<ads->nudp; i++)
-    ADD_POLLFD(ads->udpsocket[i].fd, POLLIN);
+  for (i=0; i<ads->nudpsockets; i++)
+    ADD_POLLFD(ads->udpsockets[i].fd, POLLIN);
 
   switch (ads->tcpstate) {
   case server_disconnected:
@@ -396,8 +396,8 @@ int adns_processreadable(adns_state ads, int fd, const struct timeval *now) {
   default:
     abort();
   }
-  for (i=0; i<ads->nudp; i++) {
-    udp= &ads->udpsocket[i];
+  for (i=0; i<ads->nudpsockets; i++) {
+    udp= &ads->udpsockets[i];
     if (fd == udp->fd) {
       for (;;) {
        udpaddrlen= sizeof(udpaddr);

diff --git a/src/internal.h b/src/internal.h
index 28ef987266b67f163315988a3da694abfdf92ce8..5d70ead7fff99b3641f977186ee82ad4465c7981 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -372,8 +372,8 @@ struct adns__state {
   struct query_queue udpw, tcpw, childw, output, intdone;
   adns_query forallnext;
   int nextid, tcpsocket;
-  struct udpsocket { int af; int fd; } udpsocket[MAXUDP];
-  int nudp;
+  struct udpsocket { int af; int fd; } udpsockets[MAXUDP];
+  int nudpsockets;
   vbuf tcpsend, tcprecv;
   int nservers, nsortlist, nsearchlist, searchndots, tcpserver, tcprecv_skip;
   enum adns__tcpstate {

diff --git a/src/setup.c b/src/setup.c
index 09f044b91c03f681a37a4cc32995a236784fa92f..dce6e947d779cd6e5e4357c2906ecfcfed3395a8 100644 (file)
--- a/src/setup.c
+++ b/src/setup.c
@@ -580,7 +580,7 @@ static int init_begin(adns_state *ads_r, adns_initflags flags,
   LIST_INIT(ads->intdone);
   ads->forallnext= 0;
   ads->nextid= 0x311f;
-  ads->nudp= 0;
+  ads->nudpsockets= 0;
   ads->tcpsocket= -1;
   adns__vbuf_init(&ads->tcpsend);
   adns__vbuf_init(&ads->tcprecv);
@@ -618,16 +618,16 @@ static int init_finish(adns_state ads) {
   }
 
   proto= getprotobyname("udp"); if (!proto) { r= ENOPROTOOPT; goto x_free; }
-  ads->nudp= 0;
+  ads->nudpsockets= 0;
   for (i=0; i<ads->nservers; i++) {
     if (adns__udpsocket_by_af(ads, ads->servers[i].addr.sa.sa_family))
       continue;
-    assert(ads->nudp < MAXUDP);
-    udp= &ads->udpsocket[ads->nudp];
+    assert(ads->nudpsockets < MAXUDP);
+    udp= &ads->udpsockets[ads->nudpsockets];
     udp->af= ads->servers[i].addr.sa.sa_family;
     udp->fd= socket(udp->af,SOCK_DGRAM,proto->p_proto);
     if (udp->fd < 0) { r= errno; goto x_free; }
-    ads->nudp++;
+    ads->nudpsockets++;
     r= adns__setnonblock(ads,udp->fd);
     if (r) { r= errno; goto x_closeudp; }
   }
@@ -635,7 +635,7 @@ static int init_finish(adns_state ads) {
   return 0;
 
  x_closeudp:
-  for (j=0; j<ads->nudp; j++) close(ads->udpsocket[j].fd);
+  for (j=0; j<ads->nudpsockets; j++) close(ads->udpsockets[j].fd);
  x_free:
   free(ads);
   return r;
@@ -752,7 +752,7 @@ void adns_finish(adns_state ads) {
     else if (ads->intdone.head) adns__cancel(ads->output.head);
     else break;
   }
-  for (i=0; i<ads->nudp; i++) close(ads->udpsocket[i].fd);
+  for (i=0; i<ads->nudpsockets; i++) close(ads->udpsockets[i].fd);
   if (ads->tcpsocket >= 0) close(ads->tcpsocket);
   adns__vbuf_free(&ads->tcpsend);
   adns__vbuf_free(&ads->tcprecv);

diff --git a/src/transmit.c b/src/transmit.c
index be72cf237e1f23d6e4a5ef00e286e8bdc2e9605e..853bb5c95c0313f6137beecc7d86ad14ccda6cfe 100644 (file)
--- a/src/transmit.c
+++ b/src/transmit.c
@@ -242,8 +242,8 @@ static void query_usetcp(adns_query qu, struct timeval now) {
 
 struct udpsocket *adns__udpsocket_by_af(adns_state ads, int af) {
   int i;
-  for (i=0; i<ads->nudp; i++)
-    if (ads->udpsocket[i].af == af) return &ads->udpsocket[i];
+  for (i=0; i<ads->nudpsockets; i++)
+    if (ads->udpsockets[i].af == af) return &ads->udpsockets[i];
   return 0;
 }