X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=send_common.c;h=26502cabd08376673b2c46b61ccffae400344274;hb=ac9cc8f21ddeb821134e657f509bb83cec8c1da4;hp=4574c6979f2593b58d99471543e9542eb5fbe526;hpb=610cb53b94af8e95326cd44b7845f35cffdb6bf3;p=paraslash.git

diff --git a/send_common.c b/send_common.c
index 4574c697..26502cab 100644
--- a/send_common.c
+++ b/send_common.c
@@ -21,10 +21,10 @@
 #include "afs.h"
 #include "server.h"
 #include "acl.h"
+#include "sched.h"
 #include "send.h"
 #include "close_on_fork.h"
 #include "chunk_queue.h"
-#include "sched.h"
 #include "vss.h"
 
 /** Clients will be kicked if there are more than that many bytes pending. */
@@ -343,7 +343,6 @@ void generic_com_off(struct sender_status *ss)
  * Accept a connection on the socket(s) this server is listening on.
  *
  * \param ss The sender whose listening fd is ready for reading.
- * \param rfds Passed to para_accept(),
  *
  * This accepts incoming connections on any of the listening sockets of the
  * server. If there is a connection pending, the function
@@ -367,7 +366,7 @@ void generic_com_off(struct sender_status *ss)
  * \sa \ref para_accept(), \ref mark_fd_nonblocking(), \ref acl_check_access(),
  * \ref cq_new(), \ref add_close_on_fork_list().
  */
-struct sender_client *accept_sender_client(struct sender_status *ss, fd_set *rfds)
+struct sender_client *accept_sender_client(struct sender_status *ss)
 {
 	struct sender_client *sc;
 	int fd, ret;
@@ -376,7 +375,7 @@ struct sender_client *accept_sender_client(struct sender_status *ss, fd_set *rfd
 	FOR_EACH_LISTEN_FD(n, ss) {
 		if (ss->listen_fds[n] < 0)
 			continue;
-		ret = para_accept(ss->listen_fds[n], rfds, NULL, 0, &fd);
+		ret = para_accept(ss->listen_fds[n], NULL, 0, &fd);
 		if (ret < 0)
 			goto warn;
 		if (ret == 0)
@@ -391,7 +390,7 @@ struct sender_client *accept_sender_client(struct sender_status *ss, fd_set *rfd
 		if (ret < 0)
 			goto close_fd_and_warn;
 		ss->num_clients++;
-		sc = para_calloc(sizeof(*sc));
+		sc = zalloc(sizeof(*sc));
 		sc->fd = fd;
 		sc->name = para_strdup(remote_name(fd));
 		sc->cq = cq_new(MAX_CQ_BYTES);