X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=filter.c;h=b97bdaaa3cbc9de39d62573da476495c73cc3e6a;hb=e9805263600a69a88e60edd1c8b4ba9e01a79322;hp=16204393d095d578ea2c363126900aafa44b740b;hpb=9ca92b91c68fb59989f317fea5e7c5e36cab7458;p=paraslash.git diff --git a/filter.c b/filter.c index 16204393..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); @@ -115,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" @@ -124,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. */ @@ -150,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;