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)
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@267062 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/ast_expr2.y b/main/ast_expr2.y
index 10e207e8c12a2d3a1b76b1f9b5e34ad39cdb5df7..d963fba6165cb02ebee4d9f5c35d4f57512b1f1b 100644 (file)
--- 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("");