http_recv/dccp_recv: simplify post_select()

diff --git a/dccp_recv.c b/dccp_recv.c
index 3be5365..49024bb 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;
        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))
        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)
        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) {
        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;
                if (!t->ret)
                        t->ret = -E_DCCP_RECV_EOF;

-               return;
+               goto out;

        }
        rn->loaded += t->ret;
        }
        rn->loaded += t->ret;

+       return;
+out:
+       if (t->ret < 0)
+               rn->eof = 1;

 }
 
 /**
 }
 
 /**

diff --git a/http_recv.c b/http_recv.c
index 264ae2c..d2b34c4 100644 (file)
--- a/http_recv.c
+++ b/http_recv.c
@@ -111,50 +111,48 @@ static void http_recv_post_select(struct sched *s, struct task *t)
        struct private_http_recv_data *phd = rn->private_data;
 
        t->ret = -E_HTTP_RECV_EOF;
        struct private_http_recv_data *phd = rn->private_data;
 
        t->ret = -E_HTTP_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;
        t->ret = 1;

-       if (!s->select_ret) /* we're not interested in timeouts */
-               return;
+       if (!s->select_ret)
+               goto out;

        if  (phd->status == HTTP_CONNECTED) {
                char *rq;
                if (!FD_ISSET(phd->fd, &s->wfds))
        if  (phd->status == HTTP_CONNECTED) {
                char *rq;
                if (!FD_ISSET(phd->fd, &s->wfds))

-                       return; /* nothing to do */
+                       goto out;

                rq = make_request_msg();
                PARA_NOTICE_LOG("%s", "sending http request\n");
                t->ret = send_va_buffer(phd->fd, "%s", rq);
                free(rq);
                if (t->ret > 0)
                        phd->status = HTTP_SENT_GET_REQUEST;
                rq = make_request_msg();
                PARA_NOTICE_LOG("%s", "sending http request\n");
                t->ret = send_va_buffer(phd->fd, "%s", rq);
                free(rq);
                if (t->ret > 0)
                        phd->status = HTTP_SENT_GET_REQUEST;

-               return;
+               goto out;

        }
        if (!FD_ISSET(phd->fd, &s->rfds))
        }
        if (!FD_ISSET(phd->fd, &s->rfds))

-               return; /* nothing to do */
+               goto out;

        if (phd->status == HTTP_SENT_GET_REQUEST) {
                t->ret = recv_pattern(phd->fd, HTTP_OK_MSG, MAXLINE);
                if (t->ret < 0)
        if (phd->status == HTTP_SENT_GET_REQUEST) {
                t->ret = recv_pattern(phd->fd, HTTP_OK_MSG, MAXLINE);
                if (t->ret < 0)

-                       return;
+                       goto out;

                PARA_NOTICE_LOG("%s", "received ok msg, streaming\n");
                PARA_NOTICE_LOG("%s", "received ok msg, streaming\n");

+               t->ret = 1;

                phd->status = HTTP_STREAMING;
                phd->status = HTTP_STREAMING;

-               return;
+               goto out;

        }
        t->ret = -E_OVERRUN;
        }
        t->ret = -E_OVERRUN;

-       /* already streaming */
-       if (rn->loaded >= BUFSIZE) {
-               rn->eof = 1;
-               return;
-       }
+       if (rn->loaded >= BUFSIZE)
+               goto out;

        t->ret = recv_bin_buffer(phd->fd, rn->buf + rn->loaded,
                BUFSIZE - rn->loaded);
        if (t->ret <= 0) {
        t->ret = recv_bin_buffer(phd->fd, rn->buf + rn->loaded,
                BUFSIZE - rn->loaded);
        if (t->ret <= 0) {

-               rn->eof = 1;

                if (!t->ret)
                        t->ret = -E_HTTP_RECV_EOF;
                if (!t->ret)
                        t->ret = -E_HTTP_RECV_EOF;

-               return;
+               goto out;

        }
        rn->loaded += t->ret;
        }
        rn->loaded += t->ret;

+out:
+       if (t->ret < 0)
+               rn->eof = 1;

 }
 
 static void http_recv_close(struct receiver_node *rn)
 }
 
 static void http_recv_close(struct receiver_node *rn)