X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter.c;h=804b5e1e569a9c680e309f14738e77481161682a;hp=f9ba17ad117ebe0da4a53a80a57dd5b21d49c5f8;hb=5ff39998bf0ce71bd8fc8d0f002ceb81b711992f;hpb=f167629b3191c57a6b691cd2a6af04a45a74ccb0 diff --git a/filter.c b/filter.c index f9ba17ad..804b5e1e 100644 --- a/filter.c +++ b/filter.c @@ -58,7 +58,7 @@ __noreturn static void print_help_and_die(void) ggo_print_help(&h, d? GPH_STANDARD_FLAGS_DETAILED : GPH_STANDARD_FLAGS); print_filter_helps(d? GPH_MODULE_FLAGS_DETAILED : GPH_MODULE_FLAGS); - exit(0); + exit(EXIT_SUCCESS); } static int parse_config(void) @@ -106,7 +106,7 @@ int main(int argc, char *argv[]) { static struct sched s; int i, ret; - struct filter *f; + const struct filter *f; struct btr_node *parent; struct filter_node **fns; @@ -133,7 +133,7 @@ int main(int argc, char *argv[]) goto out_cleanup; } fn->filter_num = ret; - f = filters + fn->filter_num; + f = filter_get(fn->filter_num); PARA_DEBUG_LOG("filter #%d: %s\n", i, f->name); fn->btrn = btr_new_node(&(struct btr_node_description) EMBRACE(.name = f->name, .parent = parent, @@ -142,7 +142,8 @@ int main(int argc, char *argv[]) ti.pre_select = f->pre_select; ti.post_select = f->post_select; ti.context = fn; - f->open(fn); + if (f->open) + f->open(fn); fn->task = task_register(&ti, &s); parent = fn->btrn; } @@ -159,7 +160,7 @@ out_cleanup: for (i--; i >= 0; i--) { struct filter_node *fn = fns[i]; - f = filters + fn->filter_num; + f = filter_get(fn->filter_num); if (f->close) f->close(fn); btr_remove_node(&fn->btrn);