filter.c: Cosmetics.

[paraslash.git] / filter.c

diff --git a/filter.c b/filter.c
index 81d5df1a635044e61ee66aba03eca876c8bee398..939f9b56501f99cdeb4fa11695cb1c49c0e3e5c0 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -3,7 +3,8 @@
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
-/** \file filter.c the stand-alone filter program */
+
+/** \file filter.c The stand-alone filter program. */
 
 #include "para.h"
 
@@ -16,25 +17,25 @@
 #include "stdout.h"
 #include "error.h"
 
-/** init the array of errors for para_filter */
+/** Initialize the array of errors for para_filter. */
 INIT_FILTER_ERRLISTS;
 
-/** the task that reads from stdin */
+/** The task that reads from stdin. */
 static struct stdin_task stdin_task_struct;
-/** pointer to the stdin task */
+/** pointer to the stdin task. */
 static struct stdin_task *sit = &stdin_task_struct;
 
-/** the task that filters the data */
+/** The task that filters the data. */
 static struct filter_chain filter_chain_struct;
-/** pointer to the filter chain */
+/** Pointer to the filter chain. */
 static struct filter_chain *fc = &filter_chain_struct;
 
-/** the task that writes converted data to stdout */
+/** The task that writes converted data to stdout. */
 static struct stdout_task stdout_task_struct;
-/** pointer to the stdout task */
+/** Pointer to the stdout task. */
 static struct stdout_task *sot = &stdout_task_struct;
 
-/** gengetopt struct that holds the command line args */
+/** Gengetopt struct that holds the command line args. */
 static struct filter_args_info conf;
 
 INIT_STDERR_LOGGING(conf.loglevel_arg);
@@ -75,7 +76,7 @@ static int init_filter_chain(void)
                fn = fc->filter_nodes + i;
                ret = check_filter_arg(fa, &fn->conf);
                if (ret < 0)
-                       return ret;
+                       goto err;
                fn->filter_num = ret;
                fn->fc = fc;
                INIT_LIST_HEAD(&fn->callbacks);
@@ -83,6 +84,9 @@ static int init_filter_chain(void)
        }
        open_filters();
        return 1;
+err:
+       free(fc->filter_nodes);
+       return ret;
 }
 
 static int parse_config(int argc, char *argv[])
@@ -121,21 +125,21 @@ static int parse_config(int argc, char *argv[])
 }
 
 /**
- * para_filter's main function.
+ * The main function of para_filter.
  *
- * para_filter reads data from stdin, converts it by using a chain
+ * Para_filter reads data from stdin, converts it by using a chain
  * of filters (specified on the command line) and writes the resulting
  * data to stdout.
  *
- * \param argc number of command line options
- * \param argv vector of arguments
+ * \param argc Number of command line options.
+ * \param argv Vector of arguments.
  *
  * \return \a EXIT_SUCCESS on success, EXIT_FAILURE on errors.
  */
 int main(int argc, char *argv[])
 {
        int ret;
-       struct sched s;
+       static struct sched s;
 
        stdin_set_defaults(sit);
        sit->buf = para_malloc(sit->bufsize),
@@ -159,9 +163,9 @@ int main(int argc, char *argv[])
        s.default_timeout.tv_sec = 1;
        s.default_timeout.tv_usec = 0;
        ret = schedule(&s);
+       close_filters(fc);
 out:
        free(sit->buf);
-       close_filters(fc);
        if (ret < 0)
                PARA_EMERG_LOG("%s\n", para_strerror(-ret));
        return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;