sync zend_ini_scanner.c

joec4i · Nov 5, 2008 · bc569c5 · bc569c5
1 parent 2276e85
commit bc569c5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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 @@ int ini_lex(zval *ini_lval TSRMLS_DC)
 		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
@@ -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 {