[NeoStats-Devel] [Commits] r2464 - trunk/lib/adns
[email protected] Thu, 7 Apr 2005 09:19:22 +1000
Newsgroups
gmane.comp.neostats.devel
Message-ID
<[email protected] >
Author: Mark
Date: Thu Apr 7 07:19:18 2005
New Revision: 2464
Modified:
trunk/lib/adns/event.c
trunk/lib/adns/transmit.c
Log:
adns formatting fixes
Modified: trunk/lib/adns/event.c
==============================================================================
--- trunk/lib/adns/event.c (original)
+++ trunk/lib/adns/event.c Thu Apr 7 07:19:18 2005
@@ -456,7 +456,7 @@
r = adns_socket_read(ads->tcpsocket,
ads->tcprecv.buf + ads->tcprecv.used,
ads->tcprecv.avail - ads->tcprecv.used);
- ADNS_CAPTURE_ERRNO;
+ ADNS_CAPTURE_ERRNO;
if (r > 0) {
ads->tcprecv.used += r;
} else {
@@ -486,10 +486,10 @@
if (fd == ads->udpsocket) {
for (;;) {
udpaddrlen = sizeof(udpaddr);
- ADNS_CLEAR_ERRNO;
- r= recvfrom(ads->udpsocket,udpbuf,sizeof(udpbuf),0,
- (struct sockaddr*)&udpaddr,&udpaddrlen);
- ADNS_CAPTURE_ERRNO;
+ ADNS_CLEAR_ERRNO;
+ r= recvfrom(ads->udpsocket,udpbuf,sizeof(udpbuf),0,
+ (struct sockaddr*)&udpaddr,&udpaddrlen);
+ ADNS_CAPTURE_ERRNO;
if (r < 0) {
if (errno == EAGAIN
|| errno == EWOULDBLOCK) {
@@ -566,11 +566,11 @@
assert(ads->tcprecv.used == 0);
assert(ads->tcprecv_skip == 0);
for (;;) {
- if (!adns__vbuf_ensure(&ads->tcprecv,1)) { r= ENOMEM; goto xit; }
- ADNS_CLEAR_ERRNO;
+ if (!adns__vbuf_ensure(&ads->tcprecv,1)) { r= ENOMEM; goto xit; }
+ ADNS_CLEAR_ERRNO;
r = adns_socket_read(ads->tcpsocket, &ads->tcprecv.buf, 1);
- ADNS_CAPTURE_ERRNO;
- if (r==0 || (r<0 && (errno==EAGAIN || errno==EWOULDBLOCK))) {
+ ADNS_CAPTURE_ERRNO;
+ if (r==0 || (r<0 && (errno==EAGAIN || errno==EWOULDBLOCK))) {
tcp_connected(ads, *now);
r = 0;
goto xit;
@@ -597,9 +597,9 @@
break;
while (ads->tcpsend.used) {
adns__sigpipe_protect(ads);
- ADNS_CLEAR_ERRNO;
- r= adns_socket_write(ads->tcpsocket,ads->tcpsend.buf,ads->tcpsend.used);
- ADNS_CAPTURE_ERRNO;
+ ADNS_CLEAR_ERRNO;
+ r= adns_socket_write(ads->tcpsocket,ads->tcpsend.buf,ads->tcpsend.used);
+ ADNS_CAPTURE_ERRNO;
adns__sigpipe_unprotect(ads);
if (r < 0) {
if (errno == EINTR)
@@ -880,9 +880,9 @@
adns_beforeselect(ads, &maxfd, &readfds, &writefds,
&exceptfds, &tvp, &tvbuf, 0);
assert(tvp);
- ADNS_CLEAR_ERRNO;
+ ADNS_CLEAR_ERRNO;
rsel = select(maxfd, &readfds, &writefds, &exceptfds, tvp);
- ADNS_CAPTURE_ERRNO;
+ ADNS_CAPTURE_ERRNO;
if (rsel == -1) {
if (errno == EINTR) {
if (ads->iflags & adns_if_eintr) {
Modified: trunk/lib/adns/transmit.c
==============================================================================
--- trunk/lib/adns/transmit.c (original)
+++ trunk/lib/adns/transmit.c Thu Apr 7 07:19:18 2005
@@ -227,9 +227,9 @@
iov[1].iov_len = qu->query_dglen;
adns__sigpipe_protect(qu->ads);
- ADNS_CLEAR_ERRNO;
+ ADNS_CLEAR_ERRNO;
wr = writev(qu->ads->tcpsocket, iov, 2);
- ADNS_CAPTURE_ERRNO;
+ ADNS_CAPTURE_ERRNO;
adns__sigpipe_unprotect(qu->ads);
if (wr < 0) {
if (!
@@ -293,7 +293,7 @@
servaddr.sin_addr = ads->servers[serv].addr;
servaddr.sin_port = htons(DNS_PORT);
- ADNS_CLEAR_ERRNO;
+ ADNS_CLEAR_ERRNO;
r = sendto(ads->udpsocket, qu->query_dgram, qu->query_dglen, 0,
(const struct sockaddr *) &servaddr, sizeof(servaddr));
ADNS_CAPTURE_ERRNO;