]> granicus.if.org Git - php/commitdiff
Improved memory usage by movig constants to read only memory. (Dmitry, Pierre)
authorDmitry Stogov <dmitry@php.net>
Thu, 27 Sep 2007 18:00:48 +0000 (18:00 +0000)
committerDmitry Stogov <dmitry@php.net>
Thu, 27 Sep 2007 18:00:48 +0000 (18:00 +0000)
165 files changed:
NEWS
Zend/zend.h
Zend/zend_API.c
Zend/zend_API.h
Zend/zend_builtin_functions.c
Zend/zend_compile.c
Zend/zend_compile.h
Zend/zend_exceptions.c
Zend/zend_execute.c
Zend/zend_execute.h
Zend/zend_execute_API.c
Zend/zend_hash.c
Zend/zend_hash.h
Zend/zend_ini.c
Zend/zend_ini.h
Zend/zend_interfaces.c
Zend/zend_modules.h
Zend/zend_opcode.c
ext/bcmath/bcmath.c
ext/bz2/bz2.c
ext/calendar/calendar.c
ext/com_dotnet/com_extension.c
ext/com_dotnet/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
ext/dom/cdatasection.c
ext/dom/characterdata.c
ext/dom/comment.c
ext/dom/document.c
ext/dom/documentfragment.c
ext/dom/documenttype.c
ext/dom/dom_fe.h
ext/dom/domconfiguration.c
ext/dom/domerror.c
ext/dom/domerrorhandler.c
ext/dom/domexception.c
ext/dom/domimplementation.c
ext/dom/domimplementationlist.c
ext/dom/domimplementationsource.c
ext/dom/domlocator.c
ext/dom/domstringlist.c
ext/dom/element.c
ext/dom/entity.c
ext/dom/entityreference.c
ext/dom/namednodemap.c
ext/dom/namelist.c
ext/dom/node.c
ext/dom/nodelist.c
ext/dom/notation.c
ext/dom/php_dom.c
ext/dom/processinginstruction.c
ext/dom/string_extend.c
ext/dom/text.c
ext/dom/typeinfo.c
ext/dom/userdatahandler.c
ext/dom/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
ext/mysqli/mysqli_driver.c
ext/mysqli/mysqli_exception.c
ext/mysqli/mysqli_fe.c
ext/mysqli/mysqli_warning.c
ext/mysqli/php_mysqli.h
ext/ncurses/ncurses_fe.c
ext/ncurses/php_ncurses.h
ext/oci8/oci8.c
ext/odbc/birdstep.c
ext/odbc/php_odbc.c
ext/openssl/openssl.c
ext/pcntl/pcntl.c
ext/pcre/php_pcre.c
ext/pdo/pdo.c
ext/pdo/pdo_dbh.c
ext/pdo/pdo_stmt.c
ext/pdo/php_pdo_driver.h
ext/pdo/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
ext/pdo_pgsql/pgsql_driver.c
ext/pdo_sqlite/pdo_sqlite.c
ext/pdo_sqlite/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/skeleton/skeleton.c
ext/snmp/snmp.c
ext/snmp/winsnmp.c
ext/soap/soap.c
ext/sockets/sockets.c
ext/spl/php_spl.c
ext/spl/spl_array.c
ext/spl/spl_directory.c
ext/spl/spl_functions.c
ext/spl/spl_functions.h
ext/spl/spl_iterators.c
ext/spl/spl_observer.c
ext/spl/spl_sxe.c
ext/sqlite/pdo_sqlite2.c
ext/sqlite/sqlite.c
ext/standard/basic_functions.c
ext/standard/dir.c
ext/standard/dl.c
ext/standard/info.c
ext/standard/user_filters.c
ext/sybase/php_sybase_db.c
ext/sybase_ct/php_sybase_ct.c
ext/sysvmsg/sysvmsg.c
ext/sysvsem/sysvsem.c
ext/sysvshm/sysvshm.c
ext/tidy/tidy.c
ext/tokenizer/tokenizer.c
ext/wddx/wddx.c
ext/xml/xml.c
ext/xmlreader/php_xmlreader.c
ext/xmlrpc/xmlrpc-epi-php.c
ext/xmlwriter/php_xmlwriter.c
ext/xsl/php_xsl.c
ext/xsl/xsl_fe.h
ext/xsl/xsltprocessor.c
ext/zip/php_zip.c
ext/zlib/zlib.c
sapi/aolserver/aolserver.c
sapi/apache/php_apache.c
sapi/apache2filter/php_functions.c
sapi/apache2handler/php_functions.c
sapi/apache_hooks/php_apache.c
sapi/continuity/capi.c
sapi/milter/php_milter.c
sapi/nsapi/nsapi.c

diff --git a/NEWS b/NEWS
index 87f43aeb7fad3c3fb0a55abbc3762873167a1d3f..c6a1f400d62d55595d28c8ac25c9d28767da35d3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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)
index c949d96ecc82d6036fc3b28a22f44d9d68ae60b7..921eaa1ec544ead31a79569d91c3783fedaf08bc 100644 (file)
@@ -330,7 +330,7 @@ struct _zend_class_entry {
        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;
index 1d9f9b29175c84fafe61c3e33087e9dc18ffc985..87118406b3de7a20995e60a77a412a219ac54f2a 100644 (file)
@@ -965,14 +965,14 @@ ZEND_API int _object_init(zval *arg ZEND_FILE_LINE_DC TSRMLS_DC)
 }
 
 
-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 @@ ZEND_API int add_assoc_long_ex(zval *arg, char *key, uint key_len, long n)
        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 @@ ZEND_API int add_assoc_null_ex(zval *arg, char *key, uint key_len)
        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 @@ ZEND_API int add_assoc_bool_ex(zval *arg, char *key, uint key_len, int b)
        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_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_double_ex(zval *arg, const char *key, uint key_len, double d)
 {
        zval *tmp;
 
@@ -1024,7 +1024,7 @@ 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_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_string_ex(zval *arg, char *key, uint key_len, char *str,
 }
 
 
-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 @@ ZEND_API int add_assoc_stringl_ex(zval *arg, char *key, uint key_len, char *str,
        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_double(zval *arg, ulong index, double d)
 }
 
 
-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_string(zval *arg, ulong index, char *str, int duplicate)
 }
 
 
-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_double(zval *arg, double d)
 }
 
 
-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_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_stringl(zval *arg, const char *str, uint length, int duplicate)
 {
        zval *tmp;
 
@@ -1216,7 +1216,7 @@ 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_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_string_ex(zval *arg, char *key, uint key_len, char *s
 }
 
 
-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_double(zval *arg, ulong index, double d, void **dest)
 }
 
 
-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_string(zval *arg, ulong index, char *str, void **dest
 }
 
 
