Merge commit 'fml/master'

[paraslash.git] / filter.c

diff --git a/filter.c b/filter.c
index bab827d326c31d47063a8bf04e2083d18c966c52..b97bdaaa3cbc9de39d62573da476495c73cc3e6a 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -17,6 +17,9 @@
 #include "stdout.h"
 #include "error.h"
 
+/** 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. */
@@ -118,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"
@@ -153,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;