diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-04 20:35:38 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-04 20:35:38 +0000 |
| commit | ff3eafe2b2994a0252eca6f9eb6b5dc1173a8438 (patch) | |
| tree | 70c9b31e1b64bde7fb857c5a7f1753b3a4143319 /main | |
| parent | 38923ac6a6db44e9ec094a936d94955377e0d359 (diff) | |
Merged revisions 120477 via svnmerge from
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@120478 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/pbx.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/main/pbx.c b/main/pbx.c index b59f8686f..6566e20e1 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -7579,7 +7579,7 @@ int pbx_builtin_setvar_multiple(struct ast_channel *chan, void *vdata) 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"); 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); 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); + } else if (chan) { + ast_log(LOG_WARNING, "MSet: ignoring entry '%s' with no '='\n", pair.name); } else { ast_log(LOG_WARNING, "MSet: ignoring entry '%s' with no '=' (in %s@%s:%d\n", pair.name, chan->exten, chan->context, chan->priority); } |