cvs: ZendEngine2 / zend_ini_scanner.c zend_ini_scanner_defs.h
[email protected] ("Arnaud Le Blanc")
| Newsgroups | php.zend-engine.cvs |
|---|---|
| Message-ID | <cvslbarnaud1225920938@cvsserver> |
lbarnaud Wed Nov 5 21:35:38 2008 UTC
Modified files:
/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.8&r2=1.9&diff_format=u
Index: ZendEngine2/zend_ini_scanner.c
diff -u ZendEngine2/zend_ini_scanner.c:1.8 ZendEngine2/zend_ini_scanner.c:1.9
--- ZendEngine2/zend_ini_scanner.c:1.8 Thu Sep 11 00:49:30 2008
+++ ZendEngine2/zend_ini_scanner.c Wed Nov 5 21:35:38 2008
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Wed Sep 10 19:11:30 2008 */
+/* Generated by re2c 0.13.5 on Wed Nov 5 22:35:10 2008 */
#line 1 "Zend/zend_ini_scanner.l"
/*
+----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_ini_scanner.c,v 1.8 2008/09/11 00:49:30 stas Exp $ */
+/* $Id: zend_ini_scanner.c,v 1.9 2008/11/05 21:35:38 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";
}
/* }}} */
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini_scanner_defs.h?r1=1.7&r2=1.8&diff_format=u
Index: ZendEngine2/zend_ini_scanner_defs.h
diff -u ZendEngine2/zend_ini_scanner_defs.h:1.7 ZendEngine2/zend_ini_scanner_defs.h:1.8
--- ZendEngine2/zend_ini_scanner_defs.h:1.7 Thu Sep 11 00:49:31 2008
+++ ZendEngine2/zend_ini_scanner_defs.h Wed Nov 5 21:35:38 2008
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Wed Sep 10 19:11:30 2008 */
+/* Generated by re2c 0.13.5 on Wed Nov 5 22:35:10 2008 */
#line 3 "Zend/zend_ini_scanner_defs.h"
enum YYCONDTYPE {