filter.c: Make config struct and filter_event_handler() static

[paraslash.git] / filter.c

diff --git a/filter.c b/filter.c
index f49042f8c7ecfe901bcb01b5ef889d12e93b71b5..1bb20b31fb8b7ed421edf357d8b86195f89e96e3 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -37,7 +37,7 @@ static struct filter_chain *fc = &filter_chain_struct;
 static struct stdout_task stdout_task_struct;
 static struct stdout_task *sot = &stdout_task_struct;
 
-struct gengetopt_args_info conf;
+static struct filter_args_info conf;
 
 __printf_2_3 void para_log(int ll, const char* fmt,...)
 {
@@ -51,7 +51,7 @@ __printf_2_3 void para_log(int ll, const char* fmt,...)
        va_end(argp);
 }
 
-void filter_event_handler(struct task *t)
+static void filter_event_handler(struct task *t)
 {
        PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
        unregister_task(t);
@@ -69,7 +69,6 @@ static void open_filters(void)
        }
 }
 
-
 static int init_filter_chain(void)
 {
        int i, filter_num;
@@ -113,7 +112,7 @@ static int parse_config(int argc, char *argv[])
        struct stat statbuf;
        int i;
 
-       if (cmdline_parser(argc, argv, &conf))
+       if (filter_cmdline_parser(argc, argv, &conf))
                return -E_FILTER_SYNTAX;
        if (!cf) {
                char *home = para_homedir();
@@ -121,7 +120,7 @@ static int parse_config(int argc, char *argv[])
                free(home);
        }
        if (!stat(cf, &statbuf)) {
-               if (cmdline_parser_configfile(cf, &conf, 0, 0, 0))
+               if (filter_cmdline_parser_configfile(cf, &conf, 0, 0, 0))
                        return -E_FILTER_SYNTAX;
        }
        if (!conf.list_filters_given)