[svn-commits] file: trunk r53119 - in /trunk: ./ main/config.c

[svn-commits at lists.digium.com]

Author: file
Date: Fri Feb  2 11:01:04 2007
New Revision: 53119

URL: http://svn.digium.com/view/asterisk?view=rev&rev=53119
Log:
Merged revisions 53118 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r53118 | file | 2007-02-02 10:59:53 -0600 (Fri, 02 Feb 2007) | 10 lines

Merged revisions 53117 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r53117 | file | 2007-02-02 10:58:09 -0600 (Fri, 02 Feb 2007) | 2 lines

Pass the glob expanded filename to process_text_line so that error messages contain the actual filename, not the original include one. (issue #8959 reported by tzafrir)

........

................

Modified:
    trunk/   (props changed)
    trunk/main/config.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/config.c
URL: http://svn.digium.com/view/asterisk/trunk/main/config.c?view=diff&rev=53119&r1=53118&r2=53119
==============================================================================
--- trunk/main/config.c (original)
+++ trunk/main/config.c Fri Feb  2 11:01:04 2007
@@ -923,7 +923,7 @@
 				if (process_buf) {
 					char *buf = ast_strip(process_buf);
 					if (!ast_strlen_zero(buf)) {
-						if (process_text_line(cfg, &cat, buf, lineno, filename, withcomments)) {
+						if (process_text_line(cfg, &cat, buf, lineno, fn, withcomments)) {
 							cfg = NULL;
 							break;
 						}