Remove the .purpose and .help args from struct ggo_help.

diff --git a/alsa_write.c b/alsa_write.c
index 9f60d6d88aacbd21715f529d61c5bd3e23dd6cd4..ae471679f076f17fbce5b3d8d27ed5458d1fb4cd 100644 (file)
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -247,8 +247,6 @@ void alsa_write_init(struct writer *w)
        w->parse_config = alsa_parse_config;
        w->shutdown = NULL; /* nothing to do */
        w->help = (struct ggo_help) {
        w->parse_config = alsa_parse_config;
        w->shutdown = NULL; /* nothing to do */
        w->help = (struct ggo_help) {

-               .purpose = alsa_write_args_info_purpose,
-               .usage = alsa_write_args_info_usage,

                .short_help = alsa_write_args_info_help,
                .detailed_help = alsa_write_args_info_detailed_help
        };
                .short_help = alsa_write_args_info_help,
                .detailed_help = alsa_write_args_info_detailed_help
        };

diff --git a/amp_filter.c b/amp_filter.c
index f6e22059e3f2432a2c1c69751415e789569b4fe7..a88719e33544b4a08e3d74862ee54cf13cae3d19 100644 (file)
--- a/amp_filter.c
+++ b/amp_filter.c
@@ -101,8 +101,6 @@ void amp_filter_init(struct filter *f)
        f->convert = amp_convert;
        f->parse_config = amp_parse_config;
        f->help = (struct ggo_help) {
        f->convert = amp_convert;
        f->parse_config = amp_parse_config;
        f->help = (struct ggo_help) {

-               .purpose = amp_filter_args_info_purpose,
-               .usage = amp_filter_args_info_usage,

                .short_help = amp_filter_args_info_help,
                .detailed_help = amp_filter_args_info_detailed_help
        };
                .short_help = amp_filter_args_info_help,
                .detailed_help = amp_filter_args_info_detailed_help
        };

diff --git a/compress_filter.c b/compress_filter.c
index 658983915fa7849e647d044646f202b3b095fbd9..c7af325385ae7013dc44d64fa061266903aee040 100644 (file)
--- a/compress_filter.c
+++ b/compress_filter.c
@@ -129,8 +129,6 @@ void compress_filter_init(struct filter *f)
        f->convert = compress;
        f->parse_config = compress_parse_config;
        f->help = (struct ggo_help) {
        f->convert = compress;
        f->parse_config = compress_parse_config;
        f->help = (struct ggo_help) {

-               .purpose = compress_filter_args_info_purpose,
-               .usage = compress_filter_args_info_usage,

                .short_help = compress_filter_args_info_help,
                .detailed_help = compress_filter_args_info_detailed_help
        };
                .short_help = compress_filter_args_info_help,
                .detailed_help = compress_filter_args_info_detailed_help
        };

diff --git a/file_write.c b/file_write.c
index be1e7713c0d818498a1cb860351c56c285e8dfff..533d33313136133f675a80ca7db98a2aba6f8346 100644 (file)
--- a/file_write.c
+++ b/file_write.c
@@ -120,8 +120,6 @@ void file_write_init(struct writer *w)
        w->close = file_write_close;
        w->shutdown = NULL; /* nothing to do */
        w->help = (struct ggo_help) {
        w->close = file_write_close;
        w->shutdown = NULL; /* nothing to do */
        w->help = (struct ggo_help) {

-               .purpose = file_write_args_info_purpose,
-               .usage = file_write_args_info_usage,

                .short_help = file_write_args_info_help,
                .detailed_help = file_write_args_info_detailed_help
        };
                .short_help = file_write_args_info_help,
                .detailed_help = file_write_args_info_detailed_help
        };

diff --git a/ggo.h b/ggo.h
index 40723ea91d2123e66e65b516db9bb1da17a8cf1f..c9111b16503602f7fe4dc387e0d98023bfd7bdc5 100644 (file)
--- a/ggo.h
+++ b/ggo.h
@@ -1,6 +1,4 @@
 struct ggo_help {
 struct ggo_help {

-       const char *purpose;
-       const char *usage;

        const char **short_help;
        const char **detailed_help;
 };
        const char **short_help;
        const char **detailed_help;
 };

diff --git a/mp3dec_filter.c b/mp3dec_filter.c
index 8fa7094480285b5768c1f0cf991a559e13a5f1c7..ce6cfbcb6e78eebe60764a5dc617cf5b89fd1b53 100644 (file)
--- a/mp3dec_filter.c
+++ b/mp3dec_filter.c
@@ -159,8 +159,6 @@ void mp3dec_filter_init(struct filter *f)
        f->close = mp3dec_close;
        f->parse_config = mp3dec_parse_config;
        f->help = (struct ggo_help) {
        f->close = mp3dec_close;
        f->parse_config = mp3dec_parse_config;
        f->help = (struct ggo_help) {

-               .purpose = mp3dec_filter_args_info_purpose,
-               .usage = mp3dec_filter_args_info_usage,

                .short_help = mp3dec_filter_args_info_help,
                .detailed_help = mp3dec_filter_args_info_detailed_help
        };
                .short_help = mp3dec_filter_args_info_help,
                .detailed_help = mp3dec_filter_args_info_detailed_help
        };

diff --git a/oggdec_filter.c b/oggdec_filter.c
index 7c79fd50a403423621ece3f10f335925642690bc..0653f7dadd0d7223e27ea9e339d113420aaa7a5f 100644 (file)
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -204,8 +204,6 @@ void oggdec_filter_init(struct filter *f)
        f->convert = ogg_convert;
        f->parse_config = oggdec_parse_config;
        f->help = (struct ggo_help) {
        f->convert = ogg_convert;
        f->parse_config = oggdec_parse_config;
        f->help = (struct ggo_help) {

-               .purpose = oggdec_filter_args_info_purpose,
-               .usage = oggdec_filter_args_info_usage,

                .short_help = oggdec_filter_args_info_help,
                .detailed_help = oggdec_filter_args_info_detailed_help
        };
                .short_help = oggdec_filter_args_info_help,
                .detailed_help = oggdec_filter_args_info_detailed_help
        };