Remove underscores from _get_user(), struct _user and _user_list

[paraslash.git] / dccp_recv.c

diff --git a/dccp_recv.c b/dccp_recv.c
index 3be5365fe818f4b14133a87c2d561df7b9feec59..943b8283e6a0f135c3b0edbc3cd5de44e250cedb 100644 (file)
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -98,6 +98,7 @@ static int dccp_recv_open(struct receiver_node *rn)
        ret = -E_DCCP_CONNECT;
        if (connect(pdd->fd, ai->ai_addr, ai->ai_addrlen) < 0)
                goto err_out;
        ret = -E_DCCP_CONNECT;
        if (connect(pdd->fd, ai->ai_addr, ai->ai_addrlen) < 0)
                goto err_out;

+       mark_fd_nonblock(pdd->fd);

        return 1;
 err_out:
        dccp_recv_close(rn);
        return 1;
 err_out:
        dccp_recv_close(rn);


@@ -125,8 +126,6 @@ static void dccp_recv_pre_select(struct sched *s, struct task *t)
        struct private_dccp_recv_data *pdd = rn->private_data;
 
        t->ret = 1;
        struct private_dccp_recv_data *pdd = rn->private_data;
 
        t->ret = 1;

-       if (!pdd)
-               return;

        para_fd_set(pdd->fd, &s->rfds, &s->max_fileno);
 }
 
        para_fd_set(pdd->fd, &s->rfds, &s->max_fileno);
 }
 


@@ -136,25 +135,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;
        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)
        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;

 }
 
 /**
 }
 
 /**