summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2014-10-12 20:02:27 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2014-10-19 21:14:57 +0100
commit4153634256ab06ee5b147a20234a0b7b305c12ea (patch)
tree40753ebf23573ab23fde3bd47ed10fbfe7bdb94e /src
parent27c763d5506df53a4489458dab0367b67c52f25b (diff)
src/event.c: Use `continue' in adns_processreadable (style)
This is IMO clearer than another nested indent of the bulk of the loop body. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'src')
-rw-r--r--src/event.c45
1 files changed, 22 insertions, 23 deletions
diff --git a/src/event.c b/src/event.c
index 1652268..6cfc4ba 100644
--- a/src/event.c
+++ b/src/event.c
@@ -398,31 +398,30 @@ int adns_processreadable(adns_state ads, int fd, const struct timeval *now) {
}
for (i=0; i<ads->nudpsockets; i++) {
udp= &ads->udpsockets[i];
- if (fd == udp->fd) {
- for (;;) {
- udpaddrlen= sizeof(udpaddr);
- r= recvfrom(fd,udpbuf,sizeof(udpbuf),0, &udpaddr.sa,&udpaddrlen);
- if (r<0) {
- if (errno == EAGAIN || errno == EWOULDBLOCK) { r= 0; goto xit; }
- if (errno == EINTR) continue;
- if (errno_resources(errno)) { r= errno; goto xit; }
- adns__warn(ads,-1,0,"datagram receive error: %s",strerror(errno));
- r= 0; goto xit;
- }
- for (serv= 0;
- serv < ads->nservers &&
- !adns__sockaddrs_equal(&udpaddr.sa,
- &ads->servers[serv].addr.sa);
- serv++);
- if (serv >= ads->nservers) {
- adns__warn(ads,-1,0,"datagram received from unknown nameserver %s",
- adns__sockaddr_ntoa(&udpaddr.sa, addrbuf));
- continue;
- }
- adns__procdgram(ads,udpbuf,r,serv,0,*now);
+ if (fd != udp->fd) continue;
+ for (;;) {
+ udpaddrlen= sizeof(udpaddr);
+ r= recvfrom(fd,udpbuf,sizeof(udpbuf),0, &udpaddr.sa,&udpaddrlen);
+ if (r<0) {
+ if (errno == EAGAIN || errno == EWOULDBLOCK) { r= 0; goto xit; }
+ if (errno == EINTR) continue;
+ if (errno_resources(errno)) { r= errno; goto xit; }
+ adns__warn(ads,-1,0,"datagram receive error: %s",strerror(errno));
+ r= 0; goto xit;
}
- break;
+ for (serv= 0;
+ serv < ads->nservers &&
+ !adns__sockaddrs_equal(&udpaddr.sa,
+ &ads->servers[serv].addr.sa);
+ serv++);
+ if (serv >= ads->nservers) {
+ adns__warn(ads,-1,0,"datagram received from unknown nameserver %s",
+ adns__sockaddr_ntoa(&udpaddr.sa, addrbuf));
+ continue;
+ }
+ adns__procdgram(ads,udpbuf,r,serv,0,*now);
}
+ break;
}
r= 0;
xit: