Merge commit 'remotes/fml/master'
[paraslash.git] / stdout.c
index a192f2b..137030e 100644 (file)
--- a/stdout.c
+++ b/stdout.c
  */
 static void stdout_pre_select(struct sched *s, struct task *t)
 {
-       struct stdout_task *sot = t->private_data;
+       struct stdout_task *sot = container_of(t, struct stdout_task, task);
 
-       t->ret = 1;
+       t->error = 0;
        sot->check_fd = 0;
        if (!*sot->loaded) {
-               if (*sot->input_error) {
-                       t->ret = *sot->input_error;
+               if (*sot->input_error < 0) {
+                       t->error = *sot->input_error;
                        s->timeout.tv_sec = 0;
                        s->timeout.tv_usec = 1;
                }
@@ -57,31 +57,25 @@ static void stdout_pre_select(struct sched *s, struct task *t)
  */
 static void stdout_post_select(struct sched *s, struct task *t)
 {
-       struct stdout_task *sot = t->private_data;
+       struct stdout_task *sot = container_of(t, struct stdout_task, task);
        ssize_t ret;
 
-       t->ret = 1;
+       t->error = 0;
        if (!sot->check_fd) {
                if (*sot->input_error)
-                       t->ret = *sot->input_error;
+                       t->error = *sot->input_error;
                return;
        }
        if (!FD_ISSET(STDOUT_FILENO, &s->wfds))
                return;
-       t->ret = -E_STDOUT_WRITE;
        ret = write(STDOUT_FILENO, sot->buf, *sot->loaded);
-       if (ret <= 0)
+       if (ret < 0) {
+               t->error = -ERRNO_TO_PARA_ERROR(errno);
                return;
+       }
        *sot->loaded -= ret;
        if (*sot->loaded)
                memmove(sot->buf, sot->buf + ret, *sot->loaded);
-       t->ret = 1;
-}
-
-static void stdout_default_event_handler(struct task *t)
-{
-       PARA_NOTICE_LOG("%p: %s\n", t, para_strerror(-t->ret));
-       unregister_task(t);
 }
 
 /**
@@ -97,11 +91,8 @@ void stdout_set_defaults(struct stdout_task *sot)
 {
        int ret;
 
-       sot->task.private_data = sot;
        sot->task.pre_select = stdout_pre_select;
        sot->task.post_select = stdout_post_select;
-       sot->task.event_handler = stdout_default_event_handler;
-       sot->error = 0;
        sprintf(sot->task.status, "stdout writer");
        ret = mark_fd_nonblocking(STDOUT_FILENO);
        if (ret >= 0)