-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 @@ ZEND_API int zend_startup_module_ex(zend_module_entry *module TSRMLS_DC)
 
        /* 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 @@ static void zend_sort_modules(void *base, size_t count, size_t siz, compare_func
 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 @@ ZEND_API zend_module_entry* zend_register_module_ex(zend_module_entry *module TS
 
        /* 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 @@ ZEND_API void zend_check_magic_method_implementation(zend_class_entry *ce, zend_
 }
 
 /* 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 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, zend_function_entr
 
        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 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, zend_function_entr
 /* 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 @@ static zend_object_value display_disabled_class(zend_class_entry *class_type TSR
        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 int zend_fcall_info_call(zend_fcall_info *fci, zend_fcall_info_cache *f
 }
 
 
-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);
index 861abc8a7dfcf586ac0f67f2376c8056f93b11b5..b4b27c41b4993b529430eb2d9036f04c5ab9eede 100644 (file)
@@ -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 @@ typedef struct _zend_function_entry {
 #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 @@ ZEND_API int zend_parse_method_parameters_ex(int flags, int num_args TSRMLS_DC,
 
 /* 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 void zend_wrong_param_count(TSRMLS_D);
 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 int _object_and_properties_init(zval *arg, zend_class_entry *ce, HashTa
 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_null(zval *arg, ulong idx);
 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_null(zval *arg);
 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 @@ END_EXTERN_C()
        }
 
 #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;              \
        }
 
index f56e74be7536f681de663e44931cab073611f4dd..7341e84ab3897ab831bae62c140c733abf5ab2b9 100644 (file)
@@ -88,7 +88,7 @@ static ZEND_FUNCTION(zend_thread_id);
 #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_FUNCTION(get_defined_constants)
                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 @@ ZEND_FUNCTION(get_extension_funcs)
 {
        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();
index 2d5699e70b4818375e8046f0a544670e7e17e8b4..2cf8264dc2c2b1e77277280f9751640823de4414 100644 (file)
@@ -4219,7 +4219,7 @@ ZEND_API void zend_initialize_class_data(zend_class_entry *ce, zend_bool nullify
 }
 
 
-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"))) {
index 0687698144d9c7ac9d2b5ed902439005d68306d3..cdb7a5ff01f3ef6bafd190e4ca16ea53b78a0601 100644 (file)
@@ -158,9 +158,9 @@ typedef struct _zend_property_info {
 
 
 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 @@ void zend_do_mark_last_catch(znode *first_catch, znode *last_additional_catch TS
 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 {
index 62df718373e83e32b3067d70a529c5d17efc46f1..38185819cbac47c932ddb178511aa757861b4fc2 100644 (file)
@@ -534,7 +534,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_exception___construct, 0, 0, 0)
        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_BEGIN_ARG_INFO_EX(arginfo_error_exception___construct, 0, 0, 0)
        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}
index 74e9e965877c7ce2d1e0a9353dc9b780fec0dd28..77a9ffbaf092178dd06a15a88782976fdffb3afb 100644 (file)
@@ -445,7 +445,7 @@ static inline void make_real_object(zval **object_ptr TSRMLS_DC)
        }
 }
 
-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 char * zend_verify_arg_class_kind(zend_arg_info *cur_arg_info, cha
        }
 }
 
-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 @@ static inline int zend_verify_arg_type(zend_function *zf, zend_uint arg_num, zva
        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);
index 36f2c2321ce5bdecd59ec6693a421fe7d9c2e356..3cabfebc48bab55dfa70a9c286849eeb3e0dce02 100644 (file)
@@ -70,8 +70,8 @@ static inline void safe_free_zval_ptr_rel(zval *p ZEND_FILE_LINE_DC ZEND_FILE_LI
                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 zend_bool zend_is_executing(TSRMLS_D);
 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
index 5bbccacf33e2f3e5f7fcff3d83a9f3a9b70a0b27..211036bbeab8e91cb82cb6bccd34f8d14257efc7 100644 (file)
@@ -1025,7 +1025,7 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS
 }
 
 
-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 @@ ZEND_API int zend_lookup_class_ex(char *name, int name_length, int use_autoload,
        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 @@ void zend_unset_timeout(TSRMLS_D)
 }
 
 
-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;
index ba0be7968a6a7b0f50c858241898f44cb92c42f4..a4a1e010e1b75619a29317aa10e1d715f7136e84 100644 (file)
@@ -94,7 +94,7 @@ static void _zend_is_inconsistent(HashTable *ht, char *file, int line)
 
 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 void zend_hash_set_apply_protection(HashTable *ht, zend_bool bApplyProt
 
 
 
-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 @@ ZEND_API int _zend_hash_add_or_update(HashTable *ht, char *arKey, uint nKeyLengt
        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_quick_add_or_update(HashTable *ht, char *arKey, uint nKe
 }
 
 
-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 @@ ZEND_API int zend_hash_rehash(HashTable *ht)
        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 void zend_hash_merge_ex(HashTable *target, HashTable *source, copy_ctor
 }
 
 
-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 @@ ZEND_API ulong zend_get_hash_value(char *arKey, uint nKeyLength)
  * 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_find(HashTable *ht, char *arKey, uint nKeyLength, void **
 }
 
 
-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_quick_find(HashTable *ht, char *arKey, uint nKeyLength, u
 }
 
 
-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_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_quick_exists(HashTable *ht, const char *arKey, uint nKeyLength, ulong h)
 {
        uint nIndex;
        Bucket *p;
@@ -1170,7 +1170,7 @@ ZEND_API int zend_hash_get_current_data_ex(HashTable *ht, void **pData, HashPosi
 /* 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;
 
index 64e9ebbe61d65828d84f00f17ada12f07f75b0dd..eb8bef0ac3f94e3992a74a450fded77e6ddf71da 100644 (file)
@@ -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 @@ ZEND_API void zend_hash_clean(HashTable *ht);
 #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 @@ ZEND_API int _zend_hash_index_update_or_next_insert(HashTable *ht, ulong h, void
 #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 @@ ZEND_API void zend_hash_reverse_apply(HashTable *ht, apply_func_t apply_func TSR
 
 
 /* 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_key_type_ex(HashTable *ht, HashPosition *pos)
 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 @@ ZEND_API int zend_hash_rehash(HashTable *ht);
  *                  -- 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 @@ EMPTY_SWITCH_DEFAULT_CASE()
 }
 
 
-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 @@ END_EXTERN_C()
 
 
 #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 @@ END_EXTERN_C()
 }
 
 
-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);
index 0126fe0264841864696bbd0eab0c97acbad7bbec..b7ca4998932da5e756ae7d652278da69ee2917e7 100644 (file)
@@ -164,9 +164,9 @@ ZEND_API void zend_ini_sort_entries(TSRMLS_D) /* {{{ */
 /*
  * 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 @@ ZEND_API int zend_register_ini_entries(zend_ini_entry *ini_entry, int module_num
 #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) {
index de3faebc7a4c2403feb71ec5046e69c796fbb783..2b7ac53e4430a1649dca4bcaa66c71f67f732a83 100644 (file)
@@ -92,7 +92,7 @@ ZEND_API int zend_copy_ini_directives(TSRMLS_D);
 
 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(zend_ini_color_displayer_cb);
 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) \
index bcabe781d0795d76c92194e5340892515171f408..40c63ed96717de206bd083ec6361944a5914efce 100755 (executable)
@@ -477,12 +477,12 @@ static int zend_implement_serializable(zend_class_entry *interface, zend_class_e
 /* }}}*/
 
 /* {{{ 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 @@ zend_function_entry zend_funcs_iterator[] = {
        {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_BEGIN_ARG_INFO_EX(arginfo_arrayaccess_offset_value, 0, 0, 2)
        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_BEGIN_ARG_INFO(arginfo_serializable_serialize, 0)
        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}
index 971f202bb392d86a5b220b6b31478b009dd2d3ff..2d67ac7dd060a26ace423bc45879b29f803a294c 100644 (file)
 #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 @@ struct _zend_module_entry {
        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 @@ struct _zend_module_entry {
 #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;
index 8621dc12b16084f66666d53991259ba2236c4bdc..973d3f3b6592a996524f3287741069a4b2a6879a 100644 (file)
@@ -274,9 +274,9 @@ ZEND_API void destroy_op_array(zend_op_array *op_array TSRMLS_DC)
        }
        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);
index 7c6ebe525524a4d4cea68bbed0b8928dc4164d0a..5437ccae03511c7a1e832bbcb6609084d5c99ce4 100644 (file)
@@ -105,7 +105,7 @@ ZEND_END_ARG_INFO()
 
 /* }}} */
 
-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)
index 1f905e411e9182a4ded3d798f29d7e85dd15178e..c811d231fd8c0b43ae6c73ed652b30d0236cb43c 100644 (file)
@@ -94,7 +94,7 @@ ZEND_END_ARG_INFO()
 
 /* }}} */
 
