X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter.c;h=b97bdaaa3cbc9de39d62573da476495c73cc3e6a;hp=ed168c39f9ad744ad8779917da7f1adbe455bd30;hb=e9805263600a69a88e60edd1c8b4ba9e01a79322;hpb=1023721b3a7bf7f642b3e4d034c2314a3dc7becb

diff --git a/filter.c b/filter.c
index ed168c39..b97bdaaa 100644
--- 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,30 @@
 #include "stdout.h"
 #include "error.h"
 
-/** init the array of errors for para_filter */
+/** The list of all status items used by para_{server,audiod,gui}. */
+const char *status_item_list[] = {STATUS_ITEM_ARRAY};
+
+char *stat_item_values[NUM_STAT_ITEMS] = {NULL};
+
+/** 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 +81,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 +89,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[])
@@ -112,7 +121,7 @@ static int parse_config(int argc, char *argv[])
 	if (!conf.list_filters_given)
 		return 1;
 	printf("available filters: ");
-	for (i = 0; filters[i].name; i++)
+	FOR_EACH_SUPPORTED_FILTER(i)
 		printf("%s%s%s", i? " " : "", filters[i].name,
 			filters[i].parse_config? "*": "");
 	printf("\nFilters marked with \"*\" have further command line options. Try\n"
@@ -121,14 +130,14 @@ 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.
  */
@@ -147,6 +156,7 @@ int main(int argc, char *argv[])
 	ret = init_filter_chain();
 	if (ret < 0)
 		goto out;
+	sit->output_error = &fc->task.error;
 
 	stdout_set_defaults(sot);
 	sot->buf = fc->outbuf;
@@ -159,9 +169,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;