X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=56b4401a53e3c418a250505d2e188cf7ce61da19;hp=e82e0be04aadd0a243e4c68d919cb7aa588f5c08;hb=685a2bc66e77978104039b8173a6039a80d8b733;hpb=a95093cd8b62d411b9448aa77768774e1bdd81e5 diff --git a/write.c b/write.c index e82e0be0..56b4401a 100644 --- a/write.c +++ b/write.c @@ -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: @@ -168,7 +166,6 @@ static void wng_event_handler(struct task *t) PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret)); unregister_task(t); wng_close(g); - wng_destroy(g); }