-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)
index b2ccc1d1d5be13c077fc97c21bf7ac9ac2be995d..72e0cd49780f3503dbfd24f88aa13d9ea503430e 100644 (file)
@@ -147,7 +147,7 @@ ZEND_END_ARG_INFO()
 
 /* }}} */
 
-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)
index 5150013105e38f24f6a7afb8ca9bad90c4fb95e9..4d88a4fd54615245e9063485e7e78af0f6317f17 100644 (file)
@@ -39,7 +39,7 @@ zend_class_entry
        *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)
index 85025f45ff4ff8c910a2832793f0df4f686c548d..69e4554ebabc0d5bd356f51290a85c6eed69a2d8 100755 (executable)
@@ -681,7 +681,7 @@ CPH_METHOD(__construct)
 
 
 
-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)
index fb1af418c50ac219970f50a36c85ec571e35dc18..a1018d149c984f9cec12059429e8aa783da80ffb 100644 (file)
@@ -105,7 +105,7 @@ ZEND_END_ARG_INFO()
 /* {{{ 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)
index a5b53fc67ac8b81f960afc53a92d143447d2c979..ee5cd8c4b8c612fbbeddfc0509d1075e5ddee98b 100644 (file)
@@ -291,7 +291,7 @@ ZEND_END_ARG_INFO()
 
 /* {{{ 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)
index b8be9e6b738350a48a701a2a1aff66885ddac110..0d054ceb9fc587d60955521f7103f4e02fc9022c 100644 (file)
@@ -148,7 +148,7 @@ ZEND_END_ARG_INFO()
 /* }}} */
 
 /* {{{ 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 @@ zend_function_entry date_functions[] = {
        {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 @@ zend_function_entry date_funcs_date[] = {
        {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 int date_object_compare_date(zval *d1, zval *d2 TSRMLS_DC);
 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}
 };
index d14be1bbe59dd69fdd33d5f40600ee4fedca8870..9e9a11c2a9456b62f111c24aa13de04507da0ffb 100644 (file)
@@ -144,7 +144,7 @@ ZEND_END_ARG_INFO()
 
 /* {{{ 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)
index eb1963e3f277e3764ac8c156f5dd5a3680edf3d0..1a6268b35e95c9b6ba93d92694bb951315506fa4 100644 (file)
@@ -826,7 +826,7 @@ ZEND_END_ARG_INFO()
 
 /* {{{ 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)
index ce7b030c0902627946cd20b2a079f2a785b61170..8a8c8f9c0e18bce850710a0d21853f00f8e33d9b 100644 (file)
@@ -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}
index 3c2f302d8c4e5f6db1456d02a032409cce481564..1f74ba75dc18b7ea0a958c1205e529c8be2090bc 100644 (file)
@@ -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}
 };
index 117ada752837f8691f4954c7132f5b183f14c200..60a3fc3019180b2c3bd77708342adab980402fee 100644 (file)
@@ -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)
index f5ecb4082e542aba5fcfb9eab12c706b8118c4ca..101b496f41ffa14eb4c35d9f89c65c2e7a61e98f 100644 (file)
@@ -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}
 };
index f726da0e14a630e01f4d7666781dca3ccbfdb8f6..894cdcf9281ab7cc21cc50d23c5b564348e97602 100644 (file)
@@ -48,7 +48,7 @@ struct _idsIterator {
 * 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)
index 58b8e024e8b832fb5a00bdfa9d13662622a84a55..3751bc69e6cf5fd461938ce2769adeea257bb6a1 100644 (file)
@@ -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}
index ffeda243a44d9dc122d55670dcabf451fc22380f..196d4ed343d0f518966300296bc1eafff9adc9b7 100644 (file)
@@ -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}
 };
 
index f1e477035c8230f0a8dee819dc762db3ec1dfb10..6d3815b673533b9475c7295eefa63740a4cbc458 100644 (file)
 #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 {
index c1cf0f3312ebd1d8444e30f4baea531b619d9ba6..785b09226c0fbad0ca67b75c2dab0f91cc13c74c 100644 (file)
@@ -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)
index 8bce0cda4adedb36b99f84073f406a7c6546f81b..68e3c07c17b8639514f81c7b00bfd9295f3fdd7f 100644 (file)
@@ -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}
 };
 
index ad40162effb5e003eb26ad668e72f132e76067f9..449895aa4ce40a81291c49ba52f40630802f9a13 100644 (file)
@@ -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}
 };
index 42aa341ada9ee4abb7bf7e85b17aa9ad442a9ed9..9a65f51259b908f852494d82649906216dfa2254 100644 (file)
@@ -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}
 };
 
index de92cb0489315b1c2fca46ef492bda7d06604f57..bd48659be163d5e0e6ab9c2c1daa4eec007563e3 100644 (file)
@@ -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)
index 7d9ed84b4754ea71f29fafd6a98f2441e8aa0c55..db4f4c503b844046a1a66f3bf2766faab5a22719 100644 (file)
@@ -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}
 };
index 7e5e488d471f35de44570a9e23756f29eeffe25a..f1be6c5e55046ffa011d3114711cf30077dc0a32 100644 (file)
@@ -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}
index c98067106cbc0d20de75c497f17e2e6f0daa7551..ae3b795b8d3f827c90c8eca4bb4036dea7fb4932 100644 (file)
@@ -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}
 };
 
index 6372e0c703c7d724b0056f2e5ab8c16fb95fda06..723445a675158aea5ceb6963308aecf920cf529f 100644 (file)
@@ -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}
 };
index fae0dae1c6bf568df7a07797237e184262c15261..a42b5b16b1b372d687794e7d641f8defd0b07ca5 100644 (file)
@@ -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)
index 50dca0d472d04a79c94cdd6fa6ce182a2dd775b3..a40280d506eb03c8fbe1b4ab1b7a4c182a4cc994 100644 (file)
@@ -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}
 };
 
index f80af0f91763affd2c933fd29960826df5ce36a9..d0f0b18a6087191d59f01e95697e26debd76fc2c 100644 (file)
@@ -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}
 };
index 6d76f31c97ab4ba3582bd1b0281db64383867f61..8cc431fd076f36a31c517143823fbfeacba08ac1 100644 (file)
@@ -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)
index 6ff06f64edf4314433723c0d31376bde32fc288d..0f2862ebcb347b1a91f40061287f2fec0685b639 100644 (file)
@@ -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}
index e95fa2c9d1416c3665505f2ebd0f97d823ea1fab..cd5ce8cf3b708558908ecfa39b18f10f0e10d6b1 100644 (file)
@@ -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)
index bcd015561a11c84259dd529d71da54c6fe637a37..d98586950523a965a480673463dd37cbaa820abd 100644 (file)
@@ -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}
 };
index 57f2424f2e817544b959562ee87f16879cbec127..c03f2461aa245dba2118c3c0d4ac68903381286d 100644 (file)
@@ -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}
 };
 
index d6922c334aba08c26bc2c15660a61d2393d0dda0..31e494b585181985eafb2ecf169ffa8ce34ca6a1 100644 (file)
@@ -512,7 +512,7 @@ zend_object_value dom_objects_ze1_clone_obj(zval *zobject TSRMLS_DC)
        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_object_handlers* dom_get_obj_handlers(TSRMLS_D) {
        }
 }
 
-static zend_module_dep dom_deps[] = {
+static const zend_module_dep dom_deps[] = {
        ZEND_MOD_REQUIRED("libxml")
        ZEND_MOD_CONFLICTS("domxml")
        {NULL, NULL, NULL}
index c1119b848afd8bba2cd0021a3749fbafa89653af..a30fae82ea4c6a69364b0ae65a2dbdc19ecebfe4 100644 (file)
@@ -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}
 };
index f828b1eff206e1eccd0987c2c2a1054df91cecb3..d7f64952fd0fe41058770b40ed246fccdf8bbe4f 100644 (file)
@@ -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}
index da7b34af1ef59db770ba19cf7fc6508cf83328c5..b23f94a576109af9cd44135986850ae8c8c0d7fd 100644 (file)
@@ -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)
index 338e58dd28631ce552b4cc890e54b079702c96ef..f8c3ce8db08d6a78f6fbe4cb52c29901e69eb3d2 100644 (file)
@@ -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}
 };
 
index 908434ffd3c3c2ed23178ae40c4c9c1a95f29bd8..4df36da623ae8b74f99d7add642a4086fca34684 100644 (file)
@@ -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}
 };
index c7522a119d91887874d5ca21dffe2449faf12dd9..339fe5a879efa082a48e31dc741f55940205b74a 100644 (file)
@@ -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)
index cd6e3b52772dfa5ef8c634c9f2db88c8ee8dec05..d2c24ce2db4fa9fff9da268746298183f73d2340 100644 (file)
@@ -132,7 +132,7 @@ ZEND_END_ARG_INFO()
 
 /* {{{ 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)
index 65ef8ed416d6e0a40205b84a0a0394d4959a347b..dfc9ec60f7ec960d8d0cd36a72d4d3f9cb8b5e8e 100644 (file)
@@ -543,7 +543,7 @@ ZEND_END_ARG_INFO()
 
 /* {{{ 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)
index 92b88f1690f1b5c9df4b656173b619759bf73a0d..97cb125172e86aea4304b4f21474dfcb0a340166 100644 (file)
@@ -276,7 +276,7 @@ ZEND_END_ARG_INFO()
 
 /* {{{ 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)
index dff2ea65b02bad55162a5ed5fe370b4673d67795..bb4ce8eba5ab271b5fe56cf1d15f135ff76d0365 100644 (file)
@@ -79,7 +79,7 @@ static unsigned int php_sapi_filter(int arg, char *var, char **val, unsigned int
 
 /* {{{ 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)
index 1e21b4c63e28bbd5401e2ede4a1645b75f99feea..116f814b8db18c0bdc8c93670e27b523757553f1 100644 (file)
@@ -274,7 +274,7 @@ ZEND_END_ARG_INFO()
 
 /* }}} */
 
