diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2005-11-08 01:55:31 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2005-11-08 01:55:31 +0000 |
| commit | a0a97696160c209413f213208b906d2990650320 (patch) | |
| tree | ce21ec4bfdeea79845fbbf2eb5308a2e6d513fc8 /res/res_musiconhold.c | |
| parent | 2ea48ce114efcce674220ef6cbb1cd61f3e79494 (diff) | |
issue #5648
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7011 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_musiconhold.c')
| -rwxr-xr-x | res/res_musiconhold.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index e029265dd..2939659dc 100755 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -361,7 +361,7 @@ static int spawn_mp3(struct mohclass *class) /* Look for extra arguments and add them to the list */ strncpy(xargs, class->args, sizeof(xargs) - 1); argptr = xargs; - while (argptr && !ast_strlen_zero(argptr)) { + while (!ast_strlen_zero(argptr)) { argv[argc++] = argptr; argptr = strchr(argptr, ','); if (argptr) { @@ -373,7 +373,7 @@ static int spawn_mp3(struct mohclass *class) /* Format arguments for argv vector */ strncpy(xargs, class->args, sizeof(xargs) - 1); argptr = xargs; - while (argptr && !ast_strlen_zero(argptr)) { + while (!ast_strlen_zero(argptr)) { argv[argc++] = argptr; argptr = strchr(argptr, ' '); if (argptr) { @@ -569,7 +569,7 @@ static int moh1_exec(struct ast_channel *chan, void *data) static int moh2_exec(struct ast_channel *chan, void *data) { - if (!data || ast_strlen_zero(data)) { + if (ast_strlen_zero(data)) { ast_log(LOG_WARNING, "SetMusicOnHold requires an argument (class)\n"); return -1; } @@ -865,9 +865,9 @@ static int local_ast_moh_start(struct ast_channel *chan, char *class) { struct mohclass *mohclass; - if (!class || ast_strlen_zero(class)) + if (ast_strlen_zero(class)) class = chan->musicclass; - if (!class || ast_strlen_zero(class)) + if (ast_strlen_zero(class)) class = "default"; ast_mutex_lock(&moh_lock); mohclass = get_mohbyname(class); |