diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-07-02 21:16:25 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-07-02 21:16:25 +0000 |
| commit | e4a5ae03761e2a8ec23427bcee931cc0137657ee (patch) | |
| tree | 8dbae11ced9b1ee978e5caed27c06eea564d96d3 /apps/app_mixmonitor.c | |
| parent | f6cdd9a12ce9350d1fe4490a3425d93bb5294ddc (diff) | |
MixMonitor: Make start_mixmonitor_callback() options parameter NULL tolerant.
* Removed some unnecessary code in start_mixmonitor_callback().
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@393496 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_mixmonitor.c')
| -rw-r--r-- | apps/app_mixmonitor.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c index 3f7560edd..0227ab433 100644 --- a/apps/app_mixmonitor.c +++ b/apps/app_mixmonitor.c @@ -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); } |