summaryrefslogtreecommitdiff
path: root/Zend/zend_ini_scanner.c
diff options
context:
space:
mode:
authorArnaud Le Blanc <lbarnaud@php.net>2008-11-05 21:36:11 +0000
committerArnaud Le Blanc <lbarnaud@php.net>2008-11-05 21:36:11 +0000
commitbc569c56a66613325a85d5f062097010c87f8c5e (patch)
tree4143ca2ad2193e20420ec4dc1c2addef1364ee7f /Zend/zend_ini_scanner.c
parent2276e85f132ea17c1e49f6849eaf34ecde7a8882 (diff)
downloadphp-git-bc569c56a66613325a85d5f062097010c87f8c5e.tar.gz
sync zend_ini_scanner.c
Diffstat (limited to 'Zend/zend_ini_scanner.c')
-rw-r--r--Zend/zend_ini_scanner.c6
1 files changed, 3 insertions, 3 deletions
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;