Merge branch 'master' into next

diff --git a/alsa_write.c b/alsa_write.c
index 3c7c03b467cb9e40a13e1d348a93600c0fdd51b3..ae8bed6d339724563e86eb899d9aa96a46f6f8e7 100644 (file)
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -264,4 +264,5 @@ void alsa_write_init(struct writer *w)
                .short_help = alsa_write_args_info_help,
                .detailed_help = alsa_write_args_info_detailed_help
        };
+       alsa_cmdline_parser_free(&dummy);
 }

diff --git a/file_write.c b/file_write.c
index 3286ea87a089363036cabe518a98ef16151e12ca..9a4f0707f6f213f1fc88346b0aa2c039bebfa003 100644 (file)
--- a/file_write.c
+++ b/file_write.c
@@ -142,4 +142,5 @@ void file_write_init(struct writer *w)
                .short_help = file_write_args_info_help,
                .detailed_help = file_write_args_info_detailed_help
        };
+       file_cmdline_parser_free(&dummy);
 }

diff --git a/oss_write.c b/oss_write.c
index 103b14ea5fa16c68feeb10302454e41570673dc7..9ec85560d29ebef00f269a95ca2fda49e9c427d1 100644 (file)
--- a/oss_write.c
+++ b/oss_write.c
@@ -217,4 +217,5 @@ void oss_write_init(struct writer *w)
                .short_help = oss_write_args_info_help,
                .detailed_help = oss_write_args_info_detailed_help
        };
+       oss_cmdline_parser_free(&dummy);
 }