http_recv/dccp_recv: simplify post_select()

[paraslash.git] / dccp_recv.c

diff --git a/dccp_recv.c b/dccp_recv.c
index 3be5365fe818f4b14133a87c2d561df7b9feec59..49024bb07c8addf1bd0297012df889b52b5fb25f 100644 (file)
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -136,25 +136,26 @@ static void dccp_recv_post_select(struct sched *s, struct task *t)
        struct private_dccp_recv_data *pdd = rn->private_data;
 
        t->ret = -E_DCCP_RECV_EOF;
-       if (rn->output_eof && *rn->output_eof) {
-               rn->eof = 1;
-               return;
-       }
+       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 */
+               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;
 }
 
 /**