file writer: Use xwrite() instead of plain write().

[paraslash.git] / audiod.c

diff --git a/audiod.c b/audiod.c
index 91122308f8dada77a3a73121968dca47305d7fc7..d2c66f2bfe5f5bd0d8ba1da88b048ad21d9ceb00 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -495,13 +495,7 @@ static void open_filters(struct slot_info *s)
                fn->filter_num = a->filter_nums[i];
                fn->conf = a->filter_conf[i];
                fn->task.pre_select = f->pre_select;
-               if (f->new_post_select) {
-                       fn->task.new_post_select = f->new_post_select;
-                       fn->task.post_select = NULL;
-               } else {
-                       fn->task.new_post_select = NULL;
-                       fn->task.post_select = f->post_select;
-               }
+               fn->task.post_select = f->post_select;
                fn->btrn = btr_new_node(&(struct btr_node_description)
                        EMBRACE(.name = f->name, .parent = parent,
                                .handler = f->execute, .context = fn));
@@ -565,13 +559,7 @@ static int open_receiver(int format)
        PARA_NOTICE_LOG("started %s: %s receiver in slot %d\n",
                audio_formats[format], r->name, slot_num);
        rn->task.pre_select = r->pre_select;
-       if (r->new_post_select) {
-               rn->task.new_post_select = r->new_post_select;
-               rn->task.post_select = NULL;
-       } else {
-               rn->task.new_post_select = NULL;
-               rn->task.post_select = r->post_select;
-       }
+       rn->task.post_select = r->post_select;
        sprintf(rn->task.status, "%s receiver node", r->name);
        register_task(&sched, &rn->task);
        return slot_num;
@@ -1021,8 +1009,7 @@ static int signal_post_select(struct sched *s, __a_unused struct task *t)
 static void signal_setup_default(struct signal_task *st)
 {
        st->task.pre_select = signal_pre_select;
-       st->task.new_post_select = signal_post_select;
-       st->task.post_select = NULL;
+       st->task.post_select = signal_post_select;
        sprintf(st->task.status, "signal task");
 }
 
@@ -1032,7 +1019,7 @@ static void command_pre_select(struct sched *s, struct task *t)
        para_fd_set(ct->fd, &s->rfds, &s->max_fileno);
 }
 
-static void command_post_select(struct sched *s, struct task *t)
+static int command_post_select(struct sched *s, struct task *t)
 {
        int ret;
        struct command_task *ct = container_of(t, struct command_task, task);
@@ -1049,13 +1036,13 @@ static void command_post_select(struct sched *s, struct task *t)
        if (ret < 0)
                PARA_ERROR_LOG("%s\n", para_strerror(-ret));
        audiod_status_dump();
+       return 0;
 }
 
 static void init_command_task(struct command_task *ct)
 {
        ct->task.pre_select = command_pre_select;
        ct->task.post_select = command_post_select;
-       ct->task.new_post_select = NULL;
        ct->task.error = 0;
        ct->fd = audiod_get_socket(); /* doesn't return on errors */
        sprintf(ct->task.status, "command task");
@@ -1285,8 +1272,7 @@ static void init_status_task(struct status_task *st)
 {
        memset(st, 0, sizeof(struct status_task));
        st->task.pre_select = status_pre_select;
-       st->task.new_post_select = status_post_select;
-       st->task.post_select = NULL;
+       st->task.post_select = status_post_select;
        st->sa_time_diff_sign = 1;
        st->clock_diff_count = conf.clock_diff_count_arg;
        st->current_audio_format_num = -1;