http_send.c: Get rid of write_ok().
authorAndre Noll <maan@systemlinux.org>
Sat, 2 Feb 2008 11:27:11 +0000 (12:27 +0100)
committerAndre Noll <maan@systemlinux.org>
Sat, 2 Feb 2008 11:27:11 +0000 (12:27 +0100)
Just use http_write() instead of write().

http_send.c

index 3290715..a19836a 100644 (file)
@@ -164,7 +164,7 @@ static int queue_chunk_or_shutdown(struct http_client *hc, long unsigned chunk_n
        return ret;
 }
 
-static void http_send( long unsigned current_chunk,
+static void http_send(long unsigned current_chunk,
        __a_unused long unsigned chunks_sent, const char *buf, size_t len)
 {
        struct http_client *hc, *tmp;
@@ -191,13 +191,7 @@ static void http_send( long unsigned current_chunk,
                }
                if (!len)
                        continue;
-               if (!ret || write_ok(hc->fd) <= 0) {
-                       queue_chunk_or_shutdown(hc, current_chunk, 0);
-                       continue;
-               }
-//             PARA_DEBUG_LOG("sending %d -> %s\n", len, remote_name(hc->fd));
-               ret = write(hc->fd, buf, len);
-//             PARA_DEBUG_LOG("ret: %d\n", ret);
+               ret = http_write(hc->fd, buf, len);
                if (ret < 0) {
                        http_shutdown_client(hc, "send error");
                        continue;