From c2e059292d8dce85a39e795782562b86b4d3f584 Mon Sep 17 00:00:00 2001
From: Paul Belanger <paul.belanger@polybeacon.com>
Date: Wed, 2 Jun 2010 17:25:05 +0000
Subject: [PATCH] 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)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@267041 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
main/ast_expr2.y | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/main/ast_expr2.y b/main/ast_expr2.y
index 10e207e8c1..d963fba616 100644
--- a/main/ast_expr2.y
+++ b/main/ast_expr2.y
@@ -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("");
--
GitLab