Merged revisions 146802 via svnmerge from

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

................
  r146802 | tilghman | 2008-10-06 16:09:05 -0500 (Mon, 06 Oct 2008) | 15 lines
  
  Merged revisions 146799 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r146799 | tilghman | 2008-10-06 15:52:04 -0500 (Mon, 06 Oct 2008) | 8 lines
    
    Dialplan functions should not actually return 0, unless they have modified the
    workspace.  To signal an error (and no change to the workspace), -1 should be
    returned instead.
    (closes issue #13340)
     Reported by: kryptolus
     Patches: 
           20080827__bug13340__2.diff.txt uploaded by Corydon76 (license 14)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@146838 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-10-06 21:32:42 +00:00
parent 4da4c9cbcd
commit deb3c05634
11 changed files with 51 additions and 13 deletions

View File

@@ -82,14 +82,14 @@ static int math(struct ast_channel *chan, const char *cmd, char *parse,
);
if (ast_strlen_zero(parse)) {
ast_log(LOG_WARNING, "Syntax: Math(<number1><op><number 2>[,<type_of_result>]) - missing argument!\n");
ast_log(LOG_WARNING, "Syntax: MATH(<number1><op><number 2>[,<type_of_result>]) - missing argument!\n");
return -1;
}
AST_STANDARD_APP_ARGS(args, parse);
if (args.argc < 1) {
ast_log(LOG_WARNING, "Syntax: Math(<number1><op><number 2>[,<type_of_result>]) - missing argument!\n");
ast_log(LOG_WARNING, "Syntax: MATH(<number1><op><number 2>[,<type_of_result>]) - missing argument!\n");
return -1;
}