[asterisk-commits] tilghman: branch 1.6.2 r213974 - in /branches/1.6.2: ./ main/pbx.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Aug 25 01:36:58 2009
New Revision: 213974

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=213974
Log:
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)
  ........
................

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/pbx.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/main/pbx.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/main/pbx.c?view=diff&rev=213974&r1=213973&r2=213974
==============================================================================
--- branches/1.6.2/main/pbx.c (original)
+++ branches/1.6.2/main/pbx.c Tue Aug 25 01:36:58 2009
@@ -3321,14 +3321,14 @@
 	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;