kill some dead code

[paraslash.git] / dccp_recv.c

diff --git a/dccp_recv.c b/dccp_recv.c
index deca7162bfecc40e93dd0d7431f7bae9218f23ec..335ad2e630598de4d98cafbb2257e5e07be144af 100644 (file)
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -121,10 +121,10 @@ static void *dccp_recv_parse_config(int argc, char **argv)
 
 static void dccp_recv_pre_select(struct sched *s, struct task *t)
 {
-       struct private_dccp_recv_data *pdd = t->private_data;
+       struct receiver_node *rn = t->private_data;
+       struct private_dccp_recv_data *pdd = rn->private_data;
 
-       if (!pdd)
-               return ;
+       t->ret = 1;
        para_fd_set(pdd->fd, &s->rfds, &s->max_fileno);
 }
 
@@ -133,21 +133,27 @@ static void dccp_recv_post_select(struct sched *s, struct task *t)
        struct receiver_node *rn = t->private_data;
        struct private_dccp_recv_data *pdd = rn->private_data;
 
+       t->ret = -E_DCCP_RECV_EOF;
+       if (rn->output_eof && *rn->output_eof)
+               goto out;
        t->ret = 1;
-       if (!s->select_ret || !pdd || !FD_ISSET(pdd->fd, &s->rfds))
-               return; /* nothing to do */
+       if (!s->select_ret || !FD_ISSET(pdd->fd, &s->rfds))
+               goto out; /* nothing to do */
        t->ret = -E_DCCP_OVERRUN;
        if (rn->loaded >= DCCP_BUFSIZE)
-               return;
+               goto out;
        t->ret = recv_bin_buffer(pdd->fd, rn->buf + rn->loaded,
                DCCP_BUFSIZE - rn->loaded);
        if (t->ret <= 0) {
-               rn->eof = 1;
                if (!t->ret)
                        t->ret = -E_DCCP_RECV_EOF;
-               return;
+               goto out;
        }
        rn->loaded += t->ret;
+       return;
+out:
+       if (t->ret < 0)
+               rn->eof = 1;
 }
 
 /**