Merged revisions 213971 via svnmerge from

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

................
  r213971 | tilghman | 2009-08-25 01:35:37 -0500 (Tue, 25 Aug 2009) | 14 lines

  Merged revisions 213970 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r213970 | tilghman | 2009-08-25 01:34:44 -0500 (Tue, 25 Aug 2009) | 7 lines

    Improve error message by informing user exactly which function is missing a parethesis.
    (closes issue #15242)
     Reported by: Nick_Lewis
     Patches:
           pbx.c-funcparenthesis.patch2 uploaded by dbrooks (license 790)
           pbx.c-funcparenthesis-1.4.diff uploaded by loloski (license 68)
  ........
................

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

diff --git a/main/pbx.c b/main/pbx.c
index 7994c528ee69e9cb1a36a7230240be1ee52a8ec7..a2e3f7a9b164ecf433074ffcfe5290eac8c7757b 100644 (file)
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -2838,14 +2838,14 @@ static char *func_args(char *function)
        char *args = strchr(function, '(');
 
        if (!args)
-               ast_log(LOG_WARNING, "Function doesn't contain parentheses.  Assuming null argument.\n");
+               ast_log(LOG_WARNING, "Function '%s' doesn't contain parentheses.  Assuming null argument.\n", function);
        else {
                char *p;
                *args++ = '\0';
                if ((p = strrchr(args, ')')) )
                        *p = '\0';
                else
-                       ast_log(LOG_WARNING, "Can't find trailing parenthesis?\n");
+                       ast_log(LOG_WARNING, "Can't find trailing parenthesis for function '%s(%s'?\n", function, args);
        }
        return args;
 }