Change copyright year to 2013.

[paraslash.git] / filter_common.c

diff --git a/filter_common.c b/filter_common.c
index 1233c9ad80ac5c76d8d50c7b52a6abfe0f4a1219..415824adb65f872a1815fb1f3a0af3dbd7efae6f 100644 (file)
--- a/filter_common.c
+++ b/filter_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "list.h"
@@ -42,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;
 }