[asterisk-commits] pabelanger: branch 1.6.2 r267062 - in /branches/1.6.2: ./ main/ast_expr2.y
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Jun 2 12:29:17 CDT 2010
Author: pabelanger
Date: Wed Jun 2 12:29:14 2010
New Revision: 267062
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=267062
Log:
Merged revisions 267041 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r267041 | pabelanger | 2010-06-02 13:25:05 -0400 (Wed, 02 Jun 2010) | 14 lines
Merged revisions 267009 via svnmerge from
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)
........
................
Modified:
branches/1.6.2/ (props changed)
branches/1.6.2/main/ast_expr2.y
Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.2/main/ast_expr2.y
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/ast_expr2.y?view=diff&rev=267062&r1=267061&r2=267062
==============================================================================
--- branches/1.6.2/main/ast_expr2.y (original)
+++ branches/1.6.2/main/ast_expr2.y Wed Jun 2 12:29:14 2010
@@ -1054,18 +1054,18 @@
}
} 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 @@
/* 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 @@
/* 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("");
More information about the asterisk-commits
mailing list