-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)
index f406f149f17ea6f2f55a6c180033dda5b321cf45..fae346f4b95496586284aadbf0d371748c2c6630 100644 (file)
@@ -989,7 +989,7 @@ ZEND_END_ARG_INFO()
 
 /* {{{ 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)
index 7c6d302dc8dae141fab380826ae19b9dd0f124b3..ba1742be0e1bafbf098498f65cdfe8e14ef6a826 100644 (file)
@@ -101,7 +101,7 @@ ZEND_END_ARG_INFO()
 
 /* {{{ 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() */
index 6610a8c00a6e412856d4807a3b2ed1157cf8590d..888806709a974bdf01109d69f0f97c43920b6ae0 100644 (file)
@@ -272,7 +272,7 @@ static ZEND_GINIT_FUNCTION(gmp);
 
 /* {{{ 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)
index 05a4518746b9a826b8c071e022c0bc934ce120d7..b1fc9f26e1574e8c04461bff2d56cb092b0037a1 100644 (file)
@@ -699,7 +699,7 @@ ZEND_END_ARG_INFO()
 
 /* {{{ 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)
 
index 56aba6cfe2aaea1ed178834d3ddb156025a75a61..4c92385c18ed38a41a0bba84513672ec947f49b8 100644 (file)
@@ -141,7 +141,7 @@ ZEND_END_ARG_INFO()
 
 /* {{{ 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)
index 0a80eaf3a7029f9a5edbde703bfd74906294fe9c..5e89e9735914d22a78e820601801b865bfa2b658 100644 (file)
@@ -92,7 +92,7 @@ static PHP_GINIT_FUNCTION(imap);
 
 /* {{{ 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 @@ zend_function_entry imap_functions[] = {
 /* }}} */
 
 /* {{{ imap dependencies */
-static zend_module_dep imap_deps[] = {
+static const zend_module_dep imap_deps[] = {
        ZEND_MOD_REQUIRED("standard")
        {NULL, NULL, NULL}
 };
index 5ed6de63cdb7ce47cd6c572d18376ba8ad1a4dfc..e153c88ba5a93926956ea1df049a32d1dc17b3ef 100644 (file)
@@ -47,7 +47,7 @@ ZEND_DECLARE_MODULE_GLOBALS(ibase)
 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)
index 283021b36506b60f2c06d33841530dd0790dd4b9..b3e7fa13a527d542110f0d182bd728f7da64121c 100644 (file)
@@ -41,7 +41,7 @@ static const char digits[] = "0123456789abcdef";
  *
  * 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[] */
index d4cabcd0c0fcce0c6b94eb88d66ca3a488305fb3..9e7a7759b4b984088a4da653b1c315e7d200629b 100644 (file)
@@ -100,7 +100,7 @@ static int le_link, le_result, le_result_entry;
 */
 /* {{{ 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)
index e7d01083ddaa483c5b724979681f9aa346f8d75b..d572ae4e7305b7f6b550f842d118556919f54bd4 100644 (file)
@@ -112,7 +112,7 @@ ZEND_END_ARG_INFO()
 /* }}} */
 
 /* {{{ 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)
index fb14aeec39ba18a5ec6cb562889f1ffaa04ae662..723b145f336a62d28c6512612a1ab9c4d0921d4e 100644 (file)
@@ -194,7 +194,7 @@ static const struct mb_overload_def mb_ovld[] = {
 /* }}} */
 
 /* {{{ 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)
index 58911686973c32129c5ff43adc8c5e9f3bb5ac05..8bde275d3e1145ee6a30f438496e5cd5dfcacdcd 100644 (file)
@@ -44,7 +44,7 @@ typedef struct _php_mcrypt {
        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)
index f9c2af32303fbc683dfaea3ca2c2173fde13ff60..e504e2dc7ca6abbd5d94b0da45d2cdda1386fee2 100644 (file)
@@ -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)
index 3828e43d47d08baeb3944faec79983adf35d2918..ffa8992433231721195c95a265f48dc7b0b2950e 100644 (file)
@@ -218,7 +218,7 @@ static PHP_GINIT_FUNCTION(mime_magic);
 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}      
 };
index 578a6e73c1e97b09cafe9cfd50ae9ec12a18d2fb..a97e7703ee8a4111ea8a3e93a827465b1037a61d 100644 (file)
@@ -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 SWFAction getAction(zval *id TSRMLS_DC)
 }
 /* }}} */
 
-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 @@ PHP_METHOD(swfbitmap, getHeight)
 }
 /* }}} */
 
-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 @@ PHP_FUNCTION(ming_keypress)
 }
 /* }}} */
 
-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 @@ PHP_METHOD(swfdisplayitem, getRot)
 /* }}} */
 #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 @@ PHP_METHOD(swffill, skewYTo)
        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 @@ PHP_METHOD(swffontchar, addUTF8Chars)
 }
 /* }}} */
 
-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 @@ PHP_METHOD(swffont, getShape)
 
 #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 @@ PHP_METHOD(swfgradient, addEntry)
 }
 /* }}} */
 
-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 @@ PHP_METHOD(swfmorph, getShape2)
 }
 /* }}} */
 
-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 void destroy_SWFSound_resource(zend_rsrc_list_entry *resource TSRMLS_DC)
 
 /* }}} */
 
-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 @@ PHP_METHOD(swfsoundinstance, loopCount)
 }
 /* }}} */
 
-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 @@ PHP_METHOD(swfvideostream, getnumframes)
 /* }}} */
                
                
