X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter_common.c;h=907912fd06d9f0e4a78a53c7a5026c4a0a9d4846;hp=461d88bb8d59bf4b4e075ee3383561b84a4b3ae6;hb=573ed68b79ebbe62725672a9fae8eea00ac2e357;hpb=85094cd802bdb606d4e2bf7ed66dec51db2a0953 diff --git a/filter_common.c b/filter_common.c index 461d88bb..907912fd 100644 --- a/filter_common.c +++ b/filter_common.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Andre Noll + * Copyright (C) 2005-2013 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -41,25 +41,16 @@ void filter_init(void) static int parse_filter_args(int filter_num, char *options, void **conf) { struct filter *f = &filters[filter_num]; - int ret, i, argc = 2; + int ret, argc; char **argv; -// PARA_DEBUG_LOG("%s, options: %s, parser: %p\n", f->name, -// options? options : "(none)", f->parse_config); if (!f->parse_config) return strlen(options)? -E_BAD_FILTER_OPTIONS : filter_num; -// PARA_DEBUG_LOG("options: %s\n", options); - argc = create_argv(options, " \t", &argv); + argc = create_shifted_argv(options, " \t", &argv); if (argc < 0) return -E_BAD_FILTER_OPTIONS; - PARA_DEBUG_LOG("argc = %d, argv[0]: %s\n", argc, argv[0]); - for (i = argc - 1; i >= 0; i--) - argv[i + 1] = argv[i]; argv[0] = para_strdup(f->name); - argc++; ret = f->parse_config(argc, argv, conf); - free(argv[argc - 1]); - argv[argc - 1] = NULL; free_argv(argv); return ret < 0? ret : filter_num; } @@ -132,13 +123,13 @@ void print_filter_helps(int detailed) } /** - * Set select timeout of the the scheduler. + * Set select timeout of the scheduler. * * \param s The scheduler. * \param t The task struct of this filter. * * This looks at the status of the btr node of the filter. If data is available - * in the input queue of the filter, or if an error occured, a minimal timeout + * in the input queue of the filter, or if an error occurred, a minimal timeout * for the next select call is requested from the scheduler. Otherwise the * scheduler timeout is left unchanged. */