From bc569c56a66613325a85d5f062097010c87f8c5e Mon Sep 17 00:00:00 2001 From: Arnaud Le Blanc Date: Wed, 5 Nov 2008 21:36:11 +0000 Subject: [PATCH] sync zend_ini_scanner.c --- Zend/zend_ini_scanner.c | 6 +++--- Zend/zend_ini_scanner_defs.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Zend/zend_ini_scanner.c b/Zend/zend_ini_scanner.c index 36a8fb2819372..cdfb6436326a4 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 @@ 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 index 66d91418f63c8..97d3a07b4474f 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 {