-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 SWFPrebuiltClip getPrebuiltClip(zval *id TSRMLS_DC)
 }
 
 /* }}} */
-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 @@ PHP_METHOD(swfmovie, addFont)
 /* }}} */
 #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 @@ PHP_METHOD(swfshape, drawCubicTo)
 }
 /* }}} */
 
-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 @@ PHP_METHOD(swfsprite, stopSound)
 /* }}} */
 #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 @@ PHP_METHOD(swftext, getLeading)
 }
 /* }}} */
 
-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 @@ PHP_METHOD(swftextfield, addChars)
 /* }}} */
 #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)
index 196bb174615c09ee23fb3313d5346d00196d9a28..ddf0b67656ad073524bf78c3420b2927fef4a1bc 100644 (file)
@@ -46,7 +46,7 @@ static php_msql_globals msql_globals;
 
 /* {{{ 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)
index 417c3110c4d3589e9b12a887da283656272b45c4..c0de0b530ee070940b75644355fed44adcb65927 100644 (file)
@@ -47,7 +47,7 @@ static void php_mssql_get_column_content_without_type(mssql_link *mssql_ptr,int
 
 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)
index 50439d94da43c2a70e8a9a2b41ff5218f5eb5b86..3edf6b9cb585ad3c43e5e86ca44792ced57cf9ca 100644 (file)
@@ -130,7 +130,7 @@ typedef struct _php_mysql_conn {
 
 /* {{{ 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)
index 5c97009d527d1ce80f75f418a74e58d188a7fe59..ff4f206b7ad133fc421f117e3ccffd21dc12d34f 100644 (file)
@@ -416,7 +416,7 @@ PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry *class_
 /* {{{ 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
index 3d153b9dc33281d0440b50cbd9f4638a80351732..494c2a554bd4d2a126e97943cefd34d3f5f137bd 100644 (file)
@@ -144,7 +144,7 @@ mysqli_property_entry mysqli_driver_property_entries[] = {
 
 /* {{{ 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}
index 1fa3ecae33c3ddb02d9af47f46e31e6883821447..b6b1d8903e4631b53061a258cb8dd0b72f94517b 100644 (file)
@@ -30,7 +30,7 @@
 
 /* {{{ mysqli_exception_methods[]
  */
