From: Arnaud Le Blanc <lbarnaud@php.net>
Date: Wed, 5 Nov 2008 21:36:11 +0000 (+0000)
Subject: sync zend_ini_scanner.c
X-Git-Tag: BEFORE_NS_RULES_CHANGE~81
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bc569c56a66613325a85d5f062097010c87f8c5e;p=php

sync zend_ini_scanner.c
---

diff --git a/Zend/zend_ini_scanner.c b/Zend/zend_ini_scanner.c
index 36a8fb2819..cdfb643632 100644
--- a/Zend/zend_ini_scanner.c
+++ b/Zend/zend_ini_scanner.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Mon Nov  3 00:36:23 2008 */
+/* Generated by re2c 0.13.5 on Wed Nov  5 22:35:51 2008 */
 #line 1 "Zend/zend_ini_scanner.l"
 /*
    +----------------------------------------------------------------------+
@@ -190,7 +190,7 @@ int zend_ini_scanner_get_lineno(TSRMLS_D)
 */
 char *zend_ini_scanner_get_filename(TSRMLS_D)
 {
-	return ini_filename;
+	return ini_filename ? ini_filename : "Unknown";
 }
 /* }}} */
 
@@ -848,7 +848,7 @@ yy58:
 		yyleng = YYCURSOR - SCNG(yy_text);
 #line 483 "Zend/zend_ini_scanner.l"
 		{ /* #Comment */
-	zend_error(E_DEPRECATED, "Comments starting with '#' are deprecated in %s on line %d", ini_filename, SCNG(lineno));
+	zend_error(E_DEPRECATED, "Comments starting with '#' are deprecated in %s on line %d", zend_ini_scanner_get_filename(TSRMLS_C), SCNG(lineno));
 	BEGIN(INITIAL);
 	SCNG(lineno)++;
 	return END_OF_LINE;
diff --git a/Zend/zend_ini_scanner_defs.h b/Zend/zend_ini_scanner_defs.h
index 66d91418f6..97d3a07b44 100644
--- a/Zend/zend_ini_scanner_defs.h
+++ b/Zend/zend_ini_scanner_defs.h
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Mon Nov  3 00:36:23 2008 */
+/* Generated by re2c 0.13.5 on Wed Nov  5 22:35:51 2008 */
 #line 3 "Zend/zend_ini_scanner_defs.h"
 
 enum YYCONDTYPE {