Reformat fade.ggo

[paraslash.git] / write.c

diff --git a/write.c b/write.c
index fc50040a28c07df608c551a56824188b7a383bf9..498dd78d08c8f90a9334fcaf1d5f4d7820df81ec 100644 (file)
--- a/write.c
+++ b/write.c
@@ -43,7 +43,7 @@ struct initial_delay_task {
        struct task task;
 };
 
-static struct gengetopt_args_info conf;
+static struct write_args_info conf;
 struct stdin_task sit;
 struct check_wav_task cwt;
 struct initial_delay_task idt;
@@ -89,7 +89,7 @@ static void initial_delay_pre_select(struct sched *s, struct task *t)
        if (!idt->start_time.tv_sec && !idt->start_time.tv_usec)
                return;
        t->ret = -E_DELAY_TIMEOUT;
-       if (tv_diff(&s->now, &idt->start_time, &diff) > 0)
+       if (tv_diff(now, &idt->start_time, &diff) > 0)
                return;
        t->ret = 1;
        if (tv_diff(&s->timeout , &diff, NULL) > 0)
@@ -150,8 +150,6 @@ static struct writer_node_group *check_args(void)
                if (!wng->writer_nodes[i].conf)
                        goto out;
                wng->writer_nodes[i].writer = &writers[writer_num];
-               sprintf(wng->writer_nodes[i].task.status, "%s",
-                       writer_names[writer_num]);
        }
        ret = 1;
 out:
@@ -214,9 +212,8 @@ int main(int argc, char *argv[])
        int ret = -E_WRITE_SYNTAX;
        struct sched s;
 
-       cmdline_parser(argc, argv, &conf);
+       write_cmdline_parser(argc, argv, &conf);
        init_supported_writers();
-       init_sched();
 
        wng = check_args();
        if (!wng)