-zend_function_entry mysqli_exception_methods[] = {
+const zend_function_entry mysqli_exception_methods[] = {
        {NULL, NULL, NULL}
 };
 /* }}} */
index 31a29897528698962051a216cde02f04079956ca..f82d31c40593985d014d5bf070840abba568d513 100644 (file)
@@ -50,7 +50,7 @@ static
  *
  * 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 @@ zend_function_entry mysqli_functions[] = {
  *
  * 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 @@ zend_function_entry mysqli_link_methods[] = {
  *
  * 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 @@ zend_function_entry mysqli_result_methods[] = {
  *
  * 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)
index 12a05122db1820c8992b1321f9aeb8d4bd2bb170..92dc8ce32718d3f416262c69c3c4532f55f38d59 100644 (file)
@@ -211,7 +211,7 @@ PHP_METHOD(mysqli_warning, __construct)
 }
 /* }}} */
 
-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}
index bc4ce56bee4e6cc40e9052ed5ea9824cf22b47a1..965bec7082c55f71582312d95376f6c1b6411aea 100644 (file)
@@ -133,13 +133,13 @@ typedef struct {
 #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[];
index 8ca6e7104e1217ea50bd2cf7591e4a616a6dfd5d..3d4df5def17b2d11c04ef1769cef54e7f36547cb 100644 (file)
@@ -50,7 +50,7 @@ static
  *
  * 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)
index 12cdd864005d46bda8d1f731d073f9d049add99f..3a49e0c616c3030bdf0fa41f1dff39b006a85b0b 100644 (file)
@@ -36,7 +36,7 @@ extern int le_ncurses_panels;
 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
index 7bf521099567ae3d05ed55d61b8c411d0f402abe..d6427fb297bd3ea0a0eae907d6d16d927da106c5 100644 (file)
@@ -203,7 +203,7 @@ PHP_FUNCTION(oci_collection_trim);
 
 /* {{{ 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 @@ static zend_function_entry php_oci_functions[] = {
        {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 @@ static zend_function_entry php_oci_lob_class_functions[] = {
 };
 
 #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)
index 6776c7a2c4cc348810ff628226214798cb99a770..83b548fc7cf0b9cb68f0e4cb5dcfe7d2e8153458 100644 (file)
@@ -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)
index 2c2b0b7978bc994f35aedb55b2dc136d0ad65012..df776845351993c056443445bc18977af485d79c 100644 (file)
@@ -68,7 +68,7 @@ static int le_result, le_conn, le_pconn;
 
 /* {{{ 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)
index 12daa019d15aa74d9ac4cd3b770e22f2fc4807c3..9998d2c1b8633de20d90fe4a088b36873b2b053c 100644 (file)
@@ -101,7 +101,7 @@ PHP_FUNCTION(openssl_dh_compute_key);
 
 /* {{{ 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)
index 233e20f6cb2fdc1a0ccdd100815548b1839f8b4e..72492d5c9ae44c193c61a11cb4a6d85896d003c8 100755 (executable)
@@ -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)
index e48a97e0430df97f61ecbc87a7537d5a2e01ca3c..41b390806c9e7fec242fe9f6a64372d7ea57f5f0 100644 (file)
@@ -1762,7 +1762,7 @@ PHP_FUNCTION(preg_last_error)
 
 /* {{{ 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)
index 43652a971e383e59b5ed2936b6a440c30e477eb8..cd25bb3a2ae5b8730d400e40bc78c566e30cd03f 100755 (executable)
@@ -114,7 +114,7 @@ PHP_FUNCTION(pdo_drivers)
 /* }}} */
 
 /* {{{ 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 @@ zend_function_entry pdo_functions[] = {
 
 /* {{{ 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
index ff65aeb7f8b6f50be1621d13d30f404fcba7f2d6..d1d83c0dc888593b3d00c3e9df2161683eb9a166 100755 (executable)
@@ -1160,7 +1160,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_pdo_quote, 0, 0, 1)
 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 @@ zend_function_entry pdo_dbh_functions[] = {
 /* {{{ 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 @@ int pdo_hash_methods(pdo_dbh_t *dbh, int kind TSRMLS_DC)
        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;
index ef86c7e1acbb945c979d78e4e2eca9c55db45198..693d03d690ba8e6a164b93ba8174f834a1243b55 100755 (executable)
@@ -2147,7 +2147,7 @@ static PHP_METHOD(PDOStatement, __sleep)
 }
 /* }}} */
 
-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 @@ zend_object_iterator *pdo_stmt_iter_get(zend_class_entry *ce, zval *object, int
 
 /* {{{ 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}
 };
 
index c3c98c43017d13db40720cddcb16730842c9f457..78733b812bfbbe7f2f993c773ad7c0d5f7d5843a 100755 (executable)
@@ -288,7 +288,7 @@ enum {
        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;
index c60d96162621a0b64c750581eb895ced3a80d745..7b83e55483bfdc3e152fd2e0cb3e2dbcd4b12e0e 100755 (executable)
@@ -32,12 +32,12 @@ void pdo_dbh_init(TSRMLS_D);
 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_describe_columns(pdo_stmt_t *stmt TSRMLS_DC);
 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;
index f4680de9f76ab3011325b7cbe849c8f962150611..9f484c12ed816cd127b4c569ffb0fa4d819d6150 100644 (file)
 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}
 };
index 53a1db8c2619a555fb43614f5e46d075ac59c09f..ac09b5bc8980315c8cb66f72e2e93bcd23643c19 100644 (file)
@@ -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}
 };
 /* }}} */
index f2adbe0fd38d671df080a927aa6683ffd0982488..32a0836d995431da9e9c7c0fbc833f2da91560b5 100755 (executable)
 #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}
 };
index 018afe5a4e35212c3a152b9479ffe4a5b7bec468..08bb5173c67c6ce87f88ea4867e567881f6d6154 100755 (executable)
@@ -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 @@ zend_function_entry pdo_oci_functions[] = {
 /* {{{ 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}
 };
index 02bcd8aefc32c5673e73ccbbd116470769d3ddfc..d695c1f760bea719924f94483b41cb48a6767875 100755 (executable)
 #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}
 };
index 6689c1bc06a4d6be3678d6cdacae9d6e59b498f3..5dd039a2e19d4278420142fb481057c924c16002 100644 (file)
@@ -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 @@ zend_function_entry pdo_pgsql_functions[] = {
 /* {{{ 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}
 };
index c134a2eb1dd03419f3ff214d6b1ce982692d870c..688399c1269609ef0cb55afe4a839aaf994a6de5 100644 (file)
@@ -627,14 +627,14 @@ static PHP_METHOD(PDO, pgsqlLOBUnlink)
 /* }}} */
 
 
-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:
index fadb2fce860a026b98d141fdc46c93d116d3dbd2..7f48c4c2376cfb10cfb510ce9424a0adb24fbd2a 100644 (file)
@@ -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 @@ zend_function_entry pdo_sqlite_functions[] = {
 /* {{{ 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}
 };
index eeb9d1f28e7732051731b444d06407e7ac4f93e4..03fe166650ccb38f63adfee263299adda69a47dc 100644 (file)
@@ -593,13 +593,13 @@ static PHP_METHOD(SQLite, sqliteCreateAggregate)
        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:
index 6765141db4f9c69ca49cd6c330b0c7b0d604f01a..c0c99dd996b8eeb565770911e14a8847ed2e297e 100644 (file)
@@ -90,7 +90,7 @@ static PHP_GINIT_FUNCTION(pgsql);
 
 /* {{{ 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)
index 64ee78fc3b6da6f6cfed3bf658115febcd6ae694..10bfd673a8f3d8601023a219d08b505325b69e00 100644 (file)
@@ -53,7 +53,7 @@ static PHP_MINFO_FUNCTION(posix);
 
 /* {{{ posix_functions[]
  */
-zend_function_entry posix_functions[] = {
+const zend_function_entry posix_functions[] = {
     /* POSIX.1, 3.3 */
        PHP_FE(posix_kill,              NULL)
 
index fc8f2937cce793bd5dd07212fa08d61b592867b8..128ee26f64d9437e06e396f8f7e724d52dc425ae 100644 (file)
@@ -74,7 +74,7 @@ static PHP_FUNCTION(pspell_config_save_repl);
 
 /* {{{ 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)
index d4d42582d23f6cd44c01d1179a98667a25308b7e..f70bb6743bf2f2354de1640ba47a00f16c45eb0a 100644 (file)
@@ -69,7 +69,7 @@ PHP_RSHUTDOWN_FUNCTION(readline);
 /* }}} */
 /* {{{ 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)
index e1220e2155821f78f0aaaa5af2f5263067b8341b..89245a14f7dc77c5fc9fe6fd9804e4579641b96c 100644 (file)
@@ -67,7 +67,7 @@ ZEND_DECLARE_MODULE_GLOBALS(recode);
 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)
index 586f0764e85f6ec49a18c1d6c9d34b7c2b7d5e4e..7319926844b327fecbfd92012a0272c8a5396402 100644 (file)
@@ -908,7 +908,7 @@ static void _extension_string(string *str, zend_module_entry *module, char *inde
                                  (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 @@ static void _extension_string(string *str, zend_module_entry *module, char *inde
 
        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 @@ PHPAPI void zend_reflection_class_factory(zend_class_entry *ce, zval *object TSR
 /* }}} */
 
 /* {{{ 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 @@ ZEND_METHOD(reflection_extension, getFunctions)
        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 @@ ZEND_METHOD(reflection_extension, getDependencies)
 {
        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 @@ ZEND_METHOD(reflection_extension, info)
 /* }}} */
 
 /* {{{ 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_BEGIN_ARG_INFO_EX(arginfo_reflection_export, 0, 0, 1)
        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_BEGIN_ARG_INFO(arginfo_reflection_function_invokeArgs, 0)
        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 @@ static zend_function_entry reflection_function_abstract_functions[] = {
        {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_BEGIN_ARG_INFO(arginfo_reflection_method_invokeArgs, 0)
        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_BEGIN_ARG_INFO(arginfo_reflection_class_implementsInterface, 0)
        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_BEGIN_ARG_INFO(arginfo_reflection_object___construct, 0)
        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_BEGIN_ARG_INFO(arginfo_reflection_property_setValue, 0)
        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_BEGIN_ARG_INFO(arginfo_reflection_parameter___construct, 0)
        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_BEGIN_ARG_INFO(arginfo_reflection_extension___construct, 0)
        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 @@ static zend_function_entry reflection_extension_functions[] = {
 };
 /* }}} */
 
-zend_function_entry reflection_ext_functions[] = { /* {{{ */
+const zend_function_entry reflection_ext_functions[] = { /* {{{ */
        {NULL, NULL, NULL}
 }; /* }}} */
 
index 7b2e03115cfc857a30a40d5cd8e18d9c4c9bd336..dbc99025326e59c12ac9fdcd209f3b5a8b270d85 100644 (file)
@@ -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)
index 4fcdfa89da70e17eb13c9852a312021de5934787..1057e0cee21975df7d1304a285dc23802ed985af 100644 (file)
@@ -47,7 +47,7 @@ int shm_type;
 
 /* {{{ 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)
index c97bfafc7213e6a8a3fdd449220b678959ca9fe2..220ff063073781ce053546f9416ef3d8e43cac1d 100644 (file)
@@ -2343,14 +2343,14 @@ PHP_FUNCTION(simplexml_import_dom)
 }
 /* }}} */
 
-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 @@ ZEND_GET_MODULE(simplexml)
 
 /* 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)
index 08868874e84f8d2927c66ae1e0c8f6945b158e4f..42685757da8adda21b1f709574f96f7bf7164915 100644 (file)
@@ -20,7 +20,7 @@ static int le_extname;
  *
  * 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[] */
index 2cf9162e9ec62f7ebe4c147a1281fbc8458eb7c6..7bc0eb75f043e8a1da013e66efe6f3621d5d119e 100644 (file)
@@ -114,7 +114,7 @@ static oid objid_mib[] = {1, 3, 6, 1, 2, 1};
 
 /* {{{ 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)
index 7aa4866d43bf93d5b60f9c39cd2680cb29010544..331a116e74b8abb00aa42a90f732349eec94a322 100644 (file)
@@ -21,7 +21,7 @@ Created from the snmputil sample in the Microsoft SDK for NT
 
 /* {{{ snmp_functions[]
  */
-zend_function_entry snmp_functions[] = {
+const zend_function_entry snmp_functions[] = {
     {"snmpget", php3_snmpget, NULL},
     {"snmpwalk", php3_snmpwalk, NULL},
     {NULL,NULL,NULL}
index e6270a06fc310373ede401b714ace58ab7cce7da..0024b037436d62d65cb9d4ed638bbfdeb54b250a 100644 (file)
@@ -281,13 +281,13 @@ PHP_METHOD(SoapHeader, SoapHeader);
 
 #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 @@ static zend_function_entry soap_fault_functions[] = {
        {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 __call_args[] = { 2, BYREF_NONE, BYREF_NONE };
 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 @@ static zend_function_entry soap_client_functions[] = {
        {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}
 };
index c7b78c839eb3818992c6042fadcae7d3c9ce38a5..1b8c0738bfe6200ba5a7d92753854930a11fd2b0 100644 (file)
@@ -120,7 +120,7 @@ static
 
 /* {{{ 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)
index 10ffb95bc4cfae653da63e2e8da9f6b4d2bdfd46..c4c39483445a430e07daa70a470457a7fe0f8f2f 100755 (executable)
@@ -49,7 +49,7 @@ ZEND_DECLARE_MODULE_GLOBALS(spl)
 
 /* {{{ spl_functions_none
  */
-zend_function_entry spl_functions_none[] = {
+const zend_function_entry spl_functions_none[] = {
        {NULL, NULL, NULL}
 };
 /* }}} */
@@ -690,7 +690,7 @@ ZEND_END_ARG_INFO();
 
 /* {{{ 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 @@ PHP_RSHUTDOWN_FUNCTION(spl) /* {{{ */
 } /* }}} */
 
 #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}
index e7520915dee07f75aa496c0ec1a90f17704e6dfa..7fa11bd88210db1a75498fb90708703212e7ff85 100755 (executable)
@@ -1437,7 +1437,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_array_uXsort, 0)
        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 @@ static zend_function_entry spl_funcs_ArrayObject[] = {
        {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 @@ static zend_function_entry spl_funcs_ArrayIterator[] = {
        {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}
index 1931dbbeb02bef8f5562589d432c576336383c2b..ccf69e2409290733c644ce82607436e6cc37d069 100755 (executable)
@@ -1409,7 +1409,7 @@ ZEND_END_ARG_INFO()
 
 /* 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 @@ ZEND_END_ARG_INFO()
 
 /* 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_BEGIN_ARG_INFO_EX(arginfo_r_dir_hasChildren, 0, 0, 0)
        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_BEGIN_ARG_INFO_EX(arginfo_file_object_seek, 0, 0, 1)
        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_BEGIN_ARG_INFO_EX(arginfo_temp_file_object___construct, 0, 0, 0)
        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}
 };
index 0af41f2c549a4f37fd722afd7f1f14eda493f325..31acfee436f91e38354bd5d2489f0eebd6908cfb 100755 (executable)
@@ -36,7 +36,7 @@ void spl_destroy_class(zend_class_entry ** ppce)
 /* }}} */
 
 /* {{{ 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 @@ void spl_register_interface(zend_class_entry ** ppce, char * class_name, zend_fu
 /* }}} */
 
 /* {{{ 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 @@ PHPAPI void spl_register_std_class(zend_class_entry ** ppce, char * class_name,
 /* }}} */
 
 /* {{{ 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 @@ void spl_register_parent_ce(zend_class_entry * class_entry, zend_class_entry * p
 /* }}} */
 
 /* {{{ 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);
 }
index 79aca54cb630c04a0c5e5f261124cf672611ea1a..0db207b7546c91146740bbfaf04184b314310564 100755 (executable)
@@ -57,13 +57,13 @@ typedef zend_object_value (*create_object_func_t)(zend_class_entry *class_type T
 
 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
index 75bfeed681285e3b584cf5626bea5add14fc2b22..5c1fe4d7227d23512b6c8fca12adac51841a0fe5 100755 (executable)
@@ -59,7 +59,7 @@ PHPAPI zend_class_entry *spl_ce_RegexIterator;
 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_BEGIN_ARG_INFO_EX(arginfo_recursive_it_setMaxDepth, 0, 0, 0)
        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_BEGIN_ARG_INFO(arginfo_filter_it___construct, 0)
        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_BEGIN_ARG_INFO(arginfo_parent_it___construct, 0)
        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_BEGIN_ARG_INFO_EX(arginfo_regex_it_set_preg_flags, 0, 0, 1)
        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_BEGIN_ARG_INFO_EX(arginfo_rec_regex_it___construct, 0, 0, 2)
        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_BEGIN_ARG_INFO(arginfo_seekable_it_seek, 0)
        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_BEGIN_ARG_INFO(arginfo_limit_it_seek, 0)
        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_BEGIN_ARG_INFO(arginfo_caching_it_offsetSet, 0)
        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_BEGIN_ARG_INFO_EX(arginfo_caching_rec_it___construct, 0, ZEND_RETURN_VALUE,
        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_BEGIN_ARG_INFO(arginfo_iterator_it___construct, 0)
        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_BEGIN_ARG_INFO(arginfo_norewind_it___construct, 0)
        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 @@ SPL_METHOD(InfiniteIterator, next)
        }
 } /* }}} */
 
-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 @@ SPL_METHOD(EmptyIterator, next)
 {
 } /* }}} */
 
-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_BEGIN_ARG_INFO(arginfo_append_it_append, 0)
        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 @@ PHP_FUNCTION(iterator_apply)
 }
 /* }}} */
 
-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}
 };
index e3b815bdd3418e8a5c9b2f2b5db3c0fe5ef22f3d..1dd4c5c859112f376c56527b6e1f4a6288aa0875 100755 (executable)
@@ -48,7 +48,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_SplObserver_update, 0)
        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_BEGIN_ARG_INFO_EX(arginfo_SplSubject_notify, 0, 0, 1)
        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_BEGIN_ARG_INFO(arginfo_Serialized, 0)
        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)
index 21b53c3ee08d7c2313d12a8c73deb5ebe3759988..433d30bd7c646ac74246070df41e96005bc9c658 100755 (executable)
@@ -156,7 +156,7 @@ SPL_METHOD(SimpleXMLIterator, count)
        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)
index d2c0b63b7baaff9e3f494b496b08cda97312c0b6..71dea80907a1d9976574cba75c911e0b5a51b8d9 100644 (file)
@@ -481,12 +481,12 @@ static PHP_FUNCTION(sqlite2_create_function)
        /* 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:
index cbf80a290e596dbc3c8f77726eb7a0220fc7342a..6ead6c0302c33d4191de91d17efb2fcb664fdc57 100644 (file)
@@ -164,7 +164,7 @@ static int php_sqlite_fetch(struct php_sqlite_result *rres TSRMLS_DC);
 
 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 @@ zend_function_entry sqlite_functions[] = {
        {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 @@ zend_function_entry sqlite_funcs_db[] = {
        {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 @@ zend_function_entry sqlite_funcs_query[] = {
        {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 @@ zend_function_entry sqlite_funcs_ub_query[] = {
        {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
index a063bfab1f7b3330566edd8e4bc3f349f1251589..ce5c866a4c33b4d9639e2c1936581195ab50c400 100644 (file)
@@ -3097,7 +3097,7 @@ ZEND_END_ARG_INFO()
 /* }}} */
 /* }}} */
 
-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_BEGIN()
        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}
 };
index 2e51a406a4ae4f6e49aba4ffdc7900a6bb260fec..ad122e4f8013be9bfa2c5359534f56a8bbb3e869 100644 (file)
@@ -93,7 +93,7 @@ static zend_class_entry *dir_class_entry_ptr;
                        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)
index a31f1b4b1bcbafc8322fc44921805ad998e7ac30..74efe2dd74821661f77dd72a3bafcae612b5a5aa 100644 (file)
@@ -197,7 +197,7 @@ void php_dl(zval *file, int type, zval *return_value, int start_now TSRMLS_DC)
                                  unsigned int zend_api;
                        };
 
