Merge branch 'master' into my-osx

[paraslash.git] / client_common.c

diff --git a/client_common.c b/client_common.c
index b77c192f3a1c31bc0792fd427b39e21518c2fbd1..c738079b6b1f92ab47435bfea9eb6185aa52eef2 100644 (file)
--- a/client_common.c
+++ b/client_common.c
@@ -278,11 +278,8 @@ void client_post_select(struct sched *s, struct task *t)
        case CL_SENDING: /* FIXME: might block */
                PARA_INFO_LOG("loaded: %zd\n", *pcd->in_loaded);
                t->ret = send_bin_buffer(pcd->fd, pcd->inbuf, *pcd->in_loaded);
        case CL_SENDING: /* FIXME: might block */
                PARA_INFO_LOG("loaded: %zd\n", *pcd->in_loaded);
                t->ret = send_bin_buffer(pcd->fd, pcd->inbuf, *pcd->in_loaded);

-               if (t->ret <= 0) {
-                       if (!t->ret)
-                               t->ret = 1;
+               if (t->ret < 0)

                        return;
                        return;

-               }

                *pcd->in_loaded = 0; /* FIXME: short writes */
                return;
        case CL_RECEIVING:
                *pcd->in_loaded = 0; /* FIXME: short writes */
                return;
        case CL_RECEIVING: