Make functions for printing recv/filter/write help public.

So that these functions can also be used by audiod.

diff --git a/filter.c b/filter.c
index 0ffb723e218793a2ac69f4d905b643adb04667c3..d67aeae44a8d226866c6fcf1a46c192ea4a15cc7 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -97,7 +97,7 @@ err:
 
 __noreturn static void print_help_and_die(void)
 {
-       int i, d = conf.detailed_help_given;
+       int d = conf.detailed_help_given;
        const char **p = d? filter_args_info_detailed_help
                : filter_args_info_help;
 
@@ -106,20 +106,7 @@ __noreturn static void print_help_and_die(void)
        printf_or_die("%s\n\n", filter_args_info_usage);
        for (; *p; p++)
                printf_or_die("%s\n", *p);
-
-       printf_or_die("\nAvailable filters: \n\t");
-       FOR_EACH_SUPPORTED_FILTER(i)
-               printf_or_die("%s%s", i? " " : "", filters[i].name);
-       printf_or_die("\n\n");
-
-       FOR_EACH_SUPPORTED_FILTER(i) {
-               struct filter *f = filters + i;
-
-               if (!f->help.short_help)
-                       continue;
-               printf_or_die("Options for %s:\n", f->name);
-               ggo_print_help(&f->help, d);
-       }
+       print_filter_helps(d);
        exit(0);
 }
 

diff --git a/filter.h b/filter.h
index 0c3ac70834b6c3909bd59bc87b9121811c6d3620..c2a6310b5fa12903f7e15ca5453dd312bb3e02c8 100644 (file)
--- a/filter.h
+++ b/filter.h
@@ -204,7 +204,7 @@ void close_filters(struct filter_chain *fc);
 void filter_init(struct filter *all_filters);
 int check_filter_arg(char *filter_arg, void **conf);
 void filter_pre_select(__a_unused struct sched *s, struct task *t);
-
+void print_filter_helps(int detailed);
 
 static inline void write_int16_host_endian(char *buf, int val)
 {

diff --git a/filter_common.c b/filter_common.c
index 45f576050c6f34a56dfb8f6cfff495478466f212..a39eefd683ad4092951dd73272ab9968109ed351 100644 (file)
--- a/filter_common.c
+++ b/filter_common.c
@@ -263,3 +263,22 @@ int check_filter_arg(char *fa, void **conf)
        return -E_UNSUPPORTED_FILTER;
 }
 
+void print_filter_helps(int detailed)
+{
+       int i;
+
+       printf_or_die("\nAvailable filters: \n\t");
+       FOR_EACH_SUPPORTED_FILTER(i)
+               printf_or_die("%s%s", i? " " : "", filters[i].name);
+       printf_or_die("\n\n");
+
+       FOR_EACH_SUPPORTED_FILTER(i) {
+               struct filter *f = filters + i;
+
+               if (!f->help.short_help)
+                       continue;
+               printf_or_die("Options for %s:\n", f->name);
+               ggo_print_help(&f->help, detailed);
+       }
+
+}

diff --git a/recv.c b/recv.c
index 1df476f79c2e4c2dce5c0a78d57c8c972b4ae3af..52935a8840462af33589ed1378b481c593c405a1 100644 (file)
--- a/recv.c
+++ b/recv.c
@@ -30,8 +30,7 @@ INIT_RECV_ERRLISTS;
 
 __noreturn static void print_help_and_die(void)
 {
-       printf("dsfsfsd\n");
-       int i, d = conf.detailed_help_given;
+       int d = conf.detailed_help_given;
        const char **p = d? recv_args_info_detailed_help
                : recv_args_info_help;
 
@@ -40,19 +39,7 @@ __noreturn static void print_help_and_die(void)
        printf_or_die("%s\n\n", recv_args_info_usage);
        for (; *p; p++)
                printf_or_die("%s\n", *p);
-
-       printf_or_die("\nAvailable receivers: \n\t");
-       FOR_EACH_RECEIVER(i)
-               printf_or_die("%s%s", i? " " : "", receivers[i].name);
-       printf_or_die("\n\n");
-       FOR_EACH_RECEIVER(i) {
-               struct receiver *r = receivers + i;
-
-               if (!r->help.short_help)
-                       continue;
-               printf_or_die("Options for %s:\n", r->name);
-               ggo_print_help(&r->help, d);
-       }
+       print_receiver_helps(d);
        exit(0);
 }
 

diff --git a/recv.h b/recv.h
index f8b1529236b143f95dfa4882acbb2c29e7eeb88f..3aed018042d8217f5483197b819bb2ac43d67205 100644 (file)
--- a/recv.h
+++ b/recv.h
@@ -135,3 +135,4 @@ extern struct receiver receivers[];
 #define FOR_EACH_RECEIVER(i) for (i = 0; receivers[i].name; i++)
 
 void *check_receiver_arg(char *ra, int *receiver_num);
+void print_receiver_helps(int detailed);

diff --git a/recv_common.c b/recv_common.c
index 03f569fe3aff4386f9792881a023d7be520fad0e..5f2412b5a0b02c0a40b479ed4ed635c43adb617e 100644 (file)
--- a/recv_common.c
+++ b/recv_common.c
@@ -84,3 +84,21 @@ void *check_receiver_arg(char *ra, int *receiver_num)
        PARA_ERROR_LOG("receiver not found\n");
        return NULL;
 }
+
+void print_receiver_helps(int detailed)
+{
+       int i;
+
+       printf_or_die("\nAvailable receivers: \n\t");
+       FOR_EACH_RECEIVER(i)
+               printf_or_die("%s%s", i? " " : "", receivers[i].name);
+       printf_or_die("\n\n");
+       FOR_EACH_RECEIVER(i) {
+               struct receiver *r = receivers + i;
+
+               if (!r->help.short_help)
+                       continue;
+               printf_or_die("Options for %s:\n", r->name);
+               ggo_print_help(&r->help, detailed);
+       }
+}

diff --git a/write.c b/write.c
index 6e78e773c558f3d1c6d5fd8a15d0532645cec570..9b7a92113e69ff236e08ce235ca306c9c410fd07 100644 (file)
--- a/write.c
+++ b/write.c
@@ -163,7 +163,7 @@ out:
 
 __noreturn static void print_help_and_die(void)
 {
-       int i, d = conf.detailed_help_given;
+       int d = conf.detailed_help_given;
        const char **p = d? write_args_info_detailed_help
                : write_args_info_help;
 
@@ -172,19 +172,7 @@ __noreturn static void print_help_and_die(void)
        printf_or_die("%s\n\n", write_args_info_usage);
        for (; *p; p++)
                printf_or_die("%s\n", *p);
-
-       printf_or_die("\nAvailable writers: \n\t");
-       FOR_EACH_WRITER(i)
-               printf_or_die("%s%s", i? " " : "", writer_names[i]);
-       printf_or_die("\n\n");
-       FOR_EACH_WRITER(i) {
-               struct writer *w = writers + i;
-
-               if (!w->help.short_help)
-                       continue;
-               printf_or_die("Options for %s:\n", writer_names[i]);
-               ggo_print_help(&w->help, d);
-       }
+       print_writer_helps(d);
        exit(0);
 }
 

diff --git a/write_common.c b/write_common.c
index d66b20ca112dd7cb1135d9211ff880cd2a2fc39c..5896d91c4d415ee18989574b8e10c68cdf990f3b 100644 (file)
--- a/write_common.c
+++ b/write_common.c
@@ -211,3 +211,21 @@ struct writer_node_group *setup_default_wng(void)
        wng->writer_nodes[0].conf = writers[DEFAULT_WRITER].parse_config("");
        return wng;
 }
+
+void print_writer_helps(int detailed)
+{
+       int i;
+
+       printf_or_die("\nAvailable writers: \n\t");
+       FOR_EACH_WRITER(i)
+               printf_or_die("%s%s", i? " " : "", writer_names[i]);
+       printf_or_die("\n\n");
+       FOR_EACH_WRITER(i) {
+               struct writer *w = writers + i;
+
+               if (!w->help.short_help)
+                       continue;
+               printf_or_die("Options for %s:\n", writer_names[i]);
+               ggo_print_help(&w->help, detailed);
+       }
+}

diff --git a/write_common.h b/write_common.h
index 8d94d2a08837b5772a9a3d55f65edca1586b7df0..7f0bbc57501dc7416243e8b92e580daf742b5cc6 100644 (file)
--- a/write_common.h
+++ b/write_common.h
@@ -12,3 +12,4 @@ struct writer_node_group *wng_new(unsigned num_writers);
 void init_supported_writers(void);
 void *check_writer_arg(const char *wa, int *writer_num);
 struct writer_node_group *setup_default_wng(void);
+void print_writer_helps(int detailed);