X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=73d2fb0d51f6d63663387e16a1b2b574f7024bd7;hp=c574ba3ca91f58c5114f08e4191c624898bd1a04;hb=6817a8f0c4f649168a43fc347179771600a908fc;hpb=74a6b7e900a7ca84103000028fe7e3ab56dbbcf3 diff --git a/http_send.c b/http_send.c index c574ba3c..73d2fb0d 100644 --- a/http_send.c +++ b/http_send.c @@ -178,23 +178,6 @@ static int queue_packet(struct http_client *hc, const char *buf, size_t len) return 1; } -static int write_ok(int fd) -{ - struct timeval tv = {0, 0}; - fd_set wfds; - int ret; -again: - FD_ZERO(&wfds); - FD_SET(fd, &wfds); - ret = select(fd + 1, NULL, &wfds, NULL, &tv); - if (ret < 0 && errno == EINTR) - goto again; - if (ret < 0) - ret = -E_WRITE_OK; - return ret; -} - - static int send_queued_packets(struct http_client *hc) { int ret; @@ -205,7 +188,7 @@ static int send_queued_packets(struct http_client *hc) list_for_each_entry_safe(qp, tmp, &hc->packet_queue, node) { ret = write_ok(hc->fd); if (ret <= 0) - return ret; + return ret? -E_WRITE_OK : 0; ret = write(hc->fd, qp->packet, qp->len); if (ret < 0) return ret;