send: Avoid select-specific arguments in {pre,post}_select().

[paraslash.git] / http_send.c

diff --git a/http_send.c b/http_send.c
index 39ef05a1db1a6fbbe86fea8f47153bcb06928366..6d026c715a09cf4a3599687cf7a5c5a2282c4a65 100644 (file)
--- a/http_send.c
+++ b/http_send.c
@@ -20,8 +20,8 @@
 #include "server.h"
 #include "http.h"
 #include "list.h"
-#include "send.h"
 #include "sched.h"
+#include "send.h"
 #include "vss.h"
 #include "close_on_fork.h"
 #include "fd.h"
@@ -158,7 +158,7 @@ static void http_send(long unsigned current_chunk,
        }
 }
 
-static void http_post_select(__a_unused fd_set *rfds, __a_unused fd_set *wfds)
+static void http_post_select(__a_unused struct sched *s)
 {
        struct sender_client *sc, *tmp;
        struct private_http_sender_data *phsd;
@@ -196,7 +196,7 @@ static void http_post_select(__a_unused fd_set *rfds, __a_unused fd_set *wfds)
        phsd->status = HTTP_CONNECTED;
 }
 
-static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
+static void http_pre_select(struct sched *s)
 {
        struct sender_client *sc, *tmp;
        unsigned n;
@@ -204,15 +204,15 @@ static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
        FOR_EACH_LISTEN_FD(n, hss) {
                if (hss->listen_fds[n] < 0)
                        continue;
-               para_fd_set(hss->listen_fds[n], rfds, max_fileno);
+               para_fd_set(hss->listen_fds[n], &s->rfds, &s->max_fileno);
        }
        list_for_each_entry_safe(sc, tmp, &hss->client_list, node) {
                struct private_http_sender_data *phsd = sc->private_data;
                if (phsd->status == HTTP_CONNECTED) /* need to recv get request */
-                       para_fd_set(sc->fd, rfds, max_fileno);
+                       para_fd_set(sc->fd, &s->rfds, &s->max_fileno);
                if (phsd->status == HTTP_GOT_GET_REQUEST ||
                                phsd->status == HTTP_INVALID_GET_REQUEST)
-                       para_fd_set(sc->fd, wfds, max_fileno);
+                       para_fd_set(sc->fd, &s->wfds, &s->max_fileno);
        }
 }