-                       char *name;
+                       const char *name;
                        int zend_api;
                        unsigned char zend_debug, zts;
 
index 69568f2a7dd11b984993a4485572ad35a26e1991..fd9c76655dc908a1146704f2142ce45730d12dc8 100644 (file)
@@ -1020,7 +1020,7 @@ PHP_FUNCTION(phpversion)
        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) {
index 2423f6b5e135470587c7d02a61732313a7bf712a..ea6ed4c93803d094f62a60316f3f570beef65a5e 100644 (file)
@@ -70,7 +70,7 @@ static
 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)
index 587a4ee814e3ea48d42d36b31ea36cb3bc74d48f..1e35a2a34a544c35165e3c41a33605059d4d5b85 100644 (file)
@@ -81,7 +81,7 @@ typedef struct {
 } 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)
index a34a895c45e1b929ee06e6928104b8f36c318884..572cc199bceed065951cea181f61f8156ef26634 100644 (file)
@@ -41,7 +41,7 @@ ZEND_DECLARE_MODULE_GLOBALS(sybase)
 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)
index 94b8e65fbc174edd3dc1265ce5d3f69759546ae2..7ab5b387f29cd1f3f938fb74df470844b3aa80ae 100644 (file)
@@ -65,7 +65,7 @@ static
  *
  * 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)
