cvs: ZendEngine2(PHP_5_3) / zend_ini_scanner.c zend_ini_scanner_defs.h
"Arnaud Le Blanc" <[email protected]>
| Newsgroups | gmane.comp.php.cvs.zend |
|---|---|
| Message-ID | <cvslbarnaud1225920971@cvsserver> |
lbarnaud Wed Nov 5 21:36:11 2008 UTC
Modified files: (Branch: PHP_5_3)
/ZendEngine2 zend_ini_scanner.c zend_ini_scanner_defs.h
Log:
sync zend_ini_scanner.c
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini_scanner.c?r1=1.1.2.11&r2=1.1.2.12&diff_format=u
Index: ZendEngine2/zend_ini_scanner.c
diff -u ZendEngine2/zend_ini_scanner.c:1.1.2.11 ZendEngine2/zend_ini_scanner.c:1.1.2.12
--- ZendEngine2/zend_ini_scanner.c:1.1.2.11 Sun Nov 2 23:36:53 2008
+++ ZendEngine2/zend_ini_scanner.c Wed Nov 5 21:36:11 2008
@@ -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"
/*
+----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_ini_scanner.c,v 1.1.2.11 2008/11/02 23:36:53 lbarnaud Exp $ */
+/* $Id: zend_ini_scanner.c,v 1.1.2.12 2008/11/05 21:36:11 lbarnaud Exp $ */
#include <errno.h>
#include "zend.h"
@@ -190,7 +190,7 @@
*/
char *zend_ini_scanner_get_filename(TSRMLS_D)
{
- return ini_filename;
+ return ini_filename ? ini_filename : "Unknown";
}
/* }}} */
@@ -848,7 +848,7 @@
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;
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini_scanner_defs.h?r1=1.1.2.9&r2=1.1.2.10&diff_format=u
Index: ZendEngine2/zend_ini_scanner_defs.h
diff -u ZendEngine2/zend_ini_scanner_defs.h:1.1.2.9 ZendEngine2/zend_ini_scanner_defs.h:1.1.2.10
--- ZendEngine2/zend_ini_scanner_defs.h:1.1.2.9 Sun Nov 2 23:36:53 2008
+++ ZendEngine2/zend_ini_scanner_defs.h Wed Nov 5 21:36:11 2008
@@ -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 {
--
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php