]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
MixMonitor: Make start_mixmonitor_callback() options parameter NULL tolerant.
authorRichard Mudgett <rmudgett@digium.com>
Tue, 2 Jul 2013 21:16:25 +0000 (21:16 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Tue, 2 Jul 2013 21:16:25 +0000 (21:16 +0000)
* Removed some unnecessary code in start_mixmonitor_callback().

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@393496 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_mixmonitor.c

index 3f7560edd0be0c4569c36a0da9b50f61d66df089..0227ab433325d46f68ee7fbe2a324e0df827004a 100644 (file)
@@ -1249,16 +1249,14 @@ static int manager_mute_mixmonitor(struct mansession *s, const struct message *m
 
 static int start_mixmonitor_callback(struct ast_channel *chan, const char *filename, const char *options)
 {
-       char *opts[OPT_ARG_ARRAY_SIZE] = { NULL, };
-       struct ast_flags flags = { 0 };
-       char args[PATH_MAX] = "";
+       char args[PATH_MAX];
 
-       if (!ast_strlen_zero(options)) {
-               ast_app_parse_options(mixmonitor_opts, &flags, opts, ast_strdupa(options));
+       if (ast_strlen_zero(options)) {
+               snprintf(args, sizeof(args), "%s", filename);
+       } else {
+               snprintf(args, sizeof(args), "%s,%s", filename, options);
        }
 
-       snprintf(args, sizeof(args), "%s,%s", filename, options);
-
        return mixmonitor_exec(chan, args);
 }