kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-07 02:18:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 120477 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
r120477 | tilghman | 2008-06-04 15:34:52 -0500 (Wed, 04 Jun 2008) | 2 lines

MSet doesn't necessarily need chan to be set

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@120478 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-06-04 20:35:38 +00:00
parent faddb24782
commit 816d355d89
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/pbx.c
View File

@@ -7579,7 +7579,7 @@ int pbx_builtin_setvar_multiple(struct ast_channel *chan, void *vdata)
AST_APP_ARG(value); AST_APP_ARG(value);
); );
if (ast_strlen_zero(vdata) || !chan) { if (ast_strlen_zero(vdata)) {
ast_log(LOG_WARNING, "MSet requires at least one variable name/value pair.\n"); ast_log(LOG_WARNING, "MSet requires at least one variable name/value pair.\n");
return 0; return 0;
} }
@@ -7593,6 +7593,8 @@ int pbx_builtin_setvar_multiple(struct ast_channel *chan, void *vdata)
pbx_builtin_setvar_helper(chan, pair.name, pair.value); pbx_builtin_setvar_helper(chan, pair.name, pair.value);
if (strchr(pair.name, ' ')) if (strchr(pair.name, ' '))
ast_log(LOG_WARNING, "Please avoid unnecessary spaces on variables as it may lead to unexpected results ('%s' set to '%s').\n", pair.name, pair.value); ast_log(LOG_WARNING, "Please avoid unnecessary spaces on variables as it may lead to unexpected results ('%s' set to '%s').\n", pair.name, pair.value);
} else if (chan) {
ast_log(LOG_WARNING, "MSet: ignoring entry '%s' with no '='\n", pair.name);
} else { } else {
ast_log(LOG_WARNING, "MSet: ignoring entry '%s' with no '=' (in %s@%s:%d\n", pair.name, chan->exten, chan->context, chan->priority); ast_log(LOG_WARNING, "MSet: ignoring entry '%s' with no '=' (in %s@%s:%d\n", pair.name, chan->exten, chan->context, chan->priority);
} }