cvs: php-src(PHP_5_3) / NEWS /ext/bcmath bcmath.c /ext/bz2 bz2.c /ext/calendar calendar.c /ext/com_dotnet com_extension.c com_persist.c
/ext/ctype ctype.c /ext/curl interface.c /ext/date php_date.c /ext/dba dba.c /ext/dbase dbase.c /ext/dom attr.c cdatasection.c characterdata.c
comment.c document.c documentfragment.c documenttype.c dom_fe.h domconfiguration.c domerror.c domerrorhandler.c domexception.c domimplementation.c
domimplementationlist.c domimplementationsource.c domlocator.c domstringlist.c element.c entity.c entityreference.c namednodemap.c namelist.c node.c
nodelist.c notation.c php_dom.c processinginstruction.c string_extend.c text.c typeinfo.c userdatahandler.c xpath.c /ext/exif exif.c /ext/fbsql
php_fbsql.c /ext/fdf fdf.c /ext/filter filter.c /ext/ftp php_ftp.c /ext/gd gd.c /ext/gettext gettext.c /ext/gmp gmp.c /ext/hash hash.c
/ext/iconv iconv.c /ext/imap php_imap.c /ext/interbase interbase.c /ext/json json.c /ext/ldap ldap.c ! /ext/libxml libxml.c /ext/mbstring
mbstring.c /ext/mcrypt mcrypt.c /ext/mhash mhash.c /ext/mime_magic mime_magic.c /ext/ming ming.c /ext/msql php_msql.c /ext/mssql php_mssql.c
/ext/mysql php_mysql.c /ext/mysqli mysqli.c mysqli_driver.c mysqli_exception.c mysqli_fe.c mysqli_warning.c php_mysqli.h /ext/ncurses ncurses_fe.c
php_ncurses.h /ext/oci8 oci8.c /ext/odbc birdstep.c php_odbc.c /ext/openssl openssl.c /ext/pcntl pcntl.c /ext/pcre php_pcre.c /ext/pdo pdo.c
pdo_dbh.c pdo_stmt.c php_pdo_driver.h php_pdo_int.h /ext/pdo_dblib pdo_dblib.c /ext/pdo_firebird pdo_firebird.c /ext/pdo_mysql pdo_mysql.c
/ext/pdo_oci pdo_oci.c /ext/pdo_odbc pdo_odbc.c /ext/pdo_pgsql pdo_pgsql.c pgsql_driver.c /ext/pdo_sqlite pdo_sqlite.c sqlite_driver.c /ext/pgsql
pgsql.c /ext/posix posix.c /ext/pspell pspell.c /ext/readline readline.c /ext/recode recode.c /ext/reflection php_reflection.c /ext/session
session.c /ext/shmop shmop.c /ext/simplexml simplexml.c /ext/skele! ton skeleton.c /ext/snmp snmp.c winsnmp.c /ext/soap soap.c /ext/sockets
sockets.c /ext/spl php_spl.c spl_array.c spl_directory.c spl_functions.c spl_functions.h spl_iterators.c spl_observer.c spl_sxe.c /ext/sqlite
pdo_sqlite2.c sqlite.c /ext/standard basic_functions.c dir.c dl.c info.c user_filters.c /ext/sybase php_s

dmitry Thu Sep 27 18:00:49 2007 UTC Modified files: (Branch: PHP_5_3) /php-src NEWS /ZendEngine2 zend.h zend_API.c zend_API.h zend_builtin_functions.c zend_compile.c zend_compile.h zend_exceptions.c zend_execute.c zend_execute.h zend_execute_API.c zend_hash.c zend_hash.h zend_ini.c zend_ini.h zend_interfaces.c zend_modules.h zend_opcode.c /php-src/ext/bcmath bcmath.c /php-src/ext/bz2 bz2.c /php-src/ext/calendar calendar.c /php-src/ext/com_dotnet com_extension.c com_persist.c /php-src/ext/ctype ctype.c /php-src/ext/curl interface.c /php-src/ext/date php_date.c /php-src/ext/dba dba.c /php-src/ext/dbase dbase.c /php-src/ext/dom attr.c cdatasection.c characterdata.c comment.c document.c documentfragment.c documenttype.c dom_fe.h domconfiguration.c domerror.c domerrorhandler.c domexception.c domimplementation.c domimplementationlist.c domimplementationsource.c domlocator.c domstringlist.c element.c entity.c entityreference.c namednodemap.c namelist.c node.c nodelist.c notation.c php_dom.c processinginstruction.c string_extend.c text.c typeinfo.c userdatahandler.c xpath.c /php-src/ext/exif exif.c /php-src/ext/fbsql php_fbsql.c /php-src/ext/fdf fdf.c /php-src/ext/filter filter.c /php-src/ext/ftp php_ftp.c /php-src/ext/gd gd.c /php-src/ext/gettext gettext.c /php-src/ext/gmp gmp.c /php-src/ext/hash hash.c /php-src/ext/iconv iconv.c /php-src/ext/imap php_imap.c /php-src/ext/interbase interbase.c /php-src/ext/json json.c /php-src/ext/ldap ldap.c /php-src/ext/libxml libxml.c /php-src/ext/mbstring mbstring.c /php-src/ext/mcrypt mcrypt.c /php-src/ext/mhash mhash.c /php-src/ext/mime_magic mime_magic.c /php-src/ext/ming ming.c /php-src/ext/msql php_msql.c /php-src/ext/mssql php_mssql.c /php-src/ext/mysql php_mysql.c /php-src/ext/mysqli mysqli.c mysqli_driver.c mysqli_exception.c mysqli_fe.c mysqli_warning.c php_mysqli.h /php-src/ext/ncurses ncurses_fe.c php_ncurses.h /php-src/ext/oci8 oci8.c /php-src/ext/odbc birdstep.c php_odbc.c /php-src/ext/openssl openssl.c /php-src/ext/pcntl pcntl.c /php-src/ext/pcre php_pcre.c /php-src/ext/pdo pdo.c pdo_dbh.c pdo_stmt.c php_pdo_driver.h php_pdo_int.h /php-src/ext/pdo_dblib pdo_dblib.c /php-src/ext/pdo_firebird pdo_firebird.c /php-src/ext/pdo_mysql pdo_mysql.c /php-src/ext/pdo_oci pdo_oci.c /php-src/ext/pdo_odbc pdo_odbc.c /php-src/ext/pdo_pgsql pdo_pgsql.c pgsql_driver.c /php-src/ext/pdo_sqlite pdo_sqlite.c sqlite_driver.c /php-src/ext/pgsql pgsql.c /php-src/ext/posix posix.c /php-src/ext/pspell pspell.c /php-src/ext/readline readline.c /php-src/ext/recode recode.c /php-src/ext/reflection php_reflection.c /php-src/ext/session session.c /php-src/ext/shmop shmop.c /php-src/ext/simplexml simplexml.c /php-src/ext/skeleton skeleton.c /php-src/ext/snmp snmp.c winsnmp.c /php-src/ext/soap soap.c /php-src/ext/sockets sockets.c /php-src/ext/spl php_spl.c spl_array.c spl_directory.c spl_functions.c spl_functions.h spl_iterators.c spl_observer.c spl_sxe.c /php-src/ext/sqlite pdo_sqlite2.c sqlite.c /php-src/ext/standard basic_functions.c dir.c dl.c info.c user_filters.c /php-src/ext/sybase php_sybase_db.c /php-src/ext/sybase_ct php_sybase_ct.c /php-src/ext/sysvmsg sysvmsg.c /php-src/ext/sysvsem sysvsem.c /php-src/ext/sysvshm sysvshm.c /php-src/ext/tidy tidy.c /php-src/ext/tokenizer tokenizer.c /php-src/ext/wddx wddx.c /php-src/ext/xml xml.c /php-src/ext/xmlreader php_xmlreader.c /php-src/ext/xmlrpc xmlrpc-epi-php.c /php-src/ext/xmlwriter php_xmlwriter.c /php-src/ext/xsl php_xsl.c xsl_fe.h xsltprocessor.c /php-src/ext/zip php_zip.c /php-src/ext/zlib zlib.c /php-src/sapi/aolserver aolserver.c /php-src/sapi/apache php_apache.c /php-src/sapi/apache2filter php_functions.c /php-src/sapi/apache2handler php_functions.c /php-src/sapi/apache_hooks php_apache.c /php-src/sapi/continuity capi.c /php-src/sapi/milter php_milter.c /php-src/sapi/nsapi nsapi.c Log: Improved memory usage by movig constants to read only memory. (Dmitry, Pierre)

