cvs: php-src(PHP_5_2) /ext/ctype ctype.c /ext/gmp gmp.c /ext/json json.c /ext/ncurses ncurses.c /ext/tokenizer tokenizer.c /ext/xmlreader
php_xmlreader.c /ext/xsl php_xsl.c
| From: | Antony Dovgal | Date: | Fri, 12 Jan 2007 12:17:32 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/ctype ctype.c /ext/gmp gmp.c /ext/json json.c /ext/ncurses ncurses.c /ext/tokenizer tokenizer.c /ext/xmlreader php_xmlreader.c /ext/xsl php_xsl.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-42696@lists.php.net to get a copy of this message | ||
tony2001 Fri Jan 12 12:17:32 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/ctype ctype.c
/php-src/ext/gmp gmp.c
/php-src/ext/json json.c
/php-src/ext/ncurses ncurses.c
/php-src/ext/tokenizer tokenizer.c
/php-src/ext/xmlreader php_xmlreader.c
/php-src/ext/xsl php_xsl.c
Log:
MFH: nuke skeleton leftovers
http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/ctype.c?r1=1.34.2.3.2.5&r2=1.34.2.3.2.6&diff_format=u Index: php-src/ext/ctype/ctype.c diff -u php-src/ext/ctype/ctype.c:1.34.2.3.2.5 php-src/ext/ctype/ctype.c:1.34.2.3.2.6 --- php-src/ext/ctype/ctype.c:1.34.2.3.2.5 Mon Jan 1 09:35:48 2007 +++ php-src/ext/ctype/ctype.c Fri Jan 12 12:17:31 2007 @@ -28,18 +28,8 @@ #include <ctype.h> -/* You should tweak config.m4 so this symbol (or some else suitable) - gets defined. -*/ #if HAVE_CTYPE -/* If you declare any globals in php_ctype.h uncomment this: -ZEND_DECLARE_MODULE_GLOBALS(ctype) -*/ - -/* True global resources - no need for thread safety here */ -/* static int le_ctype; */ - static PHP_MINFO_FUNCTION(ctype); static PHP_FUNCTION(ctype_alnum); http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/gmp.c?r1=1.49.2.2.2.6&r2=1.49.2.2.2.7&diff_format=u Index: php-src/ext/gmp/gmp.c diff -u php-src/ext/gmp/gmp.c:1.49.2.2.2.6 php-src/ext/gmp/gmp.c:1.49.2.2.2.7 --- php-src/ext/gmp/gmp.c:1.49.2.2.2.6 Mon Jan 1 09:36:01 2007 +++ php-src/ext/gmp/gmp.c Fri Jan 12 12:17:32 2007 @@ -424,10 +424,6 @@ php_info_print_table_start(); php_info_print_table_row(2, "gmp support", "enabled"); php_info_print_table_end(); - - /* Remove comments if you have entries in php.ini - DISPLAY_INI_ENTRIES(); - */ } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.9.2.10&r2=1.9.2.11&diff_format=u Index: php-src/ext/json/json.c diff -u php-src/ext/json/json.c:1.9.2.10 php-src/ext/json/json.c:1.9.2.11 --- php-src/ext/json/json.c:1.9.2.10 Mon Jan 1 09:36:02 2007 +++ php-src/ext/json/json.c Fri Jan 12 12:17:32 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: json.c,v 1.9.2.10 2007/01/01 09:36:02 sebastian Exp $ */ +/* $Id: json.c,v 1.9.2.11 2007/01/12 12:17:32 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,9 +35,6 @@ static PHP_FUNCTION(json_encode); static PHP_FUNCTION(json_decode); -/* If you declare any globals in php_json.h uncomment this: -ZEND_DECLARE_MODULE_GLOBALS(json) -*/ static const char digits[] = "0123456789abcdef"; /* {{{ json_functions[] http://cvs.php.net/viewvc.cgi/php-src/ext/ncurses/ncurses.c?r1=1.30.2.1.2.1&r2=1.30.2.1.2.2&diff_format=u Index: php-src/ext/ncurses/ncurses.c diff -u php-src/ext/ncurses/ncurses.c:1.30.2.1.2.1 php-src/ext/ncurses/ncurses.c:1.30.2.1.2.2 --- php-src/ext/ncurses/ncurses.c:1.30.2.1.2.1 Mon Jan 1 09:36:03 2007 +++ php-src/ext/ncurses/ncurses.c Fri Jan 12 12:17:32 2007 @@ -277,10 +277,6 @@ php_info_print_table_row(2, "color support", "no"); #endif php_info_print_table_end(); - - /* Remove comments if you have entries in php.ini - DISPLAY_INI_ENTRIES(); - */ } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/tokenizer/tokenizer.c?r1=1.31.2.5.2.3&r2=1.31.2.5.2.4&diff_format=u Index: php-src/ext/tokenizer/tokenizer.c diff -u php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.3 php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.4 --- php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.3 Mon Jan 1 09:36:09 2007 +++ php-src/ext/tokenizer/tokenizer.c Fri Jan 12 12:17:32 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: tokenizer.c,v 1.31.2.5.2.3 2007/01/01 09:36:09 sebastian Exp $ */ +/* $Id: tokenizer.c,v 1.31.2.5.2.4 2007/01/12 12:17:32 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -92,12 +92,6 @@ #define zendtext LANG_SCNG(yy_text) #define zendleng LANG_SCNG(yy_leng) -/* If you declare any globals in php_tokenizer.h uncomment this: -ZEND_DECLARE_MODULE_GLOBALS(tokenizer) -*/ - -/* True global resources - no need for thread safety here */ -/* static int le_tokenizer; */ /* {{{ tokenizer_functions[] * @@ -134,35 +128,10 @@ ZEND_GET_MODULE(tokenizer) #endif -/* {{{ PHP_INI - */ -/* Remove comments and fill if you need to have entries in php.ini -PHP_INI_BEGIN() - STD_PHP_INI_ENTRY("tokenizer.global_value", "42", PHP_INI_ALL, OnUpdateLong, global_value, zend_tokenizer_globals, tokenizer_globals) - STD_PHP_INI_ENTRY("tokenizer.global_string", "foobar", PHP_INI_ALL, OnUpdateString, global_string, zend_tokenizer_globals, tokenizer_globals) -PHP_INI_END() -*/ -/* }}} */ - -/* {{{ PHP_GINIT_FUNCTION - */ -/* Uncomment this function if you have INI entries -static PHP_GINIT_FUNCTION(tokenizer) -{ - tokenizer_globals->global_value = 0; - tokenizer_globals->global_string = NULL; -} -*/ -/* }}} */ - /* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(tokenizer) { - /* If you have INI entries, uncomment these lines - REGISTER_INI_ENTRIES(); - */ - REGISTER_LONG_CONSTANT("T_INCLUDE", T_INCLUDE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_INCLUDE_ONCE", T_INCLUDE_ONCE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_EVAL", T_EVAL, CONST_CS | CONST_PERSISTENT); @@ -294,10 +263,6 @@ php_info_print_table_start(); php_info_print_table_row(2, "Tokenizer Support", "enabled"); php_info_print_table_end(); - - /* Remove comments if you have entries in php.ini - DISPLAY_INI_ENTRIES(); - */ } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/xmlreader/php_xmlreader.c?r1=1.13.2.14.2.6&r2=1.13.2.14.2.7&diff_format=u Index: php-src/ext/xmlreader/php_xmlreader.c diff -u php-src/ext/xmlreader/php_xmlreader.c:1.13.2.14.2.6 php-src/ext/xmlreader/php_xmlreader.c:1.13.2.14.2.7 --- php-src/ext/xmlreader/php_xmlreader.c:1.13.2.14.2.6 Mon Jan 1 09:36:09 2007 +++ php-src/ext/xmlreader/php_xmlreader.c Fri Jan 12 12:17:32 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_xmlreader.c,v 1.13.2.14.2.6 2007/01/01 09:36:09 sebastian Exp $ */ +/* $Id: php_xmlreader.c,v 1.13.2.14.2.7 2007/01/12 12:17:32 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1274,7 +1274,6 @@ } /* }}} */ - /* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(xmlreader) @@ -1293,10 +1292,6 @@ php_info_print_table_row(2, "XMLReader", "enabled"); } php_info_print_table_end(); - - /* Remove comments if you have entries in php.ini - DISPLAY_INI_ENTRIES(); - */ } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/php_xsl.c?r1=1.32.2.6.2.1&r2=1.32.2.6.2.2&diff_format=u Index: php-src/ext/xsl/php_xsl.c diff -u php-src/ext/xsl/php_xsl.c:1.32.2.6.2.1 php-src/ext/xsl/php_xsl.c:1.32.2.6.2.2 --- php-src/ext/xsl/php_xsl.c:1.32.2.6.2.1 Mon Jan 1 09:36:10 2007 +++ php-src/ext/xsl/php_xsl.c Fri Jan 12 12:17:32 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_xsl.c,v 1.32.2.6.2.1 2007/01/01 09:36:10 sebastian Exp $ */ +/* $Id: php_xsl.c,v 1.32.2.6.2.2 2007/01/12 12:17:32 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -28,9 +28,6 @@ #include "php_xsl.h" -/* If you declare any globals in php_xsl.h uncomment this: -ZEND_DECLARE_MODULE_GLOBALS(xsl) -*/ zend_class_entry *xsl_xsltprocessor_class_entry; static zend_object_handlers xsl_object_handlers; @@ -253,10 +250,6 @@ */ PHP_MSHUTDOWN_FUNCTION(xsl) { - /* uncomment this line if you have INI entries - UNREGISTER_INI_ENTRIES(); - */ - xsltUnregisterExtModuleFunction ((const xmlChar *) "functionString", (const xmlChar *) "http://php.net/xsl"); xsltUnregisterExtModuleFunction ((const xmlChar *) "function", @@ -268,7 +261,6 @@ } /* }}} */ -/* Remove if there's nothing to do at request start */ /* {{{ PHP_RINIT_FUNCTION */ PHP_RINIT_FUNCTION(xsl) @@ -278,7 +270,6 @@ } /* }}} */ -/* Remove if there's nothing to do at request end */ /* {{{ PHP_RSHUTDOWN_FUNCTION */ PHP_RSHUTDOWN_FUNCTION(xsl) @@ -310,14 +301,10 @@ php_info_print_table_row(2, "libxslt compiled against libxml Version", buffer); } #if HAVE_XSL_EXSLT - php_info_print_table_row(2, "EXSLT", "enabled"); - php_info_print_table_row(2, "libexslt Version", LIBEXSLT_DOTTED_VERSION); + php_info_print_table_row(2, "EXSLT", "enabled"); + php_info_print_table_row(2, "libexslt Version", LIBEXSLT_DOTTED_VERSION); #endif php_info_print_table_end(); - - /* Remove comments if you have entries in php.ini - DISPLAY_INI_ENTRIES(); - */ } /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/ctype.c?r1=1.34.2.3.2.5&r2=1.34.2.3.2.6&diff_format=u Index: php-src/ext/ctype/ctype.c diff -u php-src/ext/ctype/ctype.c:1.34.2.3.2.5 php-src/ext/ctype/ctype.c:1.34.2.3.2.6 --- php-src/ext/ctype/ctype.c:1.34.2.3.2.5 Mon Jan 1 09:35:48 2007 +++ php-src/ext/ctype/ctype.c Fri Jan 12 12:17:31 2007 @@ -28,18 +28,8 @@ #include <ctype.h> -/* You should tweak config.m4 so this symbol (or some else suitable) - gets defined. -*/ #if HAVE_CTYPE -/* If you declare any globals in php_ctype.h uncomment this: -ZEND_DECLARE_MODULE_GLOBALS(ctype) -*/ - -/* True global resources - no need for thread safety here */ -/* static int le_ctype; */ - static PHP_MINFO_FUNCTION(ctype); static PHP_FUNCTION(ctype_alnum); http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/gmp.c?r1=1.49.2.2.2.6&r2=1.49.2.2.2.7&diff_format=u Index: php-src/ext/gmp/gmp.c diff -u php-src/ext/gmp/gmp.c:1.49.2.2.2.6 php-src/ext/gmp/gmp.c:1.49.2.2.2.7 --- php-src/ext/gmp/gmp.c:1.49.2.2.2.6 Mon Jan 1 09:36:01 2007 +++ php-src/ext/gmp/gmp.c Fri Jan 12 12:17:32 2007 @@ -424,10 +424,6 @@ php_info_print_table_start(); php_info_print_table_row(2, "gmp support", "enabled"); php_info_print_table_end(); - - /* Remove comments if you have entries in php.ini - DISPLAY_INI_ENTRIES(); - */ } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.9.2.10&r2=1.9.2.11&diff_format=u Index: php-src/ext/json/json.c diff -u php-src/ext/json/json.c:1.9.2.10 php-src/ext/json/json.c:1.9.2.11 --- php-src/ext/json/json.c:1.9.2.10 Mon Jan 1 09:36:02 2007 +++ php-src/ext/json/json.c Fri Jan 12 12:17:32 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: json.c,v 1.9.2.10 2007/01/01 09:36:02 sebastian Exp $ */ +/* $Id: json.c,v 1.9.2.11 2007/01/12 12:17:32 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,9 +35,6 @@ static PHP_FUNCTION(json_encode); static PHP_FUNCTION(json_decode); -/* If you declare any globals in php_json.h uncomment this: -ZEND_DECLARE_MODULE_GLOBALS(json) -*/ static const char digits[] = "0123456789abcdef"; /* {{{ json_functions[] http://cvs.php.net/viewvc.cgi/php-src/ext/ncurses/ncurses.c?r1=1.30.2.1.2.1&r2=1.30.2.1.2.2&diff_format=u Index: php-src/ext/ncurses/ncurses.c diff -u php-src/ext/ncurses/ncurses.c:1.30.2.1.2.1 php-src/ext/ncurses/ncurses.c:1.30.2.1.2.2 --- php-src/ext/ncurses/ncurses.c:1.30.2.1.2.1 Mon Jan 1 09:36:03 2007 +++ php-src/ext/ncurses/ncurses.c Fri Jan 12 12:17:32 2007 @@ -277,10 +277,6 @@ php_info_print_table_row(2, "color support", "no"); #endif php_info_print_table_end(); - - /* Remove comments if you have entries in php.ini - DISPLAY_INI_ENTRIES(); - */ } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/tokenizer/tokenizer.c?r1=1.31.2.5.2.3&r2=1.31.2.5.2.4&diff_format=u Index: php-src/ext/tokenizer/tokenizer.c diff -u php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.3 php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.4 --- php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.3 Mon Jan 1 09:36:09 2007 +++ php-src/ext/tokenizer/tokenizer.c Fri Jan 12 12:17:32 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: tokenizer.c,v 1.31.2.5.2.3 2007/01/01 09:36:09 sebastian Exp $ */ +/* $Id: tokenizer.c,v 1.31.2.5.2.4 2007/01/12 12:17:32 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -92,12 +92,6 @@ #define zendtext LANG_SCNG(yy_text) #define zendleng LANG_SCNG(yy_leng) -/* If you declare any globals in php_tokenizer.h uncomment this: -ZEND_DECLARE_MODULE_GLOBALS(tokenizer) -*/ - -/* True global resources - no need for thread safety here */ -/* static int le_tokenizer; */ /* {{{ tokenizer_functions[] * @@ -134,35 +128,10 @@ ZEND_GET_MODULE(tokenizer) #endif -/* {{{ PHP_INI - */ -/* Remove comments and fill if you need to have entries in php.ini -PHP_INI_BEGIN() - STD_PHP_INI_ENTRY("tokenizer.global_value", "42", PHP_INI_ALL, OnUpdateLong, global_value, zend_tokenizer_globals, tokenizer_globals) - STD_PHP_INI_ENTRY("tokenizer.global_string", "foobar", PHP_INI_ALL, OnUpdateString, global_string, zend_tokenizer_globals, tokenizer_globals) -PHP_INI_END() -*/ -/* }}} */ - -/* {{{ PHP_GINIT_FUNCTION - */ -/* Uncomment this function if you have INI entries -static PHP_GINIT_FUNCTION(tokenizer) -{ - tokenizer_globals->global_value = 0; - tokenizer_globals->global_string = NULL; -} -*/ -/* }}} */ - /* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(tokenizer) { - /* If you have INI entries, uncomment these lines - REGISTER_INI_ENTRIES(); - */ - REGISTER_LONG_CONSTANT("T_INCLUDE", T_INCLUDE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_INCLUDE_ONCE", T_INCLUDE_ONCE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_EVAL", T_EVAL, CONST_CS | CONST_PERSISTENT); @@ -294,10 +263,6 @@ php_info_print_table_start(); php_info_print_table_row(2, "Tokenizer Support", "enabled"); php_info_print_table_end(); - - /* Remove comments if you have entries in php.ini - DISPLAY_INI_ENTRIES(); - */ } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/xmlreader/php_xmlreader.c?r1=1.13.2.14.2.6&r2=1.13.2.14.2.7&diff_format=u Index: php-src/ext/xmlreader/php_xmlreader.c diff -u php-src/ext/xmlreader/php_xmlreader.c:1.13.2.14.2.6 php-src/ext/xmlreader/php_xmlreader.c:1.13.2.14.2.7 --- php-src/ext/xmlreader/php_xmlreader.c:1.13.2.14.2.6 Mon Jan 1 09:36:09 2007 +++ php-src/ext/xmlreader/php_xmlreader.c Fri Jan 12 12:17:32 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_xmlreader.c,v 1.13.2.14.2.6 2007/01/01 09:36:09 sebastian Exp $ */ +/* $Id: php_xmlreader.c,v 1.13.2.14.2.7 2007/01/12 12:17:32 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1274,7 +1274,6 @@ } /* }}} */ - /* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(xmlreader) @@ -1293,10 +1292,6 @@ php_info_print_table_row(2, "XMLReader", "enabled"); } php_info_print_table_end(); - - /* Remove comments if you have entries in php.ini - DISPLAY_INI_ENTRIES(); - */ } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/php_xsl.c?r1=1.32.2.6.2.1&r2=1.32.2.6.2.2&diff_format=u Index: php-src/ext/xsl/php_xsl.c diff -u php-src/ext/xsl/php_xsl.c:1.32.2.6.2.1 php-src/ext/xsl/php_xsl.c:1.32.2.6.2.2 --- php-src/ext/xsl/php_xsl.c:1.32.2.6.2.1 Mon Jan 1 09:36:10 2007 +++ php-src/ext/xsl/php_xsl.c Fri Jan 12 12:17:32 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_xsl.c,v 1.32.2.6.2.1 2007/01/01 09:36:10 sebastian Exp $ */ +/* $Id: php_xsl.c,v 1.32.2.6.2.2 2007/01/12 12:17:32 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -28,9 +28,6 @@ #include "php_xsl.h" -/* If you declare any globals in php_xsl.h uncomment this: -ZEND_DECLARE_MODULE_GLOBALS(xsl) -*/ zend_class_entry *xsl_xsltprocessor_class_entry; static zend_object_handlers xsl_object_handlers; @@ -253,10 +250,6 @@ */ PHP_MSHUTDOWN_FUNCTION(xsl) { - /* uncomment this line if you have INI entries - UNREGISTER_INI_ENTRIES(); - */ - xsltUnregisterExtModuleFunction ((const xmlChar *) "functionString", (const xmlChar *) "http://php.net/xsl"); xsltUnregisterExtModuleFunction ((const xmlChar *) "function", @@ -268,7 +261,6 @@ } /* }}} */ -/* Remove if there's nothing to do at request start */ /* {{{ PHP_RINIT_FUNCTION */ PHP_RINIT_FUNCTION(xsl) @@ -278,7 +270,6 @@ } /* }}} */ -/* Remove if there's nothing to do at request end */ /* {{{ PHP_RSHUTDOWN_FUNCTION */ PHP_RSHUTDOWN_FUNCTION(xsl) @@ -310,14 +301,10 @@ php_info_print_table_row(2, "libxslt compiled against libxml Version", buffer); } #if HAVE_XSL_EXSLT - php_info_print_table_row(2, "EXSLT", "enabled"); - php_info_print_table_row(2, "libexslt Version", LIBEXSLT_DOTTED_VERSION); + php_info_print_table_row(2, "EXSLT", "enabled"); + php_info_print_table_row(2, "libexslt Version", LIBEXSLT_DOTTED_VERSION); #endif php_info_print_table_end(); - - /* Remove comments if you have entries in php.ini - DISPLAY_INI_ENTRIES(); - */ } /* }}} */