kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 267009 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r267009 | pabelanger | 2010-06-02 13:14:37 -0400 (Wed, 02 Jun 2010) | 7 lines
  
  Cleanup error/warning messages in AEL2 parser
  
  (closes issue #16684)
  Reported by: Silmaril
  Patches:
        patch_ael2_logmsg.diff uploaded by Silmaril (license 979)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@267041 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Paul Belanger
2010-06-02 17:25:05 +00:00
parent 28264c52b9
commit c2e059292d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main/ast_expr2.y
View File

@@ -1054,18 +1054,18 @@ static struct val *op_func(struct val *funcname, struct expr_node *arglist, stru
}
} else {
ast_log(LOG_ERROR,"Error! '%s' doesn't appear to be an available function!", funcname->u.s);
ast_log(LOG_ERROR, "Error! '%s' doesn't appear to be an available function!\n", funcname->u.s);
return (make_number ((FP___TYPE)0.0));
}
#else
ast_log(LOG_ERROR,"Error! '%s' is not available in the standalone version!", funcname->u.s);
ast_log(LOG_ERROR, "Error! '%s' is not available in the standalone version!\n", funcname->u.s);
return (make_number ((FP___TYPE)0.0));
#endif
}
}
else
{
ast_log(LOG_ERROR,"Error! '%s' is not possibly a function name!", funcname->u.s);
ast_log(LOG_ERROR, "Error! '%s' is not possibly a function name!\n", funcname->u.s);
return (make_number ((FP___TYPE)0.0));
}
return (make_number ((FP___TYPE)0.0));
@@ -1549,7 +1549,7 @@ op_colon (struct val *a, struct val *b)
/* compile regular expression */
if ((eval = regcomp (&rp, b->u.s, REG_EXTENDED)) != 0) {
regerror (eval, &rp, errbuf, sizeof(errbuf));
ast_log(LOG_WARNING,"regcomp() error : %s",errbuf);
ast_log(LOG_WARNING, "regcomp() error : %s\n", errbuf);
free_value(a);
free_value(b);
return make_str("");
@@ -1600,7 +1600,7 @@ op_eqtilde (struct val *a, struct val *b)
/* compile regular expression */
if ((eval = regcomp (&rp, b->u.s, REG_EXTENDED)) != 0) {
regerror (eval, &rp, errbuf, sizeof(errbuf));
ast_log(LOG_WARNING,"regcomp() error : %s",errbuf);
ast_log(LOG_WARNING, "regcomp() error : %s\n", errbuf);
free_value(a);
free_value(b);
return make_str("");