diff options
| author | Yang Tse <yangsita@gmail.com> | 2006-07-28 18:01:23 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2006-07-28 18:01:23 +0000 |
| commit | 2c81bfead5aa1eb0b9f2bc5420786696b74ff115 (patch) | |
| tree | 3e27099d202f1818227ca88f6bdbf521826a3493 /ares | |
| parent | 77b3bc239daf75d9fb7702ee34c8e5871c47d387 (diff) | |
Replace send() and recv() with swrite() and sread() macros.
Diffstat (limited to 'ares')
| -rw-r--r-- | ares/ares_process.c | 21 | ||||
| -rw-r--r-- | ares/windows_port.c | 2 |
2 files changed, 10 insertions, 13 deletions
diff --git a/ares/ares_process.c b/ares/ares_process.c index 3a60bf157..dd40238ca 100644 --- a/ares/ares_process.c +++ b/ares/ares_process.c @@ -197,9 +197,7 @@ static void write_tcp_data(ares_channel channel, fd_set *write_fds, time_t now) /* Can't allocate iovecs; just send the first request. */ sendreq = server->qhead; - scount = send(server->tcp_socket, (void *)sendreq->data, - sendreq->len, 0); - + scount = swrite(server->tcp_socket, sendreq->data, sendreq->len); if (scount < 0) { if (!try_again(GET_ERRNO())) @@ -249,9 +247,9 @@ static void read_tcp_data(ares_channel channel, fd_set *read_fds, time_t now) /* We haven't yet read a length word, so read that (or * what's left to read of it). */ - count = recv(server->tcp_socket, - (void *)(server->tcp_lenbuf + server->tcp_lenbuf_pos), - 2 - server->tcp_lenbuf_pos, 0); + count = sread(server->tcp_socket, + server->tcp_lenbuf + server->tcp_lenbuf_pos, + 2 - server->tcp_lenbuf_pos); if (count <= 0) { if (!(count == -1 && try_again(GET_ERRNO()))) @@ -276,9 +274,9 @@ static void read_tcp_data(ares_channel channel, fd_set *read_fds, time_t now) else { /* Read data into the allocated buffer. */ - count = recv(server->tcp_socket, - (void *)(server->tcp_buffer + server->tcp_buffer_pos), - server->tcp_length - server->tcp_buffer_pos, 0); + count = sread(server->tcp_socket, + server->tcp_buffer + server->tcp_buffer_pos, + server->tcp_length - server->tcp_buffer_pos); if (count <= 0) { if (!(count == -1 && try_again(GET_ERRNO()))) @@ -320,7 +318,7 @@ static void read_udp_packets(ares_channel channel, fd_set *read_fds, !FD_ISSET(server->udp_socket, read_fds)) continue; - count = recv(server->udp_socket, (void *)buf, sizeof(buf), 0); + count = sread(server->udp_socket, buf, sizeof(buf)); if (count == -1 && try_again(GET_ERRNO())) continue; else if (count <= 0) @@ -510,8 +508,7 @@ void ares__send_query(ares_channel channel, struct query *query, time_t now) return; } } - if (send(server->udp_socket, (void *)query->qbuf, - query->qlen, 0) == -1) + if (swrite(server->udp_socket, query->qbuf, query->qlen) == -1) { /* FIXME: Handle EAGAIN here since it likely can happen. */ query->skip_server[query->server] = 1; diff --git a/ares/windows_port.c b/ares/windows_port.c index a2b72d538..2a326da01 100644 --- a/ares/windows_port.c +++ b/ares/windows_port.c @@ -102,6 +102,6 @@ ares_writev (ares_socket_t s, const struct iovec *vector, size_t count) memcpy (bp, vector[i].iov_base, vector[i].iov_len); bp += vector[i].iov_len; } - return send (s, (const void*)buffer, bytes, 0); + return (int)swrite(s, buffer, bytes); } #endif /* WIN32 builds only */ |