Merge commit 'remotes/yangtse/master'

[paraslash.git] / client.c

diff --git a/client.c b/client.c
index 1506f65..438707d 100644 (file)
--- a/client.c
+++ b/client.c
@@ -29,10 +29,10 @@ static void client_event_handler(struct task *t)
 {
        struct private_client_data *p = t->private_data;
 
 {
        struct private_client_data *p = t->private_data;
 

-       PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
+       PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret));

        if (t->ret != -E_HANDSHAKE_COMPLETE) {
                unregister_task(t);
        if (t->ret != -E_HANDSHAKE_COMPLETE) {
                unregister_task(t);

-               p->eof = 1;
+               p->error = t->ret;

                return;
        }
        if (p->status == CL_SENDING) {
                return;
        }
        if (p->status == CL_SENDING) {


@@ -41,13 +41,13 @@ static void client_event_handler(struct task *t)
                register_task(&sit.task);
                p->inbuf = sit.buf;
                p->in_loaded = &sit.loaded;
                register_task(&sit.task);
                p->inbuf = sit.buf;
                p->in_loaded = &sit.loaded;

-               p->in_eof = &sit.eof;
+               p->in_error = &sit.error;

                return;
        }
        stdout_set_defaults(&sot);
        sot.buf = p->buf;
        sot.loaded = &p->loaded;
                return;
        }
        stdout_set_defaults(&sot);
        sot.buf = p->buf;
        sot.loaded = &p->loaded;

-       sot.input_eof = &p->eof;
+       sot.input_error = &p->error;

        register_task(&sot.task);
 }
 
        register_task(&sot.task);
 }
 


@@ -79,7 +79,7 @@ int main(int argc, char *argv[])
        pcd->task.event_handler = client_event_handler;
        ret = schedule(&s);
        if (ret < 0)
        pcd->task.event_handler = client_event_handler;
        ret = schedule(&s);
        if (ret < 0)

-               PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+               PARA_ERROR_LOG("%s\n", para_strerror(-ret));

        client_close(pcd);
        return ret >= 0? EXIT_SUCCESS: EXIT_FAILURE;
 }
        client_close(pcd);
        return ret >= 0? EXIT_SUCCESS: EXIT_FAILURE;
 }