From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Tue, 25 Aug 2009 06:36:49 +0000 (+0000)
Subject: Merged revisions 213971 via svnmerge from
X-Git-Tag: 1.6.1.7-rc1~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9923cc724f71d46f00bddd68b5fbf71587bfd3b;p=thirdparty%2Fasterisk.git

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 7994c528ee..a2e3f7a9b1 100644
--- 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;
 }