http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.5&r2=1.2027.2.547.2.965.2.6&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.5 php-src/NEWS:1.2027.2.547.2.965.2.6 --- php-src/NEWS:1.2027.2.547.2.965.2.5 Thu Sep 27 17:06:36 2007 +++ php-src/NEWS Thu Sep 27 18:00:36 2007 @@ -1,6 +1,7 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 20??, PHP 5.3.0 +- Improved memory usage by movig constants to read only memory. (Dmitry,Pierre) - Improved ext/soap to support element names in context of XMLShema's <any>. (Dmitry) - Improved ext/openssl (Dmitry) http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.h?r1=1.293.2.11.2.9.2.1&r2=1.293.2.11.2.9.2.2&diff_format=u Index: ZendEngine2/zend.h diff -u ZendEngine2/zend.h:1.293.2.11.2.9.2.1 ZendEngine2/zend.h:1.293.2.11.2.9.2.2 --- ZendEngine2/zend.h:1.293.2.11.2.9.2.1 Thu Sep 27 05:24:50 2007 +++ ZendEngine2/zend.h Thu Sep 27 18:00:37 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend.h,v 1.293.2.11.2.9.2.1 2007/09/27 05:24:50 sebastian Exp $ */ +/* $Id: zend.h,v 1.293.2.11.2.9.2.2 2007/09/27 18:00:37 dmitry Exp $ */ #ifndef ZEND_H #define ZEND_H @@ -330,7 +330,7 @@ HashTable default_static_members; HashTable *static_members; HashTable constants_table; - struct _zend_function_entry *builtin_functions; + const struct _zend_function_entry *builtin_functions; union _zend_function *constructor; union _zend_function *destructor; http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.c?r1=1.296.2.27.2.34&r2=1.296.2.27.2.34.2.1&diff_format=u Index: ZendEngine2/zend_API.c diff -u ZendEngine2/zend_API.c:1.296.2.27.2.34 ZendEngine2/zend_API.c:1.296.2.27.2.34.2.1 --- ZendEngine2/zend_API.c:1.296.2.27.2.34 Fri Aug 31 12:36:13 2007 +++ ZendEngine2/zend_API.c Thu Sep 27 18:00:37 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_API.c,v 1.296.2.27.2.34 2007/08/31 12:36:13 tony2001 Exp $ */ +/* $Id: zend_API.c,v 1.296.2.27.2.34.2.1 2007/09/27 18:00:37 dmitry Exp $ */ #include "zend.h" #include "zend_execute.h" @@ -965,14 +965,14 @@ } -ZEND_API int add_assoc_function(zval *arg, char *key, void (*function_ptr)(INTERNAL_FUNCTION_PARAMETERS)) +ZEND_API int add_assoc_function(zval *arg, const char *key, void (*function_ptr)(INTERNAL_FUNCTION_PARAMETERS)) { zend_error(E_WARNING, "add_assoc_function() is no longer supported"); return FAILURE; } -ZEND_API int add_assoc_long_ex(zval *arg, char *key, uint key_len, long n) +ZEND_API int add_assoc_long_ex(zval *arg, const char *key, uint key_len, long n) { zval *tmp; @@ -982,7 +982,7 @@ return zend_symtable_update(Z_ARRVAL_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), NULL); } -ZEND_API int add_assoc_null_ex(zval *arg, char *key, uint key_len) +ZEND_API int add_assoc_null_ex(zval *arg, const char *key, uint key_len) { zval *tmp; @@ -992,7 +992,7 @@ return zend_symtable_update(Z_ARRVAL_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), NULL); } -ZEND_API int add_assoc_bool_ex(zval *arg, char *key, uint key_len, int b) +ZEND_API int add_assoc_bool_ex(zval *arg, const char *key, uint key_len, int b) { zval *tmp; @@ -1002,7 +1002,7 @@ return zend_symtable_update(Z_ARRVAL_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), NULL); } -ZEND_API int add_assoc_resource_ex(zval *arg, char *key, uint key_len, int r) +ZEND_API int add_assoc_resource_ex(zval *arg, const char *key, uint key_len, int r) { zval *tmp; @@ -1013,7 +1013,7 @@ } -ZEND_API int add_assoc_double_ex(zval *arg, char *key, uint key_len, double d) +ZEND_API int add_assoc_double_ex(zval *arg, const char *key, uint key_len, double d) { zval *tmp; @@ -1024,7 +1024,7 @@ } -ZEND_API int add_assoc_string_ex(zval *arg, char *key, uint key_len, char *str, int duplicate) +ZEND_API int add_assoc_string_ex(zval *arg, const char *key, uint key_len, char *str, int duplicate) { zval *tmp; @@ -1035,7 +1035,7 @@ } -ZEND_API int add_assoc_stringl_ex(zval *arg, char *key, uint key_len, char *str, uint length, int duplicate) +ZEND_API int add_assoc_stringl_ex(zval *arg, const char *key, uint key_len, char *str, uint length, int duplicate) { zval *tmp; @@ -1045,7 +1045,7 @@ return zend_symtable_update(Z_ARRVAL_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), NULL); } -ZEND_API int add_assoc_zval_ex(zval *arg, char *key, uint key_len, zval *value) +ZEND_API int add_assoc_zval_ex(zval *arg, const char *key, uint key_len, zval *value) { return zend_symtable_update(Z_ARRVAL_P(arg), key, key_len, (void *) &value, sizeof(zval *), NULL); } @@ -1105,7 +1105,7 @@ } -ZEND_API int add_index_string(zval *arg, ulong index, char *str, int duplicate) +ZEND_API int add_index_string(zval *arg, ulong index, const char *str, int duplicate) { zval *tmp; @@ -1116,7 +1116,7 @@ } -ZEND_API int add_index_stringl(zval *arg, ulong index, char *str, uint length, int duplicate) +ZEND_API int add_index_stringl(zval *arg, ulong index, const char *str, uint length, int duplicate) { zval *tmp; @@ -1188,7 +1188,7 @@ } -ZEND_API int add_next_index_string(zval *arg, char *str, int duplicate) +ZEND_API int add_next_index_string(zval *arg, const char *str, int duplicate) { zval *tmp; @@ -1199,7 +1199,7 @@ } -ZEND_API int add_next_index_stringl(zval *arg, char *str, uint length, int duplicate) +ZEND_API int add_next_index_stringl(zval *arg, const char *str, uint length, int duplicate) { zval *tmp; @@ -1216,7 +1216,7 @@ } -ZEND_API int add_get_assoc_string_ex(zval *arg, char *key, uint key_len, char *str, void **dest, int duplicate) +ZEND_API int add_get_assoc_string_ex(zval *arg, const char *key, uint key_len, const char *str, void **dest, int duplicate) { zval *tmp; @@ -1227,7 +1227,7 @@ } -ZEND_API int add_get_assoc_stringl_ex(zval *arg, char *key, uint key_len, char *str, uint length, void **dest, int duplicate) +ZEND_API int add_get_assoc_stringl_ex(zval *arg, const char *key, uint key_len, const char *str, uint length, void **dest, int duplicate) { zval *tmp; @@ -1260,7 +1260,7 @@ } -ZEND_API int add_get_index_string(zval *arg, ulong index, char *str, void **dest, int duplicate) +ZEND_API int add_get_index_string(zval *arg, ulong index, const char *str, void **dest, int duplicate) { zval *tmp; @@ -1271,7 +1271,7 @@ } -ZEND_API int add_get_index_stringl(zval *arg, ulong index, char *str, uint length, void **dest, int duplicate) +ZEND_API int add_get_index_stringl(zval *arg, ulong index, const char *str, uint length, void **dest, int duplicate) { zval *tmp; @@ -1427,7 +1427,7 @@ /* Check module dependencies */ if (module->deps) { - zend_module_dep *dep = module->deps; + const zend_module_dep *dep = module->deps; while (dep->name) { if (dep->type == MODULE_DEP_REQUIRED) { @@ -1485,7 +1485,7 @@ try_again: m = (zend_module_entry*)(*b1)->pData; if (!m->module_started && m->deps) { - zend_module_dep *dep = m->deps; + const zend_module_dep *dep = m->deps; while (dep->name) { if (dep->type == MODULE_DEP_REQUIRED || dep->type == MODULE_DEP_OPTIONAL) { b2 = b1 + 1; @@ -1530,7 +1530,7 @@ /* Check module dependencies */ if (module->deps) { - zend_module_dep *dep = module->deps; + const zend_module_dep *dep = module->deps; while (dep->name) { if (dep->type == MODULE_DEP_CONFLICTS) { @@ -1627,9 +1627,9 @@ } /* registers all functions in *library_functions in the function hash */ -ZEND_API int zend_register_functions(zend_class_entry *scope, zend_function_entry *functions, HashTable *function_table, int type TSRMLS_DC) +ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_function_entry *functions, HashTable *function_table, int type TSRMLS_DC) { - zend_function_entry *ptr = functions; + const zend_function_entry *ptr = functions; zend_function function, *reg_function; zend_internal_function *internal_function = (zend_internal_function *)&function; int count=0, unload=0; @@ -1660,11 +1660,11 @@ while (ptr->fname) { internal_function->handler = ptr->handler; - internal_function->function_name = ptr->fname; + internal_function->function_name = (char*)ptr->fname; internal_function->scope = scope; internal_function->prototype = NULL; if (ptr->arg_info) { - internal_function->arg_info = ptr->arg_info+1; + internal_function->arg_info = (zend_arg_info*)ptr->arg_info+1; internal_function->num_args = ptr->num_args; /* Currently you cannot denote that the function can accept less arguments than num_args */ if (ptr->arg_info[0].required_num_args == -1) { @@ -1857,9 +1857,9 @@ /* count=-1 means erase all functions, otherwise, * erase the first count functions */ -ZEND_API void zend_unregister_functions(zend_function_entry *functions, int count, HashTable *function_table TSRMLS_DC) +ZEND_API void zend_unregister_functions(const zend_function_entry *functions, int count, HashTable *function_table TSRMLS_DC) { - zend_function_entry *ptr = functions; + const zend_function_entry *ptr = functions; int i=0; HashTable *target_function_table = function_table; @@ -2112,7 +2112,7 @@ return retval; } -static zend_function_entry disabled_class_new[] = { +static const zend_function_entry disabled_class_new[] = { { NULL, NULL, NULL } }; @@ -2486,7 +2486,7 @@ } -ZEND_API char *zend_get_module_version(char *module_name) +ZEND_API const char *zend_get_module_version(const char *module_name) { char *lname; int name_len = strlen(module_name); http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.h?r1=1.207.2.8.2.8&r2=1.207.2.8.2.8.2.1&diff_format=u Index: ZendEngine2/zend_API.h diff -u ZendEngine2/zend_API.h:1.207.2.8.2.8 ZendEngine2/zend_API.h:1.207.2.8.2.8.2.1 --- ZendEngine2/zend_API.h:1.207.2.8.2.8 Mon Apr 16 08:09:54 2007 +++ ZendEngine2/zend_API.h Thu Sep 27 18:00:37 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_API.h,v 1.207.2.8.2.8 2007/04/16 08:09:54 dmitry Exp $ */ +/* $Id: zend_API.h,v 1.207.2.8.2.8.2.1 2007/09/27 18:00:37 dmitry Exp $ */ #ifndef ZEND_API_H #define ZEND_API_H @@ -33,9 +33,9 @@ BEGIN_EXTERN_C() typedef struct _zend_function_entry { - char *fname; + const char *fname; void (*handler)(INTERNAL_FUNCTION_PARAMETERS); - struct _zend_arg_info *arg_info; + const struct _zend_arg_info *arg_info; zend_uint num_args; zend_uint flags; } zend_function_entry; @@ -68,7 +68,7 @@ #define ZEND_ARG_OBJ_INFO(pass_by_ref, name, classname, allow_null) { #name, sizeof(#name)-1, #classname, sizeof(#classname)-1, 0, allow_null, pass_by_ref, 0, 0 }, #define ZEND_ARG_ARRAY_INFO(pass_by_ref, name, allow_null) { #name, sizeof(#name)-1, NULL, 0, 1, allow_null, pass_by_ref, 0, 0 }, #define ZEND_BEGIN_ARG_INFO_EX(name, pass_rest_by_reference, return_reference, required_num_args) \ - zend_arg_info name[] = { \ + const zend_arg_info name[] = { \ { NULL, 0, NULL, 0, 0, 0, pass_rest_by_reference, return_reference, required_num_args }, #define ZEND_BEGIN_ARG_INFO(name, pass_rest_by_reference) \ ZEND_BEGIN_ARG_INFO_EX(name, pass_rest_by_reference, ZEND_RETURN_VALUE, -1) @@ -194,8 +194,8 @@ /* End of parameter parsing API -- andrei */ -ZEND_API int zend_register_functions(zend_class_entry *scope, zend_function_entry *functions, HashTable *function_table, int type TSRMLS_DC); -ZEND_API void zend_unregister_functions(zend_function_entry *functions, int count, HashTable *function_table TSRMLS_DC); +ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_function_entry *functions, HashTable *function_table, int type TSRMLS_DC); +ZEND_API void zend_unregister_functions(const zend_function_entry *functions, int count, HashTable *function_table TSRMLS_DC); ZEND_API int zend_startup_module(zend_module_entry *module_entry); ZEND_API zend_module_entry* zend_register_internal_module(zend_module_entry *module_entry TSRMLS_DC); ZEND_API zend_module_entry* zend_register_module_ex(zend_module_entry *module TSRMLS_DC); @@ -222,7 +222,7 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, uint check_flags, char **callable_name, int *callable_name_len, zend_class_entry **ce_ptr, zend_function **fptr_ptr, zval ***zobj_ptr_ptr TSRMLS_DC); ZEND_API zend_bool zend_is_callable(zval *callable, uint check_flags, char **callable_name); ZEND_API zend_bool zend_make_callable(zval *callable, char **callable_name TSRMLS_DC); -ZEND_API char *zend_get_module_version(char *module_name); +ZEND_API const char *zend_get_module_version(const char *module_name); ZEND_API int zend_get_module_started(char *module_name); ZEND_API int zend_declare_property(zend_class_entry *ce, char *name, int name_length, zval *property, int access_type TSRMLS_DC); ZEND_API int zend_declare_property_ex(zend_class_entry *ce, char *name, int name_length, zval *property, int access_type, char *doc_comment, int doc_comment_len TSRMLS_DC); @@ -291,16 +291,16 @@ ZEND_API void zend_merge_properties(zval *obj, HashTable *properties, int destroy_ht TSRMLS_DC); /* no longer supported */ -ZEND_API int add_assoc_function(zval *arg, char *key, void (*function_ptr)(INTERNAL_FUNCTION_PARAMETERS)); +ZEND_API int add_assoc_function(zval *arg, const char *key, void (*function_ptr)(INTERNAL_FUNCTION_PARAMETERS)); -ZEND_API int add_assoc_long_ex(zval *arg, char *key, uint key_len, long n); -ZEND_API int add_assoc_null_ex(zval *arg, char *key, uint key_len); -ZEND_API int add_assoc_bool_ex(zval *arg, char *key, uint key_len, int b); -ZEND_API int add_assoc_resource_ex(zval *arg, char *key, uint key_len, int r); -ZEND_API int add_assoc_double_ex(zval *arg, char *key, uint key_len, double d); -ZEND_API int add_assoc_string_ex(zval *arg, char *key, uint key_len, char *str, int duplicate); -ZEND_API int add_assoc_stringl_ex(zval *arg, char *key, uint key_len, char *str, uint length, int duplicate); -ZEND_API int add_assoc_zval_ex(zval *arg, char *key, uint key_len, zval *value); +ZEND_API int add_assoc_long_ex(zval *arg, const char *key, uint key_len, long n); +ZEND_API int add_assoc_null_ex(zval *arg, const char *key, uint key_len); +ZEND_API int add_assoc_bool_ex(zval *arg, const char *key, uint key_len, int b); +ZEND_API int add_assoc_resource_ex(zval *arg, const char *key, uint key_len, int r); +ZEND_API int add_assoc_double_ex(zval *arg, const char *key, uint key_len, double d); +ZEND_API int add_assoc_string_ex(zval *arg, const char *key, uint key_len, char *str, int duplicate); +ZEND_API int add_assoc_stringl_ex(zval *arg, const char *key, uint key_len, char *str, uint length, int duplicate); +ZEND_API int add_assoc_zval_ex(zval *arg, const char *key, uint key_len, zval *value); #define add_assoc_long(__arg, __key, __n) add_assoc_long_ex(__arg, __key, strlen(__key)+1, __n) #define add_assoc_null(__arg, __key) add_assoc_null_ex(__arg, __key, strlen(__key) + 1) @@ -322,8 +322,8 @@ ZEND_API int add_index_bool(zval *arg, ulong idx, int b); ZEND_API int add_index_resource(zval *arg, ulong idx, int r); ZEND_API int add_index_double(zval *arg, ulong idx, double d); -ZEND_API int add_index_string(zval *arg, ulong idx, char *str, int duplicate); -ZEND_API int add_index_stringl(zval *arg, ulong idx, char *str, uint length, int duplicate); +ZEND_API int add_index_string(zval *arg, ulong idx, const char *str, int duplicate); +ZEND_API int add_index_stringl(zval *arg, ulong idx, const char *str, uint length, int duplicate); ZEND_API int add_index_zval(zval *arg, ulong index, zval *value); ZEND_API int add_next_index_long(zval *arg, long n); @@ -331,20 +331,20 @@ ZEND_API int add_next_index_bool(zval *arg, int b); ZEND_API int add_next_index_resource(zval *arg, int r); ZEND_API int add_next_index_double(zval *arg, double d); -ZEND_API int add_next_index_string(zval *arg, char *str, int duplicate); -ZEND_API int add_next_index_stringl(zval *arg, char *str, uint length, int duplicate); +ZEND_API int add_next_index_string(zval *arg, const char *str, int duplicate); +ZEND_API int add_next_index_stringl(zval *arg, const char *str, uint length, int duplicate); ZEND_API int add_next_index_zval(zval *arg, zval *value); -ZEND_API int add_get_assoc_string_ex(zval *arg, char *key, uint key_len, char *str, void **dest, int duplicate); -ZEND_API int add_get_assoc_stringl_ex(zval *arg, char *key, uint key_len, char *str, uint length, void **dest, int duplicate); +ZEND_API int add_get_assoc_string_ex(zval *arg, const char *key, uint key_len, const char *str, void **dest, int duplicate); +ZEND_API int add_get_assoc_stringl_ex(zval *arg, const char *key, uint key_len, const char *str, uint length, void **dest, int duplicate); #define add_get_assoc_string(__arg, __key, __str, __dest, __duplicate) add_get_assoc_string_ex(__arg, __key, strlen(__key)+1, __str, __dest, __duplicate) #define add_get_assoc_stringl(__arg, __key, __str, __length, __dest, __duplicate) add_get_assoc_stringl_ex(__arg, __key, strlen(__key)+1, __str, __length, __dest, __duplicate) ZEND_API int add_get_index_long(zval *arg, ulong idx, long l, void **dest); ZEND_API int add_get_index_double(zval *arg, ulong idx, double d, void **dest); -ZEND_API int add_get_index_string(zval *arg, ulong idx, char *str, void **dest, int duplicate); -ZEND_API int add_get_index_stringl(zval *arg, ulong idx, char *str, uint length, void **dest, int duplicate); +ZEND_API int add_get_index_string(zval *arg, ulong idx, const char *str, void **dest, int duplicate); +ZEND_API int add_get_index_stringl(zval *arg, ulong idx, const char *str, uint length, void **dest, int duplicate); ZEND_API int add_property_long_ex(zval *arg, char *key, uint key_len, long l TSRMLS_DC); ZEND_API int add_property_null_ex(zval *arg, char *key, uint key_len TSRMLS_DC); @@ -462,16 +462,16 @@ } #define ZVAL_STRING(z, s, duplicate) { \ - char *__s=(s); \ + const char *__s=(s); \ (z)->value.str.len = strlen(__s); \ - (z)->value.str.val = (duplicate?estrndup(__s, (z)->value.str.len):__s); \ + (z)->value.str.val = (duplicate?estrndup(__s, (z)->value.str.len):(char*)__s); \ (z)->type = IS_STRING; \ } #define ZVAL_STRINGL(z, s, l, duplicate) { \ - char *__s=(s); int __l=l; \ + const char *__s=(s); int __l=l;\ (z)->value.str.len = __l; \ - (z)->value.str.val = (duplicate?estrndup(__s, __l):__s); \ + (z)->value.str.val = (duplicate?estrndup(__s, __l):(char*)__s); \ (z)->type = IS_STRING; \ } http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_builtin_functions.c?r1=1.277.2.12.2.25&r2=1.277.2.12.2.25.2.1&diff_format=u Index: ZendEngine2/zend_builtin_functions.c diff -u ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.25 ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.25.2.1 --- ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.25 Thu Aug 30 07:43:21 2007 +++ ZendEngine2/zend_builtin_functions.c Thu Sep 27 18:00:37 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_builtin_functions.c,v 1.277.2.12.2.25 2007/08/30 07:43:21 sebastian Exp $ */ +/* $Id: zend_builtin_functions.c,v 1.277.2.12.2.25.2.1 2007/09/27 18:00:37 dmitry Exp $ */ #include "zend.h" #include "zend_API.h" @@ -88,7 +88,7 @@ #include "zend_arg_defs.c" -static zend_function_entry builtin_functions[] = { +static const zend_function_entry builtin_functions[] = { ZEND_FE(zend_version, NULL) ZEND_FE(func_num_args, NULL) ZEND_FE(func_get_arg, NULL) @@ -1609,7 +1609,7 @@ zend_constant *val; int module_number; zval **modules; - char **module_names; + const char **module_names; zend_module_entry *module; int i = 1; @@ -2136,7 +2136,7 @@ { zval **extension_name; zend_module_entry *module; - zend_function_entry *func; + const zend_function_entry *func; if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &extension_name)) { ZEND_WRONG_PARAM_COUNT(); http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_compile.c?r1=1.647.2.27.2.41&r2=1.647.2.27.2.41.2.1&diff_format=u Index: ZendEngine2/zend_compile.c diff -u ZendEngine2/zend_compile.c:1.647.2.27.2.41 ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.1 --- ZendEngine2/zend_compile.c:1.647.2.27.2.41 Thu Sep 20 14:11:31 2007 +++ ZendEngine2/zend_compile.c Thu Sep 27 18:00:37 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_compile.c,v 1.647.2.27.2.41 2007/09/20 14:11:31 jani Exp $ */ +/* $Id: zend_compile.c,v 1.647.2.27.2.41.2.1 2007/09/27 18:00:37 dmitry Exp $ */ #include <zend_language_parser.h> #include "zend.h" @@ -4219,7 +4219,7 @@ } -int zend_get_class_fetch_type(char *class_name, uint class_name_len) +int zend_get_class_fetch_type(const char *class_name, uint class_name_len) { if ((class_name_len == sizeof("self")-1) && !memcmp(class_name, "self", sizeof("self"))) { http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_compile.h?r1=1.316.2.8.2.12&r2=1.316.2.8.2.12.2.1&diff_format=u Index: ZendEngine2/zend_compile.h diff -u ZendEngine2/zend_compile.h:1.316.2.8.2.12 ZendEngine2/zend_compile.h:1.316.2.8.2.12.2.1 --- ZendEngine2/zend_compile.h:1.316.2.8.2.12 Fri May 18 13:12:04 2007 +++ ZendEngine2/zend_compile.h Thu Sep 27 18:00:37 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_compile.h,v 1.316.2.8.2.12 2007/05/18 13:12:04 dmitry Exp $ */ +/* $Id: zend_compile.h,v 1.316.2.8.2.12.2.1 2007/09/27 18:00:37 dmitry Exp $ */ #ifndef ZEND_COMPILE_H #define ZEND_COMPILE_H @@ -158,9 +158,9 @@ typedef struct _zend_arg_info { - char *name; + const char *name; zend_uint name_len; - char *class_name; + const char *class_name; zend_uint class_name_len; zend_bool array_type_hint; zend_bool allow_null; @@ -547,7 +547,7 @@ ZEND_API zend_bool zend_is_compiling(TSRMLS_D); ZEND_API char *zend_make_compiled_string_description(char *name TSRMLS_DC); ZEND_API void zend_initialize_class_data(zend_class_entry *ce, zend_bool nullify_handlers TSRMLS_DC); -int zend_get_class_fetch_type(char *class_name, uint class_name_len); +int zend_get_class_fetch_type(const char *class_name, uint class_name_len); typedef zend_bool (*zend_auto_global_callback)(char *name, uint name_len TSRMLS_DC); typedef struct _zend_auto_global { http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_exceptions.c?r1=1.79.2.6.2.9&r2=1.79.2.6.2.9.2.1&diff_format=u Index: ZendEngine2/zend_exceptions.c diff -u ZendEngine2/zend_exceptions.c:1.79.2.6.2.9 ZendEngine2/zend_exceptions.c:1.79.2.6.2.9.2.1 --- ZendEngine2/zend_exceptions.c:1.79.2.6.2.9 Wed May 30 16:32:02 2007 +++ ZendEngine2/zend_exceptions.c Thu Sep 27 18:00:37 2007 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_exceptions.c,v 1.79.2.6.2.9 2007/05/30 16:32:02 tony2001 Exp $ */ +/* $Id: zend_exceptions.c,v 1.79.2.6.2.9.2.1 2007/09/27 18:00:37 dmitry Exp $ */ #include "zend.h" #include "zend_API.h" @@ -534,7 +534,7 @@ ZEND_ARG_INFO(0, code) ZEND_END_ARG_INFO() -static zend_function_entry default_exception_functions[] = { +const static zend_function_entry default_exception_functions[] = { ZEND_ME(exception, __clone, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL) ZEND_ME(exception, __construct, arginfo_exception___construct, ZEND_ACC_PUBLIC) ZEND_ME(exception, getMessage, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) @@ -556,7 +556,7 @@ ZEND_ARG_INFO(0, lineno) ZEND_END_ARG_INFO() -static zend_function_entry error_exception_functions[] = { +static const zend_function_entry error_exception_functions[] = { ZEND_ME(error_exception, __construct, arginfo_error_exception___construct, ZEND_ACC_PUBLIC) ZEND_ME(error_exception, getSeverity, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) {NULL, NULL, NULL} http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute.c?r1=1.716.2.12.2.24&r2=1.716.2.12.2.24.2.1&diff_format=u Index: ZendEngine2/zend_execute.c diff -u ZendEngine2/zend_execute.c:1.716.2.12.2.24 ZendEngine2/zend_execute.c:1.716.2.12.2.24.2.1 --- ZendEngine2/zend_execute.c:1.716.2.12.2.24 Thu Jul 19 15:29:30 2007 +++ ZendEngine2/zend_execute.c Thu Sep 27 18:00:37 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute.c,v 1.716.2.12.2.24 2007/07/19 15:29:30 jani Exp $ */ +/* $Id: zend_execute.c,v 1.716.2.12.2.24.2.1 2007/09/27 18:00:37 dmitry Exp $ */ #define ZEND_INTENSIVE_DEBUGGING 0 @@ -445,7 +445,7 @@ } } -static inline char * zend_verify_arg_class_kind(zend_arg_info *cur_arg_info, char **class_name, zend_class_entry **pce TSRMLS_DC) +static inline char * zend_verify_arg_class_kind(const zend_arg_info *cur_arg_info, const char **class_name, zend_class_entry **pce TSRMLS_DC) { *pce = zend_fetch_class(cur_arg_info->class_name, cur_arg_info->class_name_len, (ZEND_FETCH_CLASS_AUTO | ZEND_FETCH_CLASS_NO_AUTOLOAD) TSRMLS_CC); @@ -457,7 +457,7 @@ } } -static inline int zend_verify_arg_error(zend_function *zf, zend_uint arg_num, zend_arg_info *cur_arg_info, char *need_msg, char *need_kind, char *given_msg, char *given_kind TSRMLS_DC) +static inline int zend_verify_arg_error(zend_function *zf, zend_uint arg_num, const zend_arg_info *cur_arg_info, const char *need_msg, const char *need_kind, char *given_msg, char *given_kind TSRMLS_DC) { zend_execute_data *ptr = EG(current_execute_data)->prev_execute_data; char *fname = zf->common.function_name; @@ -494,7 +494,7 @@ cur_arg_info = &zf->common.arg_info[arg_num-1]; if (cur_arg_info->class_name) { - char *class_name; + const char *class_name; if (!arg) { need_msg = zend_verify_arg_class_kind(cur_arg_info, &class_name, &ce TSRMLS_CC); http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute.h?r1=1.84.2.4.2.8&r2=1.84.2.4.2.8.2.1&diff_format=u Index: ZendEngine2/zend_execute.h diff -u ZendEngine2/zend_execute.h:1.84.2.4.2.8 ZendEngine2/zend_execute.h:1.84.2.4.2.8.2.1 --- ZendEngine2/zend_execute.h:1.84.2.4.2.8 Sat Jul 21 00:35:14 2007 +++ ZendEngine2/zend_execute.h Thu Sep 27 18:00:37 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute.h,v 1.84.2.4.2.8 2007/07/21 00:35:14 jani Exp $ */ +/* $Id: zend_execute.h,v 1.84.2.4.2.8.2.1 2007/09/27 18:00:37 dmitry Exp $ */ #ifndef ZEND_EXECUTE_H #define ZEND_EXECUTE_H @@ -70,8 +70,8 @@ FREE_ZVAL_REL(p); } } -ZEND_API int zend_lookup_class(char *name, int name_length, zend_class_entry ***ce TSRMLS_DC); -ZEND_API int zend_lookup_class_ex(char *name, int name_length, int use_autoload, zend_class_entry ***ce TSRMLS_DC); +ZEND_API int zend_lookup_class(const char *name, int name_length, zend_class_entry ***ce TSRMLS_DC); +ZEND_API int zend_lookup_class_ex(const char *name, int name_length, int use_autoload, zend_class_entry ***ce TSRMLS_DC); ZEND_API int zend_eval_string(char *str, zval *retval_ptr, char *string_name TSRMLS_DC); ZEND_API int zend_eval_string_ex(char *str, zval *retval_ptr, char *string_name, int handle_exceptions TSRMLS_DC); @@ -182,7 +182,7 @@ ZEND_API void zend_set_timeout(long seconds); ZEND_API void zend_unset_timeout(TSRMLS_D); ZEND_API void zend_timeout(int dummy); -ZEND_API zend_class_entry *zend_fetch_class(char *class_name, uint class_name_len, int fetch_type TSRMLS_DC); +ZEND_API zend_class_entry *zend_fetch_class(const char *class_name, uint class_name_len, int fetch_type TSRMLS_DC); void zend_verify_abstract_class(zend_class_entry *ce TSRMLS_DC); #ifdef ZEND_WIN32 http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.331.2.20.2.24&r2=1.331.2.20.2.24.2.1&diff_format=u Index: ZendEngine2/zend_execute_API.c diff -u ZendEngine2/zend_execute_API.c:1.331.2.20.2.24 ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.1 --- ZendEngine2/zend_execute_API.c:1.331.2.20.2.24 Sat Jul 21 00:35:14 2007 +++ ZendEngine2/zend_execute_API.c Thu Sep 27 18:00:37 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute_API.c,v 1.331.2.20.2.24 2007/07/21 00:35:14 jani Exp $ */ +/* $Id: zend_execute_API.c,v 1.331.2.20.2.24.2.1 2007/09/27 18:00:37 dmitry Exp $ */ #include <stdio.h> #include <signal.h> @@ -1025,7 +1025,7 @@ } -ZEND_API int zend_lookup_class_ex(char *name, int name_length, int use_autoload, zend_class_entry ***ce TSRMLS_DC) +ZEND_API int zend_lookup_class_ex(const char *name, int name_length, int use_autoload, zend_class_entry ***ce TSRMLS_DC) { zval **args[1]; zval autoload_function; @@ -1123,7 +1123,7 @@ return retval; } -ZEND_API int zend_lookup_class(char *name, int name_length, zend_class_entry ***ce TSRMLS_DC) +ZEND_API int zend_lookup_class(const char *name, int name_length, zend_class_entry ***ce TSRMLS_DC) { return zend_lookup_class_ex(name, name_length, 1, ce TSRMLS_CC); } @@ -1471,7 +1471,7 @@ } -zend_class_entry *zend_fetch_class(char *class_name, uint class_name_len, int fetch_type TSRMLS_DC) +zend_class_entry *zend_fetch_class(const char *class_name, uint class_name_len, int fetch_type TSRMLS_DC) { zend_class_entry **pce; int use_autoload = (fetch_type & ZEND_FETCH_CLASS_NO_AUTOLOAD) == 0; http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_hash.c?r1=1.121.2.4.2.8&r2=1.121.2.4.2.8.2.1&diff_format=u Index: ZendEngine2/zend_hash.c diff -u ZendEngine2/zend_hash.c:1.121.2.4.2.8 ZendEngine2/zend_hash.c:1.121.2.4.2.8.2.1 --- ZendEngine2/zend_hash.c:1.121.2.4.2.8 Tue Jul 24 18:28:39 2007 +++ ZendEngine2/zend_hash.c Thu Sep 27 18:00:37 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_hash.c,v 1.121.2.4.2.8 2007/07/24 18:28:39 dmitry Exp $ */ +/* $Id: zend_hash.c,v 1.121.2.4.2.8.2.1 2007/09/27 18:00:37 dmitry Exp $ */ #include "zend.h" @@ -94,7 +94,7 @@ static int zend_hash_do_resize(HashTable *ht); -ZEND_API ulong zend_hash_func(char *arKey, uint nKeyLength) +ZEND_API ulong zend_hash_func(const char *arKey, uint nKeyLength) { return zend_inline_hash_func(arKey, nKeyLength); } @@ -197,7 +197,7 @@ -ZEND_API int _zend_hash_add_or_update(HashTable *ht, char *arKey, uint nKeyLength, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC) +ZEND_API int _zend_hash_add_or_update(HashTable *ht, const char *arKey, uint nKeyLength, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC) { ulong h; uint nIndex; @@ -267,7 +267,7 @@ return SUCCESS; } -ZEND_API int _zend_hash_quick_add_or_update(HashTable *ht, char *arKey, uint nKeyLength, ulong h, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC) +ZEND_API int _zend_hash_quick_add_or_update(HashTable *ht, const char *arKey, uint nKeyLength, ulong h, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC) { uint nIndex; Bucket *p; @@ -336,7 +336,7 @@ } -ZEND_API int zend_hash_add_empty_element(HashTable *ht, char *arKey, uint nKeyLength) +ZEND_API int zend_hash_add_empty_element(HashTable *ht, const char *arKey, uint nKeyLength) { void *dummy = (void *) 1; @@ -452,7 +452,7 @@ return SUCCESS; } -ZEND_API int zend_hash_del_key_or_index(HashTable *ht, char *arKey, uint nKeyLength, ulong h, int flag) +ZEND_API int zend_hash_del_key_or_index(HashTable *ht, const char *arKey, uint nKeyLength, ulong h, int flag) { uint nIndex; Bucket *p; @@ -856,7 +856,7 @@ } -ZEND_API ulong zend_get_hash_value(char *arKey, uint nKeyLength) +ZEND_API ulong zend_get_hash_value(const char *arKey, uint nKeyLength) { return zend_inline_hash_func(arKey, nKeyLength); } @@ -866,7 +866,7 @@ * data is returned in pData. The reason is that there's no reason * someone using the hash table might not want to have NULL data */ -ZEND_API int zend_hash_find(HashTable *ht, char *arKey, uint nKeyLength, void **pData) +ZEND_API int zend_hash_find(HashTable *ht, const char *arKey, uint nKeyLength, void **pData) { ulong h; uint nIndex; @@ -891,7 +891,7 @@ } -ZEND_API int zend_hash_quick_find(HashTable *ht, char *arKey, uint nKeyLength, ulong h, void **pData) +ZEND_API int zend_hash_quick_find(HashTable *ht, const char *arKey, uint nKeyLength, ulong h, void **pData) { uint nIndex; Bucket *p; @@ -918,7 +918,7 @@ } -ZEND_API int zend_hash_exists(HashTable *ht, char *arKey, uint nKeyLength) +ZEND_API int zend_hash_exists(HashTable *ht, const char *arKey, uint nKeyLength) { ulong h; uint nIndex; @@ -942,7 +942,7 @@ } -ZEND_API int zend_hash_quick_exists(HashTable *ht, char *arKey, uint nKeyLength, ulong h) +ZEND_API int zend_hash_quick_exists(HashTable *ht, const char *arKey, uint nKeyLength, ulong h) { uint nIndex; Bucket *p; @@ -1170,7 +1170,7 @@ /* This function changes key of currevt element without changing elements' * order. If element with target key already exists, it will be deleted first. */ -ZEND_API int zend_hash_update_current_key_ex(HashTable *ht, int key_type, char *str_index, uint str_length, ulong num_index, HashPosition *pos) +ZEND_API int zend_hash_update_current_key_ex(HashTable *ht, int key_type, const char *str_index, uint str_length, ulong num_index, HashPosition *pos) { Bucket *p; http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_hash.h?r1=1.78.2.2.2.2&r2=1.78.2.2.2.2.2.1&diff_format=u Index: ZendEngine2/zend_hash.h diff -u ZendEngine2/zend_hash.h:1.78.2.2.2.2 ZendEngine2/zend_hash.h:1.78.2.2.2.2.2.1 --- ZendEngine2/zend_hash.h:1.78.2.2.2.2 Wed Jan 10 15:58:07 2007 +++ ZendEngine2/zend_hash.h Thu Sep 27 18:00:37 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_hash.h,v 1.78.2.2.2.2 2007/01/10 15:58:07 dmitry Exp $ */ +/* $Id: zend_hash.h,v 1.78.2.2.2.2.2.1 2007/09/27 18:00:37 dmitry Exp $ */ #ifndef ZEND_HASH_H #define ZEND_HASH_H @@ -36,7 +36,7 @@ #define HASH_DEL_KEY 0 #define HASH_DEL_INDEX 1 -typedef ulong (*hash_func_t)(char *arKey, uint nKeyLength); +typedef ulong (*hash_func_t)(const char *arKey, uint nKeyLength); typedef int (*compare_func_t)(const void *, const void * TSRMLS_DC); typedef void (*sort_func_t)(void *, size_t, register size_t, compare_func_t TSRMLS_DC); typedef void (*dtor_func_t)(void *pDest); @@ -98,13 +98,13 @@ #define zend_hash_init_ex(ht, nSize, pHashFunction, pDestructor, persistent, bApplyProtection) _zend_hash_init_ex((ht), (nSize), (pHashFunction), (pDestructor), (persistent), (bApplyProtection) ZEND_FILE_LINE_CC) /* additions/updates/changes */ -ZEND_API int _zend_hash_add_or_update(HashTable *ht, char *arKey, uint nKeyLength, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC); +ZEND_API int _zend_hash_add_or_update(HashTable *ht, const char *arKey, uint nKeyLength, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC); #define zend_hash_update(ht, arKey, nKeyLength, pData, nDataSize, pDest) \ _zend_hash_add_or_update(ht, arKey, nKeyLength, pData, nDataSize, pDest, HASH_UPDATE ZEND_FILE_LINE_CC) #define zend_hash_add(ht, arKey, nKeyLength, pData, nDataSize, pDest) \ _zend_hash_add_or_update(ht, arKey, nKeyLength, pData, nDataSize, pDest, HASH_ADD ZEND_FILE_LINE_CC) -ZEND_API int _zend_hash_quick_add_or_update(HashTable *ht, char *arKey, uint nKeyLength, ulong h, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC); +ZEND_API int _zend_hash_quick_add_or_update(HashTable *ht, const char *arKey, uint nKeyLength, ulong h, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC); #define zend_hash_quick_update(ht, arKey, nKeyLength, h, pData, nDataSize, pDest) \ _zend_hash_quick_add_or_update(ht, arKey, nKeyLength, h, pData, nDataSize, pDest, HASH_UPDATE ZEND_FILE_LINE_CC) #define zend_hash_quick_add(ht, arKey, nKeyLength, h, pData, nDataSize, pDest) \ @@ -116,7 +116,7 @@ #define zend_hash_next_index_insert(ht, pData, nDataSize, pDest) \ _zend_hash_index_update_or_next_insert(ht, 0, pData, nDataSize, pDest, HASH_NEXT_INSERT ZEND_FILE_LINE_CC) -ZEND_API int zend_hash_add_empty_element(HashTable *ht, char *arKey, uint nKeyLength); +ZEND_API int zend_hash_add_empty_element(HashTable *ht, const char *arKey, uint nKeyLength); #define ZEND_HASH_APPLY_KEEP 0 @@ -144,22 +144,22 @@ /* Deletes */ -ZEND_API int zend_hash_del_key_or_index(HashTable *ht, char *arKey, uint nKeyLength, ulong h, int flag); +ZEND_API int zend_hash_del_key_or_index(HashTable *ht, const char *arKey, uint nKeyLength, ulong h, int flag); #define zend_hash_del(ht, arKey, nKeyLength) \ zend_hash_del_key_or_index(ht, arKey, nKeyLength, 0, HASH_DEL_KEY) #define zend_hash_index_del(ht, h) \ zend_hash_del_key_or_index(ht, NULL, 0, h, HASH_DEL_INDEX) -ZEND_API ulong zend_get_hash_value(char *arKey, uint nKeyLength); +ZEND_API ulong zend_get_hash_value(const char *arKey, uint nKeyLength); /* Data retreival */ -ZEND_API int zend_hash_find(HashTable *ht, char *arKey, uint nKeyLength, void **pData); -ZEND_API int zend_hash_quick_find(HashTable *ht, char *arKey, uint nKeyLength, ulong h, void **pData); +ZEND_API int zend_hash_find(HashTable *ht, const char *arKey, uint nKeyLength, void **pData); +ZEND_API int zend_hash_quick_find(HashTable *ht, const char *arKey, uint nKeyLength, ulong h, void **pData); ZEND_API int zend_hash_index_find(HashTable *ht, ulong h, void **pData); /* Misc */ -ZEND_API int zend_hash_exists(HashTable *ht, char *arKey, uint nKeyLength); -ZEND_API int zend_hash_quick_exists(HashTable *ht, char *arKey, uint nKeyLength, ulong h); +ZEND_API int zend_hash_exists(HashTable *ht, const char *arKey, uint nKeyLength); +ZEND_API int zend_hash_quick_exists(HashTable *ht, const char *arKey, uint nKeyLength, ulong h); ZEND_API int zend_hash_index_exists(HashTable *ht, ulong h); ZEND_API ulong zend_hash_next_free_element(HashTable *ht); @@ -174,7 +174,7 @@ ZEND_API int zend_hash_get_current_data_ex(HashTable *ht, void **pData, HashPosition *pos); ZEND_API void zend_hash_internal_pointer_reset_ex(HashTable *ht, HashPosition *pos); ZEND_API void zend_hash_internal_pointer_end_ex(HashTable *ht, HashPosition *pos); -ZEND_API int zend_hash_update_current_key_ex(HashTable *ht, int key_type, char *str_index, uint str_length, ulong num_index, HashPosition *pos); +ZEND_API int zend_hash_update_current_key_ex(HashTable *ht, int key_type, const char *str_index, uint str_length, ulong num_index, HashPosition *pos); typedef struct _HashPointer { HashPosition pos; @@ -251,7 +251,7 @@ * -- Ralf S. Engelschall <rse@engelschall.com> */ -static inline ulong zend_inline_hash_func(char *arKey, uint nKeyLength) +static inline ulong zend_inline_hash_func(const char *arKey, uint nKeyLength) { register ulong hash = 5381; @@ -281,7 +281,7 @@ } -ZEND_API ulong zend_hash_func(char *arKey, uint nKeyLength); +ZEND_API ulong zend_hash_func(const char *arKey, uint nKeyLength); #if ZEND_DEBUG /* debug */ @@ -299,13 +299,13 @@ #define HANDLE_NUMERIC(key, length, func) { \ - register char *tmp=key; \ + register const char *tmp=key; \ \ if (*tmp=='-') { \ tmp++; \ } \ if ((*tmp>='0' && *tmp<='9')) do { /* possibly a numeric index */ \ - char *end=key+length-1; \ + const char *end=key+length-1; \ long idx; \ \ if (*tmp++=='0' && length>2) { /* don't accept numbers with leading zeros */ \ @@ -334,34 +334,34 @@ } -static inline int zend_symtable_update(HashTable *ht, char *arKey, uint nKeyLength, void *pData, uint nDataSize, void **pDest) \ +static inline int zend_symtable_update(HashTable *ht, const char *arKey, uint nKeyLength, void *pData, uint nDataSize, void **pDest) \ { HANDLE_NUMERIC(arKey, nKeyLength, zend_hash_index_update(ht, idx, pData, nDataSize, pDest)); return zend_hash_update(ht, arKey, nKeyLength, pData, nDataSize, pDest); } -static inline int zend_symtable_del(HashTable *ht, char *arKey, uint nKeyLength) +static inline int zend_symtable_del(HashTable *ht, const char *arKey, uint nKeyLength) { HANDLE_NUMERIC(arKey, nKeyLength, zend_hash_index_del(ht, idx)) return zend_hash_del(ht, arKey, nKeyLength); } -static inline int zend_symtable_find(HashTable *ht, char *arKey, uint nKeyLength, void **pData) +static inline int zend_symtable_find(HashTable *ht, const char *arKey, uint nKeyLength, void **pData) { HANDLE_NUMERIC(arKey, nKeyLength, zend_hash_index_find(ht, idx, pData)); return zend_hash_find(ht, arKey, nKeyLength, pData); } -static inline int zend_symtable_exists(HashTable *ht, char *arKey, uint nKeyLength) +static inline int zend_symtable_exists(HashTable *ht, const char *arKey, uint nKeyLength) { HANDLE_NUMERIC(arKey, nKeyLength, zend_hash_index_exists(ht, idx)); return zend_hash_exists(ht, arKey, nKeyLength); } -static inline int zend_symtable_update_current_key(HashTable *ht, char *arKey, uint nKeyLength) +static inline int zend_symtable_update_current_key(HashTable *ht, const char *arKey, uint nKeyLength) { HANDLE_NUMERIC(arKey, nKeyLength, zend_hash_update_current_key(ht, HASH_KEY_IS_LONG, NULL, 0, idx)); return zend_hash_update_current_key(ht, HASH_KEY_IS_STRING, arKey, nKeyLength, 0); http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini.c?r1=1.39.2.2.2.18.2.8&r2=1.39.2.2.2.18.2.9&diff_format=u Index: ZendEngine2/zend_ini.c diff -u ZendEngine2/zend_ini.c:1.39.2.2.2.18.2.8 ZendEngine2/zend_ini.c:1.39.2.2.2.18.2.9 --- ZendEngine2/zend_ini.c:1.39.2.2.2.18.2.8 Thu Sep 27 17:26:47 2007 +++ ZendEngine2/zend_ini.c Thu Sep 27 18:00:37 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_ini.c,v 1.39.2.2.2.18.2.8 2007/09/27 17:26:47 iliaa Exp $ */ +/* $Id: zend_ini.c,v 1.39.2.2.2.18.2.9 2007/09/27 18:00:37 dmitry Exp $ */ #include "zend.h" #include "zend_qsort.h" @@ -164,9 +164,9 @@ /* * Registration / unregistration */ -ZEND_API int zend_register_ini_entries(zend_ini_entry *ini_entry, int module_number TSRMLS_DC) /* {{{ */ +ZEND_API int zend_register_ini_entries(const zend_ini_entry *ini_entry, int module_number TSRMLS_DC) /* {{{ */ { - zend_ini_entry *p = ini_entry; + const zend_ini_entry *p = ini_entry; zend_ini_entry *hashed_ini_entry; zval default_value; HashTable *directives = registered_zend_ini_directives; @@ -187,12 +187,12 @@ #endif while (p->name) { - p->module_number = module_number; config_directive_success = 0; - if (zend_hash_add(directives, p->name, p->name_length, p, sizeof(zend_ini_entry), (void **) &hashed_ini_entry) == FAILURE) { + if (zend_hash_add(directives, p->name, p->name_length, (void*)p, sizeof(zend_ini_entry), (void **) &hashed_ini_entry) == FAILURE) { zend_unregister_ini_entries(module_number TSRMLS_CC); return FAILURE; } + hashed_ini_entry->module_number = module_number; if ((zend_get_configuration_directive(p->name, p->name_length, &default_value)) == SUCCESS) { if (!hashed_ini_entry->on_modify || hashed_ini_entry->on_modify(hashed_ini_entry, Z_STRVAL(default_value), Z_STRLEN(default_value), hashed_ini_entry->mh_arg1, hashed_ini_entry->mh_arg2, hashed_ini_entry->mh_arg3, ZEND_INI_STAGE_STARTUP TSRMLS_CC) == SUCCESS) { http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini.h?r1=1.34.2.1.2.6.2.1&r2=1.34.2.1.2.6.2.2&diff_format=u Index: ZendEngine2/zend_ini.h diff -u ZendEngine2/zend_ini.h:1.34.2.1.2.6.2.1 ZendEngine2/zend_ini.h:1.34.2.1.2.6.2.2 --- ZendEngine2/zend_ini.h:1.34.2.1.2.6.2.1 Thu Sep 27 16:55:24 2007 +++ ZendEngine2/zend_ini.h Thu Sep 27 18:00:37 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_ini.h,v 1.34.2.1.2.6.2.1 2007/09/27 16:55:24 jani Exp $ */ +/* $Id: zend_ini.h,v 1.34.2.1.2.6.2.2 2007/09/27 18:00:37 dmitry Exp $ */ #ifndef ZEND_INI_H #define ZEND_INI_H @@ -92,7 +92,7 @@ ZEND_API void zend_ini_sort_entries(TSRMLS_D); -ZEND_API int zend_register_ini_entries(zend_ini_entry *ini_entry, int module_number TSRMLS_DC); +ZEND_API int zend_register_ini_entries(const zend_ini_entry *ini_entry, int module_number TSRMLS_DC); ZEND_API void zend_unregister_ini_entries(int module_number TSRMLS_DC); ZEND_API void zend_ini_refresh_caches(int stage TSRMLS_DC); ZEND_API int zend_alter_ini_entry(char *name, uint name_length, char *new_value, uint new_value_length, int modify_type, int stage); @@ -111,7 +111,7 @@ ZEND_API ZEND_INI_DISP(display_link_numbers); END_EXTERN_C() -#define ZEND_INI_BEGIN() static zend_ini_entry ini_entries[] = { +#define ZEND_INI_BEGIN() static const zend_ini_entry ini_entries[] = { #define ZEND_INI_END() { 0, 0, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0, NULL, 0, 0, NULL } }; #define ZEND_INI_ENTRY3_EX(name, default_value, modifiable, on_modify, arg1, arg2, arg3, displayer) \ http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_interfaces.c?r1=1.33.2.4.2.6&r2=1.33.2.4.2.6.2.1&diff_format=u Index: ZendEngine2/zend_interfaces.c diff -u ZendEngine2/zend_interfaces.c:1.33.2.4.2.6 ZendEngine2/zend_interfaces.c:1.33.2.4.2.6.2.1 --- ZendEngine2/zend_interfaces.c:1.33.2.4.2.6 Wed May 30 16:32:02 2007 +++ ZendEngine2/zend_interfaces.c Thu Sep 27 18:00:37 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_interfaces.c,v 1.33.2.4.2.6 2007/05/30 16:32:02 tony2001 Exp $ */ +/* $Id: zend_interfaces.c,v 1.33.2.4.2.6.2.1 2007/09/27 18:00:37 dmitry Exp $ */ #include "zend.h" #include "zend_API.h" @@ -477,12 +477,12 @@ /* }}}*/ /* {{{ function tables */ -zend_function_entry zend_funcs_aggregate[] = { +const zend_function_entry zend_funcs_aggregate[] = { ZEND_ABSTRACT_ME(iterator, getIterator, NULL) {NULL, NULL, NULL} }; -zend_function_entry zend_funcs_iterator[] = { +const zend_function_entry zend_funcs_iterator[] = { ZEND_ABSTRACT_ME(iterator, current, NULL) ZEND_ABSTRACT_ME(iterator, next, NULL) ZEND_ABSTRACT_ME(iterator, key, NULL) @@ -491,7 +491,7 @@ {NULL, NULL, NULL} }; -zend_function_entry *zend_funcs_traversable = NULL; +const zend_function_entry *zend_funcs_traversable = NULL; static ZEND_BEGIN_ARG_INFO_EX(arginfo_arrayaccess_offset, 0, 0, 1) @@ -509,7 +509,7 @@ ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() -zend_function_entry zend_funcs_arrayaccess[] = { +const zend_function_entry zend_funcs_arrayaccess[] = { ZEND_ABSTRACT_ME(arrayaccess, offsetExists, arginfo_arrayaccess_offset) ZEND_ABSTRACT_ME(arrayaccess, offsetGet, arginfo_arrayaccess_offset_get) ZEND_ABSTRACT_ME(arrayaccess, offsetSet, arginfo_arrayaccess_offset_value) @@ -522,7 +522,7 @@ ZEND_ARG_INFO(0, serialized) ZEND_END_ARG_INFO() -zend_function_entry zend_funcs_serializable[] = { +const zend_function_entry zend_funcs_serializable[] = { ZEND_ABSTRACT_ME(serializable, serialize, NULL) ZEND_FENTRY(unserialize, NULL, arginfo_serializable_serialize, ZEND_ACC_PUBLIC|ZEND_ACC_ABSTRACT|ZEND_ACC_CTOR) {NULL, NULL, NULL} http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_modules.h?r1=1.67.2.3.2.4&r2=1.67.2.3.2.4.2.1&diff_format=u Index: ZendEngine2/zend_modules.h diff -u ZendEngine2/zend_modules.h:1.67.2.3.2.4 ZendEngine2/zend_modules.h:1.67.2.3.2.4.2.1 --- ZendEngine2/zend_modules.h:1.67.2.3.2.4 Mon Jan 1 09:35:46 2007 +++ ZendEngine2/zend_modules.h Thu Sep 27 18:00:37 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_modules.h,v 1.67.2.3.2.4 2007/01/01 09:35:46 sebastian Exp $ */ +/* $Id: zend_modules.h,v 1.67.2.3.2.4.2.1 2007/09/27 18:00:37 dmitry Exp $ */ #ifndef MODULES_H #define MODULES_H @@ -32,12 +32,12 @@ #define ZEND_MODULE_INFO_FUNC_ARGS zend_module_entry *zend_module TSRMLS_DC #define ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU zend_module TSRMLS_CC -extern struct _zend_arg_info first_arg_force_ref[2]; -extern struct _zend_arg_info second_arg_force_ref[3]; -extern struct _zend_arg_info third_arg_force_ref[4]; -extern struct _zend_arg_info fourth_arg_force_ref[5]; -extern struct _zend_arg_info fifth_arg_force_ref[6]; -extern struct _zend_arg_info all_args_by_ref[1]; +extern const struct _zend_arg_info first_arg_force_ref[2]; +extern const struct _zend_arg_info second_arg_force_ref[3]; +extern const struct _zend_arg_info third_arg_force_ref[4]; +extern const struct _zend_arg_info fourth_arg_force_ref[5]; +extern const struct _zend_arg_info fifth_arg_force_ref[6]; +extern const struct _zend_arg_info all_args_by_ref[1]; #define ZEND_MODULE_API_NO 20060613 #ifdef ZTS @@ -79,16 +79,16 @@ unsigned int zend_api; unsigned char zend_debug; unsigned char zts; - struct _zend_ini_entry *ini_entry; - struct _zend_module_dep *deps; - char *name; - struct _zend_function_entry *functions; + const struct _zend_ini_entry *ini_entry; + const struct _zend_module_dep *deps; + const char *name; + const struct _zend_function_entry *functions; int (*module_startup_func)(INIT_FUNC_ARGS); int (*module_shutdown_func)(SHUTDOWN_FUNC_ARGS); int (*request_startup_func)(INIT_FUNC_ARGS); int (*request_shutdown_func)(SHUTDOWN_FUNC_ARGS); void (*info_func)(ZEND_MODULE_INFO_FUNC_ARGS); - char *version; + const char *version; size_t globals_size; #ifdef ZTS ts_rsrc_id* globals_id_ptr; @@ -117,10 +117,10 @@ #define ZEND_MOD_OPTIONAL(name) ZEND_MOD_OPTIONAL_EX(name, NULL, NULL) struct _zend_module_dep { - char *name; /* module name */ - char *rel; /* version relationship: NULL (exists), lt|le|eq|ge|gt (to given version) */ - char *version; /* version */ - unsigned char type; /* dependency type */ + const char *name; /* module name */ + const char *rel; /* version relationship: NULL (exists), lt|le|eq|ge|gt (to given version) */ + const char *version; /* version */ + unsigned char type; /* dependency type */ }; extern ZEND_API HashTable module_registry; http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_opcode.c?r1=1.110.2.6.2.3&r2=1.110.2.6.2.3.2.1&diff_format=u Index: ZendEngine2/zend_opcode.c diff -u ZendEngine2/zend_opcode.c:1.110.2.6.2.3 ZendEngine2/zend_opcode.c:1.110.2.6.2.3.2.1 --- ZendEngine2/zend_opcode.c:1.110.2.6.2.3 Mon Apr 16 08:09:55 2007 +++ ZendEngine2/zend_opcode.c Thu Sep 27 18:00:37 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_opcode.c,v 1.110.2.6.2.3 2007/04/16 08:09:55 dmitry Exp $ */ +/* $Id: zend_opcode.c,v 1.110.2.6.2.3.2.1 2007/09/27 18:00:37 dmitry Exp $ */ #include <stdio.h> @@ -274,9 +274,9 @@ } if (op_array->arg_info) { for (i=0; i<op_array->num_args; i++) { - efree(op_array->arg_info[i].name); + efree((char*)op_array->arg_info[i].name); if (op_array->arg_info[i].class_name) { - efree(op_array->arg_info[i].class_name); + efree((char*)op_array->arg_info[i].class_name); } } efree(op_array->arg_info); http://cvs.php.net/viewvc.cgi/php-src/ext/bcmath/bcmath.c?r1=1.62.2.2.2.8&r2=1.62.2.2.2.8.2.1&diff_format=u Index: php-src/ext/bcmath/bcmath.c diff -u php-src/ext/bcmath/bcmath.c:1.62.2.2.2.8 php-src/ext/bcmath/bcmath.c:1.62.2.2.2.8.2.1 --- php-src/ext/bcmath/bcmath.c:1.62.2.2.2.8 Fri Jun 8 00:41:57 2007 +++ php-src/ext/bcmath/bcmath.c Thu Sep 27 18:00:37 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: bcmath.c,v 1.62.2.2.2.8 2007/06/08 00:41:57 iliaa Exp $ */ +/* $Id: bcmath.c,v 1.62.2.2.2.8.2.1 2007/09/27 18:00:37 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -105,7 +105,7 @@ /* }}} */ -zend_function_entry bcmath_functions[] = { +const zend_function_entry bcmath_functions[] = { PHP_FE(bcadd, arginfo_bcadd) PHP_FE(bcsub, arginfo_bcsub) PHP_FE(bcmul, arginfo_bcmul) http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/bz2.c?r1=1.14.2.3.2.12&r2=1.14.2.3.2.12.2.1&diff_format=u Index: php-src/ext/bz2/bz2.c diff -u php-src/ext/bz2/bz2.c:1.14.2.3.2.12 php-src/ext/bz2/bz2.c:1.14.2.3.2.12.2.1 --- php-src/ext/bz2/bz2.c:1.14.2.3.2.12 Wed Mar 14 03:50:18 2007 +++ php-src/ext/bz2/bz2.c Thu Sep 27 18:00:37 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: bz2.c,v 1.14.2.3.2.12 2007/03/14 03:50:18 iliaa Exp $ */ +/* $Id: bz2.c,v 1.14.2.3.2.12.2.1 2007/09/27 18:00:37 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -94,7 +94,7 @@ /* }}} */ -static zend_function_entry bz2_functions[] = { +static const zend_function_entry bz2_functions[] = { PHP_FE(bzopen, arginfo_bzopen) PHP_FE(bzread, arginfo_bzread) PHP_FALIAS(bzwrite, fwrite, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/calendar/calendar.c?r1=1.46.2.2.2.4&r2=1.46.2.2.2.4.2.1&diff_format=u Index: php-src/ext/calendar/calendar.c diff -u php-src/ext/calendar/calendar.c:1.46.2.2.2.4 php-src/ext/calendar/calendar.c:1.46.2.2.2.4.2.1 --- php-src/ext/calendar/calendar.c:1.46.2.2.2.4 Fri Feb 16 18:32:38 2007 +++ php-src/ext/calendar/calendar.c Thu Sep 27 18:00:38 2007 @@ -18,7 +18,7 @@ | Wez Furlong <wez@thebrainroom.com> | +----------------------------------------------------------------------+ */ -/* $Id: calendar.c,v 1.46.2.2.2.4 2007/02/16 18:32:38 stas Exp $ */ +/* $Id: calendar.c,v 1.46.2.2.2.4.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -147,7 +147,7 @@ /* }}} */ -zend_function_entry calendar_functions[] = { +const zend_function_entry calendar_functions[] = { PHP_FE(jdtogregorian, arginfo_jdtogregorian) PHP_FE(gregoriantojd, arginfo_gregoriantojd) PHP_FE(jdtojulian, arginfo_jdtojulian) http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/com_extension.c?r1=1.17.2.2.2.6&r2=1.17.2.2.2.6.2.1&diff_format=u Index: php-src/ext/com_dotnet/com_extension.c diff -u php-src/ext/com_dotnet/com_extension.c:1.17.2.2.2.6 php-src/ext/com_dotnet/com_extension.c:1.17.2.2.2.6.2.1 --- php-src/ext/com_dotnet/com_extension.c:1.17.2.2.2.6 Mon Mar 5 15:49:00 2007 +++ php-src/ext/com_dotnet/com_extension.c Thu Sep 27 18:00:38 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: com_extension.c,v 1.17.2.2.2.6 2007/03/05 15:49:00 wharmby Exp $ */ +/* $Id: com_extension.c,v 1.17.2.2.2.6.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -39,7 +39,7 @@ *php_com_exception_class_entry, *php_com_saproxy_class_entry; -zend_function_entry com_dotnet_functions[] = { +const zend_function_entry com_dotnet_functions[] = { PHP_FE(variant_set, NULL) PHP_FE(variant_add, NULL) PHP_FE(variant_cat, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/com_persist.c?r1=1.5.2.3.2.2&r2=1.5.2.3.2.2.2.1&diff_format=u Index: php-src/ext/com_dotnet/com_persist.c diff -u php-src/ext/com_dotnet/com_persist.c:1.5.2.3.2.2 php-src/ext/com_dotnet/com_persist.c:1.5.2.3.2.2.2.1 --- php-src/ext/com_dotnet/com_persist.c:1.5.2.3.2.2 Mon Jan 1 09:35:48 2007 +++ php-src/ext/com_dotnet/com_persist.c Thu Sep 27 18:00:38 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: com_persist.c,v 1.5.2.3.2.2 2007/01/01 09:35:48 sebastian Exp $ */ +/* $Id: com_persist.c,v 1.5.2.3.2.2.2.1 2007/09/27 18:00:38 dmitry Exp $ */ /* Infrastructure for working with persistent COM objects. * Implements: IStream* wrapper for PHP streams. @@ -681,7 +681,7 @@ -static zend_function_entry com_persist_helper_methods[] = { +static const zend_function_entry com_persist_helper_methods[] = { CPH_ME(__construct, NULL) CPH_ME(GetCurFileName, NULL) CPH_ME(SaveToFile, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/ctype.c?r1=1.34.2.3.2.6&r2=1.34.2.3.2.6.2.1&diff_format=u Index: php-src/ext/ctype/ctype.c diff -u php-src/ext/ctype/ctype.c:1.34.2.3.2.6 php-src/ext/ctype/ctype.c:1.34.2.3.2.6.2.1 --- php-src/ext/ctype/ctype.c:1.34.2.3.2.6 Fri Jan 12 12:17:31 2007 +++ php-src/ext/ctype/ctype.c Thu Sep 27 18:00:38 2007 @@ -105,7 +105,7 @@ /* {{{ ctype_functions[] * Every user visible function must have an entry in ctype_functions[]. */ -static zend_function_entry ctype_functions[] = { +static const zend_function_entry ctype_functions[] = { PHP_FE(ctype_alnum, arginfo_ctype_alnum) PHP_FE(ctype_alpha, arginfo_ctype_alpha) PHP_FE(ctype_cntrl, arginfo_ctype_cntrl) http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27&r2=1.62.2.14.2.27.2.1&diff_format=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27 php-src/ext/curl/interface.c:1.62.2.14.2.27.2.1 --- php-src/ext/curl/interface.c:1.62.2.14.2.27 Wed Jul 4 13:34:23 2007 +++ php-src/ext/curl/interface.c Thu Sep 27 18:00:38 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interface.c,v 1.62.2.14.2.27 2007/07/04 13:34:23 tony2001 Exp $ */ +/* $Id: interface.c,v 1.62.2.14.2.27.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -291,7 +291,7 @@ /* {{{ curl_functions[] */ -zend_function_entry curl_functions[] = { +const zend_function_entry curl_functions[] = { PHP_FE(curl_init, arginfo_curl_init) PHP_FE(curl_copy_handle, arginfo_curl_copy_handle) PHP_FE(curl_version, arginfo_curl_version) http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51&r2=1.43.2.45.2.51.2.1&diff_format=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.43.2.45.2.51 php-src/ext/date/php_date.c:1.43.2.45.2.51.2.1 --- php-src/ext/date/php_date.c:1.43.2.45.2.51 Thu Jul 12 18:59:05 2007 +++ php-src/ext/date/php_date.c Thu Sep 27 18:00:38 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_date.c,v 1.43.2.45.2.51 2007/07/12 18:59:05 derick Exp $ */ +/* $Id: php_date.c,v 1.43.2.45.2.51.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #include "php.h" #include "php_streams.h" @@ -148,7 +148,7 @@ /* }}} */ /* {{{ Function table */ -zend_function_entry date_functions[] = { +const zend_function_entry date_functions[] = { PHP_FE(strtotime, arginfo_strtotime) PHP_FE(date, arginfo_date) PHP_FE(idate, arginfo_idate) @@ -198,7 +198,7 @@ {NULL, NULL, NULL} }; -zend_function_entry date_funcs_date[] = { +const zend_function_entry date_funcs_date[] = { PHP_ME(DateTime, __construct, NULL, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC) PHP_ME_MAPPING(format, date_format, NULL, 0) PHP_ME_MAPPING(modify, date_modify, NULL, 0) @@ -211,7 +211,7 @@ {NULL, NULL, NULL} }; -zend_function_entry date_funcs_timezone[] = { +const zend_function_entry date_funcs_timezone[] = { PHP_ME(DateTimeZone, __construct, NULL, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC) PHP_ME_MAPPING(getName, timezone_name_get, NULL, 0) PHP_ME_MAPPING(getOffset, timezone_offset_get, NULL, 0) @@ -302,7 +302,7 @@ static zend_object_value date_object_clone_timezone(zval *this_ptr TSRMLS_DC); /* This is need to ensure that session extension request shutdown occurs 1st, because it uses the date extension */ -static zend_module_dep date_deps[] = { +static const zend_module_dep date_deps[] = { ZEND_MOD_OPTIONAL("session") {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/ext/dba/dba.c?r1=1.111.2.4.2.5&r2=1.111.2.4.2.5.2.1&diff_format=u Index: php-src/ext/dba/dba.c diff -u php-src/ext/dba/dba.c:1.111.2.4.2.5 php-src/ext/dba/dba.c:1.111.2.4.2.5.2.1 --- php-src/ext/dba/dba.c:1.111.2.4.2.5 Mon Jan 1 09:35:59 2007 +++ php-src/ext/dba/dba.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba.c,v 1.111.2.4.2.5 2007/01/01 09:35:59 sebastian Exp $ */ +/* $Id: dba.c,v 1.111.2.4.2.5.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -144,7 +144,7 @@ /* {{{ dba_functions[] */ -zend_function_entry dba_functions[] = { +const zend_function_entry dba_functions[] = { PHP_FE(dba_open, arginfo_dba_open) PHP_FE(dba_popen, arginfo_dba_popen) PHP_FE(dba_close, arginfo_dba_close) http://cvs.php.net/viewvc.cgi/php-src/ext/dbase/dbase.c?r1=1.74.2.2.2.9&r2=1.74.2.2.2.9.2.1&diff_format=u Index: php-src/ext/dbase/dbase.c diff -u php-src/ext/dbase/dbase.c:1.74.2.2.2.9 php-src/ext/dbase/dbase.c:1.74.2.2.2.9.2.1 --- php-src/ext/dbase/dbase.c:1.74.2.2.2.9 Sun Feb 25 23:17:12 2007 +++ php-src/ext/dbase/dbase.c Thu Sep 27 18:00:38 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbase.c,v 1.74.2.2.2.9 2007/02/25 23:17:12 tony2001 Exp $ */ +/* $Id: dbase.c,v 1.74.2.2.2.9.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -826,7 +826,7 @@ /* {{{ dbase_functions[] */ -zend_function_entry dbase_functions[] = { +const zend_function_entry dbase_functions[] = { PHP_FE(dbase_open, arginfo_dbase_open) PHP_FE(dbase_create, arginfo_dbase_create) PHP_FE(dbase_close, arginfo_dbase_close) http://cvs.php.net/viewvc.cgi/php-src/ext/dom/attr.c?r1=1.18.2.2.2.2&r2=1.18.2.2.2.2.2.1&diff_format=u Index: php-src/ext/dom/attr.c diff -u php-src/ext/dom/attr.c:1.18.2.2.2.2 php-src/ext/dom/attr.c:1.18.2.2.2.2.2.1 --- php-src/ext/dom/attr.c:1.18.2.2.2.2 Mon Jan 1 09:36:00 2007 +++ php-src/ext/dom/attr.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: attr.c,v 1.18.2.2.2.2 2007/01/01 09:36:00 sebastian Exp $ */ +/* $Id: attr.c,v 1.18.2.2.2.2.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -37,7 +37,7 @@ * Since: */ -zend_function_entry php_dom_attr_class_functions[] = { +const zend_function_entry php_dom_attr_class_functions[] = { PHP_FALIAS(isId, dom_attr_is_id, NULL) PHP_ME(domattr, __construct, NULL, ZEND_ACC_PUBLIC) {NULL, NULL, NULL} http://cvs.php.net/viewvc.cgi/php-src/ext/dom/cdatasection.c?r1=1.11.2.1.2.1&r2=1.11.2.1.2.1.2.1&diff_format=u Index: php-src/ext/dom/cdatasection.c diff -u php-src/ext/dom/cdatasection.c:1.11.2.1.2.1 php-src/ext/dom/cdatasection.c:1.11.2.1.2.1.2.1 --- php-src/ext/dom/cdatasection.c:1.11.2.1.2.1 Mon Jan 1 09:36:00 2007 +++ php-src/ext/dom/cdatasection.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cdatasection.c,v 1.11.2.1.2.1 2007/01/01 09:36:00 sebastian Exp $ */ +/* $Id: cdatasection.c,v 1.11.2.1.2.1.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,7 +35,7 @@ * Since: */ -zend_function_entry php_dom_cdatasection_class_functions[] = { +const zend_function_entry php_dom_cdatasection_class_functions[] = { PHP_ME(domcdatasection, __construct, NULL, ZEND_ACC_PUBLIC) {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/ext/dom/characterdata.c?r1=1.15.2.1.2.2&r2=1.15.2.1.2.2.2.1&diff_format=u Index: php-src/ext/dom/characterdata.c diff -u php-src/ext/dom/characterdata.c:1.15.2.1.2.2 php-src/ext/dom/characterdata.c:1.15.2.1.2.2.2.1 --- php-src/ext/dom/characterdata.c:1.15.2.1.2.2 Mon Jan 1 09:36:00 2007 +++ php-src/ext/dom/characterdata.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: characterdata.c,v 1.15.2.1.2.2 2007/01/01 09:36:00 sebastian Exp $ */ +/* $Id: characterdata.c,v 1.15.2.1.2.2.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,7 +35,7 @@ * Since: */ -zend_function_entry php_dom_characterdata_class_functions[] = { +const zend_function_entry php_dom_characterdata_class_functions[] = { PHP_FALIAS(substringData, dom_characterdata_substring_data, NULL) PHP_FALIAS(appendData, dom_characterdata_append_data, NULL) PHP_FALIAS(insertData, dom_characterdata_insert_data, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/dom/comment.c?r1=1.11.2.1.2.1&r2=1.11.2.1.2.1.2.1&diff_format=u Index: php-src/ext/dom/comment.c diff -u php-src/ext/dom/comment.c:1.11.2.1.2.1 php-src/ext/dom/comment.c:1.11.2.1.2.1.2.1 --- php-src/ext/dom/comment.c:1.11.2.1.2.1 Mon Jan 1 09:36:00 2007 +++ php-src/ext/dom/comment.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: comment.c,v 1.11.2.1.2.1 2007/01/01 09:36:00 sebastian Exp $ */ +/* $Id: comment.c,v 1.11.2.1.2.1.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,7 +35,7 @@ * Since: */ -zend_function_entry php_dom_comment_class_functions[] = { +const zend_function_entry php_dom_comment_class_functions[] = { PHP_ME(domcomment, __construct, NULL, ZEND_ACC_PUBLIC) {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/ext/dom/document.c?r1=1.68.2.3.2.5&r2=1.68.2.3.2.5.2.1&diff_format=u Index: php-src/ext/dom/document.c diff -u php-src/ext/dom/document.c:1.68.2.3.2.5 php-src/ext/dom/document.c:1.68.2.3.2.5.2.1 --- php-src/ext/dom/document.c:1.68.2.3.2.5 Mon Jan 1 09:36:00 2007 +++ php-src/ext/dom/document.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: document.c,v 1.68.2.3.2.5 2007/01/01 09:36:00 sebastian Exp $ */ +/* $Id: document.c,v 1.68.2.3.2.5.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -48,7 +48,7 @@ * Since: */ -zend_function_entry php_dom_document_class_functions[] = { +const zend_function_entry php_dom_document_class_functions[] = { PHP_FALIAS(createElement, dom_document_create_element, NULL) PHP_FALIAS(createDocumentFragment, dom_document_create_document_fragment, NULL) PHP_FALIAS(createTextNode, dom_document_create_text_node, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/dom/documentfragment.c?r1=1.15.2.1.2.1&r2=1.15.2.1.2.1.2.1&diff_format=u Index: php-src/ext/dom/documentfragment.c diff -u php-src/ext/dom/documentfragment.c:1.15.2.1.2.1 php-src/ext/dom/documentfragment.c:1.15.2.1.2.1.2.1 --- php-src/ext/dom/documentfragment.c:1.15.2.1.2.1 Mon Jan 1 09:36:00 2007 +++ php-src/ext/dom/documentfragment.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: documentfragment.c,v 1.15.2.1.2.1 2007/01/01 09:36:00 sebastian Exp $ */ +/* $Id: documentfragment.c,v 1.15.2.1.2.1.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,7 +35,7 @@ * Since: */ -zend_function_entry php_dom_documentfragment_class_functions[] = { +const zend_function_entry php_dom_documentfragment_class_functions[] = { PHP_ME(domdocumentfragment, __construct, NULL, ZEND_ACC_PUBLIC) PHP_ME(domdocumentfragment, appendXML, NULL, ZEND_ACC_PUBLIC) {NULL, NULL, NULL} http://cvs.php.net/viewvc.cgi/php-src/ext/dom/documenttype.c?r1=1.15.2.1.2.1&r2=1.15.2.1.2.1.2.1&diff_format=u Index: php-src/ext/dom/documenttype.c diff -u php-src/ext/dom/documenttype.c:1.15.2.1.2.1 php-src/ext/dom/documenttype.c:1.15.2.1.2.1.2.1 --- php-src/ext/dom/documenttype.c:1.15.2.1.2.1 Mon Jan 1 09:36:00 2007 +++ php-src/ext/dom/documenttype.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: documenttype.c,v 1.15.2.1.2.1 2007/01/01 09:36:00 sebastian Exp $ */ +/* $Id: documenttype.c,v 1.15.2.1.2.1.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -34,7 +34,7 @@ * Since: */ -zend_function_entry php_dom_documenttype_class_functions[] = { +const zend_function_entry php_dom_documenttype_class_functions[] = { {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/ext/dom/dom_fe.h?r1=1.14.2.1.2.4&r2=1.14.2.1.2.4.2.1&diff_format=u Index: php-src/ext/dom/dom_fe.h diff -u php-src/ext/dom/dom_fe.h:1.14.2.1.2.4 php-src/ext/dom/dom_fe.h:1.14.2.1.2.4.2.1 --- php-src/ext/dom/dom_fe.h:1.14.2.1.2.4 Mon Jan 1 09:36:00 2007 +++ php-src/ext/dom/dom_fe.h Thu Sep 27 18:00:38 2007 @@ -17,40 +17,40 @@ +----------------------------------------------------------------------+ */ -/* $Id: dom_fe.h,v 1.14.2.1.2.4 2007/01/01 09:36:00 sebastian Exp $ */ +/* $Id: dom_fe.h,v 1.14.2.1.2.4.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifndef DOM_FE_H #define DOM_FE_H -extern zend_function_entry php_dom_domexception_class_functions[]; -extern zend_function_entry php_dom_domstringlist_class_functions[]; -extern zend_function_entry php_dom_namelist_class_functions[]; -extern zend_function_entry php_dom_domimplementationlist_class_functions[]; -extern zend_function_entry php_dom_domimplementationsource_class_functions[]; -extern zend_function_entry php_dom_domimplementation_class_functions[]; -extern zend_function_entry php_dom_documentfragment_class_functions[]; -extern zend_function_entry php_dom_document_class_functions[]; -extern zend_function_entry php_dom_node_class_functions[]; -extern zend_function_entry php_dom_nodelist_class_functions[]; -extern zend_function_entry php_dom_namednodemap_class_functions[]; -extern zend_function_entry php_dom_characterdata_class_functions[]; -extern zend_function_entry php_dom_attr_class_functions[]; -extern zend_function_entry php_dom_element_class_functions[]; -extern zend_function_entry php_dom_text_class_functions[]; -extern zend_function_entry php_dom_comment_class_functions[]; -extern zend_function_entry php_dom_typeinfo_class_functions[]; -extern zend_function_entry php_dom_userdatahandler_class_functions[]; -extern zend_function_entry php_dom_domerror_class_functions[]; -extern zend_function_entry php_dom_domerrorhandler_class_functions[]; -extern zend_function_entry php_dom_domlocator_class_functions[]; -extern zend_function_entry php_dom_domconfiguration_class_functions[]; -extern zend_function_entry php_dom_cdatasection_class_functions[]; -extern zend_function_entry php_dom_documenttype_class_functions[]; -extern zend_function_entry php_dom_notation_class_functions[]; -extern zend_function_entry php_dom_entity_class_functions[]; -extern zend_function_entry php_dom_entityreference_class_functions[]; -extern zend_function_entry php_dom_processinginstruction_class_functions[]; -extern zend_function_entry php_dom_string_extend_class_functions[]; -extern zend_function_entry php_dom_xpath_class_functions[]; +extern const zend_function_entry php_dom_domexception_class_functions[]; +extern const zend_function_entry php_dom_domstringlist_class_functions[]; +extern const zend_function_entry php_dom_namelist_class_functions[]; +extern const zend_function_entry php_dom_domimplementationlist_class_functions[]; +extern const zend_function_entry php_dom_domimplementationsource_class_functions[]; +extern const zend_function_entry php_dom_domimplementation_class_functions[]; +extern const zend_function_entry php_dom_documentfragment_class_functions[]; +extern const zend_function_entry php_dom_document_class_functions[]; +extern const zend_function_entry php_dom_node_class_functions[]; +extern const zend_function_entry php_dom_nodelist_class_functions[]; +extern const zend_function_entry php_dom_namednodemap_class_functions[]; +extern const zend_function_entry php_dom_characterdata_class_functions[]; +extern const zend_function_entry php_dom_attr_class_functions[]; +extern const zend_function_entry php_dom_element_class_functions[]; +extern const zend_function_entry php_dom_text_class_functions[]; +extern const zend_function_entry php_dom_comment_class_functions[]; +extern const zend_function_entry php_dom_typeinfo_class_functions[]; +extern const zend_function_entry php_dom_userdatahandler_class_functions[]; +extern const zend_function_entry php_dom_domerror_class_functions[]; +extern const zend_function_entry php_dom_domerrorhandler_class_functions[]; +extern const zend_function_entry php_dom_domlocator_class_functions[]; +extern const zend_function_entry php_dom_domconfiguration_class_functions[]; +extern const zend_function_entry php_dom_cdatasection_class_functions[]; +extern const zend_function_entry php_dom_documenttype_class_functions[]; +extern const zend_function_entry php_dom_notation_class_functions[]; +extern const zend_function_entry php_dom_entity_class_functions[]; +extern const zend_function_entry php_dom_entityreference_class_functions[]; +extern const zend_function_entry php_dom_processinginstruction_class_functions[]; +extern const zend_function_entry php_dom_string_extend_class_functions[]; +extern const zend_function_entry php_dom_xpath_class_functions[]; /* domexception errors */ typedef enum { http://cvs.php.net/viewvc.cgi/php-src/ext/dom/domconfiguration.c?r1=1.5.2.1.2.1&r2=1.5.2.1.2.1.2.1&diff_format=u Index: php-src/ext/dom/domconfiguration.c diff -u php-src/ext/dom/domconfiguration.c:1.5.2.1.2.1 php-src/ext/dom/domconfiguration.c:1.5.2.1.2.1.2.1 --- php-src/ext/dom/domconfiguration.c:1.5.2.1.2.1 Mon Jan 1 09:36:00 2007 +++ php-src/ext/dom/domconfiguration.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: domconfiguration.c,v 1.5.2.1.2.1 2007/01/01 09:36:00 sebastian Exp $ */ +/* $Id: domconfiguration.c,v 1.5.2.1.2.1.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,7 +35,7 @@ * Since: DOM Level 3 */ -zend_function_entry php_dom_domconfiguration_class_functions[] = { +const zend_function_entry php_dom_domconfiguration_class_functions[] = { PHP_FALIAS(setParameter, dom_domconfiguration_set_parameter, NULL) PHP_FALIAS(getParameter, dom_domconfiguration_get_parameter, NULL) PHP_FALIAS(canSetParameter, dom_domconfiguration_can_set_parameter, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/dom/domerror.c?r1=1.6.2.1.2.1&r2=1.6.2.1.2.1.2.1&diff_format=u Index: php-src/ext/dom/domerror.c diff -u php-src/ext/dom/domerror.c:1.6.2.1.2.1 php-src/ext/dom/domerror.c:1.6.2.1.2.1.2.1 --- php-src/ext/dom/domerror.c:1.6.2.1.2.1 Mon Jan 1 09:36:00 2007 +++ php-src/ext/dom/domerror.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: domerror.c,v 1.6.2.1.2.1 2007/01/01 09:36:00 sebastian Exp $ */ +/* $Id: domerror.c,v 1.6.2.1.2.1.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,7 +35,7 @@ * Since: DOM Level 3 */ -zend_function_entry php_dom_domerror_class_functions[] = { +const zend_function_entry php_dom_domerror_class_functions[] = { {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/ext/dom/domerrorhandler.c?r1=1.5.2.1.2.1&r2=1.5.2.1.2.1.2.1&diff_format=u Index: php-src/ext/dom/domerrorhandler.c diff -u php-src/ext/dom/domerrorhandler.c:1.5.2.1.2.1 php-src/ext/dom/domerrorhandler.c:1.5.2.1.2.1.2.1 --- php-src/ext/dom/domerrorhandler.c:1.5.2.1.2.1 Mon Jan 1 09:36:00 2007 +++ php-src/ext/dom/domerrorhandler.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: domerrorhandler.c,v 1.5.2.1.2.1 2007/01/01 09:36:00 sebastian Exp $ */ +/* $Id: domerrorhandler.c,v 1.5.2.1.2.1.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,7 +35,7 @@ * Since: DOM Level 3 */ -zend_function_entry php_dom_domerrorhandler_class_functions[] = { +const zend_function_entry php_dom_domerrorhandler_class_functions[] = { PHP_FALIAS(handleError, dom_domerrorhandler_handle_error, NULL) {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/ext/dom/domexception.c?r1=1.11.2.1.2.1&r2=1.11.2.1.2.1.2.1&diff_format=u Index: php-src/ext/dom/domexception.c diff -u php-src/ext/dom/domexception.c:1.11.2.1.2.1 php-src/ext/dom/domexception.c:1.11.2.1.2.1.2.1 --- php-src/ext/dom/domexception.c:1.11.2.1.2.1 Mon Jan 1 09:36:00 2007 +++ php-src/ext/dom/domexception.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: domexception.c,v 1.11.2.1.2.1 2007/01/01 09:36:00 sebastian Exp $ */ +/* $Id: domexception.c,v 1.11.2.1.2.1.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -37,7 +37,7 @@ extern zend_class_entry *dom_domexception_class_entry; -zend_function_entry php_dom_domexception_class_functions[] = { +const zend_function_entry php_dom_domexception_class_functions[] = { {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/ext/dom/domimplementation.c?r1=1.15.2.2.2.2&r2=1.15.2.2.2.2.2.1&diff_format=u Index: php-src/ext/dom/domimplementation.c diff -u php-src/ext/dom/domimplementation.c:1.15.2.2.2.2 php-src/ext/dom/domimplementation.c:1.15.2.2.2.2.2.1 --- php-src/ext/dom/domimplementation.c:1.15.2.2.2.2 Mon Jan 1 09:36:00 2007 +++ php-src/ext/dom/domimplementation.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: domimplementation.c,v 1.15.2.2.2.2 2007/01/01 09:36:00 sebastian Exp $ */ +/* $Id: domimplementation.c,v 1.15.2.2.2.2.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -34,7 +34,7 @@ * Since: */ -zend_function_entry php_dom_domimplementation_class_functions[] = { +const zend_function_entry php_dom_domimplementation_class_functions[] = { PHP_ME(domimplementation, getFeature, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_ALLOW_STATIC) PHP_ME(domimplementation, hasFeature, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_ALLOW_STATIC) PHP_ME(domimplementation, createDocumentType, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_ALLOW_STATIC) http://cvs.php.net/viewvc.cgi/php-src/ext/dom/domimplementationlist.c?r1=1.6.2.1.2.1&r2=1.6.2.1.2.1.2.1&diff_format=u Index: php-src/ext/dom/domimplementationlist.c diff -u php-src/ext/dom/domimplementationlist.c:1.6.2.1.2.1 php-src/ext/dom/domimplementationlist.c:1.6.2.1.2.1.2.1 --- php-src/ext/dom/domimplementationlist.c:1.6.2.1.2.1 Mon Jan 1 09:36:00 2007 +++ php-src/ext/dom/domimplementationlist.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: domimplementationlist.c,v 1.6.2.1.2.1 2007/01/01 09:36:00 sebastian Exp $ */ +/* $Id: domimplementationlist.c,v 1.6.2.1.2.1.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,7 +35,7 @@ * Since: DOM Level 3 */ -zend_function_entry php_dom_domimplementationlist_class_functions[] = { +const zend_function_entry php_dom_domimplementationlist_class_functions[] = { PHP_FALIAS(item, dom_domimplementationlist_item, NULL) {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/ext/dom/domimplementationsource.c?r1=1.5.2.1.2.1&r2=1.5.2.1.2.1.2.1&diff_format=u Index: php-src/ext/dom/domimplementationsource.c diff -u php-src/ext/dom/domimplementationsource.c:1.5.2.1.2.1 php-src/ext/dom/domimplementationsource.c:1.5.2.1.2.1.2.1 --- php-src/ext/dom/domimplementationsource.c:1.5.2.1.2.1 Mon Jan 1 09:36:00 2007 +++ php-src/ext/dom/domimplementationsource.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: domimplementationsource.c,v 1.5.2.1.2.1 2007/01/01 09:36:00 sebastian Exp $ */ +/* $Id: domimplementationsource.c,v 1.5.2.1.2.1.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,7 +35,7 @@ * Since: DOM Level 3 */ -zend_function_entry php_dom_domimplementationsource_class_functions[] = { +const zend_function_entry php_dom_domimplementationsource_class_functions[] = { PHP_FALIAS(getDomimplementation, dom_domimplementationsource_get_domimplementation, NULL) PHP_FALIAS(getDomimplementations, dom_domimplementationsource_get_domimplementations, NULL) {NULL, NULL, NULL} http://cvs.php.net/viewvc.cgi/php-src/ext/dom/domlocator.c?r1=1.6.2.1.2.1&r2=1.6.2.1.2.1.2.1&diff_format=u Index: php-src/ext/dom/domlocator.c diff -u php-src/ext/dom/domlocator.c:1.6.2.1.2.1 php-src/ext/dom/domlocator.c:1.6.2.1.2.1.2.1 --- php-src/ext/dom/domlocator.c:1.6.2.1.2.1 Mon Jan 1 09:36:00 2007 +++ php-src/ext/dom/domlocator.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: domlocator.c,v 1.6.2.1.2.1 2007/01/01 09:36:00 sebastian Exp $ */ +/* $Id: domlocator.c,v 1.6.2.1.2.1.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,7 +35,7 @@ * Since: DOM Level 3 */ -zend_function_entry php_dom_domlocator_class_functions[] = { +const zend_function_entry php_dom_domlocator_class_functions[] = { {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/ext/dom/domstringlist.c?r1=1.6.2.1.2.1&r2=1.6.2.1.2.1.2.1&diff_format=u Index: php-src/ext/dom/domstringlist.c diff -u php-src/ext/dom/domstringlist.c:1.6.2.1.2.1 php-src/ext/dom/domstringlist.c:1.6.2.1.2.1.2.1 --- php-src/ext/dom/domstringlist.c:1.6.2.1.2.1 Mon Jan 1 09:36:00 2007 +++ php-src/ext/dom/domstringlist.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: domstringlist.c,v 1.6.2.1.2.1 2007/01/01 09:36:00 sebastian Exp $ */ +/* $Id: domstringlist.c,v 1.6.2.1.2.1.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,7 +35,7 @@ * Since: DOM Level 3 */ -zend_function_entry php_dom_domstringlist_class_functions[] = { +const zend_function_entry php_dom_domstringlist_class_functions[] = { PHP_FALIAS(item, dom_domstringlist_item, NULL) {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/ext/dom/element.c?r1=1.36.2.4.2.8&r2=1.36.2.4.2.8.2.1&diff_format=u Index: php-src/ext/dom/element.c diff -u php-src/ext/dom/element.c:1.36.2.4.2.8 php-src/ext/dom/element.c:1.36.2.4.2.8.2.1 --- php-src/ext/dom/element.c:1.36.2.4.2.8 Fri May 4 19:30:59 2007 +++ php-src/ext/dom/element.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: element.c,v 1.36.2.4.2.8 2007/05/04 19:30:59 rrichards Exp $ */ +/* $Id: element.c,v 1.36.2.4.2.8.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,7 +35,7 @@ * Since: */ -zend_function_entry php_dom_element_class_functions[] = { +const zend_function_entry php_dom_element_class_functions[] = { PHP_FALIAS(getAttribute, dom_element_get_attribute, NULL) PHP_FALIAS(setAttribute, dom_element_set_attribute, NULL) PHP_FALIAS(removeAttribute, dom_element_remove_attribute, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/dom/entity.c?r1=1.9.2.1.2.1&r2=1.9.2.1.2.1.2.1&diff_format=u Index: php-src/ext/dom/entity.c diff -u php-src/ext/dom/entity.c:1.9.2.1.2.1 php-src/ext/dom/entity.c:1.9.2.1.2.1.2.1 --- php-src/ext/dom/entity.c:1.9.2.1.2.1 Mon Jan 1 09:36:00 2007 +++ php-src/ext/dom/entity.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: entity.c,v 1.9.2.1.2.1 2007/01/01 09:36:00 sebastian Exp $ */ +/* $Id: entity.c,v 1.9.2.1.2.1.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,7 +35,7 @@ * Since: */ -zend_function_entry php_dom_entity_class_functions[] = { +const zend_function_entry php_dom_entity_class_functions[] = { {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/ext/dom/entityreference.c?r1=1.12.2.1.2.2&r2=1.12.2.1.2.2.2.1&diff_format=u Index: php-src/ext/dom/entityreference.c diff -u php-src/ext/dom/entityreference.c:1.12.2.1.2.2 php-src/ext/dom/entityreference.c:1.12.2.1.2.2.2.1 --- php-src/ext/dom/entityreference.c:1.12.2.1.2.2 Mon Jan 1 09:36:00 2007 +++ php-src/ext/dom/entityreference.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: entityreference.c,v 1.12.2.1.2.2 2007/01/01 09:36:00 sebastian Exp $ */ +/* $Id: entityreference.c,v 1.12.2.1.2.2.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,7 +35,7 @@ * Since: */ -zend_function_entry php_dom_entityreference_class_functions[] = { +const zend_function_entry php_dom_entityreference_class_functions[] = { PHP_ME(domentityreference, __construct, NULL, ZEND_ACC_PUBLIC) {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/ext/dom/namednodemap.c?r1=1.15.2.2.2.1&r2=1.15.2.2.2.1.2.1&diff_format=u Index: php-src/ext/dom/namednodemap.c diff -u php-src/ext/dom/namednodemap.c:1.15.2.2.2.1 php-src/ext/dom/namednodemap.c:1.15.2.2.2.1.2.1 --- php-src/ext/dom/namednodemap.c:1.15.2.2.2.1 Mon Jan 1 09:36:00 2007 +++ php-src/ext/dom/namednodemap.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: namednodemap.c,v 1.15.2.2.2.1 2007/01/01 09:36:00 sebastian Exp $ */ +/* $Id: namednodemap.c,v 1.15.2.2.2.1.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,7 +35,7 @@ * Since: */ -zend_function_entry php_dom_namednodemap_class_functions[] = { +const zend_function_entry php_dom_namednodemap_class_functions[] = { PHP_FALIAS(getNamedItem, dom_namednodemap_get_named_item, NULL) PHP_FALIAS(setNamedItem, dom_namednodemap_set_named_item, NULL) PHP_FALIAS(removeNamedItem, dom_namednodemap_remove_named_item, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/dom/namelist.c?r1=1.7.2.1.2.1&r2=1.7.2.1.2.1.2.1&diff_format=u Index: php-src/ext/dom/namelist.c diff -u php-src/ext/dom/namelist.c:1.7.2.1.2.1 php-src/ext/dom/namelist.c:1.7.2.1.2.1.2.1 --- php-src/ext/dom/namelist.c:1.7.2.1.2.1 Mon Jan 1 09:36:00 2007 +++ php-src/ext/dom/namelist.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: namelist.c,v 1.7.2.1.2.1 2007/01/01 09:36:00 sebastian Exp $ */ +/* $Id: namelist.c,v 1.7.2.1.2.1.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,7 +35,7 @@ * Since: DOM Level 3 */ -zend_function_entry php_dom_namelist_class_functions[] = { +const zend_function_entry php_dom_namelist_class_functions[] = { PHP_FALIAS(getName, dom_namelist_get_name, NULL) PHP_FALIAS(getNamespaceURI, dom_namelist_get_namespace_uri, NULL) {NULL, NULL, NULL} http://cvs.php.net/viewvc.cgi/php-src/ext/dom/node.c?r1=1.37.2.3.2.8&r2=1.37.2.3.2.8.2.1&diff_format=u Index: php-src/ext/dom/node.c diff -u php-src/ext/dom/node.c:1.37.2.3.2.8 php-src/ext/dom/node.c:1.37.2.3.2.8.2.1 --- php-src/ext/dom/node.c:1.37.2.3.2.8 Fri May 4 19:30:59 2007 +++ php-src/ext/dom/node.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: node.c,v 1.37.2.3.2.8 2007/05/04 19:30:59 rrichards Exp $ */ +/* $Id: node.c,v 1.37.2.3.2.8.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -34,7 +34,7 @@ * Since: */ -zend_function_entry php_dom_node_class_functions[] = { +const zend_function_entry php_dom_node_class_functions[] = { PHP_FALIAS(insertBefore, dom_node_insert_before, NULL) PHP_FALIAS(replaceChild, dom_node_replace_child, NULL) PHP_FALIAS(removeChild, dom_node_remove_child, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/dom/nodelist.c?r1=1.17.2.2.2.2&r2=1.17.2.2.2.2.2.1&diff_format=u Index: php-src/ext/dom/nodelist.c diff -u php-src/ext/dom/nodelist.c:1.17.2.2.2.2 php-src/ext/dom/nodelist.c:1.17.2.2.2.2.2.1 --- php-src/ext/dom/nodelist.c:1.17.2.2.2.2 Mon Jan 1 09:36:00 2007 +++ php-src/ext/dom/nodelist.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: nodelist.c,v 1.17.2.2.2.2 2007/01/01 09:36:00 sebastian Exp $ */ +/* $Id: nodelist.c,v 1.17.2.2.2.2.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,7 +35,7 @@ * Since: */ -zend_function_entry php_dom_nodelist_class_functions[] = { +const zend_function_entry php_dom_nodelist_class_functions[] = { PHP_FALIAS(item, dom_nodelist_item, NULL) {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/ext/dom/notation.c?r1=1.9.2.2.2.1&r2=1.9.2.2.2.1.2.1&diff_format=u Index: php-src/ext/dom/notation.c diff -u php-src/ext/dom/notation.c:1.9.2.2.2.1 php-src/ext/dom/notation.c:1.9.2.2.2.1.2.1 --- php-src/ext/dom/notation.c:1.9.2.2.2.1 Mon Jan 1 09:36:00 2007 +++ php-src/ext/dom/notation.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: notation.c,v 1.9.2.2.2.1 2007/01/01 09:36:00 sebastian Exp $ */ +/* $Id: notation.c,v 1.9.2.2.2.1.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,7 +35,7 @@ * Since: */ -zend_function_entry php_dom_notation_class_functions[] = { +const zend_function_entry php_dom_notation_class_functions[] = { {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/ext/dom/php_dom.c?r1=1.73.2.12.2.12&r2=1.73.2.12.2.12.2.1&diff_format=u Index: php-src/ext/dom/php_dom.c diff -u php-src/ext/dom/php_dom.c:1.73.2.12.2.12 php-src/ext/dom/php_dom.c:1.73.2.12.2.12.2.1 --- php-src/ext/dom/php_dom.c:1.73.2.12.2.12 Thu Aug 30 16:32:34 2007 +++ php-src/ext/dom/php_dom.c Thu Sep 27 18:00:38 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_dom.c,v 1.73.2.12.2.12 2007/08/30 16:32:34 rrichards Exp $ */ +/* $Id: php_dom.c,v 1.73.2.12.2.12.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -512,7 +512,7 @@ return zobject->value.obj; } -static zend_function_entry dom_functions[] = { +static const zend_function_entry dom_functions[] = { PHP_FE(dom_import_simplexml, NULL) {NULL, NULL, NULL} }; @@ -525,7 +525,7 @@ } } -static zend_module_dep dom_deps[] = { +static const zend_module_dep dom_deps[] = { ZEND_MOD_REQUIRED("libxml") ZEND_MOD_CONFLICTS("domxml") {NULL, NULL, NULL} http://cvs.php.net/viewvc.cgi/php-src/ext/dom/processinginstruction.c?r1=1.17.2.1.2.1&r2=1.17.2.1.2.1.2.1&diff_format=u Index: php-src/ext/dom/processinginstruction.c diff -u php-src/ext/dom/processinginstruction.c:1.17.2.1.2.1 php-src/ext/dom/processinginstruction.c:1.17.2.1.2.1.2.1 --- php-src/ext/dom/processinginstruction.c:1.17.2.1.2.1 Mon Jan 1 09:36:00 2007 +++ php-src/ext/dom/processinginstruction.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: processinginstruction.c,v 1.17.2.1.2.1 2007/01/01 09:36:00 sebastian Exp $ */ +/* $Id: processinginstruction.c,v 1.17.2.1.2.1.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,7 +35,7 @@ * Since: */ -zend_function_entry php_dom_processinginstruction_class_functions[] = { +const zend_function_entry php_dom_processinginstruction_class_functions[] = { PHP_ME(domprocessinginstruction, __construct, NULL, ZEND_ACC_PUBLIC) {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/ext/dom/string_extend.c?r1=1.5.2.1.2.1&r2=1.5.2.1.2.1.2.1&diff_format=u Index: php-src/ext/dom/string_extend.c diff -u php-src/ext/dom/string_extend.c:1.5.2.1.2.1 php-src/ext/dom/string_extend.c:1.5.2.1.2.1.2.1 --- php-src/ext/dom/string_extend.c:1.5.2.1.2.1 Mon Jan 1 09:36:00 2007 +++ php-src/ext/dom/string_extend.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string_extend.c,v 1.5.2.1.2.1 2007/01/01 09:36:00 sebastian Exp $ */ +/* $Id: string_extend.c,v 1.5.2.1.2.1.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,7 +35,7 @@ * Since: */ -zend_function_entry php_dom_string_extend_class_functions[] = { +const zend_function_entry php_dom_string_extend_class_functions[] = { PHP_FALIAS(findOffset16, dom_string_extend_find_offset16, NULL) PHP_FALIAS(findOffset32, dom_string_extend_find_offset32, NULL) {NULL, NULL, NULL} http://cvs.php.net/viewvc.cgi/php-src/ext/dom/text.c?r1=1.23.2.1.2.4&r2=1.23.2.1.2.4.2.1&diff_format=u Index: php-src/ext/dom/text.c diff -u php-src/ext/dom/text.c:1.23.2.1.2.4 php-src/ext/dom/text.c:1.23.2.1.2.4.2.1 --- php-src/ext/dom/text.c:1.23.2.1.2.4 Mon May 14 11:52:35 2007 +++ php-src/ext/dom/text.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: text.c,v 1.23.2.1.2.4 2007/05/14 11:52:35 rrichards Exp $ */ +/* $Id: text.c,v 1.23.2.1.2.4.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,7 +35,7 @@ * Since: */ -zend_function_entry php_dom_text_class_functions[] = { +const zend_function_entry php_dom_text_class_functions[] = { PHP_FALIAS(splitText, dom_text_split_text, NULL) PHP_FALIAS(isWhitespaceInElementContent, dom_text_is_whitespace_in_element_content, NULL) PHP_FALIAS(isElementContentWhitespace, dom_text_is_whitespace_in_element_content, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/dom/typeinfo.c?r1=1.6.2.1.2.1&r2=1.6.2.1.2.1.2.1&diff_format=u Index: php-src/ext/dom/typeinfo.c diff -u php-src/ext/dom/typeinfo.c:1.6.2.1.2.1 php-src/ext/dom/typeinfo.c:1.6.2.1.2.1.2.1 --- php-src/ext/dom/typeinfo.c:1.6.2.1.2.1 Mon Jan 1 09:36:00 2007 +++ php-src/ext/dom/typeinfo.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: typeinfo.c,v 1.6.2.1.2.1 2007/01/01 09:36:00 sebastian Exp $ */ +/* $Id: typeinfo.c,v 1.6.2.1.2.1.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,7 +35,7 @@ * Since: DOM Level 3 */ -zend_function_entry php_dom_typeinfo_class_functions[] = { +const zend_function_entry php_dom_typeinfo_class_functions[] = { {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/ext/dom/userdatahandler.c?r1=1.6.2.1.2.1&r2=1.6.2.1.2.1.2.1&diff_format=u Index: php-src/ext/dom/userdatahandler.c diff -u php-src/ext/dom/userdatahandler.c:1.6.2.1.2.1 php-src/ext/dom/userdatahandler.c:1.6.2.1.2.1.2.1 --- php-src/ext/dom/userdatahandler.c:1.6.2.1.2.1 Mon Jan 1 09:36:00 2007 +++ php-src/ext/dom/userdatahandler.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: userdatahandler.c,v 1.6.2.1.2.1 2007/01/01 09:36:00 sebastian Exp $ */ +/* $Id: userdatahandler.c,v 1.6.2.1.2.1.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,7 +35,7 @@ * Since: DOM Level 3 */ -zend_function_entry php_dom_userdatahandler_class_functions[] = { +const zend_function_entry php_dom_userdatahandler_class_functions[] = { PHP_FALIAS(handle, dom_userdatahandler_handle, NULL) {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/ext/dom/xpath.c?r1=1.26.2.1.2.1&r2=1.26.2.1.2.1.2.1&diff_format=u Index: php-src/ext/dom/xpath.c diff -u php-src/ext/dom/xpath.c:1.26.2.1.2.1 php-src/ext/dom/xpath.c:1.26.2.1.2.1.2.1 --- php-src/ext/dom/xpath.c:1.26.2.1.2.1 Mon Jan 1 09:36:00 2007 +++ php-src/ext/dom/xpath.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xpath.c,v 1.26.2.1.2.1 2007/01/01 09:36:00 sebastian Exp $ */ +/* $Id: xpath.c,v 1.26.2.1.2.1.2.1 2007/09/27 18:00:38 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -36,7 +36,7 @@ #if defined(LIBXML_XPATH_ENABLED) -zend_function_entry php_dom_xpath_class_functions[] = { +const zend_function_entry php_dom_xpath_class_functions[] = { PHP_ME(domxpath, __construct, NULL, ZEND_ACC_PUBLIC) PHP_FALIAS(registerNamespace, dom_xpath_register_ns, NULL) PHP_FALIAS(query, dom_xpath_query, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/exif/exif.c?r1=1.173.2.5.2.20&r2=1.173.2.5.2.20.2.1&diff_format=u Index: php-src/ext/exif/exif.c diff -u php-src/ext/exif/exif.c:1.173.2.5.2.20 php-src/ext/exif/exif.c:1.173.2.5.2.20.2.1 --- php-src/ext/exif/exif.c:1.173.2.5.2.20 Sun Jun 10 20:12:45 2007 +++ php-src/ext/exif/exif.c Thu Sep 27 18:00:38 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: exif.c,v 1.173.2.5.2.20 2007/06/10 20:12:45 iliaa Exp $ */ +/* $Id: exif.c,v 1.173.2.5.2.20.2.1 2007/09/27 18:00:38 dmitry Exp $ */ /* ToDos * @@ -132,7 +132,7 @@ /* {{{ exif_functions[] */ -zend_function_entry exif_functions[] = { +const zend_function_entry exif_functions[] = { PHP_FE(exif_read_data, arginfo_exif_read_data) PHP_FALIAS(read_exif_data, exif_read_data, arginfo_exif_read_data) PHP_FE(exif_tagname, arginfo_exif_tagname) @@ -142,7 +142,7 @@ }; /* }}} */ -#define EXIF_VERSION "1.4 $Id: exif.c,v 1.173.2.5.2.20 2007/06/10 20:12:45 iliaa Exp $" +#define EXIF_VERSION "1.4 $Id: exif.c,v 1.173.2.5.2.20.2.1 2007/09/27 18:00:38 dmitry Exp $" /* {{{ PHP_MINFO_FUNCTION */ http://cvs.php.net/viewvc.cgi/php-src/ext/fbsql/php_fbsql.c?r1=1.114.2.3.2.6&r2=1.114.2.3.2.6.2.1&diff_format=u Index: php-src/ext/fbsql/php_fbsql.c diff -u php-src/ext/fbsql/php_fbsql.c:1.114.2.3.2.6 php-src/ext/fbsql/php_fbsql.c:1.114.2.3.2.6.2.1 --- php-src/ext/fbsql/php_fbsql.c:1.114.2.3.2.6 Sat Feb 24 02:17:24 2007 +++ php-src/ext/fbsql/php_fbsql.c Thu Sep 27 18:00:38 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_fbsql.c,v 1.114.2.3.2.6 2007/02/24 02:17:24 helly Exp $ */ +/* $Id: php_fbsql.c,v 1.114.2.3.2.6.2.1 2007/09/27 18:00:38 dmitry Exp $ */ /* TODO: * @@ -543,7 +543,7 @@ /* {{{ fbsql_functions[] */ -zend_function_entry fbsql_functions[] = { +const zend_function_entry fbsql_functions[] = { PHP_FE(fbsql_connect, arginfo_fbsql_connect) PHP_FE(fbsql_pconnect, arginfo_fbsql_pconnect) PHP_FE(fbsql_close, arginfo_fbsql_close) http://cvs.php.net/viewvc.cgi/php-src/ext/fdf/fdf.c?r1=1.89.2.2.2.9&r2=1.89.2.2.2.9.2.1&diff_format=u Index: php-src/ext/fdf/fdf.c diff -u php-src/ext/fdf/fdf.c:1.89.2.2.2.9 php-src/ext/fdf/fdf.c:1.89.2.2.2.9.2.1 --- php-src/ext/fdf/fdf.c:1.89.2.2.2.9 Mon Mar 5 21:54:46 2007 +++ php-src/ext/fdf/fdf.c Thu Sep 27 18:00:39 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fdf.c,v 1.89.2.2.2.9 2007/03/05 21:54:46 stas Exp $ */ +/* $Id: fdf.c,v 1.89.2.2.2.9.2.1 2007/09/27 18:00:39 dmitry Exp $ */ /* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from http://beta1.adobe.com/ada/acrosdk/forms.html. */ @@ -276,7 +276,7 @@ /* {{{ fdf_functions[] */ -zend_function_entry fdf_functions[] = { +const zend_function_entry fdf_functions[] = { PHP_FE(fdf_add_template, arginfo_fdf_add_template) PHP_FE(fdf_close, arginfo_fdf_close) PHP_FE(fdf_create, arginfo_fdf_create) http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.52.2.39&r2=1.52.2.39.2.1&diff_format=u Index: php-src/ext/filter/filter.c diff -u php-src/ext/filter/filter.c:1.52.2.39 php-src/ext/filter/filter.c:1.52.2.39.2.1 --- php-src/ext/filter/filter.c:1.52.2.39 Wed Apr 4 20:50:26 2007 +++ php-src/ext/filter/filter.c Thu Sep 27 18:00:39 2007 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filter.c,v 1.52.2.39 2007/04/04 20:50:26 pajoye Exp $ */ +/* $Id: filter.c,v 1.52.2.39.2.1 2007/09/27 18:00:39 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -79,7 +79,7 @@ /* {{{ filter_functions[] */ -zend_function_entry filter_functions[] = { +const zend_function_entry filter_functions[] = { PHP_FE(filter_input, NULL) PHP_FE(filter_var, NULL) PHP_FE(filter_input_array, NULL) @@ -275,7 +275,7 @@ { php_info_print_table_start(); php_info_print_table_row( 2, "Input Validation and Filtering", "enabled" ); - php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.39 $"); + php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.39.2.1 $"); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); http://cvs.php.net/viewvc.cgi/php-src/ext/ftp/php_ftp.c?r1=1.103.2.2.2.2&r2=1.103.2.2.2.2.2.1&diff_format=u Index: php-src/ext/ftp/php_ftp.c diff -u php-src/ext/ftp/php_ftp.c:1.103.2.2.2.2 php-src/ext/ftp/php_ftp.c:1.103.2.2.2.2.2.1 --- php-src/ext/ftp/php_ftp.c:1.103.2.2.2.2 Mon Jan 1 09:36:01 2007 +++ php-src/ext/ftp/php_ftp.c Thu Sep 27 18:00:39 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ftp.c,v 1.103.2.2.2.2 2007/01/01 09:36:01 sebastian Exp $ */ +/* $Id: php_ftp.c,v 1.103.2.2.2.2.2.1 2007/09/27 18:00:39 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -274,7 +274,7 @@ /* }}} */ -zend_function_entry php_ftp_functions[] = { +const zend_function_entry php_ftp_functions[] = { PHP_FE(ftp_connect, arginfo_ftp_connect) #if HAVE_OPENSSL_EXT PHP_FE(ftp_ssl_connect, arginfo_ftp_ssl_connect) http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32&r2=1.312.2.20.2.32.2.1&diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32 php-src/ext/gd/gd.c:1.312.2.20.2.32.2.1 --- php-src/ext/gd/gd.c:1.312.2.20.2.32 Tue Sep 11 21:03:48 2007 +++ php-src/ext/gd/gd.c Thu Sep 27 18:00:39 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.312.2.20.2.32 2007/09/11 21:03:48 pajoye Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.32.2.1 2007/09/27 18:00:39 dmitry Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -989,7 +989,7 @@ /* {{{ gd_functions[] */ -zend_function_entry gd_functions[] = { +const zend_function_entry gd_functions[] = { PHP_FE(gd_info, arginfo_gd_info) PHP_FE(imagearc, arginfo_imagearc) PHP_FE(imageellipse, arginfo_imageellipse) http://cvs.php.net/viewvc.cgi/php-src/ext/gettext/gettext.c?r1=1.46.2.2.2.4&r2=1.46.2.2.2.4.2.1&diff_format=u Index: php-src/ext/gettext/gettext.c diff -u php-src/ext/gettext/gettext.c:1.46.2.2.2.4 php-src/ext/gettext/gettext.c:1.46.2.2.2.4.2.1 --- php-src/ext/gettext/gettext.c:1.46.2.2.2.4 Tue Jan 16 14:42:38 2007 +++ php-src/ext/gettext/gettext.c Thu Sep 27 18:00:39 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gettext.c,v 1.46.2.2.2.4 2007/01/16 14:42:38 tony2001 Exp $ */ +/* $Id: gettext.c,v 1.46.2.2.2.4.2.1 2007/09/27 18:00:39 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -101,7 +101,7 @@ /* {{{ php_gettext_functions[] */ -zend_function_entry php_gettext_functions[] = { +const zend_function_entry php_gettext_functions[] = { PHP_NAMED_FE(textdomain, zif_textdomain, arginfo_textdomain) PHP_NAMED_FE(gettext, zif_gettext, arginfo_gettext) /* Alias for gettext() */ http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/gmp.c?r1=1.49.2.2.2.11&r2=1.49.2.2.2.11.2.1&diff_format=u Index: php-src/ext/gmp/gmp.c diff -u php-src/ext/gmp/gmp.c:1.49.2.2.2.11 php-src/ext/gmp/gmp.c:1.49.2.2.2.11.2.1 --- php-src/ext/gmp/gmp.c:1.49.2.2.2.11 Thu Apr 26 13:44:02 2007 +++ php-src/ext/gmp/gmp.c Thu Sep 27 18:00:39 2007 @@ -272,7 +272,7 @@ /* {{{ gmp_functions[] */ -zend_function_entry gmp_functions[] = { +const zend_function_entry gmp_functions[] = { ZEND_FE(gmp_init, arginfo_gmp_init) ZEND_FE(gmp_intval, arginfo_gmp_intval) ZEND_FE(gmp_strval, arginfo_gmp_strval) http://cvs.php.net/viewvc.cgi/php-src/ext/hash/hash.c?r1=1.18.2.5.2.7&r2=1.18.2.5.2.7.2.1&diff_format=u Index: php-src/ext/hash/hash.c diff -u php-src/ext/hash/hash.c:1.18.2.5.2.7 php-src/ext/hash/hash.c:1.18.2.5.2.7.2.1 --- php-src/ext/hash/hash.c:1.18.2.5.2.7 Tue Feb 27 03:28:16 2007 +++ php-src/ext/hash/hash.c Thu Sep 27 18:00:39 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hash.c,v 1.18.2.5.2.7 2007/02/27 03:28:16 iliaa Exp $ */ +/* $Id: hash.c,v 1.18.2.5.2.7.2.1 2007/09/27 18:00:39 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -699,7 +699,7 @@ /* {{{ hash_functions[] */ -zend_function_entry hash_functions[] = { +const zend_function_entry hash_functions[] = { PHP_FE(hash, arginfo_hash) PHP_FE(hash_file, arginfo_hash_file) http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/iconv.c?r1=1.124.2.8.2.20.2.1&r2=1.124.2.8.2.20.2.2&diff_format=u Index: php-src/ext/iconv/iconv.c diff -u php-src/ext/iconv/iconv.c:1.124.2.8.2.20.2.1 php-src/ext/iconv/iconv.c:1.124.2.8.2.20.2.2 --- php-src/ext/iconv/iconv.c:1.124.2.8.2.20.2.1 Thu Sep 27 09:18:50 2007 +++ php-src/ext/iconv/iconv.c Thu Sep 27 18:00:39 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: iconv.c,v 1.124.2.8.2.20.2.1 2007/09/27 09:18:50 tony2001 Exp $ */ +/* $Id: iconv.c,v 1.124.2.8.2.20.2.2 2007/09/27 18:00:39 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -141,7 +141,7 @@ /* {{{ iconv_functions[] */ -zend_function_entry iconv_functions[] = { +const zend_function_entry iconv_functions[] = { PHP_RAW_NAMED_FE(iconv,php_if_iconv, arginfo_iconv) PHP_FE(ob_iconv_handler, arginfo_ob_iconv_handler) PHP_FE(iconv_get_encoding, arginfo_iconv_get_encoding) http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.26&r2=1.208.2.7.2.26.2.1&diff_format=u Index: php-src/ext/imap/php_imap.c diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.26 php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.1 --- php-src/ext/imap/php_imap.c:1.208.2.7.2.26 Tue Jul 31 00:31:10 2007 +++ php-src/ext/imap/php_imap.c Thu Sep 27 18:00:39 2007 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.208.2.7.2.26 2007/07/31 00:31:10 stas Exp $ */ +/* $Id: php_imap.c,v 1.208.2.7.2.26.2.1 2007/09/27 18:00:39 dmitry Exp $ */ #define IMAP41 @@ -92,7 +92,7 @@ /* {{{ imap_functions[] */ -zend_function_entry imap_functions[] = { +const zend_function_entry imap_functions[] = { PHP_FE(imap_open, NULL) PHP_FE(imap_reopen, NULL) PHP_FE(imap_close, NULL) @@ -173,7 +173,7 @@ /* }}} */ /* {{{ imap dependencies */ -static zend_module_dep imap_deps[] = { +static const zend_module_dep imap_deps[] = { ZEND_MOD_REQUIRED("standard") {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/interbase.c?r1=1.225.2.4.2.7&r2=1.225.2.4.2.7.2.1&diff_format=u Index: php-src/ext/interbase/interbase.c diff -u php-src/ext/interbase/interbase.c:1.225.2.4.2.7 php-src/ext/interbase/interbase.c:1.225.2.4.2.7.2.1 --- php-src/ext/interbase/interbase.c:1.225.2.4.2.7 Wed Feb 28 10:37:07 2007 +++ php-src/ext/interbase/interbase.c Thu Sep 27 18:00:39 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interbase.c,v 1.225.2.4.2.7 2007/02/28 10:37:07 bjori Exp $ */ +/* $Id: interbase.c,v 1.225.2.4.2.7.2.1 2007/09/27 18:00:39 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -47,7 +47,7 @@ static PHP_GINIT_FUNCTION(ibase); /* {{{ extension definition structures */ -zend_function_entry ibase_functions[] = { +const zend_function_entry ibase_functions[] = { PHP_FE(ibase_connect, NULL) PHP_FE(ibase_pconnect, NULL) PHP_FE(ibase_close, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.9.2.19&r2=1.9.2.19.2.1&diff_format=u Index: php-src/ext/json/json.c diff -u php-src/ext/json/json.c:1.9.2.19 php-src/ext/json/json.c:1.9.2.19.2.1 --- php-src/ext/json/json.c:1.9.2.19 Tue Jul 24 22:57:13 2007 +++ php-src/ext/json/json.c Thu Sep 27 18:00:39 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: json.c,v 1.9.2.19 2007/07/24 22:57:13 bjori Exp $ */ +/* $Id: json.c,v 1.9.2.19.2.1 2007/09/27 18:00:39 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -41,7 +41,7 @@ * * Every user visible function must have an entry in json_functions[]. */ -static function_entry json_functions[] = { +static const function_entry json_functions[] = { PHP_FE(json_encode, NULL) PHP_FE(json_decode, NULL) {NULL, NULL, NULL} /* Must be the last line in json_functions[] */ http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.161.2.3.2.11&r2=1.161.2.3.2.11.2.1&diff_format=u Index: php-src/ext/ldap/ldap.c diff -u php-src/ext/ldap/ldap.c:1.161.2.3.2.11 php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.1 --- php-src/ext/ldap/ldap.c:1.161.2.3.2.11 Tue Jul 17 09:09:42 2007 +++ php-src/ext/ldap/ldap.c Thu Sep 27 18:00:39 2007 @@ -23,7 +23,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ldap.c,v 1.161.2.3.2.11 2007/07/17 09:09:42 jani Exp $ */ +/* $Id: ldap.c,v 1.161.2.3.2.11.2.1 2007/09/27 18:00:39 dmitry Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -100,7 +100,7 @@ */ /* {{{ ldap_functions[] */ -zend_function_entry ldap_functions[] = { +const zend_function_entry ldap_functions[] = { PHP_FE(ldap_connect, NULL) PHP_FALIAS(ldap_close, ldap_unbind, NULL) PHP_FE(ldap_bind, NULL) @@ -322,7 +322,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "LDAP Support", "enabled"); - php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.161.2.3.2.11 2007/07/17 09:09:42 jani Exp $"); + php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.161.2.3.2.11.2.1 2007/09/27 18:00:39 dmitry Exp $"); if (LDAPG(max_links) == -1) { snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links)); http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/libxml.c?r1=1.32.2.7.2.15&r2=1.32.2.7.2.15.2.1&diff_format=u Index: php-src/ext/libxml/libxml.c diff -u php-src/ext/libxml/libxml.c:1.32.2.7.2.15 php-src/ext/libxml/libxml.c:1.32.2.7.2.15.2.1 --- php-src/ext/libxml/libxml.c:1.32.2.7.2.15 Wed Aug 1 11:43:05 2007 +++ php-src/ext/libxml/libxml.c Thu Sep 27 18:00:39 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: libxml.c,v 1.32.2.7.2.15 2007/08/01 11:43:05 tony2001 Exp $ */ +/* $Id: libxml.c,v 1.32.2.7.2.15.2.1 2007/09/27 18:00:39 dmitry Exp $ */ #define IS_EXT_MODULE @@ -112,7 +112,7 @@ /* }}} */ /* {{{ extension definition structures */ -static zend_function_entry libxml_functions[] = { +static const zend_function_entry libxml_functions[] = { PHP_FE(libxml_set_streams_context, arginfo_libxml_set_streams_context) PHP_FE(libxml_use_internal_errors, arginfo_libxml_use_internal_errors) PHP_FE(libxml_get_last_error, arginfo_libxml_get_last_error) http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.25&r2=1.224.2.22.2.25.2.1&diff_format=u Index: php-src/ext/mbstring/mbstring.c diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25 php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.1 --- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25 Mon Sep 24 11:51:36 2007 +++ php-src/ext/mbstring/mbstring.c Thu Sep 27 18:00:40 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mbstring.c,v 1.224.2.22.2.25 2007/09/24 11:51:36 hirokawa Exp $ */ +/* $Id: mbstring.c,v 1.224.2.22.2.25.2.1 2007/09/27 18:00:40 dmitry Exp $ */ /* * PHP 4 Multibyte String module "mbstring" @@ -194,7 +194,7 @@ /* }}} */ /* {{{ zend_function_entry mbstring_functions[] */ -zend_function_entry mbstring_functions[] = { +const zend_function_entry mbstring_functions[] = { PHP_FE(mb_convert_case, NULL) PHP_FE(mb_strtoupper, NULL) PHP_FE(mb_strtolower, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/mcrypt.c?r1=1.91.2.3.2.11&r2=1.91.2.3.2.11.2.1&diff_format=u Index: php-src/ext/mcrypt/mcrypt.c diff -u php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.11 php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.11.2.1 --- php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.11 Thu Jul 19 14:32:55 2007 +++ php-src/ext/mcrypt/mcrypt.c Thu Sep 27 18:00:40 2007 @@ -16,7 +16,7 @@ | Derick Rethans <derick@derickrethans.nl> | +----------------------------------------------------------------------+ */ -/* $Id: mcrypt.c,v 1.91.2.3.2.11 2007/07/19 14:32:55 tony2001 Exp $ */ +/* $Id: mcrypt.c,v 1.91.2.3.2.11.2.1 2007/09/27 18:00:40 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -44,7 +44,7 @@ zend_bool init; } php_mcrypt; -zend_function_entry mcrypt_functions[] = { /* {{{ */ +const zend_function_entry mcrypt_functions[] = { /* {{{ */ PHP_FE(mcrypt_ecb, NULL) PHP_FE(mcrypt_cbc, NULL) PHP_FE(mcrypt_cfb, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/mhash/mhash.c?r1=1.48.2.3.2.5&r2=1.48.2.3.2.5.2.1&diff_format=u Index: php-src/ext/mhash/mhash.c diff -u php-src/ext/mhash/mhash.c:1.48.2.3.2.5 php-src/ext/mhash/mhash.c:1.48.2.3.2.5.2.1 --- php-src/ext/mhash/mhash.c:1.48.2.3.2.5 Tue Feb 27 03:28:16 2007 +++ php-src/ext/mhash/mhash.c Thu Sep 27 18:00:40 2007 @@ -16,7 +16,7 @@ | Nikos Mavroyanopoulos <nmav@hellug.gr> (HMAC, KEYGEN) | +----------------------------------------------------------------------+ */ -/* $Id: mhash.c,v 1.48.2.3.2.5 2007/02/27 03:28:16 iliaa Exp $ */ +/* $Id: mhash.c,v 1.48.2.3.2.5.2.1 2007/09/27 18:00:40 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -33,7 +33,7 @@ #include "php_globals.h" #include "ext/standard/info.h" -zend_function_entry mhash_functions[] = { +const zend_function_entry mhash_functions[] = { PHP_FE(mhash_get_block_size, NULL) PHP_FE(mhash_get_hash_name, NULL) PHP_FE(mhash_keygen_s2k, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/mime_magic/mime_magic.c?r1=1.42.2.5.2.7&r2=1.42.2.5.2.7.2.1&diff_format=u Index: php-src/ext/mime_magic/mime_magic.c diff -u php-src/ext/mime_magic/mime_magic.c:1.42.2.5.2.7 php-src/ext/mime_magic/mime_magic.c:1.42.2.5.2.7.2.1 --- php-src/ext/mime_magic/mime_magic.c:1.42.2.5.2.7 Thu Jun 7 08:44:41 2007 +++ php-src/ext/mime_magic/mime_magic.c Thu Sep 27 18:00:41 2007 @@ -15,7 +15,7 @@ | Author: Hartmut Holzgraefe <hholzgra@php.net> | +----------------------------------------------------------------------+ - $Id: mime_magic.c,v 1.42.2.5.2.7 2007/06/07 08:44:41 tony2001 Exp $ + $Id: mime_magic.c,v 1.42.2.5.2.7.2.1 2007/09/27 18:00:41 dmitry Exp $ This module contains a lot of stuff taken from Apache mod_mime_magic, so the license section is a little bit longer than usual: @@ -218,7 +218,7 @@ static magic_server_config_rec mime_global; /* {{{ mime_magic_functions[] */ -zend_function_entry mime_magic_functions[] = { +const zend_function_entry mime_magic_functions[] = { PHP_FE(mime_content_type, NULL) {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/ext/ming/ming.c?r1=1.79.2.4.2.8&r2=1.79.2.4.2.8.2.1&diff_format=u Index: php-src/ext/ming/ming.c diff -u php-src/ext/ming/ming.c:1.79.2.4.2.8 php-src/ext/ming/ming.c:1.79.2.4.2.8.2.1 --- php-src/ext/ming/ming.c:1.79.2.4.2.8 Sat Jan 6 19:25:31 2007 +++ php-src/ext/ming/ming.c Thu Sep 27 18:00:41 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ming.c,v 1.79.2.4.2.8 2007/01/06 19:25:31 nlopess Exp $ */ +/* $Id: ming.c,v 1.79.2.4.2.8.2.1 2007/09/27 18:00:41 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -45,7 +45,7 @@ void destroySWFBlock(SWFBlock block); #endif -static zend_function_entry ming_functions[] = { +static const zend_function_entry ming_functions[] = { PHP_FALIAS(ming_setcubicthreshold, ming_setCubicThreshold, NULL) PHP_FALIAS(ming_setscale, ming_setScale, NULL) PHP_FALIAS(ming_useswfversion, ming_useSWFVersion, NULL) @@ -355,7 +355,7 @@ } /* }}} */ -static zend_function_entry swfaction_functions[] = { +static const zend_function_entry swfaction_functions[] = { PHP_ME(swfaction, __construct, NULL, 0) { NULL, NULL, NULL } }; @@ -461,7 +461,7 @@ } /* }}} */ -static zend_function_entry swfbitmap_functions[] = { +static const zend_function_entry swfbitmap_functions[] = { PHP_ME(swfbitmap, __construct, NULL, 0) PHP_ME(swfbitmap, getWidth, NULL, 0) PHP_ME(swfbitmap, getHeight, NULL, 0) @@ -704,7 +704,7 @@ } /* }}} */ -static zend_function_entry swfbutton_functions[] = { +static const zend_function_entry swfbutton_functions[] = { PHP_ME(swfbutton, __construct, NULL, 0) PHP_ME(swfbutton, setHit, NULL, 0) PHP_ME(swfbutton, setOver, NULL, 0) @@ -1199,7 +1199,7 @@ /* }}} */ #endif -static zend_function_entry swfdisplayitem_functions[] = { +static const zend_function_entry swfdisplayitem_functions[] = { PHP_ME(swfdisplayitem, moveTo, NULL, 0) PHP_ME(swfdisplayitem, move, NULL, 0) PHP_ME(swfdisplayitem, scaleTo, NULL, 0) @@ -1347,7 +1347,7 @@ SWFFill_skewYTo(getFill(getThis() TSRMLS_CC), FLOAT_Z_DVAL_PP(y)); } /* }}} */ -static zend_function_entry swffill_functions[] = { +static const zend_function_entry swffill_functions[] = { PHP_ME(swffill, __construct, NULL, 0) PHP_ME(swffill, moveTo, NULL, 0) PHP_ME(swffill, scaleTo, NULL, 0) @@ -1412,7 +1412,7 @@ } /* }}} */ -static zend_function_entry swffontchar_functions[] = { +static const zend_function_entry swffontchar_functions[] = { PHP_ME(swffontchar, addChars, NULL, 0) PHP_ME(swffontchar, addUTF8Chars, NULL, 0) { NULL, NULL, NULL } @@ -1614,7 +1614,7 @@ #endif -static zend_function_entry swffont_functions[] = { +static const zend_function_entry swffont_functions[] = { PHP_ME(swffont, __construct, NULL, 0) PHP_ME(swffont, getWidth, NULL, 0) #ifdef HAVE_NEW_MING @@ -1700,7 +1700,7 @@ } /* }}} */ -static zend_function_entry swfgradient_functions[] = { +static const zend_function_entry swfgradient_functions[] = { PHP_ME(swfgradient, __construct, NULL, 0) PHP_ME(swfgradient, addEntry, NULL, 0) { NULL, NULL, NULL } @@ -1769,7 +1769,7 @@ } /* }}} */ -static zend_function_entry swfmorph_functions[] = { +static const zend_function_entry swfmorph_functions[] = { PHP_ME(swfmorph, __construct, NULL, 0) PHP_ME(swfmorph, getShape1, NULL, 0) PHP_ME(swfmorph, getShape2, NULL, 0) @@ -1849,7 +1849,7 @@ /* }}} */ -static zend_function_entry swfsound_functions[] = { +static const zend_function_entry swfsound_functions[] = { PHP_ME(swfsound, __construct, NULL, 0) { NULL, NULL, NULL } }; @@ -1934,7 +1934,7 @@ } /* }}} */ -static zend_function_entry swfsoundinstance_functions[] = { +static const zend_function_entry swfsoundinstance_functions[] = { PHP_ME(swfsoundinstance, noMultiple, NULL, 0) PHP_ME(swfsoundinstance, loopInPoint, NULL, 0) PHP_ME(swfsoundinstance, loopOutPoint, NULL, 0) @@ -2039,7 +2039,7 @@ /* }}} */ -static zend_function_entry swfvideostream_functions[] = { +static const zend_function_entry swfvideostream_functions[] = { PHP_ME(swfvideostream, __construct, NULL, 0) PHP_ME(swfvideostream, setdimension, NULL, 0) PHP_ME(swfvideostream, getnumframes, NULL, 0) @@ -2117,7 +2117,7 @@ } /* }}} */ -static zend_function_entry swfprebuiltclip_functions[] = { +static const zend_function_entry swfprebuiltclip_functions[] = { PHP_ME(swfprebuiltclip, __construct, NULL, 0) { NULL, NULL, NULL } }; @@ -2769,7 +2769,7 @@ /* }}} */ #endif -static zend_function_entry swfmovie_functions[] = { +static const zend_function_entry swfmovie_functions[] = { PHP_ME(swfmovie, __construct, NULL, 0) PHP_ME(swfmovie, nextFrame, NULL, 0) PHP_ME(swfmovie, labelFrame, NULL, 0) @@ -3300,7 +3300,7 @@ } /* }}} */ -static zend_function_entry swfshape_functions[] = { +static const zend_function_entry swfshape_functions[] = { PHP_ME(swfshape, __construct, NULL, 0) PHP_ME(swfshape, setLine, NULL, 0) PHP_ME(swfshape, addFill, NULL, 0) @@ -3491,7 +3491,7 @@ /* }}} */ #endif -static zend_function_entry swfsprite_functions[] = { +static const zend_function_entry swfsprite_functions[] = { PHP_ME(swfsprite, __construct, NULL, 0) PHP_ME(swfsprite, add, NULL, 0) PHP_ME(swfsprite, remove, NULL, 0) @@ -3777,7 +3777,7 @@ } /* }}} */ -static zend_function_entry swftext_functions[] = { +static const zend_function_entry swftext_functions[] = { PHP_ME(swftext, __construct, NULL, 0) PHP_ME(swftext, setFont, NULL, 0) PHP_ME(swftext, setHeight, NULL, 0) @@ -4088,7 +4088,7 @@ /* }}} */ #endif -static zend_function_entry swftextfield_functions[] = { +static const zend_function_entry swftextfield_functions[] = { PHP_ME(swftextfield, __construct, NULL, 0) PHP_ME(swftextfield, setFont, NULL, 0) PHP_ME(swftextfield, setBounds, NULL, 0) http://cvs.php.net/viewvc.cgi/php-src/ext/msql/php_msql.c?r1=1.60.2.4.2.2&r2=1.60.2.4.2.2.2.1&diff_format=u Index: php-src/ext/msql/php_msql.c diff -u php-src/ext/msql/php_msql.c:1.60.2.4.2.2 php-src/ext/msql/php_msql.c:1.60.2.4.2.2.2.1 --- php-src/ext/msql/php_msql.c:1.60.2.4.2.2 Sat Feb 24 02:17:25 2007 +++ php-src/ext/msql/php_msql.c Thu Sep 27 18:00:41 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_msql.c,v 1.60.2.4.2.2 2007/02/24 02:17:25 helly Exp $ */ +/* $Id: php_msql.c,v 1.60.2.4.2.2.2.1 2007/09/27 18:00:41 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -46,7 +46,7 @@ /* {{{ msql_functions[] */ -zend_function_entry msql_functions[] = { +const zend_function_entry msql_functions[] = { PHP_FE(msql_connect, NULL) PHP_FE(msql_pconnect, NULL) PHP_FE(msql_close, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/mssql/php_mssql.c?r1=1.152.2.13.2.4&r2=1.152.2.13.2.4.2.1&diff_format=u Index: php-src/ext/mssql/php_mssql.c diff -u php-src/ext/mssql/php_mssql.c:1.152.2.13.2.4 php-src/ext/mssql/php_mssql.c:1.152.2.13.2.4.2.1 --- php-src/ext/mssql/php_mssql.c:1.152.2.13.2.4 Sat Feb 24 02:17:25 2007 +++ php-src/ext/mssql/php_mssql.c Thu Sep 27 18:00:41 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.152.2.13.2.4 2007/02/24 02:17:25 helly Exp $ */ +/* $Id: php_mssql.c,v 1.152.2.13.2.4.2.1 2007/09/27 18:00:41 dmitry Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -47,7 +47,7 @@ static void _mssql_bind_hash_dtor(void *data); -zend_function_entry mssql_functions[] = { +const zend_function_entry mssql_functions[] = { PHP_FE(mssql_connect, NULL) PHP_FE(mssql_pconnect, NULL) PHP_FE(mssql_close, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16&r2=1.213.2.6.2.16.2.1&diff_format=u Index: php-src/ext/mysql/php_mysql.c diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16 php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.1 --- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16 Sun Sep 9 16:08:17 2007 +++ php-src/ext/mysql/php_mysql.c Thu Sep 27 18:00:41 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.213.2.6.2.16 2007/09/09 16:08:17 scottmac Exp $ */ +/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.1 2007/09/27 18:00:41 dmitry Exp $ */ /* TODO: * @@ -130,7 +130,7 @@ /* {{{ mysql_functions[] */ -zend_function_entry mysql_functions[] = { +const zend_function_entry mysql_functions[] = { PHP_FE(mysql_connect, NULL) PHP_FE(mysql_pconnect, NULL) PHP_FE(mysql_close, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17&r2=1.72.2.16.2.17.2.1&diff_format=u Index: php-src/ext/mysqli/mysqli.c diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17 php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.1 --- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17 Wed Sep 12 09:12:56 2007 +++ php-src/ext/mysqli/mysqli.c Thu Sep 27 18:00:41 2007 @@ -15,7 +15,7 @@ | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli.c,v 1.72.2.16.2.17 2007/09/12 09:12:56 andrey Exp $ + $Id: mysqli.c,v 1.72.2.16.2.17.2.1 2007/09/27 18:00:41 dmitry Exp $ */ #ifdef HAVE_CONFIG_H @@ -416,7 +416,7 @@ /* {{{ mysqli_module_entry */ /* Dependancies */ -static zend_module_dep mysqli_deps[] = { +static const zend_module_dep mysqli_deps[] = { #if defined(HAVE_SPL) && ((PHP_MAJOR_VERSION > 5) || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 1)) ZEND_MOD_REQUIRED("spl") #endif http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_driver.c?r1=1.4.2.3.2.2&r2=1.4.2.3.2.2.2.1&diff_format=u Index: php-src/ext/mysqli/mysqli_driver.c diff -u php-src/ext/mysqli/mysqli_driver.c:1.4.2.3.2.2 php-src/ext/mysqli/mysqli_driver.c:1.4.2.3.2.2.2.1 --- php-src/ext/mysqli/mysqli_driver.c:1.4.2.3.2.2 Mon Jan 1 09:36:03 2007 +++ php-src/ext/mysqli/mysqli_driver.c Thu Sep 27 18:00:41 2007 @@ -144,7 +144,7 @@ /* {{{ mysqli_driver_methods[] */ -zend_function_entry mysqli_driver_methods[] = { +const zend_function_entry mysqli_driver_methods[] = { PHP_FALIAS(embedded_server_start, mysqli_embedded_server_start, NULL) PHP_FALIAS(embedded_server_end, mysqli_embedded_server_end, NULL) {NULL, NULL, NULL} http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_exception.c?r1=1.6.2.2.2.1&r2=1.6.2.2.2.1.2.1&diff_format=u Index: php-src/ext/mysqli/mysqli_exception.c diff -u php-src/ext/mysqli/mysqli_exception.c:1.6.2.2.2.1 php-src/ext/mysqli/mysqli_exception.c:1.6.2.2.2.1.2.1 --- php-src/ext/mysqli/mysqli_exception.c:1.6.2.2.2.1 Mon Jan 1 09:36:03 2007 +++ php-src/ext/mysqli/mysqli_exception.c Thu Sep 27 18:00:41 2007 @@ -30,7 +30,7 @@ /* {{{ mysqli_exception_methods[] */ -zend_function_entry mysqli_exception_methods[] = { +const zend_function_entry mysqli_exception_methods[] = { {NULL, NULL, NULL} }; /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_fe.c?r1=1.49.2.5.2.1&r2=1.49.2.5.2.1.2.1&diff_format=u Index: php-src/ext/mysqli/mysqli_fe.c diff -u php-src/ext/mysqli/mysqli_fe.c:1.49.2.5.2.1 php-src/ext/mysqli/mysqli_fe.c:1.49.2.5.2.1.2.1 --- php-src/ext/mysqli/mysqli_fe.c:1.49.2.5.2.1 Mon Jan 1 09:36:03 2007 +++ php-src/ext/mysqli/mysqli_fe.c Thu Sep 27 18:00:41 2007 @@ -15,7 +15,7 @@ | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli_fe.c,v 1.49.2.5.2.1 2007/01/01 09:36:03 sebastian Exp $ + $Id: mysqli_fe.c,v 1.49.2.5.2.1.2.1 2007/09/27 18:00:41 dmitry Exp $ */ #ifdef HAVE_CONFIG_H @@ -50,7 +50,7 @@ * * Every user visible function must have an entry in mysqli_functions[]. */ -zend_function_entry mysqli_functions[] = { +const zend_function_entry mysqli_functions[] = { PHP_FE(mysqli_affected_rows, NULL) PHP_FE(mysqli_autocommit, NULL) PHP_FE(mysqli_change_user, NULL) @@ -176,7 +176,7 @@ * * Every user visible function must have an entry in mysqli_functions[]. */ -zend_function_entry mysqli_link_methods[] = { +const zend_function_entry mysqli_link_methods[] = { PHP_FALIAS(autocommit,mysqli_autocommit,NULL) PHP_FALIAS(change_user,mysqli_change_user,NULL) PHP_FALIAS(character_set_name, mysqli_character_set_name,NULL) @@ -237,7 +237,7 @@ * * Every user visible function must have an entry in mysqli_result_functions[]. */ -zend_function_entry mysqli_result_methods[] = { +const zend_function_entry mysqli_result_methods[] = { PHP_FALIAS(mysqli_result, mysqli_result_construct, NULL) PHP_FALIAS(close,mysqli_free_result,NULL) PHP_FALIAS(free,mysqli_free_result,NULL) @@ -260,7 +260,7 @@ * * Every user visible function must have an entry in mysqli_stmt_functions[]. */ -zend_function_entry mysqli_stmt_methods[] = { +const zend_function_entry mysqli_stmt_methods[] = { PHP_FALIAS(mysqli_stmt, mysqli_stmt_construct, NULL) PHP_FALIAS(attr_get,mysqli_stmt_attr_get,NULL) PHP_FALIAS(attr_set,mysqli_stmt_attr_set,NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_warning.c?r1=1.5.2.6.2.1&r2=1.5.2.6.2.1.2.1&diff_format=u Index: php-src/ext/mysqli/mysqli_warning.c diff -u php-src/ext/mysqli/mysqli_warning.c:1.5.2.6.2.1 php-src/ext/mysqli/mysqli_warning.c:1.5.2.6.2.1.2.1 --- php-src/ext/mysqli/mysqli_warning.c:1.5.2.6.2.1 Mon Jan 1 09:36:03 2007 +++ php-src/ext/mysqli/mysqli_warning.c Thu Sep 27 18:00:41 2007 @@ -211,7 +211,7 @@ } /* }}} */ -zend_function_entry mysqli_warning_methods[] = { +const zend_function_entry mysqli_warning_methods[] = { PHP_ME(mysqli_warning, __construct, NULL, ZEND_ACC_PROTECTED) PHP_ME(mysqli_warning, next, NULL, ZEND_ACC_PUBLIC) {NULL, NULL, NULL} http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/php_mysqli.h?r1=1.54.2.7.2.6&r2=1.54.2.7.2.6.2.1&diff_format=u Index: php-src/ext/mysqli/php_mysqli.h diff -u php-src/ext/mysqli/php_mysqli.h:1.54.2.7.2.6 php-src/ext/mysqli/php_mysqli.h:1.54.2.7.2.6.2.1 --- php-src/ext/mysqli/php_mysqli.h:1.54.2.7.2.6 Wed Sep 12 09:12:56 2007 +++ php-src/ext/mysqli/php_mysqli.h Thu Sep 27 18:00:41 2007 @@ -15,7 +15,7 @@ | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+ - $Id: php_mysqli.h,v 1.54.2.7.2.6 2007/09/12 09:12:56 andrey Exp $ + $Id: php_mysqli.h,v 1.54.2.7.2.6.2.1 2007/09/27 18:00:41 dmitry Exp $ */ /* A little hack to prevent build break, when mysql is used together with @@ -133,13 +133,13 @@ #define PHP_MYSQLI_EXPORT(__type) PHP_MYSQLI_API __type extern zend_module_entry mysqli_module_entry; -extern zend_function_entry mysqli_functions[]; -extern zend_function_entry mysqli_link_methods[]; -extern zend_function_entry mysqli_stmt_methods[]; -extern zend_function_entry mysqli_result_methods[]; -extern zend_function_entry mysqli_driver_methods[]; -extern zend_function_entry mysqli_warning_methods[]; -extern zend_function_entry mysqli_exception_methods[]; +extern const zend_function_entry mysqli_functions[]; +extern const zend_function_entry mysqli_link_methods[]; +extern const zend_function_entry mysqli_stmt_methods[]; +extern const zend_function_entry mysqli_result_methods[]; +extern const zend_function_entry mysqli_driver_methods[]; +extern const zend_function_entry mysqli_warning_methods[]; +extern const zend_function_entry mysqli_exception_methods[]; extern mysqli_property_entry mysqli_link_property_entries[]; extern mysqli_property_entry mysqli_result_property_entries[]; http://cvs.php.net/viewvc.cgi/php-src/ext/ncurses/ncurses_fe.c?r1=1.26.2.2.2.1&r2=1.26.2.2.2.1.2.1&diff_format=u Index: php-src/ext/ncurses/ncurses_fe.c diff -u php-src/ext/ncurses/ncurses_fe.c:1.26.2.2.2.1 php-src/ext/ncurses/ncurses_fe.c:1.26.2.2.2.1.2.1 --- php-src/ext/ncurses/ncurses_fe.c:1.26.2.2.2.1 Mon Jan 1 09:36:03 2007 +++ php-src/ext/ncurses/ncurses_fe.c Thu Sep 27 18:00:41 2007 @@ -50,7 +50,7 @@ * * Every user visible function must have an entry in ncurses_functions[]. */ -zend_function_entry ncurses_functions[] = { +const zend_function_entry ncurses_functions[] = { PHP_FE(ncurses_addch, NULL) #ifdef HAVE_NCURSES_COLOR_SET PHP_FE(ncurses_color_set, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/ncurses/php_ncurses.h?r1=1.18.2.2.2.1&r2=1.18.2.2.2.1.2.1&diff_format=u Index: php-src/ext/ncurses/php_ncurses.h diff -u php-src/ext/ncurses/php_ncurses.h:1.18.2.2.2.1 php-src/ext/ncurses/php_ncurses.h:1.18.2.2.2.1.2.1 --- php-src/ext/ncurses/php_ncurses.h:1.18.2.2.2.1 Mon Jan 1 09:36:03 2007 +++ php-src/ext/ncurses/php_ncurses.h Thu Sep 27 18:00:41 2007 @@ -36,7 +36,7 @@ extern zend_module_entry ncurses_module_entry; #define phpext_ncurses_ptr &ncurses_module_entry -extern zend_function_entry ncurses_functions[]; +extern const zend_function_entry ncurses_functions[]; #include "php_ncurses_fe.h" #ifdef PHP_WIN32 http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.16.2.38&r2=1.269.2.16.2.38.2.1&diff_format=u Index: php-src/ext/oci8/oci8.c diff -u php-src/ext/oci8/oci8.c:1.269.2.16.2.38 php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.1 --- php-src/ext/oci8/oci8.c:1.269.2.16.2.38 Fri Aug 31 22:30:27 2007 +++ php-src/ext/oci8/oci8.c Thu Sep 27 18:00:41 2007 @@ -26,7 +26,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.269.2.16.2.38 2007/08/31 22:30:27 tony2001 Exp $ */ +/* $Id: oci8.c,v 1.269.2.16.2.38.2.1 2007/09/27 18:00:41 dmitry Exp $ */ /* TODO * * file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty() with OCI_ATTR_LOBEMPTY @@ -203,7 +203,7 @@ /* {{{ extension definition structures */ -static zend_function_entry php_oci_functions[] = { +static const zend_function_entry php_oci_functions[] = { PHP_FE(oci_define_by_name, oci_third_arg_force_ref) PHP_FE(oci_bind_by_name, oci_third_arg_force_ref) PHP_FE(oci_bind_array_by_name, oci_third_arg_force_ref) @@ -326,7 +326,7 @@ {NULL,NULL,NULL} }; -static zend_function_entry php_oci_lob_class_functions[] = { +static const zend_function_entry php_oci_lob_class_functions[] = { PHP_FALIAS(load, oci_lob_load, NULL) PHP_FALIAS(tell, oci_lob_tell, NULL) PHP_FALIAS(truncate, oci_lob_truncate, NULL) @@ -355,7 +355,7 @@ }; #ifdef PHP_OCI8_HAVE_COLLECTIONS -static zend_function_entry php_oci_coll_class_functions[] = { +static const zend_function_entry php_oci_coll_class_functions[] = { PHP_FALIAS(append, oci_collection_append, NULL) PHP_FALIAS(getelem, oci_collection_element_get, NULL) PHP_FALIAS(assignelem, oci_collection_element_assign, NULL) @@ -674,7 +674,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); php_info_print_table_row(2, "Version", "1.2.4"); - php_info_print_table_row(2, "Revision", "$Revision: 1.269.2.16.2.38 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.269.2.16.2.38.2.1 $"); snprintf(buf, sizeof(buf), "%ld", OCI_G(num_persistent)); php_info_print_table_row(2, "Active Persistent Connections", buf); http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/birdstep.c?r1=1.13.2.2.2.2&r2=1.13.2.2.2.2.2.1&diff_format=u Index: php-src/ext/odbc/birdstep.c diff -u php-src/ext/odbc/birdstep.c:1.13.2.2.2.2 php-src/ext/odbc/birdstep.c:1.13.2.2.2.2.2.1 --- php-src/ext/odbc/birdstep.c:1.13.2.2.2.2 Fri Aug 31 07:42:00 2007 +++ php-src/ext/odbc/birdstep.c Thu Sep 27 18:00:41 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: birdstep.c,v 1.13.2.2.2.2 2007/08/31 07:42:00 jani Exp $ */ +/* $Id: birdstep.c,v 1.13.2.2.2.2.2.1 2007/09/27 18:00:41 dmitry Exp $ */ /* * TODO: @@ -49,7 +49,7 @@ #include "ext/standard/info.h" #include "php_ini.h" -zend_function_entry birdstep_functions[] = { +const zend_function_entry birdstep_functions[] = { PHP_FE(birdstep_connect, NULL) PHP_FE(birdstep_close, NULL) PHP_FE(birdstep_exec, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.189.2.4.2.7&r2=1.189.2.4.2.7.2.1&diff_format=u Index: php-src/ext/odbc/php_odbc.c diff -u php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7 php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.1 --- php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7 Tue Mar 13 00:04:38 2007 +++ php-src/ext/odbc/php_odbc.c Thu Sep 27 18:00:41 2007 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.189.2.4.2.7 2007/03/13 00:04:38 stas Exp $ */ +/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.1 2007/09/27 18:00:41 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -68,7 +68,7 @@ /* {{{ odbc_functions[] */ -zend_function_entry odbc_functions[] = { +const zend_function_entry odbc_functions[] = { PHP_FE(odbc_autocommit, NULL) PHP_FE(odbc_binmode, NULL) PHP_FE(odbc_close, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.41.2.1&r2=1.98.2.5.2.41.2.2&diff_format=u Index: php-src/ext/openssl/openssl.c diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.1 php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.2 --- php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.1 Thu Sep 27 08:46:00 2007 +++ php-src/ext/openssl/openssl.c Thu Sep 27 18:00:42 2007 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: openssl.c,v 1.98.2.5.2.41.2.1 2007/09/27 08:46:00 dmitry Exp $ */ +/* $Id: openssl.c,v 1.98.2.5.2.41.2.2 2007/09/27 18:00:42 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -101,7 +101,7 @@ /* {{{ openssl_functions[] */ -zend_function_entry openssl_functions[] = { +const zend_function_entry openssl_functions[] = { /* public/private key functions */ PHP_FE(openssl_pkey_free, NULL) PHP_FE(openssl_pkey_new, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/pcntl.c?r1=1.48.2.2.2.4&r2=1.48.2.2.2.4.2.1&diff_format=u Index: php-src/ext/pcntl/pcntl.c diff -u php-src/ext/pcntl/pcntl.c:1.48.2.2.2.4 php-src/ext/pcntl/pcntl.c:1.48.2.2.2.4.2.1 --- php-src/ext/pcntl/pcntl.c:1.48.2.2.2.4 Mon Jan 1 09:36:04 2007 +++ php-src/ext/pcntl/pcntl.c Thu Sep 27 18:00:42 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pcntl.c,v 1.48.2.2.2.4 2007/01/01 09:36:04 sebastian Exp $ */ +/* $Id: pcntl.c,v 1.48.2.2.2.4.2.1 2007/09/27 18:00:42 dmitry Exp $ */ #define PCNTL_DEBUG 0 @@ -44,7 +44,7 @@ ZEND_DECLARE_MODULE_GLOBALS(pcntl) static PHP_GINIT_FUNCTION(pcntl); -zend_function_entry pcntl_functions[] = { +const zend_function_entry pcntl_functions[] = { PHP_FE(pcntl_fork, NULL) PHP_FE(pcntl_waitpid, second_arg_force_ref) PHP_FE(pcntl_wait, first_arg_force_ref) http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.21&r2=1.168.2.9.2.21.2.1&diff_format=u Index: php-src/ext/pcre/php_pcre.c diff -u php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21 php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.1 --- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21 Thu Sep 20 08:10:44 2007 +++ php-src/ext/pcre/php_pcre.c Thu Sep 27 18:00:42 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.168.2.9.2.21 2007/09/20 08:10:44 tony2001 Exp $ */ +/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.1 2007/09/27 18:00:42 dmitry Exp $ */ #include "php.h" #include "php_ini.h" @@ -1762,7 +1762,7 @@ /* {{{ module definition structures */ -zend_function_entry pcre_functions[] = { +const zend_function_entry pcre_functions[] = { PHP_FE(preg_match, third_arg_force_ref) PHP_FE(preg_match_all, third_arg_force_ref) PHP_FE(preg_replace, fifth_arg_force_ref) http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo.c?r1=1.57.2.17.2.9&r2=1.57.2.17.2.9.2.1&diff_format=u Index: php-src/ext/pdo/pdo.c diff -u php-src/ext/pdo/pdo.c:1.57.2.17.2.9 php-src/ext/pdo/pdo.c:1.57.2.17.2.9.2.1 --- php-src/ext/pdo/pdo.c:1.57.2.17.2.9 Mon Jul 23 11:53:58 2007 +++ php-src/ext/pdo/pdo.c Thu Sep 27 18:00:42 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo.c,v 1.57.2.17.2.9 2007/07/23 11:53:58 jani Exp $ */ +/* $Id: pdo.c,v 1.57.2.17.2.9.2.1 2007/09/27 18:00:42 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -114,7 +114,7 @@ /* }}} */ /* {{{ pdo_functions[] */ -zend_function_entry pdo_functions[] = { +const zend_function_entry pdo_functions[] = { PHP_FE(pdo_drivers, NULL) {NULL, NULL, NULL} }; @@ -122,7 +122,7 @@ /* {{{ pdo_functions[] */ #if ZEND_MODULE_API_NO >= 20050922 -static zend_module_dep pdo_deps[] = { +static const zend_module_dep pdo_deps[] = { #ifdef HAVE_SPL ZEND_MOD_REQUIRED("spl") #endif http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.31.2.17&r2=1.82.2.31.2.17.2.1&diff_format=u Index: php-src/ext/pdo/pdo_dbh.c diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17 php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.1 --- php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17 Wed Sep 12 18:26:49 2007 +++ php-src/ext/pdo/pdo_dbh.c Thu Sep 27 18:00:42 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_dbh.c,v 1.82.2.31.2.17 2007/09/12 18:26:49 iliaa Exp $ */ +/* $Id: pdo_dbh.c,v 1.82.2.31.2.17.2.1 2007/09/27 18:00:42 dmitry Exp $ */ /* The PDO Database Handle Class */ @@ -1160,7 +1160,7 @@ ZEND_END_ARG_INFO() /* }}} */ -zend_function_entry pdo_dbh_functions[] = { +const zend_function_entry pdo_dbh_functions[] = { ZEND_MALIAS(PDO, __construct, dbh_constructor, arginfo_pdo___construct, ZEND_ACC_PUBLIC) PHP_ME(PDO, prepare, arginfo_pdo_prepare, ZEND_ACC_PUBLIC) PHP_ME(PDO, beginTransaction, NULL, ZEND_ACC_PUBLIC) @@ -1183,7 +1183,7 @@ /* {{{ overloaded object handlers for PDO class */ int pdo_hash_methods(pdo_dbh_t *dbh, int kind TSRMLS_DC) { - zend_function_entry *funcs; + const zend_function_entry *funcs; zend_function func; zend_internal_function *ifunc = (zend_internal_function*)&func; int namelen; @@ -1206,11 +1206,11 @@ while (funcs->fname) { ifunc->type = ZEND_INTERNAL_FUNCTION; ifunc->handler = funcs->handler; - ifunc->function_name = funcs->fname; + ifunc->function_name = (char*)funcs->fname; ifunc->scope = dbh->ce; ifunc->prototype = NULL; if (funcs->arg_info) { - ifunc->arg_info = funcs->arg_info + 1; + ifunc->arg_info = (zend_arg_info*)funcs->arg_info + 1; ifunc->num_args = funcs->num_args; if (funcs->arg_info[0].required_num_args == -1) { ifunc->required_num_args = funcs->num_args; http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.24&r2=1.118.2.38.2.24.2.1&diff_format=u Index: php-src/ext/pdo/pdo_stmt.c diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24 php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.1 --- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24 Wed Sep 12 21:21:18 2007 +++ php-src/ext/pdo/pdo_stmt.c Thu Sep 27 18:00:42 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_stmt.c,v 1.118.2.38.2.24 2007/09/12 21:21:18 stas Exp $ */ +/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.1 2007/09/27 18:00:42 dmitry Exp $ */ /* The PDO Statement Handle Class */ @@ -2147,7 +2147,7 @@ } /* }}} */ -zend_function_entry pdo_dbstmt_functions[] = { +const zend_function_entry pdo_dbstmt_functions[] = { PHP_ME(PDOStatement, execute, arginfo_pdostatement_execute, ZEND_ACC_PUBLIC) PHP_ME(PDOStatement, fetch, arginfo_pdostatement_fetch, ZEND_ACC_PUBLIC) PHP_ME(PDOStatement, bindParam, arginfo_pdostatement_bindparam, ZEND_ACC_PUBLIC) @@ -2520,7 +2520,7 @@ /* {{{ overloaded handlers for PDORow class (used by PDO_FETCH_LAZY) */ -zend_function_entry pdo_row_functions[] = { +const zend_function_entry pdo_row_functions[] = { {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/php_pdo_driver.h?r1=1.66.2.11.2.6&r2=1.66.2.11.2.6.2.1&diff_format=u Index: php-src/ext/pdo/php_pdo_driver.h diff -u php-src/ext/pdo/php_pdo_driver.h:1.66.2.11.2.6 php-src/ext/pdo/php_pdo_driver.h:1.66.2.11.2.6.2.1 --- php-src/ext/pdo/php_pdo_driver.h:1.66.2.11.2.6 Mon Jul 23 11:53:58 2007 +++ php-src/ext/pdo/php_pdo_driver.h Thu Sep 27 18:00:42 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pdo_driver.h,v 1.66.2.11.2.6 2007/07/23 11:53:58 jani Exp $ */ +/* $Id: php_pdo_driver.h,v 1.66.2.11.2.6.2.1 2007/09/27 18:00:42 dmitry Exp $ */ #ifndef PHP_PDO_DRIVER_H #define PHP_PDO_DRIVER_H @@ -288,7 +288,7 @@ PDO_DBH_DRIVER_METHOD_KIND__MAX }; -typedef zend_function_entry *(*pdo_dbh_get_driver_methods_func)(pdo_dbh_t *dbh, int kind TSRMLS_DC); +typedef const zend_function_entry *(*pdo_dbh_get_driver_methods_func)(pdo_dbh_t *dbh, int kind TSRMLS_DC); struct pdo_dbh_methods { pdo_dbh_close_func closer; http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/php_pdo_int.h?r1=1.17.2.6.2.2&r2=1.17.2.6.2.2.2.1&diff_format=u Index: php-src/ext/pdo/php_pdo_int.h diff -u php-src/ext/pdo/php_pdo_int.h:1.17.2.6.2.2 php-src/ext/pdo/php_pdo_int.h:1.17.2.6.2.2.2.1 --- php-src/ext/pdo/php_pdo_int.h:1.17.2.6.2.2 Mon Jan 1 09:36:04 2007 +++ php-src/ext/pdo/php_pdo_int.h Thu Sep 27 18:00:42 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pdo_int.h,v 1.17.2.6.2.2 2007/01/01 09:36:04 sebastian Exp $ */ +/* $Id: php_pdo_int.h,v 1.17.2.6.2.2.2.1 2007/09/27 18:00:42 dmitry Exp $ */ /* Stuff private to the PDO extension and not for consumption by PDO drivers * */ @@ -32,12 +32,12 @@ void pdo_stmt_init(TSRMLS_D); extern zend_object_value pdo_dbh_new(zend_class_entry *ce TSRMLS_DC); -extern zend_function_entry pdo_dbh_functions[]; +extern const zend_function_entry pdo_dbh_functions[]; extern zend_class_entry *pdo_dbh_ce; extern ZEND_RSRC_DTOR_FUNC(php_pdo_pdbh_dtor); extern zend_object_value pdo_dbstmt_new(zend_class_entry *ce TSRMLS_DC); -extern zend_function_entry pdo_dbstmt_functions[]; +extern const zend_function_entry pdo_dbstmt_functions[]; extern zend_class_entry *pdo_dbstmt_ce; void pdo_dbstmt_free_storage(pdo_stmt_t *stmt TSRMLS_DC); zend_object_iterator *pdo_stmt_iter_get(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC); @@ -46,7 +46,7 @@ int pdo_stmt_setup_fetch_mode(INTERNAL_FUNCTION_PARAMETERS, pdo_stmt_t *stmt, int skip_first_arg); extern zend_object_value pdo_row_new(zend_class_entry *ce TSRMLS_DC); -extern zend_function_entry pdo_row_functions[]; +extern const zend_function_entry pdo_row_functions[]; extern zend_class_entry *pdo_row_ce; void pdo_row_free_storage(pdo_stmt_t *stmt TSRMLS_DC); extern zend_object_handlers pdo_row_object_handlers; http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_dblib/pdo_dblib.c?r1=1.9.2.6.2.3&r2=1.9.2.6.2.3.2.1&diff_format=u Index: php-src/ext/pdo_dblib/pdo_dblib.c diff -u php-src/ext/pdo_dblib/pdo_dblib.c:1.9.2.6.2.3 php-src/ext/pdo_dblib/pdo_dblib.c:1.9.2.6.2.3.2.1 --- php-src/ext/pdo_dblib/pdo_dblib.c:1.9.2.6.2.3 Mon Jan 1 09:36:04 2007 +++ php-src/ext/pdo_dblib/pdo_dblib.c Thu Sep 27 18:00:42 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_dblib.c,v 1.9.2.6.2.3 2007/01/01 09:36:04 sebastian Exp $ */ +/* $Id: pdo_dblib.c,v 1.9.2.6.2.3.2.1 2007/09/27 18:00:42 dmitry Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -35,12 +35,12 @@ ZEND_DECLARE_MODULE_GLOBALS(dblib) static PHP_GINIT_FUNCTION(dblib); -zend_function_entry pdo_dblib_functions[] = { +const zend_function_entry pdo_dblib_functions[] = { {NULL, NULL, NULL} }; #if ZEND_MODULE_API_NO >= 20050922 -static zend_module_dep pdo_dblib_deps[] = { +static const zend_module_dep pdo_dblib_deps[] = { ZEND_MOD_REQUIRED("pdo") {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_firebird/pdo_firebird.c?r1=1.4.2.3.2.1&r2=1.4.2.3.2.1.2.1&diff_format=u Index: php-src/ext/pdo_firebird/pdo_firebird.c diff -u php-src/ext/pdo_firebird/pdo_firebird.c:1.4.2.3.2.1 php-src/ext/pdo_firebird/pdo_firebird.c:1.4.2.3.2.1.2.1 --- php-src/ext/pdo_firebird/pdo_firebird.c:1.4.2.3.2.1 Mon Jan 1 09:36:04 2007 +++ php-src/ext/pdo_firebird/pdo_firebird.c Thu Sep 27 18:00:42 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_firebird.c,v 1.4.2.3.2.1 2007/01/01 09:36:04 sebastian Exp $ */ +/* $Id: pdo_firebird.c,v 1.4.2.3.2.1.2.1 2007/09/27 18:00:42 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -30,7 +30,7 @@ #include "php_pdo_firebird.h" #include "php_pdo_firebird_int.h" -zend_function_entry pdo_firebird_functions[] = { /* {{{ */ +const zend_function_entry pdo_firebird_functions[] = { /* {{{ */ {NULL, NULL, NULL} }; /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/pdo_mysql.c?r1=1.8.2.13.2.1&r2=1.8.2.13.2.1.2.1&diff_format=u Index: php-src/ext/pdo_mysql/pdo_mysql.c diff -u php-src/ext/pdo_mysql/pdo_mysql.c:1.8.2.13.2.1 php-src/ext/pdo_mysql/pdo_mysql.c:1.8.2.13.2.1.2.1 --- php-src/ext/pdo_mysql/pdo_mysql.c:1.8.2.13.2.1 Mon Jan 1 09:36:05 2007 +++ php-src/ext/pdo_mysql/pdo_mysql.c Thu Sep 27 18:00:42 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_mysql.c,v 1.8.2.13.2.1 2007/01/01 09:36:05 sebastian Exp $ */ +/* $Id: pdo_mysql.c,v 1.8.2.13.2.1.2.1 2007/09/27 18:00:42 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -31,14 +31,14 @@ #include "php_pdo_mysql_int.h" /* {{{ pdo_mysql_functions[] */ -zend_function_entry pdo_mysql_functions[] = { +const zend_function_entry pdo_mysql_functions[] = { {NULL, NULL, NULL} }; /* }}} */ /* {{{ pdo_mysql_functions[] */ #if ZEND_MODULE_API_NO >= 20050922 -static zend_module_dep pdo_mysql_deps[] = { +static const zend_module_dep pdo_mysql_deps[] = { ZEND_MOD_REQUIRED("pdo") {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/pdo_oci.c?r1=1.5.2.6.2.1&r2=1.5.2.6.2.1.2.1&diff_format=u Index: php-src/ext/pdo_oci/pdo_oci.c diff -u php-src/ext/pdo_oci/pdo_oci.c:1.5.2.6.2.1 php-src/ext/pdo_oci/pdo_oci.c:1.5.2.6.2.1.2.1 --- php-src/ext/pdo_oci/pdo_oci.c:1.5.2.6.2.1 Mon Jan 1 09:36:05 2007 +++ php-src/ext/pdo_oci/pdo_oci.c Thu Sep 27 18:00:42 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_oci.c,v 1.5.2.6.2.1 2007/01/01 09:36:05 sebastian Exp $ */ +/* $Id: pdo_oci.c,v 1.5.2.6.2.1.2.1 2007/09/27 18:00:42 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -31,7 +31,7 @@ #include "php_pdo_oci_int.h" /* {{{ pdo_oci_functions[] */ -zend_function_entry pdo_oci_functions[] = { +const zend_function_entry pdo_oci_functions[] = { {NULL, NULL, NULL} }; /* }}} */ @@ -39,7 +39,7 @@ /* {{{ pdo_oci_module_entry */ #if ZEND_MODULE_API_NO >= 20050922 -static zend_module_dep pdo_oci_deps[] = { +static const zend_module_dep pdo_oci_deps[] = { ZEND_MOD_REQUIRED("pdo") {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_odbc/pdo_odbc.c?r1=1.14.2.7.2.2&r2=1.14.2.7.2.2.2.1&diff_format=u Index: php-src/ext/pdo_odbc/pdo_odbc.c diff -u php-src/ext/pdo_odbc/pdo_odbc.c:1.14.2.7.2.2 php-src/ext/pdo_odbc/pdo_odbc.c:1.14.2.7.2.2.2.1 --- php-src/ext/pdo_odbc/pdo_odbc.c:1.14.2.7.2.2 Mon Jan 1 09:36:05 2007 +++ php-src/ext/pdo_odbc/pdo_odbc.c Thu Sep 27 18:00:42 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_odbc.c,v 1.14.2.7.2.2 2007/01/01 09:36:05 sebastian Exp $ */ +/* $Id: pdo_odbc.c,v 1.14.2.7.2.2.2.1 2007/09/27 18:00:42 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -31,14 +31,14 @@ #include "php_pdo_odbc_int.h" /* {{{ pdo_odbc_functions[] */ -function_entry pdo_odbc_functions[] = { +const function_entry pdo_odbc_functions[] = { {NULL, NULL, NULL} }; /* }}} */ /* {{{ pdo_odbc_deps[] */ #if ZEND_MODULE_API_NO >= 20050922 -static zend_module_dep pdo_odbc_deps[] = { +static const zend_module_dep pdo_odbc_deps[] = { ZEND_MOD_REQUIRED("pdo") {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/pdo_pgsql.c?r1=1.7.2.11.2.1&r2=1.7.2.11.2.1.2.1&diff_format=u Index: php-src/ext/pdo_pgsql/pdo_pgsql.c diff -u php-src/ext/pdo_pgsql/pdo_pgsql.c:1.7.2.11.2.1 php-src/ext/pdo_pgsql/pdo_pgsql.c:1.7.2.11.2.1.2.1 --- php-src/ext/pdo_pgsql/pdo_pgsql.c:1.7.2.11.2.1 Mon Jan 1 09:36:05 2007 +++ php-src/ext/pdo_pgsql/pdo_pgsql.c Thu Sep 27 18:00:42 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_pgsql.c,v 1.7.2.11.2.1 2007/01/01 09:36:05 sebastian Exp $ */ +/* $Id: pdo_pgsql.c,v 1.7.2.11.2.1.2.1 2007/09/27 18:00:42 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,7 +35,7 @@ #endif /* {{{ pdo_pgsql_functions[] */ -zend_function_entry pdo_pgsql_functions[] = { +const zend_function_entry pdo_pgsql_functions[] = { {NULL, NULL, NULL} }; /* }}} */ @@ -43,7 +43,7 @@ /* {{{ pdo_sqlite_deps */ #if ZEND_MODULE_API_NO >= 20050922 -static zend_module_dep pdo_pgsql_deps[] = { +static const zend_module_dep pdo_pgsql_deps[] = { ZEND_MOD_REQUIRED("pdo") {NULL, NULL, NULL} }; @@ -123,7 +123,7 @@ php_info_print_table_row(2, "PostgreSQL(libpq) Version", PG_VERSION); #endif php_info_print_table_row(2, "Module version", pdo_pgsql_module_entry.version); - php_info_print_table_row(2, "Revision", " $Id: pdo_pgsql.c,v 1.7.2.11.2.1 2007/01/01 09:36:05 sebastian Exp $ "); + php_info_print_table_row(2, "Revision", " $Id: pdo_pgsql.c,v 1.7.2.11.2.1.2.1 2007/09/27 18:00:42 dmitry Exp $ "); php_info_print_table_end(); } http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/pgsql_driver.c?r1=1.53.2.14.2.9&r2=1.53.2.14.2.9.2.1&diff_format=u Index: php-src/ext/pdo_pgsql/pgsql_driver.c diff -u php-src/ext/pdo_pgsql/pgsql_driver.c:1.53.2.14.2.9 php-src/ext/pdo_pgsql/pgsql_driver.c:1.53.2.14.2.9.2.1 --- php-src/ext/pdo_pgsql/pgsql_driver.c:1.53.2.14.2.9 Thu Jun 28 03:13:29 2007 +++ php-src/ext/pdo_pgsql/pgsql_driver.c Thu Sep 27 18:00:42 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql_driver.c,v 1.53.2.14.2.9 2007/06/28 03:13:29 iliaa Exp $ */ +/* $Id: pgsql_driver.c,v 1.53.2.14.2.9.2.1 2007/09/27 18:00:42 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -627,14 +627,14 @@ /* }}} */ -static zend_function_entry dbh_methods[] = { +static const zend_function_entry dbh_methods[] = { PHP_ME(PDO, pgsqlLOBCreate, NULL, ZEND_ACC_PUBLIC) PHP_ME(PDO, pgsqlLOBOpen, NULL, ZEND_ACC_PUBLIC) PHP_ME(PDO, pgsqlLOBUnlink, NULL, ZEND_ACC_PUBLIC) {NULL, NULL, NULL} }; -static zend_function_entry *pdo_pgsql_get_driver_methods(pdo_dbh_t *dbh, int kind TSRMLS_DC) +static const zend_function_entry *pdo_pgsql_get_driver_methods(pdo_dbh_t *dbh, int kind TSRMLS_DC) { switch (kind) { case PDO_DBH_DRIVER_METHOD_KIND_DBH: http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/pdo_sqlite.c?r1=1.10.2.6.2.2&r2=1.10.2.6.2.2.2.1&diff_format=u Index: php-src/ext/pdo_sqlite/pdo_sqlite.c diff -u php-src/ext/pdo_sqlite/pdo_sqlite.c:1.10.2.6.2.2 php-src/ext/pdo_sqlite/pdo_sqlite.c:1.10.2.6.2.2.2.1 --- php-src/ext/pdo_sqlite/pdo_sqlite.c:1.10.2.6.2.2 Fri Mar 23 14:30:00 2007 +++ php-src/ext/pdo_sqlite/pdo_sqlite.c Thu Sep 27 18:00:42 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_sqlite.c,v 1.10.2.6.2.2 2007/03/23 14:30:00 wez Exp $ */ +/* $Id: pdo_sqlite.c,v 1.10.2.6.2.2.2.1 2007/09/27 18:00:42 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -34,7 +34,7 @@ #define PHP_PDO_SQLITE_MODULE_VERSION "1.0.1" /* {{{ pdo_sqlite_functions[] */ -zend_function_entry pdo_sqlite_functions[] = { +const zend_function_entry pdo_sqlite_functions[] = { {NULL, NULL, NULL} }; /* }}} */ @@ -42,7 +42,7 @@ /* {{{ pdo_sqlite_deps */ #if ZEND_MODULE_API_NO >= 20050922 -static zend_module_dep pdo_sqlite_deps[] = { +static const zend_module_dep pdo_sqlite_deps[] = { ZEND_MOD_REQUIRED("pdo") {NULL, NULL, NULL} }; @@ -100,7 +100,7 @@ "(bundled) " #endif PHP_PDO_SQLITE_MODULE_VERSION - " $Id: pdo_sqlite.c,v 1.10.2.6.2.2 2007/03/23 14:30:00 wez Exp $"); + " $Id: pdo_sqlite.c,v 1.10.2.6.2.2.2.1 2007/09/27 18:00:42 dmitry Exp $"); php_info_print_table_row(2, "SQLite Library", sqlite3_libversion()); php_info_print_table_end(); } http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite_driver.c?r1=1.20.2.5.2.2&r2=1.20.2.5.2.2.2.1&diff_format=u Index: php-src/ext/pdo_sqlite/sqlite_driver.c diff -u php-src/ext/pdo_sqlite/sqlite_driver.c:1.20.2.5.2.2 php-src/ext/pdo_sqlite/sqlite_driver.c:1.20.2.5.2.2.2.1 --- php-src/ext/pdo_sqlite/sqlite_driver.c:1.20.2.5.2.2 Mon Jan 1 09:36:05 2007 +++ php-src/ext/pdo_sqlite/sqlite_driver.c Thu Sep 27 18:00:42 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sqlite_driver.c,v 1.20.2.5.2.2 2007/01/01 09:36:05 sebastian Exp $ */ +/* $Id: sqlite_driver.c,v 1.20.2.5.2.2.2.1 2007/09/27 18:00:42 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -593,13 +593,13 @@ RETURN_FALSE; } /* }}} */ -static zend_function_entry dbh_methods[] = { +static const zend_function_entry dbh_methods[] = { PHP_ME(SQLite, sqliteCreateFunction, NULL, ZEND_ACC_PUBLIC) PHP_ME(SQLite, sqliteCreateAggregate, NULL, ZEND_ACC_PUBLIC) {NULL, NULL, NULL} }; -static zend_function_entry *get_driver_methods(pdo_dbh_t *dbh, int kind TSRMLS_DC) +static const zend_function_entry *get_driver_methods(pdo_dbh_t *dbh, int kind TSRMLS_DC) { switch (kind) { case PDO_DBH_DRIVER_METHOD_KIND_DBH: http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.331.2.13.2.24&r2=1.331.2.13.2.24.2.1&diff_format=u Index: php-src/ext/pgsql/pgsql.c diff -u php-src/ext/pgsql/pgsql.c:1.331.2.13.2.24 php-src/ext/pgsql/pgsql.c:1.331.2.13.2.24.2.1 --- php-src/ext/pgsql/pgsql.c:1.331.2.13.2.24 Wed Sep 5 13:03:59 2007 +++ php-src/ext/pgsql/pgsql.c Thu Sep 27 18:00:42 2007 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.331.2.13.2.24 2007/09/05 13:03:59 iliaa Exp $ */ +/* $Id: pgsql.c,v 1.331.2.13.2.24.2.1 2007/09/27 18:00:42 dmitry Exp $ */ #include <stdlib.h> @@ -90,7 +90,7 @@ /* {{{ pgsql_functions[] */ -zend_function_entry pgsql_functions[] = { +const zend_function_entry pgsql_functions[] = { /* connection functions */ PHP_FE(pg_connect, NULL) PHP_FE(pg_pconnect, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/posix/posix.c?r1=1.70.2.3.2.16&r2=1.70.2.3.2.16.2.1&diff_format=u Index: php-src/ext/posix/posix.c diff -u php-src/ext/posix/posix.c:1.70.2.3.2.16 php-src/ext/posix/posix.c:1.70.2.3.2.16.2.1 --- php-src/ext/posix/posix.c:1.70.2.3.2.16 Wed Jul 25 09:06:22 2007 +++ php-src/ext/posix/posix.c Thu Sep 27 18:00:43 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: posix.c,v 1.70.2.3.2.16 2007/07/25 09:06:22 bjori Exp $ */ +/* $Id: posix.c,v 1.70.2.3.2.16.2.1 2007/09/27 18:00:43 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -53,7 +53,7 @@ /* {{{ posix_functions[] */ -zend_function_entry posix_functions[] = { +const zend_function_entry posix_functions[] = { /* POSIX.1, 3.3 */ PHP_FE(posix_kill, NULL) @@ -147,7 +147,7 @@ static PHP_MINFO_FUNCTION(posix) { php_info_print_table_start(); - php_info_print_table_row(2, "Revision", "$Revision: 1.70.2.3.2.16 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.70.2.3.2.16.2.1 $"); php_info_print_table_end(); } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/pspell/pspell.c?r1=1.45.2.4.2.7&r2=1.45.2.4.2.7.2.1&diff_format=u Index: php-src/ext/pspell/pspell.c diff -u php-src/ext/pspell/pspell.c:1.45.2.4.2.7 php-src/ext/pspell/pspell.c:1.45.2.4.2.7.2.1 --- php-src/ext/pspell/pspell.c:1.45.2.4.2.7 Sat Feb 24 02:17:25 2007 +++ php-src/ext/pspell/pspell.c Thu Sep 27 18:00:43 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pspell.c,v 1.45.2.4.2.7 2007/02/24 02:17:25 helly Exp $ */ +/* $Id: pspell.c,v 1.45.2.4.2.7.2.1 2007/09/27 18:00:43 dmitry Exp $ */ #define IS_EXT_MODULE @@ -74,7 +74,7 @@ /* {{{ pspell_functions[] */ -static zend_function_entry pspell_functions[] = { +static const zend_function_entry pspell_functions[] = { PHP_FE(pspell_new, NULL) PHP_FE(pspell_new_personal, NULL) PHP_FE(pspell_new_config, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/readline/readline.c?r1=1.42.2.3.2.3&r2=1.42.2.3.2.3.2.1&diff_format=u Index: php-src/ext/readline/readline.c diff -u php-src/ext/readline/readline.c:1.42.2.3.2.3 php-src/ext/readline/readline.c:1.42.2.3.2.3.2.1 --- php-src/ext/readline/readline.c:1.42.2.3.2.3 Mon Feb 12 01:23:17 2007 +++ php-src/ext/readline/readline.c Thu Sep 27 18:00:43 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: readline.c,v 1.42.2.3.2.3 2007/02/12 01:23:17 iliaa Exp $ */ +/* $Id: readline.c,v 1.42.2.3.2.3.2.1 2007/09/27 18:00:43 dmitry Exp $ */ /* {{{ includes & prototypes */ @@ -69,7 +69,7 @@ /* }}} */ /* {{{ module stuff */ -static zend_function_entry php_readline_functions[] = { +static const zend_function_entry php_readline_functions[] = { PHP_FE(readline, NULL) PHP_FE(readline_info, NULL) PHP_FE(readline_add_history, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/recode/recode.c?r1=1.37.2.1.2.3&r2=1.37.2.1.2.3.2.1&diff_format=u Index: php-src/ext/recode/recode.c diff -u php-src/ext/recode/recode.c:1.37.2.1.2.3 php-src/ext/recode/recode.c:1.37.2.1.2.3.2.1 --- php-src/ext/recode/recode.c:1.37.2.1.2.3 Fri Jun 22 00:02:15 2007 +++ php-src/ext/recode/recode.c Thu Sep 27 18:00:43 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: recode.c,v 1.37.2.1.2.3 2007/06/22 00:02:15 stas Exp $ */ +/* $Id: recode.c,v 1.37.2.1.2.3.2.1 2007/09/27 18:00:43 dmitry Exp $ */ /* {{{ includes & prototypes */ @@ -67,7 +67,7 @@ static PHP_GINIT_FUNCTION(recode); /* {{{ module stuff */ -static zend_function_entry php_recode_functions[] = { +static const zend_function_entry php_recode_functions[] = { PHP_FE(recode_string, NULL) PHP_FE(recode_file, NULL) PHP_FALIAS(recode, recode_string, NULL) @@ -122,7 +122,7 @@ { php_info_print_table_start(); php_info_print_table_row(2, "Recode Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.37.2.1.2.3 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.37.2.1.2.3.2.1 $"); php_info_print_table_end(); } http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.45.2.1&r2=1.164.2.33.2.45.2.2&diff_format=u Index: php-src/ext/reflection/php_reflection.c diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.1 php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.2 --- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.1 Thu Sep 27 09:15:09 2007 +++ php-src/ext/reflection/php_reflection.c Thu Sep 27 18:00:43 2007 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.1 2007/09/27 09:15:09 tony2001 Exp $ */ +/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.2 2007/09/27 18:00:43 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -908,7 +908,7 @@ (module->version == NO_VERSION_YET) ? "<no_version>" : module->version); if (module->deps) { - zend_module_dep* dep = module->deps; + const zend_module_dep* dep = module->deps; string_printf(str, "\n - Dependencies {\n"); @@ -970,7 +970,7 @@ if (module->functions && module->functions->fname) { zend_function *fptr; - zend_function_entry *func = module->functions; + const zend_function_entry *func = module->functions; string_printf(str, "\n - Functions {\n"); @@ -1040,7 +1040,7 @@ /* }}} */ /* {{{ reflection_extension_factory */ -static void reflection_extension_factory(zval *object, char *name_str TSRMLS_DC) +static void reflection_extension_factory(zval *object, const char *name_str TSRMLS_DC) { reflection_object *intern; zval *name; @@ -4209,7 +4209,7 @@ if (module->functions) { zval *function; zend_function *fptr; - zend_function_entry *func = module->functions; + const zend_function_entry *func = module->functions; /* Is there a better way of doing this? */ while (func->fname) { @@ -4348,7 +4348,7 @@ { reflection_object *intern; zend_module_entry *module; - zend_module_dep *dep; + const zend_module_dep *dep; METHOD_NOTSTATIC_NUMPARAMS(reflection_extension_ptr, 0); GET_REFLECTION_OBJECT_PTR(module); @@ -4409,7 +4409,7 @@ /* }}} */ /* {{{ method tables */ -static zend_function_entry reflection_exception_functions[] = { +static const zend_function_entry reflection_exception_functions[] = { {NULL, NULL, NULL} }; @@ -4425,13 +4425,13 @@ ZEND_ARG_INFO(0, return) ZEND_END_ARG_INFO() -static zend_function_entry reflection_functions[] = { +static const zend_function_entry reflection_functions[] = { ZEND_ME(reflection, getModifierNames, arginfo_reflection_getModifierNames, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) ZEND_ME(reflection, export, arginfo_reflection_export, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) {NULL, NULL, NULL} }; -static zend_function_entry reflector_functions[] = { +static const zend_function_entry reflector_functions[] = { ZEND_FENTRY(export, NULL, NULL, ZEND_ACC_STATIC|ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC) ZEND_ABSTRACT_ME(reflector, __toString, NULL) {NULL, NULL, NULL} @@ -4458,7 +4458,7 @@ ZEND_ARG_ARRAY_INFO(0, args, 0) ZEND_END_ARG_INFO() -static zend_function_entry reflection_function_abstract_functions[] = { +static const zend_function_entry reflection_function_abstract_functions[] = { ZEND_ME(reflection, __clone, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL) PHP_ABSTRACT_ME(reflection_function, __toString, NULL) ZEND_ME(reflection_function, isInternal, NULL, 0) @@ -4479,7 +4479,7 @@ {NULL, NULL, NULL} }; -static zend_function_entry reflection_function_functions[] = { +static const zend_function_entry reflection_function_functions[] = { ZEND_ME(reflection_function, __construct, arginfo_reflection_function___construct, 0) ZEND_ME(reflection_function, __toString, NULL, 0) ZEND_ME(reflection_function, export, arginfo_reflection_function_export, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC) @@ -4514,7 +4514,7 @@ ZEND_ARG_ARRAY_INFO(0, args, 0) ZEND_END_ARG_INFO() -static zend_function_entry reflection_method_functions[] = { +static const zend_function_entry reflection_method_functions[] = { ZEND_ME(reflection_method, export, arginfo_reflection_method_export, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC) ZEND_ME(reflection_method, __construct, arginfo_reflection_method___construct, 0) ZEND_ME(reflection_method, __toString, NULL, 0) @@ -4623,7 +4623,7 @@ ZEND_ARG_INFO(0, interface) ZEND_END_ARG_INFO() -static zend_function_entry reflection_class_functions[] = { +static const zend_function_entry reflection_class_functions[] = { ZEND_ME(reflection, __clone, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL) ZEND_ME(reflection_class, export, arginfo_reflection_class_export, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC) ZEND_ME(reflection_class, __construct, arginfo_reflection_class___construct, 0) @@ -4680,7 +4680,7 @@ ZEND_ARG_INFO(0, argument) ZEND_END_ARG_INFO() -static zend_function_entry reflection_object_functions[] = { +static const zend_function_entry reflection_object_functions[] = { ZEND_ME(reflection_object, export, arginfo_reflection_object_export, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC) ZEND_ME(reflection_object, __construct, arginfo_reflection_object___construct, 0) {NULL, NULL, NULL} @@ -4709,7 +4709,7 @@ ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() -static zend_function_entry reflection_property_functions[] = { +static const zend_function_entry reflection_property_functions[] = { ZEND_ME(reflection, __clone, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL) ZEND_ME(reflection_property, export, arginfo_reflection_property_export, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC) ZEND_ME(reflection_property, __construct, arginfo_reflection_property___construct, 0) @@ -4741,7 +4741,7 @@ ZEND_ARG_INFO(0, parameter) ZEND_END_ARG_INFO() -static zend_function_entry reflection_parameter_functions[] = { +static const zend_function_entry reflection_parameter_functions[] = { ZEND_ME(reflection, __clone, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL) ZEND_ME(reflection_parameter, export, arginfo_reflection_parameter_export, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC) ZEND_ME(reflection_parameter, __construct, arginfo_reflection_parameter___construct, 0) @@ -4771,7 +4771,7 @@ ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() -static zend_function_entry reflection_extension_functions[] = { +static const zend_function_entry reflection_extension_functions[] = { ZEND_ME(reflection, __clone, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL) ZEND_ME(reflection_extension, export, arginfo_reflection_extension_export, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC) ZEND_ME(reflection_extension, __construct, arginfo_reflection_extension___construct, 0) @@ -4789,7 +4789,7 @@ }; /* }}} */ -zend_function_entry reflection_ext_functions[] = { /* {{{ */ +const zend_function_entry reflection_ext_functions[] = { /* {{{ */ {NULL, NULL, NULL} }; /* }}} */ @@ -4903,7 +4903,7 @@ php_info_print_table_start(); php_info_print_table_header(2, "Reflection", "enabled"); - php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.164.2.33.2.45.2.1 2007/09/27 09:15:09 tony2001 Exp $"); + php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.164.2.33.2.45.2.2 2007/09/27 18:00:43 dmitry Exp $"); php_info_print_table_end(); } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.417.2.8.2.40&r2=1.417.2.8.2.40.2.1&diff_format=u Index: php-src/ext/session/session.c diff -u php-src/ext/session/session.c:1.417.2.8.2.40 php-src/ext/session/session.c:1.417.2.8.2.40.2.1 --- php-src/ext/session/session.c:1.417.2.8.2.40 Fri Aug 3 01:16:40 2007 +++ php-src/ext/session/session.c Thu Sep 27 18:00:43 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.417.2.8.2.40 2007/08/03 01:16:40 stas Exp $ */ +/* $Id: session.c,v 1.417.2.8.2.40.2.1 2007/09/27 18:00:43 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -57,7 +57,7 @@ /* {{{ session_functions[] */ -zend_function_entry session_functions[] = { +const zend_function_entry session_functions[] = { PHP_FE(session_name, NULL) PHP_FE(session_module_name, NULL) PHP_FE(session_save_path, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/shmop/shmop.c?r1=1.31.2.2.2.5&r2=1.31.2.2.2.5.2.1&diff_format=u Index: php-src/ext/shmop/shmop.c diff -u php-src/ext/shmop/shmop.c:1.31.2.2.2.5 php-src/ext/shmop/shmop.c:1.31.2.2.2.5.2.1 --- php-src/ext/shmop/shmop.c:1.31.2.2.2.5 Sat Feb 24 16:36:56 2007 +++ php-src/ext/shmop/shmop.c Thu Sep 27 18:00:43 2007 @@ -16,7 +16,7 @@ | Ilia Alshanetsky <ilia@prohost.org> | +----------------------------------------------------------------------+ */ -/* $Id: shmop.c,v 1.31.2.2.2.5 2007/02/24 16:36:56 iliaa Exp $ */ +/* $Id: shmop.c,v 1.31.2.2.2.5.2.1 2007/09/27 18:00:43 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -47,7 +47,7 @@ /* {{{ shmop_functions[] */ -zend_function_entry shmop_functions[] = { +const zend_function_entry shmop_functions[] = { PHP_FE(shmop_open, NULL) PHP_FE(shmop_read, NULL) PHP_FE(shmop_close, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.35&r2=1.151.2.22.2.35.2.1&diff_format=u Index: php-src/ext/simplexml/simplexml.c diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35 php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.1 --- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35 Tue Jul 31 15:40:49 2007 +++ php-src/ext/simplexml/simplexml.c Thu Sep 27 18:00:43 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: simplexml.c,v 1.151.2.22.2.35 2007/07/31 15:40:49 rrichards Exp $ */ +/* $Id: simplexml.c,v 1.151.2.22.2.35.2.1 2007/09/27 18:00:43 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -2343,14 +2343,14 @@ } /* }}} */ -zend_function_entry simplexml_functions[] = { +const zend_function_entry simplexml_functions[] = { PHP_FE(simplexml_load_file, NULL) PHP_FE(simplexml_load_string, NULL) PHP_FE(simplexml_import_dom, NULL) {NULL, NULL, NULL} }; -static zend_module_dep simplexml_deps[] = { +static const zend_module_dep simplexml_deps[] = { ZEND_MOD_REQUIRED("libxml") {NULL, NULL, NULL} }; @@ -2375,7 +2375,7 @@ /* the method table */ /* each method can have its own parameters and visibility */ -static zend_function_entry sxe_functions[] = { +static const zend_function_entry sxe_functions[] = { SXE_ME(__construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) /* must be called */ SXE_ME(asXML, NULL, ZEND_ACC_PUBLIC) SXE_MALIAS(saveXML, asXML, NULL, ZEND_ACC_PUBLIC) @@ -2440,7 +2440,7 @@ { php_info_print_table_start(); php_info_print_table_header(2, "Simplexml support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.151.2.22.2.35 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.151.2.22.2.35.2.1 $"); php_info_print_table_row(2, "Schema support", #ifdef LIBXML_SCHEMAS_ENABLED "enabled"); http://cvs.php.net/viewvc.cgi/php-src/ext/skeleton/skeleton.c?r1=1.35.4.1.2.2&r2=1.35.4.1.2.2.2.1&diff_format=u Index: php-src/ext/skeleton/skeleton.c diff -u php-src/ext/skeleton/skeleton.c:1.35.4.1.2.2 php-src/ext/skeleton/skeleton.c:1.35.4.1.2.2.2.1 --- php-src/ext/skeleton/skeleton.c:1.35.4.1.2.2 Sat Feb 24 02:17:26 2007 +++ php-src/ext/skeleton/skeleton.c Thu Sep 27 18:00:43 2007 @@ -20,7 +20,7 @@ * * Every user visible function must have an entry in extname_functions[]. */ -zend_function_entry extname_functions[] = { +const zend_function_entry extname_functions[] = { PHP_FE(confirm_extname_compiled, NULL) /* For testing, remove later. */ /* __function_entries_here__ */ {NULL, NULL, NULL} /* Must be the last line in extname_functions[] */ http://cvs.php.net/viewvc.cgi/php-src/ext/snmp/snmp.c?r1=1.106.2.2.2.5&r2=1.106.2.2.2.5.2.1&diff_format=u Index: php-src/ext/snmp/snmp.c diff -u php-src/ext/snmp/snmp.c:1.106.2.2.2.5 php-src/ext/snmp/snmp.c:1.106.2.2.2.5.2.1 --- php-src/ext/snmp/snmp.c:1.106.2.2.2.5 Mon Jul 9 13:42:05 2007 +++ php-src/ext/snmp/snmp.c Thu Sep 27 18:00:43 2007 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: snmp.c,v 1.106.2.2.2.5 2007/07/09 13:42:05 jani Exp $ */ +/* $Id: snmp.c,v 1.106.2.2.2.5.2.1 2007/09/27 18:00:43 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -114,7 +114,7 @@ /* {{{ snmp_functions[] */ -zend_function_entry snmp_functions[] = { +const zend_function_entry snmp_functions[] = { PHP_FE(snmpget, NULL) PHP_FE(snmpgetnext, NULL) PHP_FE(snmpwalk, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/snmp/winsnmp.c?r1=1.16.4.2&r2=1.16.4.2.4.1&diff_format=u Index: php-src/ext/snmp/winsnmp.c diff -u php-src/ext/snmp/winsnmp.c:1.16.4.2 php-src/ext/snmp/winsnmp.c:1.16.4.2.4.1 --- php-src/ext/snmp/winsnmp.c:1.16.4.2 Tue Dec 6 02:25:31 2005 +++ php-src/ext/snmp/winsnmp.c Thu Sep 27 18:00:43 2007 @@ -21,7 +21,7 @@ /* {{{ snmp_functions[] */ -zend_function_entry snmp_functions[] = { +const zend_function_entry snmp_functions[] = { {"snmpget", php3_snmpget, NULL}, {"snmpwalk", php3_snmpwalk, NULL}, {NULL,NULL,NULL} http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.30&r2=1.156.2.28.2.30.2.1&diff_format=u Index: php-src/ext/soap/soap.c diff -u php-src/ext/soap/soap.c:1.156.2.28.2.30 php-src/ext/soap/soap.c:1.156.2.28.2.30.2.1 --- php-src/ext/soap/soap.c:1.156.2.28.2.30 Wed Sep 5 11:20:45 2007 +++ php-src/ext/soap/soap.c Thu Sep 27 18:00:43 2007 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: soap.c,v 1.156.2.28.2.30 2007/09/05 11:20:45 dmitry Exp $ */ +/* $Id: soap.c,v 1.156.2.28.2.30.2.1 2007/09/27 18:00:43 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -281,13 +281,13 @@ #define SOAP_CTOR(class_name, func_name, arginfo, flags) PHP_ME(class_name, func_name, arginfo, flags) -static zend_function_entry soap_functions[] = { +static const zend_function_entry soap_functions[] = { PHP_FE(use_soap_error_handler, NULL) PHP_FE(is_soap_fault, NULL) {NULL, NULL, NULL} }; -static zend_function_entry soap_fault_functions[] = { +static const zend_function_entry soap_fault_functions[] = { SOAP_CTOR(SoapFault, SoapFault, NULL, 0) #ifdef ZEND_ENGINE_2 PHP_ME(SoapFault, __toString, NULL, 0) @@ -295,7 +295,7 @@ {NULL, NULL, NULL} }; -static zend_function_entry soap_server_functions[] = { +static const zend_function_entry soap_server_functions[] = { SOAP_CTOR(SoapServer, SoapServer, NULL, 0) PHP_ME(SoapServer, setPersistence, NULL, 0) PHP_ME(SoapServer, setClass, NULL, 0) @@ -325,7 +325,7 @@ unsigned char __soap_call_args[] = { 5, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE }; #endif -static zend_function_entry soap_client_functions[] = { +static const zend_function_entry soap_client_functions[] = { SOAP_CTOR(SoapClient, SoapClient, NULL, 0) PHP_ME(SoapClient, __call, __call_args, 0) ZEND_NAMED_ME(__soapCall, ZEND_MN(SoapClient___call), __soap_call_args, 0) @@ -342,17 +342,17 @@ {NULL, NULL, NULL} }; -static zend_function_entry soap_var_functions[] = { +static const zend_function_entry soap_var_functions[] = { SOAP_CTOR(SoapVar, SoapVar, NULL, 0) {NULL, NULL, NULL} }; -static zend_function_entry soap_param_functions[] = { +static const zend_function_entry soap_param_functions[] = { SOAP_CTOR(SoapParam, SoapParam, NULL, 0) {NULL, NULL, NULL} }; -static zend_function_entry soap_header_functions[] = { +static const zend_function_entry soap_header_functions[] = { SOAP_CTOR(SoapHeader, SoapHeader, NULL, 0) {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.171.2.9.2.14&r2=1.171.2.9.2.14.2.1&diff_format=u Index: php-src/ext/sockets/sockets.c diff -u php-src/ext/sockets/sockets.c:1.171.2.9.2.14 php-src/ext/sockets/sockets.c:1.171.2.9.2.14.2.1 --- php-src/ext/sockets/sockets.c:1.171.2.9.2.14 Wed Sep 26 10:55:07 2007 +++ php-src/ext/sockets/sockets.c Thu Sep 27 18:00:43 2007 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sockets.c,v 1.171.2.9.2.14 2007/09/26 10:55:07 tony2001 Exp $ */ +/* $Id: sockets.c,v 1.171.2.9.2.14.2.1 2007/09/27 18:00:43 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -120,7 +120,7 @@ /* {{{ sockets_functions[] */ -zend_function_entry sockets_functions[] = { +const zend_function_entry sockets_functions[] = { PHP_FE(socket_select, first_through_third_args_force_ref) PHP_FE(socket_create, NULL) PHP_FE(socket_create_listen, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.52.2.28.2.17&r2=1.52.2.28.2.17.2.1&diff_format=u Index: php-src/ext/spl/php_spl.c diff -u php-src/ext/spl/php_spl.c:1.52.2.28.2.17 php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.1 --- php-src/ext/spl/php_spl.c:1.52.2.28.2.17 Sat May 19 18:40:27 2007 +++ php-src/ext/spl/php_spl.c Thu Sep 27 18:00:44 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_spl.c,v 1.52.2.28.2.17 2007/05/19 18:40:27 iliaa Exp $ */ +/* $Id: php_spl.c,v 1.52.2.28.2.17.2.1 2007/09/27 18:00:44 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -49,7 +49,7 @@ /* {{{ spl_functions_none */ -zend_function_entry spl_functions_none[] = { +const zend_function_entry spl_functions_none[] = { {NULL, NULL, NULL} }; /* }}} */ @@ -690,7 +690,7 @@ /* {{{ spl_functions */ -zend_function_entry spl_functions[] = { +const zend_function_entry spl_functions[] = { PHP_FE(spl_classes, NULL) PHP_FE(spl_autoload, NULL) PHP_FE(spl_autoload_extensions, NULL) @@ -749,7 +749,7 @@ } /* }}} */ #ifdef HAVE_SIMPLEXML -static zend_module_dep spl_deps[] = { +static const zend_module_dep spl_deps[] = { ZEND_MOD_REQUIRED("libxml") ZEND_MOD_REQUIRED("simplexml") {NULL, NULL, NULL} http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.71.2.17.2.13&r2=1.71.2.17.2.13.2.1&diff_format=u Index: php-src/ext/spl/spl_array.c diff -u php-src/ext/spl/spl_array.c:1.71.2.17.2.13 php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.1 --- php-src/ext/spl/spl_array.c:1.71.2.17.2.13 Fri Jul 20 10:53:56 2007 +++ php-src/ext/spl/spl_array.c Thu Sep 27 18:00:44 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_array.c,v 1.71.2.17.2.13 2007/07/20 10:53:56 tony2001 Exp $ */ +/* $Id: spl_array.c,v 1.71.2.17.2.13.2.1 2007/09/27 18:00:44 dmitry Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -1437,7 +1437,7 @@ ZEND_ARG_INFO(0, cmp_function ) ZEND_END_ARG_INFO(); -static zend_function_entry spl_funcs_ArrayObject[] = { +static const zend_function_entry spl_funcs_ArrayObject[] = { SPL_ME(Array, __construct, arginfo_array___construct, ZEND_ACC_PUBLIC) SPL_ME(Array, offsetExists, arginfo_array_offsetGet, ZEND_ACC_PUBLIC) SPL_ME(Array, offsetGet, arginfo_array_offsetGet, ZEND_ACC_PUBLIC) @@ -1462,7 +1462,7 @@ {NULL, NULL, NULL} }; -static zend_function_entry spl_funcs_ArrayIterator[] = { +static const zend_function_entry spl_funcs_ArrayIterator[] = { SPL_ME(Array, __construct, arginfo_array___construct, ZEND_ACC_PUBLIC) SPL_ME(Array, offsetExists, arginfo_array_offsetGet, ZEND_ACC_PUBLIC) SPL_ME(Array, offsetGet, arginfo_array_offsetGet, ZEND_ACC_PUBLIC) @@ -1489,7 +1489,7 @@ {NULL, NULL, NULL} }; -static zend_function_entry spl_funcs_RecursiveArrayIterator[] = { +static const zend_function_entry spl_funcs_RecursiveArrayIterator[] = { SPL_ME(Array, hasChildren, NULL, ZEND_ACC_PUBLIC) SPL_ME(Array, getChildren, NULL, ZEND_ACC_PUBLIC) {NULL, NULL, NULL} http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.45.2.27.2.23&r2=1.45.2.27.2.23.2.1&diff_format=u Index: php-src/ext/spl/spl_directory.c diff -u php-src/ext/spl/spl_directory.c:1.45.2.27.2.23 php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.1 --- php-src/ext/spl/spl_directory.c:1.45.2.27.2.23 Sat Sep 22 15:55:35 2007 +++ php-src/ext/spl/spl_directory.c Thu Sep 27 18:00:44 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_directory.c,v 1.45.2.27.2.23 2007/09/22 15:55:35 iliaa Exp $ */ +/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.1 2007/09/27 18:00:44 dmitry Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -1409,7 +1409,7 @@ /* the method table */ /* each method can have its own parameters and visibility */ -static zend_function_entry spl_SplFileInfo_functions[] = { +static const zend_function_entry spl_SplFileInfo_functions[] = { SPL_ME(SplFileInfo, __construct, arginfo_info___construct, ZEND_ACC_PUBLIC) SPL_ME(SplFileInfo, getPath, NULL, ZEND_ACC_PUBLIC) SPL_ME(SplFileInfo, getFilename, NULL, ZEND_ACC_PUBLIC) @@ -1450,7 +1450,7 @@ /* the method table */ /* each method can have its own parameters and visibility */ -static zend_function_entry spl_DirectoryIterator_functions[] = { +static const zend_function_entry spl_DirectoryIterator_functions[] = { SPL_ME(DirectoryIterator, __construct, arginfo_dir___construct, ZEND_ACC_PUBLIC) SPL_ME(DirectoryIterator, getFilename, NULL, ZEND_ACC_PUBLIC) SPL_ME(DirectoryIterator, getBasename, arginfo_optinalSuffix, ZEND_ACC_PUBLIC) @@ -1475,7 +1475,7 @@ ZEND_ARG_INFO(0, allow_links) ZEND_END_ARG_INFO() -static zend_function_entry spl_RecursiveDirectoryIterator_functions[] = { +static const zend_function_entry spl_RecursiveDirectoryIterator_functions[] = { SPL_ME(RecursiveDirectoryIterator, __construct, arginfo_r_dir___construct, ZEND_ACC_PUBLIC) SPL_ME(RecursiveDirectoryIterator, rewind, NULL, ZEND_ACC_PUBLIC) SPL_ME(RecursiveDirectoryIterator, next, NULL, ZEND_ACC_PUBLIC) @@ -2280,7 +2280,7 @@ ZEND_ARG_INFO(0, line_pos) ZEND_END_ARG_INFO() -static zend_function_entry spl_SplFileObject_functions[] = { +static const zend_function_entry spl_SplFileObject_functions[] = { SPL_ME(SplFileObject, __construct, arginfo_file_object___construct, ZEND_ACC_PUBLIC) SPL_ME(SplFileObject, rewind, NULL, ZEND_ACC_PUBLIC) SPL_ME(SplFileObject, eof, NULL, ZEND_ACC_PUBLIC) @@ -2321,7 +2321,7 @@ ZEND_ARG_INFO(0, max_memory) ZEND_END_ARG_INFO() -static zend_function_entry spl_SplTempFileObject_functions[] = { +static const zend_function_entry spl_SplTempFileObject_functions[] = { SPL_ME(SplTempFileObject, __construct, arginfo_temp_file_object___construct, ZEND_ACC_PUBLIC) {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_functions.c?r1=1.28.2.3.2.3&r2=1.28.2.3.2.3.2.1&diff_format=u Index: php-src/ext/spl/spl_functions.c diff -u php-src/ext/spl/spl_functions.c:1.28.2.3.2.3 php-src/ext/spl/spl_functions.c:1.28.2.3.2.3.2.1 --- php-src/ext/spl/spl_functions.c:1.28.2.3.2.3 Mon Jan 1 09:36:07 2007 +++ php-src/ext/spl/spl_functions.c Thu Sep 27 18:00:44 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_functions.c,v 1.28.2.3.2.3 2007/01/01 09:36:07 sebastian Exp $ */ +/* $Id: spl_functions.c,v 1.28.2.3.2.3.2.1 2007/09/27 18:00:44 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -36,7 +36,7 @@ /* }}} */ /* {{{ spl_register_interface */ -void spl_register_interface(zend_class_entry ** ppce, char * class_name, zend_function_entry * functions TSRMLS_DC) +void spl_register_interface(zend_class_entry ** ppce, char * class_name, const zend_function_entry * functions TSRMLS_DC) { zend_class_entry ce; @@ -47,7 +47,7 @@ /* }}} */ /* {{{ spl_register_std_class */ -PHPAPI void spl_register_std_class(zend_class_entry ** ppce, char * class_name, void * obj_ctor, zend_function_entry * function_list TSRMLS_DC) +PHPAPI void spl_register_std_class(zend_class_entry ** ppce, char * class_name, void * obj_ctor, const zend_function_entry * function_list TSRMLS_DC) { zend_class_entry ce; @@ -63,7 +63,7 @@ /* }}} */ /* {{{ spl_register_sub_class */ -PHPAPI void spl_register_sub_class(zend_class_entry ** ppce, zend_class_entry * parent_ce, char * class_name, void *obj_ctor, zend_function_entry * function_list TSRMLS_DC) +PHPAPI void spl_register_sub_class(zend_class_entry ** ppce, zend_class_entry * parent_ce, char * class_name, void *obj_ctor, const zend_function_entry * function_list TSRMLS_DC) { zend_class_entry ce; @@ -88,7 +88,7 @@ /* }}} */ /* {{{ spl_register_functions */ -void spl_register_functions(zend_class_entry * class_entry, zend_function_entry * function_list TSRMLS_DC) +void spl_register_functions(zend_class_entry * class_entry, const zend_function_entry * function_list TSRMLS_DC) { zend_register_functions(class_entry, function_list, &class_entry->function_table, MODULE_PERSISTENT TSRMLS_CC); } http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_functions.h?r1=1.19.2.3.2.2&r2=1.19.2.3.2.2.2.1&diff_format=u Index: php-src/ext/spl/spl_functions.h diff -u php-src/ext/spl/spl_functions.h:1.19.2.3.2.2 php-src/ext/spl/spl_functions.h:1.19.2.3.2.2.2.1 --- php-src/ext/spl/spl_functions.h:1.19.2.3.2.2 Mon Jan 1 09:36:07 2007 +++ php-src/ext/spl/spl_functions.h Thu Sep 27 18:00:44 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_functions.h,v 1.19.2.3.2.2 2007/01/01 09:36:07 sebastian Exp $ */ +/* $Id: spl_functions.h,v 1.19.2.3.2.2.2.1 2007/09/27 18:00:44 dmitry Exp $ */ #ifndef PHP_FUNCTIONS_H #define PHP_FUNCTIONS_H @@ -57,13 +57,13 @@ void spl_destroy_class(zend_class_entry ** ppce); -void spl_register_std_class(zend_class_entry ** ppce, char * class_name, create_object_func_t ctor, zend_function_entry * function_list TSRMLS_DC); -void spl_register_sub_class(zend_class_entry ** ppce, zend_class_entry * parent_ce, char * class_name, create_object_func_t ctor, zend_function_entry * function_list TSRMLS_DC); +void spl_register_std_class(zend_class_entry ** ppce, char * class_name, create_object_func_t ctor, const zend_function_entry * function_list TSRMLS_DC); +void spl_register_sub_class(zend_class_entry ** ppce, zend_class_entry * parent_ce, char * class_name, create_object_func_t ctor, const zend_function_entry * function_list TSRMLS_DC); -void spl_register_interface(zend_class_entry ** ppce, char * class_name, zend_function_entry *functions TSRMLS_DC); +void spl_register_interface(zend_class_entry ** ppce, char * class_name, const zend_function_entry *functions TSRMLS_DC); void spl_register_parent_ce(zend_class_entry * class_entry, zend_class_entry * parent_class TSRMLS_DC); -void spl_register_functions(zend_class_entry * class_entry, zend_function_entry * function_list TSRMLS_DC); +void spl_register_functions(zend_class_entry * class_entry, const zend_function_entry * function_list TSRMLS_DC); void spl_register_property( zend_class_entry * class_entry, char *prop_name, int prop_name_len, int prop_flags TSRMLS_DC); /* sub: whether to allow subclasses/interfaces http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.30.2.28&r2=1.73.2.30.2.28.2.1&diff_format=u Index: php-src/ext/spl/spl_iterators.c diff -u php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28 php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.1 --- php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28 Fri May 11 00:15:25 2007 +++ php-src/ext/spl/spl_iterators.c Thu Sep 27 18:00:44 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_iterators.c,v 1.73.2.30.2.28 2007/05/11 00:15:25 helly Exp $ */ +/* $Id: spl_iterators.c,v 1.73.2.30.2.28.2.1 2007/09/27 18:00:44 dmitry Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -59,7 +59,7 @@ PHPAPI zend_class_entry *spl_ce_RecursiveRegexIterator; PHPAPI zend_class_entry *spl_ce_Countable; -zend_function_entry spl_funcs_RecursiveIterator[] = { +const zend_function_entry spl_funcs_RecursiveIterator[] = { SPL_ABSTRACT_ME(RecursiveIterator, hasChildren, NULL) SPL_ABSTRACT_ME(RecursiveIterator, getChildren, NULL) {NULL, NULL, NULL} @@ -765,7 +765,7 @@ ZEND_ARG_INFO(0, max_depth) ZEND_END_ARG_INFO(); -static zend_function_entry spl_funcs_RecursiveIteratorIterator[] = { +static const zend_function_entry spl_funcs_RecursiveIteratorIterator[] = { SPL_ME(RecursiveIteratorIterator, __construct, arginfo_recursive_it___construct, ZEND_ACC_PUBLIC) SPL_ME(RecursiveIteratorIterator, rewind, NULL, ZEND_ACC_PUBLIC) SPL_ME(RecursiveIteratorIterator, valid, NULL, ZEND_ACC_PUBLIC) @@ -1615,7 +1615,7 @@ ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0) ZEND_END_ARG_INFO(); -static zend_function_entry spl_funcs_FilterIterator[] = { +static const zend_function_entry spl_funcs_FilterIterator[] = { SPL_ME(FilterIterator, __construct, arginfo_filter_it___construct, ZEND_ACC_PUBLIC) SPL_ME(FilterIterator, rewind, NULL, ZEND_ACC_PUBLIC) SPL_ME(dual_it, valid, NULL, ZEND_ACC_PUBLIC) @@ -1632,14 +1632,14 @@ ZEND_ARG_OBJ_INFO(0, iterator, RecursiveIterator, 0) ZEND_END_ARG_INFO(); -static zend_function_entry spl_funcs_RecursiveFilterIterator[] = { +static const zend_function_entry spl_funcs_RecursiveFilterIterator[] = { SPL_ME(RecursiveFilterIterator, __construct, arginfo_parent_it___construct, ZEND_ACC_PUBLIC) SPL_ME(RecursiveFilterIterator, hasChildren, NULL, ZEND_ACC_PUBLIC) SPL_ME(RecursiveFilterIterator, getChildren, NULL, ZEND_ACC_PUBLIC) {NULL, NULL, NULL} }; -static zend_function_entry spl_funcs_ParentIterator[] = { +static const zend_function_entry spl_funcs_ParentIterator[] = { SPL_ME(ParentIterator, __construct, arginfo_parent_it___construct, ZEND_ACC_PUBLIC) SPL_MA(ParentIterator, accept, RecursiveFilterIterator, hasChildren, NULL, ZEND_ACC_PUBLIC) {NULL, NULL, NULL} @@ -1670,7 +1670,7 @@ ZEND_ARG_INFO(0, preg_flags) ZEND_END_ARG_INFO(); -static zend_function_entry spl_funcs_RegexIterator[] = { +static const zend_function_entry spl_funcs_RegexIterator[] = { SPL_ME(RegexIterator, __construct, arginfo_regex_it___construct, ZEND_ACC_PUBLIC) SPL_ME(RegexIterator, accept, NULL, ZEND_ACC_PUBLIC) SPL_ME(RegexIterator, getMode, NULL, ZEND_ACC_PUBLIC) @@ -1691,7 +1691,7 @@ ZEND_ARG_INFO(0, preg_flags) ZEND_END_ARG_INFO(); -static zend_function_entry spl_funcs_RecursiveRegexIterator[] = { +static const zend_function_entry spl_funcs_RecursiveRegexIterator[] = { SPL_ME(RecursiveRegexIterator, __construct, arginfo_rec_regex_it___construct, ZEND_ACC_PUBLIC) SPL_ME(RecursiveFilterIterator, hasChildren, NULL, ZEND_ACC_PUBLIC) SPL_ME(RecursiveRegexIterator, getChildren, NULL, ZEND_ACC_PUBLIC) @@ -1823,7 +1823,7 @@ ZEND_ARG_INFO(0, position) ZEND_END_ARG_INFO(); -static zend_function_entry spl_funcs_SeekableIterator[] = { +static const zend_function_entry spl_funcs_SeekableIterator[] = { SPL_ABSTRACT_ME(SeekableIterator, seek, arginfo_seekable_it_seek) {NULL, NULL, NULL} }; @@ -1840,7 +1840,7 @@ ZEND_ARG_INFO(0, position) ZEND_END_ARG_INFO(); -static zend_function_entry spl_funcs_LimitIterator[] = { +static const zend_function_entry spl_funcs_LimitIterator[] = { SPL_ME(LimitIterator, __construct, arginfo_limit_it___construct, ZEND_ACC_PUBLIC) SPL_ME(LimitIterator, rewind, NULL, ZEND_ACC_PUBLIC) SPL_ME(LimitIterator, valid, NULL, ZEND_ACC_PUBLIC) @@ -2236,7 +2236,7 @@ ZEND_ARG_INFO(0, newval) ZEND_END_ARG_INFO(); -static zend_function_entry spl_funcs_CachingIterator[] = { +static const zend_function_entry spl_funcs_CachingIterator[] = { SPL_ME(CachingIterator, __construct, arginfo_caching_it___construct, ZEND_ACC_PUBLIC) SPL_ME(CachingIterator, rewind, NULL, ZEND_ACC_PUBLIC) SPL_ME(CachingIterator, valid, NULL, ZEND_ACC_PUBLIC) @@ -2296,7 +2296,7 @@ ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO(); -static zend_function_entry spl_funcs_RecursiveCachingIterator[] = { +static const zend_function_entry spl_funcs_RecursiveCachingIterator[] = { SPL_ME(RecursiveCachingIterator, __construct, arginfo_caching_rec_it___construct, ZEND_ACC_PUBLIC) SPL_ME(RecursiveCachingIterator, hasChildren, NULL, ZEND_ACC_PUBLIC) SPL_ME(RecursiveCachingIterator, getChildren, NULL, ZEND_ACC_PUBLIC) @@ -2315,7 +2315,7 @@ ZEND_ARG_OBJ_INFO(0, iterator, Traversable, 0) ZEND_END_ARG_INFO(); -static zend_function_entry spl_funcs_IteratorIterator[] = { +static const zend_function_entry spl_funcs_IteratorIterator[] = { SPL_ME(IteratorIterator, __construct, arginfo_iterator_it___construct, ZEND_ACC_PUBLIC) SPL_ME(dual_it, rewind, NULL, ZEND_ACC_PUBLIC) SPL_ME(dual_it, valid, NULL, ZEND_ACC_PUBLIC) @@ -2399,7 +2399,7 @@ ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0) ZEND_END_ARG_INFO(); -static zend_function_entry spl_funcs_NoRewindIterator[] = { +static const zend_function_entry spl_funcs_NoRewindIterator[] = { SPL_ME(NoRewindIterator, __construct, arginfo_norewind_it___construct, ZEND_ACC_PUBLIC) SPL_ME(NoRewindIterator, rewind, NULL, ZEND_ACC_PUBLIC) SPL_ME(NoRewindIterator, valid, NULL, ZEND_ACC_PUBLIC) @@ -2436,7 +2436,7 @@ } } /* }}} */ -static zend_function_entry spl_funcs_InfiniteIterator[] = { +static const zend_function_entry spl_funcs_InfiniteIterator[] = { SPL_ME(InfiniteIterator, __construct, arginfo_norewind_it___construct, ZEND_ACC_PUBLIC) SPL_ME(InfiniteIterator, next, NULL, ZEND_ACC_PUBLIC) {NULL, NULL, NULL} @@ -2475,7 +2475,7 @@ { } /* }}} */ -static zend_function_entry spl_funcs_EmptyIterator[] = { +static const zend_function_entry spl_funcs_EmptyIterator[] = { SPL_ME(EmptyIterator, rewind, NULL, ZEND_ACC_PUBLIC) SPL_ME(EmptyIterator, valid, NULL, ZEND_ACC_PUBLIC) SPL_ME(EmptyIterator, key, NULL, ZEND_ACC_PUBLIC) @@ -2632,7 +2632,7 @@ ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0) ZEND_END_ARG_INFO(); -static zend_function_entry spl_funcs_AppendIterator[] = { +static const zend_function_entry spl_funcs_AppendIterator[] = { SPL_ME(AppendIterator, __construct, NULL, ZEND_ACC_PUBLIC) SPL_ME(AppendIterator, append, arginfo_append_it_append, ZEND_ACC_PUBLIC) SPL_ME(AppendIterator, rewind, NULL, ZEND_ACC_PUBLIC) @@ -2823,12 +2823,12 @@ } /* }}} */ -static zend_function_entry spl_funcs_OuterIterator[] = { +static const zend_function_entry spl_funcs_OuterIterator[] = { SPL_ABSTRACT_ME(OuterIterator, getInnerIterator, NULL) {NULL, NULL, NULL} }; -static zend_function_entry spl_funcs_Countable[] = { +static const zend_function_entry spl_funcs_Countable[] = { SPL_ABSTRACT_ME(Countable, count, NULL) {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_observer.c?r1=1.2.2.6.2.3&r2=1.2.2.6.2.3.2.1&diff_format=u Index: php-src/ext/spl/spl_observer.c diff -u php-src/ext/spl/spl_observer.c:1.2.2.6.2.3 php-src/ext/spl/spl_observer.c:1.2.2.6.2.3.2.1 --- php-src/ext/spl/spl_observer.c:1.2.2.6.2.3 Thu Feb 8 22:14:25 2007 +++ php-src/ext/spl/spl_observer.c Thu Sep 27 18:00:44 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_observer.c,v 1.2.2.6.2.3 2007/02/08 22:14:25 helly Exp $ */ +/* $Id: spl_observer.c,v 1.2.2.6.2.3.2.1 2007/09/27 18:00:44 dmitry Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -48,7 +48,7 @@ ZEND_ARG_OBJ_INFO(0, SplSubject, SplSubject, 0) ZEND_END_ARG_INFO(); -static zend_function_entry spl_funcs_SplObserver[] = { +static const zend_function_entry spl_funcs_SplObserver[] = { SPL_ABSTRACT_ME(SplObserver, update, arginfo_SplObserver_update) {NULL, NULL, NULL} }; @@ -63,7 +63,7 @@ ZEND_ARG_OBJ_INFO(0, ignore, SplObserver, 1) ZEND_END_ARG_INFO();*/ -static zend_function_entry spl_funcs_SplSubject[] = { +static const zend_function_entry spl_funcs_SplSubject[] = { SPL_ABSTRACT_ME(SplSubject, attach, arginfo_SplSubject_attach) SPL_ABSTRACT_ME(SplSubject, detach, arginfo_SplSubject_attach) SPL_ABSTRACT_ME(SplSubject, notify, NULL) @@ -414,7 +414,7 @@ ZEND_ARG_INFO(0, serialized) ZEND_END_ARG_INFO(); -static zend_function_entry spl_funcs_SplObjectStorage[] = { +static const zend_function_entry spl_funcs_SplObjectStorage[] = { SPL_ME(SplObjectStorage, attach, arginfo_Object, 0) SPL_ME(SplObjectStorage, detach, arginfo_Object, 0) SPL_ME(SplObjectStorage, contains, arginfo_Object, 0) http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_sxe.c?r1=1.8.2.5.2.2&r2=1.8.2.5.2.2.2.1&diff_format=u Index: php-src/ext/spl/spl_sxe.c diff -u php-src/ext/spl/spl_sxe.c:1.8.2.5.2.2 php-src/ext/spl/spl_sxe.c:1.8.2.5.2.2.2.1 --- php-src/ext/spl/spl_sxe.c:1.8.2.5.2.2 Tue Aug 14 12:10:46 2007 +++ php-src/ext/spl/spl_sxe.c Thu Sep 27 18:00:44 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_sxe.c,v 1.8.2.5.2.2 2007/08/14 12:10:46 rrichards Exp $ */ +/* $Id: spl_sxe.c,v 1.8.2.5.2.2.2.1 2007/09/27 18:00:44 dmitry Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -156,7 +156,7 @@ RETURN_LONG(count); } -static zend_function_entry spl_funcs_SimpleXMLIterator[] = { +static const zend_function_entry spl_funcs_SimpleXMLIterator[] = { SPL_ME(SimpleXMLIterator, rewind, NULL, ZEND_ACC_PUBLIC) SPL_ME(SimpleXMLIterator, valid, NULL, ZEND_ACC_PUBLIC) SPL_ME(SimpleXMLIterator, current, NULL, ZEND_ACC_PUBLIC) http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/pdo_sqlite2.c?r1=1.6.2.3.2.2&r2=1.6.2.3.2.2.2.1&diff_format=u Index: php-src/ext/sqlite/pdo_sqlite2.c diff -u php-src/ext/sqlite/pdo_sqlite2.c:1.6.2.3.2.2 php-src/ext/sqlite/pdo_sqlite2.c:1.6.2.3.2.2.2.1 --- php-src/ext/sqlite/pdo_sqlite2.c:1.6.2.3.2.2 Mon Jan 1 09:36:07 2007 +++ php-src/ext/sqlite/pdo_sqlite2.c Thu Sep 27 18:00:44 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_sqlite2.c,v 1.6.2.3.2.2 2007/01/01 09:36:07 sebastian Exp $ */ +/* $Id: pdo_sqlite2.c,v 1.6.2.3.2.2.2.1 2007/09/27 18:00:44 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -481,12 +481,12 @@ /* TODO: implement this stuff */ } -static zend_function_entry dbh_methods[] = { +static const zend_function_entry dbh_methods[] = { PHP_FE(sqlite2_create_function, NULL) {NULL, NULL, NULL} }; -static zend_function_entry *get_driver_methods(pdo_dbh_t *dbh, int kind TSRMLS_DC) +static const zend_function_entry *get_driver_methods(pdo_dbh_t *dbh, int kind TSRMLS_DC) { switch (kind) { case PDO_DBH_DRIVER_METHOD_KIND_DBH: http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/sqlite.c?r1=1.166.2.13.2.9&r2=1.166.2.13.2.9.2.1&diff_format=u Index: php-src/ext/sqlite/sqlite.c diff -u php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9 php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9.2.1 --- php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9 Sat May 19 17:58:22 2007 +++ php-src/ext/sqlite/sqlite.c Thu Sep 27 18:00:45 2007 @@ -17,7 +17,7 @@ | Marcus Boerger <helly@php.net> | +----------------------------------------------------------------------+ - $Id: sqlite.c,v 1.166.2.13.2.9 2007/05/19 17:58:22 iliaa Exp $ + $Id: sqlite.c,v 1.166.2.13.2.9.2.1 2007/09/27 18:00:45 dmitry Exp $ */ #ifdef HAVE_CONFIG_H @@ -164,7 +164,7 @@ enum { PHPSQLITE_ASSOC = 1, PHPSQLITE_NUM = 2, PHPSQLITE_BOTH = PHPSQLITE_ASSOC|PHPSQLITE_NUM }; -zend_function_entry sqlite_functions[] = { +const zend_function_entry sqlite_functions[] = { PHP_FE(sqlite_open, third_arg_force_ref) PHP_FE(sqlite_popen, third_arg_force_ref) PHP_FE(sqlite_close, NULL) @@ -207,7 +207,7 @@ {NULL, NULL, NULL} }; -zend_function_entry sqlite_funcs_db[] = { +const zend_function_entry sqlite_funcs_db[] = { PHP_ME_MAPPING(__construct, sqlite_open, third_arg_force_ref, 0) /* PHP_ME_MAPPING(close, sqlite_close, NULL, 0)*/ PHP_ME_MAPPING(query, sqlite_query, third_arg_force_ref, 0) @@ -227,7 +227,7 @@ {NULL, NULL, NULL} }; -zend_function_entry sqlite_funcs_query[] = { +const zend_function_entry sqlite_funcs_query[] = { PHP_ME_MAPPING(fetch, sqlite_fetch_array, NULL, 0) PHP_ME_MAPPING(fetchObject, sqlite_fetch_object, NULL, 0) PHP_ME_MAPPING(fetchSingle, sqlite_fetch_single, NULL, 0) @@ -251,7 +251,7 @@ {NULL, NULL, NULL} }; -zend_function_entry sqlite_funcs_ub_query[] = { +const zend_function_entry sqlite_funcs_ub_query[] = { PHP_ME_MAPPING(fetch, sqlite_fetch_array, NULL, 0) PHP_ME_MAPPING(fetchObject, sqlite_fetch_object, NULL, 0) PHP_ME_MAPPING(fetchSingle, sqlite_fetch_single, NULL, 0) @@ -266,12 +266,12 @@ {NULL, NULL, NULL} }; -zend_function_entry sqlite_funcs_exception[] = { +const zend_function_entry sqlite_funcs_exception[] = { {NULL, NULL, NULL} }; /* Dependancies */ -static zend_module_dep sqlite_deps[] = { +static const zend_module_dep sqlite_deps[] = { #if defined(HAVE_SPL) && ((PHP_MAJOR_VERSION > 5) || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 1)) ZEND_MOD_REQUIRED("spl") #endif @@ -1128,7 +1128,7 @@ { php_info_print_table_start(); php_info_print_table_header(2, "SQLite support", "enabled"); - php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.166.2.13.2.9 2007/05/19 17:58:22 iliaa Exp $"); + php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.166.2.13.2.9.2.1 2007/09/27 18:00:45 dmitry Exp $"); php_info_print_table_row(2, "SQLite Library", sqlite_libversion()); php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding()); php_info_print_table_end(); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64&r2=1.725.2.31.2.64.2.1&diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64 php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.1 --- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64 Thu Sep 6 13:28:05 2007 +++ php-src/ext/standard/basic_functions.c Thu Sep 27 18:00:45 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.725.2.31.2.64 2007/09/06 13:28:05 derick Exp $ */ +/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.1 2007/09/27 18:00:45 dmitry Exp $ */ #include "php.h" #include "php_streams.h" @@ -3097,7 +3097,7 @@ /* }}} */ /* }}} */ -zend_function_entry basic_functions[] = { +const zend_function_entry basic_functions[] = { PHP_FE(constant, arginfo_constant) PHP_FE(bin2hex, arginfo_bin2hex) PHP_FE(sleep, arginfo_sleep) @@ -3821,7 +3821,7 @@ PHP_INI_ENTRY_EX("safe_mode_allowed_env_vars", SAFE_MODE_ALLOWED_ENV_VARS, PHP_INI_SYSTEM, OnUpdateSafeModeAllowedEnvVars, NULL) PHP_INI_END() -static zend_module_dep standard_deps[] = { +static const zend_module_dep standard_deps[] = { ZEND_MOD_OPTIONAL("session") {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.147.2.3.2.12&r2=1.147.2.3.2.12.2.1&diff_format=u Index: php-src/ext/standard/dir.c diff -u php-src/ext/standard/dir.c:1.147.2.3.2.12 php-src/ext/standard/dir.c:1.147.2.3.2.12.2.1 --- php-src/ext/standard/dir.c:1.147.2.3.2.12 Wed Sep 19 22:37:58 2007 +++ php-src/ext/standard/dir.c Thu Sep 27 18:00:45 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dir.c,v 1.147.2.3.2.12 2007/09/19 22:37:58 iliaa Exp $ */ +/* $Id: dir.c,v 1.147.2.3.2.12.2.1 2007/09/27 18:00:45 dmitry Exp $ */ /* {{{ includes/startup/misc */ @@ -93,7 +93,7 @@ RETURN_FALSE; \ } -static zend_function_entry php_dir_class_functions[] = { +static const zend_function_entry php_dir_class_functions[] = { PHP_FALIAS(close, closedir, NULL) PHP_FALIAS(rewind, rewinddir, NULL) PHP_NAMED_FE(read, php_if_readdir, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dl.c?r1=1.106.2.1.2.5&r2=1.106.2.1.2.5.2.1&diff_format=u Index: php-src/ext/standard/dl.c diff -u php-src/ext/standard/dl.c:1.106.2.1.2.5 php-src/ext/standard/dl.c:1.106.2.1.2.5.2.1 --- php-src/ext/standard/dl.c:1.106.2.1.2.5 Tue Sep 18 20:19:34 2007 +++ php-src/ext/standard/dl.c Thu Sep 27 18:00:45 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dl.c,v 1.106.2.1.2.5 2007/09/18 20:19:34 stas Exp $ */ +/* $Id: dl.c,v 1.106.2.1.2.5.2.1 2007/09/27 18:00:45 dmitry Exp $ */ #include "php.h" #include "dl.h" @@ -197,7 +197,7 @@ unsigned int zend_api; }; - char *name; + const char *name; int zend_api; unsigned char zend_debug, zts; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.14&r2=1.249.2.10.2.14.2.1&diff_format=u Index: php-src/ext/standard/info.c diff -u php-src/ext/standard/info.c:1.249.2.10.2.14 php-src/ext/standard/info.c:1.249.2.10.2.14.2.1 --- php-src/ext/standard/info.c:1.249.2.10.2.14 Sat Jul 21 01:24:26 2007 +++ php-src/ext/standard/info.c Thu Sep 27 18:00:45 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: info.c,v 1.249.2.10.2.14 2007/07/21 01:24:26 jani Exp $ */ +/* $Id: info.c,v 1.249.2.10.2.14.2.1 2007/09/27 18:00:45 dmitry Exp $ */ #include "php.h" #include "php_ini.h" @@ -1020,7 +1020,7 @@ if (argc == 0) { RETURN_STRING(PHP_VERSION, 1); } else if (argc == 1 && zend_get_parameters_ex(1, &arg) == SUCCESS) { - char *version; + const char *version; convert_to_string_ex(arg); version = zend_get_module_version(Z_STRVAL_PP(arg)); if (version == NULL) { http://cvs.php.net/viewvc.cgi/php-src/ext/standard/user_filters.c?r1=1.31.2.4.2.9&r2=1.31.2.4.2.9.2.1&diff_format=u Index: php-src/ext/standard/user_filters.c diff -u php-src/ext/standard/user_filters.c:1.31.2.4.2.9 php-src/ext/standard/user_filters.c:1.31.2.4.2.9.2.1 --- php-src/ext/standard/user_filters.c:1.31.2.4.2.9 Sat Aug 4 07:53:00 2007 +++ php-src/ext/standard/user_filters.c Thu Sep 27 18:00:45 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: user_filters.c,v 1.31.2.4.2.9 2007/08/04 07:53:00 pollita Exp $ */ +/* $Id: user_filters.c,v 1.31.2.4.2.9.2.1 2007/09/27 18:00:45 dmitry Exp $ */ #include "php.h" #include "php_globals.h" @@ -70,7 +70,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_php_user_filter_onClose, 0) ZEND_END_ARG_INFO() -static zend_function_entry user_filter_class_funcs[] = { +static const zend_function_entry user_filter_class_funcs[] = { PHP_NAMED_FE(filter, PHP_FN(user_filter_nop), arginfo_php_user_filter_filter) PHP_NAMED_FE(onCreate, PHP_FN(user_filter_nop), arginfo_php_user_filter_onCreate) PHP_NAMED_FE(onClose, PHP_FN(user_filter_nop), arginfo_php_user_filter_onClose) http://cvs.php.net/viewvc.cgi/php-src/ext/sybase/php_sybase_db.c?r1=1.66.2.5.2.8&r2=1.66.2.5.2.8.2.1&diff_format=u Index: php-src/ext/sybase/php_sybase_db.c diff -u php-src/ext/sybase/php_sybase_db.c:1.66.2.5.2.8 php-src/ext/sybase/php_sybase_db.c:1.66.2.5.2.8.2.1 --- php-src/ext/sybase/php_sybase_db.c:1.66.2.5.2.8 Fri Aug 31 07:42:00 2007 +++ php-src/ext/sybase/php_sybase_db.c Thu Sep 27 18:00:45 2007 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_db.c,v 1.66.2.5.2.8 2007/08/31 07:42:00 jani Exp $ */ +/* $Id: php_sybase_db.c,v 1.66.2.5.2.8.2.1 2007/09/27 18:00:45 dmitry Exp $ */ #ifdef HAVE_CONFIG_H @@ -81,7 +81,7 @@ } sybase_result; -zend_function_entry sybase_functions[] = { +const zend_function_entry sybase_functions[] = { PHP_FE(sybase_connect, NULL) PHP_FE(sybase_pconnect, NULL) PHP_FE(sybase_close, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/php_sybase_ct.c?r1=1.103.2.5.2.13&r2=1.103.2.5.2.13.2.1&diff_format=u Index: php-src/ext/sybase_ct/php_sybase_ct.c diff -u php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.13 php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.13.2.1 --- php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.13 Tue Apr 10 15:56:31 2007 +++ php-src/ext/sybase_ct/php_sybase_ct.c Thu Sep 27 18:00:45 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_ct.c,v 1.103.2.5.2.13 2007/04/10 15:56:31 helly Exp $ */ +/* $Id: php_sybase_ct.c,v 1.103.2.5.2.13.2.1 2007/09/27 18:00:45 dmitry Exp $ */ #ifdef HAVE_CONFIG_H @@ -41,7 +41,7 @@ static PHP_GINIT_FUNCTION(sybase); static PHP_GSHUTDOWN_FUNCTION(sybase); -zend_function_entry sybase_functions[] = { +const zend_function_entry sybase_functions[] = { PHP_FE(sybase_connect, NULL) PHP_FE(sybase_pconnect, NULL) PHP_FE(sybase_close, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/sysvmsg/sysvmsg.c?r1=1.20.2.3.2.6&r2=1.20.2.3.2.6.2.1&diff_format=u Index: php-src/ext/sysvmsg/sysvmsg.c diff -u php-src/ext/sysvmsg/sysvmsg.c:1.20.2.3.2.6 php-src/ext/sysvmsg/sysvmsg.c:1.20.2.3.2.6.2.1 --- php-src/ext/sysvmsg/sysvmsg.c:1.20.2.3.2.6 Wed Jan 17 08:25:32 2007 +++ php-src/ext/sysvmsg/sysvmsg.c Thu Sep 27 18:00:45 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvmsg.c,v 1.20.2.3.2.6 2007/01/17 08:25:32 tony2001 Exp $ */ +/* $Id: sysvmsg.c,v 1.20.2.3.2.6.2.1 2007/09/27 18:00:45 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -65,7 +65,7 @@ * * Every user visible function must have an entry in sysvmsg_functions[]. */ -zend_function_entry sysvmsg_functions[] = { +const zend_function_entry sysvmsg_functions[] = { PHP_FE(msg_get_queue, NULL) PHP_FE(msg_send, sixth_arg_force_ref) PHP_FE(msg_receive, msg_receive_args_force_ref) @@ -125,7 +125,7 @@ { php_info_print_table_start(); php_info_print_table_row(2, "sysvmsg support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.20.2.3.2.6 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.20.2.3.2.6.2.1 $"); php_info_print_table_end(); } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/sysvsem/sysvsem.c?r1=1.51.2.3.2.2&r2=1.51.2.3.2.2.2.1&diff_format=u Index: php-src/ext/sysvsem/sysvsem.c diff -u php-src/ext/sysvsem/sysvsem.c:1.51.2.3.2.2 php-src/ext/sysvsem/sysvsem.c:1.51.2.3.2.2.2.1 --- php-src/ext/sysvsem/sysvsem.c:1.51.2.3.2.2 Fri May 11 15:46:38 2007 +++ php-src/ext/sysvsem/sysvsem.c Thu Sep 27 18:00:45 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvsem.c,v 1.51.2.3.2.2 2007/05/11 15:46:38 tony2001 Exp $ */ +/* $Id: sysvsem.c,v 1.51.2.3.2.2.2.1 2007/09/27 18:00:45 dmitry Exp $ */ /* Latest update build anc tested on Linux 2.2.14 * @@ -58,7 +58,7 @@ /* {{{ sysvsem_functions[] */ -zend_function_entry sysvsem_functions[] = { +const zend_function_entry sysvsem_functions[] = { PHP_FE(sem_get, NULL) PHP_FE(sem_acquire, NULL) PHP_FE(sem_release, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/sysvshm/sysvshm.c?r1=1.70.2.2.2.5&r2=1.70.2.2.2.5.2.1&diff_format=u Index: php-src/ext/sysvshm/sysvshm.c diff -u php-src/ext/sysvshm/sysvshm.c:1.70.2.2.2.5 php-src/ext/sysvshm/sysvshm.c:1.70.2.2.2.5.2.1 --- php-src/ext/sysvshm/sysvshm.c:1.70.2.2.2.5 Fri Aug 31 07:42:00 2007 +++ php-src/ext/sysvshm/sysvshm.c Thu Sep 27 18:00:45 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvshm.c,v 1.70.2.2.2.5 2007/08/31 07:42:00 jani Exp $ */ +/* $Id: sysvshm.c,v 1.70.2.2.2.5.2.1 2007/09/27 18:00:45 dmitry Exp $ */ /* This has been built and tested on Linux 2.2.14 * @@ -41,7 +41,7 @@ /* {{{ sysvshm_functions[] */ -zend_function_entry sysvshm_functions[] = { +const zend_function_entry sysvshm_functions[] = { PHP_FE(shm_attach, NULL) PHP_FE(shm_remove, NULL) PHP_FE(shm_detach, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tidy.c?r1=1.66.2.8.2.24&r2=1.66.2.8.2.24.2.1&diff_format=u Index: php-src/ext/tidy/tidy.c diff -u php-src/ext/tidy/tidy.c:1.66.2.8.2.24 php-src/ext/tidy/tidy.c:1.66.2.8.2.24.2.1 --- php-src/ext/tidy/tidy.c:1.66.2.8.2.24 Thu Sep 20 22:25:05 2007 +++ php-src/ext/tidy/tidy.c Thu Sep 27 18:00:45 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: tidy.c,v 1.66.2.8.2.24 2007/09/20 22:25:05 nlopess Exp $ */ +/* $Id: tidy.c,v 1.66.2.8.2.24.2.1 2007/09/27 18:00:45 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -277,7 +277,7 @@ PHP_INI_ENTRY("tidy.clean_output", "0", PHP_INI_PERDIR, NULL) PHP_INI_END() -static zend_function_entry tidy_functions[] = { +static const zend_function_entry tidy_functions[] = { PHP_FE(tidy_getopt, NULL) PHP_FE(tidy_parse_string, NULL) PHP_FE(tidy_parse_file, NULL) @@ -308,7 +308,7 @@ {NULL, NULL, NULL} }; -static zend_function_entry tidy_funcs_doc[] = { +static const zend_function_entry tidy_funcs_doc[] = { TIDY_METHOD_MAP(getOpt, tidy_getopt, NULL) TIDY_METHOD_MAP(cleanRepair, tidy_clean_repair, NULL) TIDY_DOC_ME(parseFile, NULL) @@ -333,7 +333,7 @@ {NULL, NULL, NULL} }; -static zend_function_entry tidy_funcs_node[] = { +static const zend_function_entry tidy_funcs_node[] = { TIDY_NODE_ME(hasChildren, NULL) TIDY_NODE_ME(hasSiblings, NULL) TIDY_NODE_ME(isComment, NULL) @@ -998,7 +998,7 @@ php_info_print_table_start(); php_info_print_table_header(2, "Tidy support", "enabled"); php_info_print_table_row(2, "libTidy Release", (char *)tidyReleaseDate()); - php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.66.2.8.2.24 2007/09/20 22:25:05 nlopess Exp $)"); + php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.66.2.8.2.24.2.1 2007/09/27 18:00:45 dmitry Exp $)"); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); http://cvs.php.net/viewvc.cgi/php-src/ext/tokenizer/tokenizer.c?r1=1.31.2.5.2.7&r2=1.31.2.5.2.7.2.1&diff_format=u Index: php-src/ext/tokenizer/tokenizer.c diff -u php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.7 php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.7.2.1 --- php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.7 Tue Jul 31 23:24:11 2007 +++ php-src/ext/tokenizer/tokenizer.c Thu Sep 27 18:00:45 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: tokenizer.c,v 1.31.2.5.2.7 2007/07/31 23:24:11 johannes Exp $ */ +/* $Id: tokenizer.c,v 1.31.2.5.2.7.2.1 2007/09/27 18:00:45 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -97,7 +97,7 @@ * * Every user visible function must have an entry in tokenizer_functions[]. */ -zend_function_entry tokenizer_functions[] = { +const zend_function_entry tokenizer_functions[] = { PHP_FE(token_get_all, NULL) PHP_FE(token_name, NULL) {NULL, NULL, NULL} /* Must be the last line in tokenizer_functions[] */ http://cvs.php.net/viewvc.cgi/php-src/ext/wddx/wddx.c?r1=1.119.2.10.2.17&r2=1.119.2.10.2.17.2.1&diff_format=u Index: php-src/ext/wddx/wddx.c diff -u php-src/ext/wddx/wddx.c:1.119.2.10.2.17 php-src/ext/wddx/wddx.c:1.119.2.10.2.17.2.1 --- php-src/ext/wddx/wddx.c:1.119.2.10.2.17 Mon Jun 11 15:08:43 2007 +++ php-src/ext/wddx/wddx.c Thu Sep 27 18:00:45 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: wddx.c,v 1.119.2.10.2.17 2007/06/11 15:08:43 iliaa Exp $ */ +/* $Id: wddx.c,v 1.119.2.10.2.17.2.1 2007/09/27 18:00:45 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -104,7 +104,7 @@ /* {{{ wddx_functions[] */ -zend_function_entry wddx_functions[] = { +const zend_function_entry wddx_functions[] = { PHP_FE(wddx_serialize_value, NULL) PHP_FE(wddx_serialize_vars, NULL) PHP_FE(wddx_packet_start, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/xml/xml.c?r1=1.157.2.4.2.5&r2=1.157.2.4.2.5.2.1&diff_format=u Index: php-src/ext/xml/xml.c diff -u php-src/ext/xml/xml.c:1.157.2.4.2.5 php-src/ext/xml/xml.c:1.157.2.4.2.5.2.1 --- php-src/ext/xml/xml.c:1.157.2.4.2.5 Mon Jan 1 09:36:09 2007 +++ php-src/ext/xml/xml.c Thu Sep 27 18:00:45 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.157.2.4.2.5 2007/01/01 09:36:09 sebastian Exp $ */ +/* $Id: xml.c,v 1.157.2.4.2.5.2.1 2007/09/27 18:00:45 dmitry Exp $ */ #define IS_EXT_MODULE @@ -107,7 +107,7 @@ ZEND_ARG_PASS_INFO(1) ZEND_END_ARG_INFO(); -zend_function_entry xml_functions[] = { +const zend_function_entry xml_functions[] = { PHP_FE(xml_parser_create, NULL) PHP_FE(xml_parser_create_ns, NULL) PHP_FE(xml_set_object, second_arg_force_ref) @@ -136,7 +136,7 @@ }; #ifdef LIBXML_EXPAT_COMPAT -static zend_module_dep xml_deps[] = { +static const zend_module_dep xml_deps[] = { ZEND_MOD_REQUIRED("libxml") {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/ext/xmlreader/php_xmlreader.c?r1=1.13.2.14.2.9&r2=1.13.2.14.2.9.2.1&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.9 php-src/ext/xmlreader/php_xmlreader.c:1.13.2.14.2.9.2.1 --- php-src/ext/xmlreader/php_xmlreader.c:1.13.2.14.2.9 Thu Sep 20 09:30:45 2007 +++ php-src/ext/xmlreader/php_xmlreader.c Thu Sep 27 18:00:45 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_xmlreader.c,v 1.13.2.14.2.9 2007/09/20 09:30:45 rrichards Exp $ */ +/* $Id: php_xmlreader.c,v 1.13.2.14.2.9.2.1 2007/09/27 18:00:45 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -319,7 +319,7 @@ /* }}} */ #endif -static zend_module_dep xmlreader_deps[] = { +static const zend_module_dep xmlreader_deps[] = { ZEND_MOD_REQUIRED("libxml") {NULL, NULL, NULL} }; @@ -1292,7 +1292,7 @@ ZEND_END_ARG_INFO() /* }}} */ -static zend_function_entry xmlreader_functions[] = { +static const zend_function_entry xmlreader_functions[] = { PHP_ME(xmlreader, close, arginfo_xmlreader_close, ZEND_ACC_PUBLIC) PHP_ME(xmlreader, getAttribute, arginfo_xmlreader_getAttribute, ZEND_ACC_PUBLIC) PHP_ME(xmlreader, getAttributeNo, arginfo_xmlreader_getAttributeNo, ZEND_ACC_PUBLIC) http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.39.2.5.2.6&r2=1.39.2.5.2.6.2.1&diff_format=u Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.6 php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.6.2.1 --- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.6 Tue Sep 18 19:49:53 2007 +++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Thu Sep 27 18:00:46 2007 @@ -51,7 +51,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.6 2007/09/18 19:49:53 iliaa Exp $ */ +/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.6.2.1 2007/09/27 18:00:46 dmitry Exp $ */ /********************************************************************** * BUGS: * @@ -75,7 +75,7 @@ static int le_xmlrpc_server; -zend_function_entry xmlrpc_functions[] = { +const zend_function_entry xmlrpc_functions[] = { PHP_FE(xmlrpc_encode, NULL) PHP_FE(xmlrpc_decode, NULL) PHP_FE(xmlrpc_decode_request, second_arg_force_ref) http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.20.2.12.2.15&r2=1.20.2.12.2.15.2.1&diff_format=u Index: php-src/ext/xmlwriter/php_xmlwriter.c diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.15 php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.15.2.1 --- php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.15 Mon May 14 09:23:49 2007 +++ php-src/ext/xmlwriter/php_xmlwriter.c Thu Sep 27 18:00:46 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_xmlwriter.c,v 1.20.2.12.2.15 2007/05/14 09:23:49 pajoye Exp $ */ +/* $Id: php_xmlwriter.c,v 1.20.2.12.2.15.2.1 2007/09/27 18:00:46 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -173,7 +173,7 @@ } \ /* {{{ xmlwriter_functions */ -static zend_function_entry xmlwriter_functions[] = { +static const zend_function_entry xmlwriter_functions[] = { PHP_FE(xmlwriter_open_uri, NULL) PHP_FE(xmlwriter_open_memory, NULL) #if LIBXML_VERSION >= 20605 @@ -230,7 +230,7 @@ #ifdef ZEND_ENGINE_2 /* {{{ xmlwriter_class_functions */ -static zend_function_entry xmlwriter_class_functions[] = { +static const zend_function_entry xmlwriter_class_functions[] = { PHP_ME_MAPPING(openUri, xmlwriter_open_uri, NULL, 0) PHP_ME_MAPPING(openMemory, xmlwriter_open_memory, NULL, 0) #if LIBXML_VERSION >= 20605 http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/php_xsl.c?r1=1.32.2.6.2.2&r2=1.32.2.6.2.2.2.1&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.2 php-src/ext/xsl/php_xsl.c:1.32.2.6.2.2.2.1 --- php-src/ext/xsl/php_xsl.c:1.32.2.6.2.2 Fri Jan 12 12:17:32 2007 +++ php-src/ext/xsl/php_xsl.c Thu Sep 27 18:00:46 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_xsl.c,v 1.32.2.6.2.2 2007/01/12 12:17:32 tony2001 Exp $ */ +/* $Id: php_xsl.c,v 1.32.2.6.2.2.2.1 2007/09/27 18:00:46 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,12 +35,12 @@ * * Every user visible function must have an entry in xsl_functions[]. */ -zend_function_entry xsl_functions[] = { +const zend_function_entry xsl_functions[] = { {NULL, NULL, NULL} /* Must be the last line in xsl_functions[] */ }; /* }}} */ -static zend_module_dep xsl_deps[] = { +static const zend_module_dep xsl_deps[] = { ZEND_MOD_REQUIRED("libxml") {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsl_fe.h?r1=1.8.2.1.2.1&r2=1.8.2.1.2.1.2.1&diff_format=u Index: php-src/ext/xsl/xsl_fe.h diff -u php-src/ext/xsl/xsl_fe.h:1.8.2.1.2.1 php-src/ext/xsl/xsl_fe.h:1.8.2.1.2.1.2.1 --- php-src/ext/xsl/xsl_fe.h:1.8.2.1.2.1 Mon Jan 1 09:36:10 2007 +++ php-src/ext/xsl/xsl_fe.h Thu Sep 27 18:00:46 2007 @@ -16,12 +16,12 @@ +----------------------------------------------------------------------+ */ -/* $Id: xsl_fe.h,v 1.8.2.1.2.1 2007/01/01 09:36:10 sebastian Exp $ */ +/* $Id: xsl_fe.h,v 1.8.2.1.2.1.2.1 2007/09/27 18:00:46 dmitry Exp $ */ #ifndef XSL_FE_H #define XSL_FE_H -extern zend_function_entry php_xsl_xsltprocessor_class_functions[]; +extern const zend_function_entry php_xsl_xsltprocessor_class_functions[]; extern zend_class_entry *xsl_xsltprocessor_class_entry; PHP_FUNCTION(xsl_xsltprocessor_import_stylesheet); http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.39.2.2.2.9&r2=1.39.2.2.2.9.2.1&diff_format=u Index: php-src/ext/xsl/xsltprocessor.c diff -u php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9 php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9.2.1 --- php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9 Mon Jul 30 16:33:22 2007 +++ php-src/ext/xsl/xsltprocessor.c Thu Sep 27 18:00:46 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xsltprocessor.c,v 1.39.2.2.2.9 2007/07/30 16:33:22 rrichards Exp $ */ +/* $Id: xsltprocessor.c,v 1.39.2.2.2.9.2.1 2007/09/27 18:00:46 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -34,7 +34,7 @@ * Since: */ -zend_function_entry php_xsl_xsltprocessor_class_functions[] = { +const zend_function_entry php_xsl_xsltprocessor_class_functions[] = { PHP_FALIAS(importStylesheet, xsl_xsltprocessor_import_stylesheet, NULL) PHP_FALIAS(transformToDoc, xsl_xsltprocessor_transform_to_doc, NULL) PHP_FALIAS(transformToUri, xsl_xsltprocessor_transform_to_uri, NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.38&r2=1.1.2.38.2.1&diff_format=u Index: php-src/ext/zip/php_zip.c diff -u php-src/ext/zip/php_zip.c:1.1.2.38 php-src/ext/zip/php_zip.c:1.1.2.38.2.1 --- php-src/ext/zip/php_zip.c:1.1.2.38 Mon Aug 6 22:02:32 2007 +++ php-src/ext/zip/php_zip.c Thu Sep 27 18:00:46 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_zip.c,v 1.1.2.38 2007/08/06 22:02:32 bjori Exp $ */ +/* $Id: php_zip.c,v 1.1.2.38.2.1 2007/09/27 18:00:46 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -272,7 +272,7 @@ /* }}} */ /* {{{ zend_function_entry */ -static zend_function_entry zip_functions[] = { +static const zend_function_entry zip_functions[] = { PHP_FE(zip_open, NULL) PHP_FE(zip_close, NULL) PHP_FE(zip_read, NULL) @@ -1971,7 +1971,7 @@ /* }}} */ /* {{{ ze_zip_object_class_functions */ -static zend_function_entry zip_class_functions[] = { +static const zend_function_entry zip_class_functions[] = { ZIPARCHIVE_ME(open, NULL, ZEND_ACC_PUBLIC) ZIPARCHIVE_ME(close, NULL, ZEND_ACC_PUBLIC) ZIPARCHIVE_ME(addEmptyDir, NULL, ZEND_ACC_PUBLIC) @@ -2101,7 +2101,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "Zip", "enabled"); - php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 1.1.2.38 2007/08/06 22:02:32 bjori Exp $"); + php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 1.1.2.38.2.1 2007/09/27 18:00:46 dmitry Exp $"); php_info_print_table_row(2, "Zip version", "2.0.0"); php_info_print_table_row(2, "Libzip version", "0.7.1"); http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib.c?r1=1.183.2.6.2.5&r2=1.183.2.6.2.5.2.1&diff_format=u Index: php-src/ext/zlib/zlib.c diff -u php-src/ext/zlib/zlib.c:1.183.2.6.2.5 php-src/ext/zlib/zlib.c:1.183.2.6.2.5.2.1 --- php-src/ext/zlib/zlib.c:1.183.2.6.2.5 Mon Jan 1 09:36:10 2007 +++ php-src/ext/zlib/zlib.c Thu Sep 27 18:00:46 2007 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.183.2.6.2.5 2007/01/01 09:36:10 sebastian Exp $ */ +/* $Id: zlib.c,v 1.183.2.6.2.5.2.1 2007/09/27 18:00:46 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -103,7 +103,7 @@ /* {{{ php_zlib_functions[] */ -static zend_function_entry php_zlib_functions[] = { +static const zend_function_entry php_zlib_functions[] = { PHP_FE(readgzfile, NULL) PHP_FALIAS(gzrewind, rewind, NULL) PHP_FALIAS(gzclose, fclose, NULL) http://cvs.php.net/viewvc.cgi/php-src/sapi/aolserver/aolserver.c?r1=1.81.2.2.2.1&r2=1.81.2.2.2.1.2.1&diff_format=u Index: php-src/sapi/aolserver/aolserver.c diff -u php-src/sapi/aolserver/aolserver.c:1.81.2.2.2.1 php-src/sapi/aolserver/aolserver.c:1.81.2.2.2.1.2.1 --- php-src/sapi/aolserver/aolserver.c:1.81.2.2.2.1 Mon Jan 1 09:36:12 2007 +++ php-src/sapi/aolserver/aolserver.c Thu Sep 27 18:00:46 2007 @@ -22,7 +22,7 @@ * - CGI/1.1 conformance */ -/* $Id: aolserver.c,v 1.81.2.2.2.1 2007/01/01 09:36:12 sebastian Exp $ */ +/* $Id: aolserver.c,v 1.81.2.2.2.1.2.1 2007/09/27 18:00:46 dmitry Exp $ */ /* conflict between PHP and AOLserver headers */ #define Debug php_Debug @@ -205,7 +205,7 @@ int i; php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.81.2.2.2.1 2007/01/01 09:36:12 sebastian Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.81.2.2.2.1.2.1 2007/09/27 18:00:46 dmitry Exp $"); php_info_print_table_row(2, "Build date", Ns_InfoBuildDate()); php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile()); php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog()); @@ -240,7 +240,7 @@ PHP_FUNCTION(getallheaders); -static zend_function_entry aolserver_functions[] = { +const static zend_function_entry aolserver_functions[] = { PHP_FE(getallheaders, NULL) {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/php_apache.c?r1=1.89.2.4.2.6&r2=1.89.2.4.2.6.2.1&diff_format=u Index: php-src/sapi/apache/php_apache.c diff -u php-src/sapi/apache/php_apache.c:1.89.2.4.2.6 php-src/sapi/apache/php_apache.c:1.89.2.4.2.6.2.1 --- php-src/sapi/apache/php_apache.c:1.89.2.4.2.6 Fri Sep 7 08:49:24 2007 +++ php-src/sapi/apache/php_apache.c Thu Sep 27 18:00:46 2007 @@ -17,7 +17,7 @@ | David Sklar <sklar@student.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_apache.c,v 1.89.2.4.2.6 2007/09/07 08:49:24 jani Exp $ */ +/* $Id: php_apache.c,v 1.89.2.4.2.6.2.1 2007/09/27 18:00:46 dmitry Exp $ */ #include "php_apache_http.h" @@ -56,7 +56,7 @@ PHP_MINFO_FUNCTION(apache); -zend_function_entry apache_functions[] = { +const zend_function_entry apache_functions[] = { PHP_FE(virtual, NULL) PHP_FE(apache_request_headers, NULL) PHP_FE(apache_note, NULL) http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/php_functions.c?r1=1.44.2.2.2.2&r2=1.44.2.2.2.2.2.1&diff_format=u Index: php-src/sapi/apache2filter/php_functions.c diff -u php-src/sapi/apache2filter/php_functions.c:1.44.2.2.2.2 php-src/sapi/apache2filter/php_functions.c:1.44.2.2.2.2.2.1 --- php-src/sapi/apache2filter/php_functions.c:1.44.2.2.2.2 Mon Jan 1 09:36:12 2007 +++ php-src/sapi/apache2filter/php_functions.c Thu Sep 27 18:00:46 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_functions.c,v 1.44.2.2.2.2 2007/01/01 09:36:12 sebastian Exp $ */ +/* $Id: php_functions.c,v 1.44.2.2.2.2.2.1 2007/09/27 18:00:46 dmitry Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -359,7 +359,7 @@ php_info_print_table_end(); } -static zend_function_entry apache_functions[] = { +static const zend_function_entry apache_functions[] = { PHP_FE(apache_lookup_uri, NULL) PHP_FE(virtual, NULL) PHP_FE(apache_request_headers, NULL) http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/php_functions.c?r1=1.18.2.6.2.5&r2=1.18.2.6.2.5.2.1&diff_format=u Index: php-src/sapi/apache2handler/php_functions.c diff -u php-src/sapi/apache2handler/php_functions.c:1.18.2.6.2.5 php-src/sapi/apache2handler/php_functions.c:1.18.2.6.2.5.2.1 --- php-src/sapi/apache2handler/php_functions.c:1.18.2.6.2.5 Sat Feb 24 02:17:28 2007 +++ php-src/sapi/apache2handler/php_functions.c Thu Sep 27 18:00:46 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_functions.c,v 1.18.2.6.2.5 2007/02/24 02:17:28 helly Exp $ */ +/* $Id: php_functions.c,v 1.18.2.6.2.5.2.1 2007/09/27 18:00:46 dmitry Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -478,7 +478,7 @@ } } -static zend_function_entry apache_functions[] = { +static const zend_function_entry apache_functions[] = { PHP_FE(apache_lookup_uri, NULL) PHP_FE(virtual, NULL) PHP_FE(apache_request_headers, NULL) http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.19.2.3.2.5&r2=1.19.2.3.2.5.2.1&diff_format=u Index: php-src/sapi/apache_hooks/php_apache.c diff -u php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.5 php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.5.2.1 --- php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.5 Sat Feb 24 02:17:28 2007 +++ php-src/sapi/apache_hooks/php_apache.c Thu Sep 27 18:00:46 2007 @@ -17,7 +17,7 @@ | David Sklar <sklar@student.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_apache.c,v 1.19.2.3.2.5 2007/02/24 02:17:28 helly Exp $ */ +/* $Id: php_apache.c,v 1.19.2.3.2.5.2.1 2007/09/27 18:00:46 dmitry Exp $ */ #include "php_apache_http.h" @@ -60,7 +60,7 @@ PHP_MINFO_FUNCTION(apache); -zend_function_entry apache_functions[] = { +const zend_function_entry apache_functions[] = { PHP_FE(virtual, NULL) PHP_FE(apache_request_headers, NULL) PHP_FE(apache_note, NULL) @@ -1286,7 +1286,7 @@ /* {{{ php_apache_request_class_functions */ -static zend_function_entry php_apache_request_class_functions[] = { +const static zend_function_entry php_apache_request_class_functions[] = { /* string slots */ PHP_FALIAS(args, apache_request_args, NULL) PHP_FALIAS(boundary, apache_request_boundary, NULL) http://cvs.php.net/viewvc.cgi/php-src/sapi/continuity/capi.c?r1=1.11.2.2.2.1&r2=1.11.2.2.2.1.2.1&diff_format=u Index: php-src/sapi/continuity/capi.c diff -u php-src/sapi/continuity/capi.c:1.11.2.2.2.1 php-src/sapi/continuity/capi.c:1.11.2.2.2.1.2.1 --- php-src/sapi/continuity/capi.c:1.11.2.2.2.1 Mon Jan 1 09:36:12 2007 +++ php-src/sapi/continuity/capi.c Thu Sep 27 18:00:46 2007 @@ -80,7 +80,7 @@ PHP_FUNCTION(continuity_request_headers); PHP_FUNCTION(continuity_response_headers); -zend_function_entry continuity_functions[] = { +const zend_function_entry continuity_functions[] = { {NULL, NULL, NULL} }; @@ -110,7 +110,7 @@ PHP_MINFO_FUNCTION(continuity) { php_info_print_table_start(); - php_info_print_table_row(2, "Continuity Module Revision", "$Revision: 1.11.2.2.2.1 $"); + php_info_print_table_row(2, "Continuity Module Revision", "$Revision: 1.11.2.2.2.1.2.1 $"); php_info_print_table_row(2, "Server Version", conFget_build()); #ifdef CONTINUITY_CDPEXT php_info_print_table_row(2,"CDP Extensions", "enabled"); http://cvs.php.net/viewvc.cgi/php-src/sapi/milter/php_milter.c?r1=1.14.2.2.2.3&r2=1.14.2.2.2.3.2.1&diff_format=u Index: php-src/sapi/milter/php_milter.c diff -u php-src/sapi/milter/php_milter.c:1.14.2.2.2.3 php-src/sapi/milter/php_milter.c:1.14.2.2.2.3.2.1 --- php-src/sapi/milter/php_milter.c:1.14.2.2.2.3 Wed Mar 28 10:08:31 2007 +++ php-src/sapi/milter/php_milter.c Thu Sep 27 18:00:46 2007 @@ -770,7 +770,7 @@ /* {{{ milter_functions[] */ -static zend_function_entry milter_functions[] = { +const static zend_function_entry milter_functions[] = { PHP_FE(smfi_setflags, NULL) PHP_FE(smfi_settimeout, NULL) PHP_FE(smfi_getsymval, NULL) http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.6&r2=1.69.2.3.2.6.2.1&diff_format=u Index: php-src/sapi/nsapi/nsapi.c diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6 php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.1 --- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6 Fri Apr 27 00:29:26 2007 +++ php-src/sapi/nsapi/nsapi.c Thu Sep 27 18:00:46 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: nsapi.c,v 1.69.2.3.2.6 2007/04/27 00:29:26 thetaphi Exp $ */ +/* $Id: nsapi.c,v 1.69.2.3.2.6.2.1 2007/09/27 18:00:46 dmitry Exp $ */ /* * PHP includes @@ -172,7 +172,7 @@ * * Every user visible function must have an entry in nsapi_functions[]. */ -zend_function_entry nsapi_functions[] = { +const zend_function_entry nsapi_functions[] = { PHP_FE(nsapi_virtual, NULL) /* Make subrequest */ PHP_FALIAS(virtual, nsapi_virtual, NULL) /* compatibility */ PHP_FE(nsapi_request_headers, NULL) /* get request headers */ @@ -308,7 +308,7 @@ PHP_MINFO_FUNCTION(nsapi) { php_info_print_table_start(); - php_info_print_table_row(2, "NSAPI Module Revision", "$Revision: 1.69.2.3.2.6 $"); + php_info_print_table_row(2, "NSAPI Module Revision", "$Revision: 1.69.2.3.2.6.2.1 $"); php_info_print_table_row(2, "Server Software", system_version()); php_info_print_table_row(2, "Sub-requests with nsapi_virtual()", (nsapi_servact_service)?((zend_ini_long("zlib.output_compression", sizeof("zlib.output_compression"), 0))?"not supported with zlib.output_compression":"enabled"):"not supported on this platform" );