index cd1450eb5c08b9439f30d61f2dfaf19972a3869a..9f440a76d6c01dbf22060a4d525c054bc2cfea0b 100644 (file)
@@ -58,7 +58,7 @@ union semun {
 
 /* {{{ 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)
index 25c2ba0bcc6cec3e28fc7844eb71800a2d09199c..3e1f48142ad3cc7f19112986efdff3f257f88efe 100644 (file)
@@ -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)
index cb2525ce0ead072993d6e6de5be98fe6e05ae190..60928a7ce0fa4e6b561c7797dc71787828d3a5ef 100644 (file)
@@ -277,7 +277,7 @@ STD_PHP_INI_ENTRY("tidy.default_config",    "",     PHP_INI_SYSTEM,         OnUpdateString,         d
 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 @@ static zend_function_entry tidy_functions[] = {
        {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 @@ static zend_function_entry tidy_funcs_doc[] = {
        {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)
index 7075da09281f62ab29a3c7defe79bdbbdd348286..52fb6659030ffbd910339b53d20b05bdbef0803a 100644 (file)
@@ -97,7 +97,7 @@ struct yy_buffer_state
  *
  * 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[] */
index a3ff9870bfe4f9bbdeb9ab76dd7889e3883bb07f..948bd7564e71c84fe0276e0ce26ad6e83cbc8fe6 100644 (file)
@@ -104,7 +104,7 @@ static void php_wddx_process_data(void *user_data, const XML_Char *s, int len);
 
 /* {{{ 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)
index 26cb27a4f611fea733294d28e30f1ceda11de481..7c945240d31190372d6f7ce56492f902dea624e6 100644 (file)
@@ -107,7 +107,7 @@ static
                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 @@ zend_function_entry xml_functions[] = {
 };
 
 #ifdef LIBXML_EXPAT_COMPAT
-static zend_module_dep xml_deps[] = {
+static const zend_module_dep xml_deps[] = {
        ZEND_MOD_REQUIRED("libxml")
        {NULL, NULL, NULL}
 };
index 933dee611b3f1b29a51de996b11db36597a14c75..fa5910573e3423b966d5de17839a1952d8f33ac7 100644 (file)
@@ -319,7 +319,7 @@ static xmlRelaxNGPtr _xmlreader_get_relaxNG(char *source, int source_len, int ty
 /* }}} */
 #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_BEGIN_ARG_INFO(arginfo_xmlreader_expand, 0)
 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)
index c0918a6cbd9b7bd76eb4cf2fd9b42038affb3605..423deb045fa39bd2f623de8c84b8ec9ed3e8d851 100644 (file)
@@ -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)
index 45a0d912c106a4960f6a76a7debdd3492edabd9f..3bcf683c6d4cef9dc50c5b0852810f24dd264325 100644 (file)
@@ -173,7 +173,7 @@ static zend_object_value xmlwriter_object_new(zend_class_entry *class_type TSRML
        }       \
 
 /* {{{ 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 @@ static zend_function_entry xmlwriter_functions[] = {
 
 #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
index 7e332824c29d3b41d18ef46c11ad2d69979d33b9..19c4111e122cc426c4d2a8121cb45a030213153e 100644 (file)
@@ -35,12 +35,12 @@ static zend_object_handlers xsl_object_handlers;
  *
  * 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}
 };
index a6e992ea2314a058fe7dcbbf9f8763b894be9549..3153e78e9fd82eca0cfeff1c9c6fb9630fa2a112 100644 (file)
@@ -21,7 +21,7 @@
 #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);
index c806a5608a2286a335bd5fcee2a272f5e8015b65..beb38a2ee7168f6c1422153cf01ebd76eab81021 100644 (file)
@@ -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)
index 59336158dee8bdcf640e20f14c612928dc60e9fc..69f507d37956c56e6f2ce9f75e4ec42e18d26b09 100644 (file)
@@ -272,7 +272,7 @@ static char * php_zipobj_get_zip_comment(struct zip *za, int *len TSRMLS_DC) /*
 /* }}} */
 
 /* {{{ 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 @@ static ZIPARCHIVE_METHOD(getStream)
 /* }}} */
 
 /* {{{ 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)
index 24ffd88186d89f052037b7415b5e93a5ea2dd8b8..6c3a0469cd1ddf0c2bf1b0980bf0914b76985065 100644 (file)
@@ -103,7 +103,7 @@ static PHP_FUNCTION(zlib_get_coding_type);
 
 /* {{{ 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)
index 37bb5aab2977dd73c054071ecd0460994aea07a3..e491a4a300db392289f1c489617853a1b913921d 100644 (file)
@@ -240,7 +240,7 @@ static void php_info_aolserver(ZEND_MODULE_INFO_FUNC_ARGS)
 
 PHP_FUNCTION(getallheaders);
 
-static zend_function_entry aolserver_functions[] = {
+const static zend_function_entry aolserver_functions[] = {
        PHP_FE(getallheaders, NULL)
        {NULL, NULL, NULL}
 };
index ca424e3455ca47066aa93324cc2564c5d29394fa..b740464d5b121c91df7bc1b8a583f53306fcb6e8 100644 (file)
@@ -56,7 +56,7 @@ PHP_FUNCTION(apache_reset_timeout);
 
 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)
index 934020481646825c573f367f2d1266088b2cae44..b96a08d417f0cc9cea7bc7a34f72d849d7ec861e 100644 (file)
@@ -359,7 +359,7 @@ PHP_MINFO_FUNCTION(apache)
        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)
index fd6e34ef1116b08565709918f08e4eb8864b0c0f..970cbbf35875f30a7480db2889e72a3775e4278b 100644 (file)
@@ -478,7 +478,7 @@ PHP_MINFO_FUNCTION(apache)
        }
 }
 
-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)
index fb56d3dfb8c662fad3e1085c962be85e0e5f5d21..8ab47501e4a7ff7853736f62fe8ac33ef03771e1 100644 (file)
@@ -60,7 +60,7 @@ PHP_FUNCTION(apache_get_modules);
 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_FUNCTION(apache_request_send_header_field)
 
 /* {{{ 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)
index cb99b86171e654f991fa10fc07002fbcbde3cb4e..e1fc659e43df9ea4e6b2c4525c552d6bc7e03e44 100644 (file)
@@ -80,7 +80,7 @@ PHP_FUNCTION(continuity_virtual);
 PHP_FUNCTION(continuity_request_headers);
 PHP_FUNCTION(continuity_response_headers);
 
-zend_function_entry continuity_functions[] = {
+const zend_function_entry continuity_functions[] = {
         {NULL, NULL, NULL}
 };
 
index 620e39008d06d0e2874c8aee2b68a35ddd62cabc..e97e3117fd4e489f45e5b401223e046655320d3f 100644 (file)
@@ -770,7 +770,7 @@ PHP_MINFO_FUNCTION(milter)
 
 /* {{{ 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)
index dac56dd711563b44c61d6e2da9ecb1c651558238..392277783a513e8b8701de16f4d385b31d155f65 100644 (file)
@@ -172,7 +172,7 @@ ZEND_DECLARE_MODULE_GLOBALS(nsapi)
  *
  * 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 */