]> 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:28:44 +0000 (18:28 +0000)
committerDmitry Stogov <dmitry@php.net>
Thu, 27 Sep 2007 18:28:44 +0000 (18:28 +0000)
164 files changed:
Zend/zend.h
Zend/zend_API.c
Zend/zend_API.h
Zend/zend_builtin_functions.c
Zend/zend_exceptions.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
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/ereg/ereg.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_structs.h
ext/mysqlnd/mysqlnd.c
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_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/unicode/collator.c
ext/unicode/unicode.c
ext/unicode/unicode_iterators.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
main/SAPI.h
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/cgi/cgi_main.c
sapi/cli/php_cli.c
sapi/continuity/capi.c
sapi/embed/php_embed.c
sapi/milter/php_milter.c
sapi/nsapi/nsapi.c

index 01daaa17be62921fd6f545d8160fe34be13cf681..de96c1e3b17d0c63628a571f347dcdae2721c81f 100644 (file)
@@ -247,7 +247,7 @@ typedef union _zstr {
 #endif
 
 #ifdef __GNUC__
-#      define ZSTR(x)    ((zstr)(x))
+#      define ZSTR(x)    ((zstr)((void*)(x)))
 #      define NULL_ZSTR  ZSTR((void*)NULL)
 #      define EMPTY_ZSTR ZSTR("\0\0")
 #else
@@ -368,7 +368,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 7a5f3892d419c198dc200e1a9481d7f07594d64a..a9708185d116ca2a8b1a70fddb2cfe51ef807d27 100644 (file)
@@ -1342,32 +1342,32 @@ 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_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);
 }
 /* }}} */
 
-ZEND_API int add_ascii_assoc_zval_ex(zval *arg, char *key, uint key_len, zval *value) /* {{{ */
+ZEND_API int add_ascii_assoc_zval_ex(zval *arg, const char *key, uint key_len, zval *value) /* {{{ */
 {
        return zend_ascii_symtable_update(Z_ARRVAL_P(arg), key, key_len, (void*)&value, sizeof(zval*), NULL);
 }
 /* }}} */
 
-ZEND_API int add_rt_assoc_zval_ex(zval *arg, char *key, uint key_len, zval *value) /* {{{ */
+ZEND_API int add_rt_assoc_zval_ex(zval *arg, const char *key, uint key_len, zval *value) /* {{{ */
 {
        return zend_rt_symtable_update(Z_ARRVAL_P(arg), key, key_len, (void*)&value, sizeof(zval*), NULL);
 }
 /* }}} */
 
-ZEND_API int add_utf8_assoc_zval_ex(zval *arg, char *key, uint key_len, zval *value) /* {{{ */
+ZEND_API int add_utf8_assoc_zval_ex(zval *arg, const char *key, uint key_len, zval *value) /* {{{ */
 {
        return zend_utf8_symtable_update(Z_ARRVAL_P(arg), key, key_len, (void*)&value, sizeof(zval*), NULL);
 }
@@ -1391,7 +1391,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;
 
@@ -1402,7 +1402,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;
 
@@ -1435,7 +1435,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;
 
@@ -1446,7 +1446,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;
 
@@ -1833,7 +1833,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) {
@@ -1892,7 +1892,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;
@@ -1939,7 +1939,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) {
@@ -2062,9 +2062,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;
@@ -2100,7 +2100,7 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, zend_function_entr
                        internal_function->function_name.u = malloc(UBYTES(len));
                        u_charsToUChars(ptr->fname, internal_function->function_name.u, len);
                } else {
-                       internal_function->function_name.s = ptr->fname;
+                       internal_function->function_name.s = (char*)ptr->fname;
                }
                internal_function->scope = scope;
                internal_function->prototype = NULL;
@@ -2125,7 +2125,7 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, zend_function_entr
                                        }
                                }
                        } else {
-                               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 */
@@ -2333,9 +2333,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;
 
@@ -2599,7 +2599,7 @@ static zend_object_value display_disabled_class(zend_class_entry *class_type TSR
 }
 /* }}} */
 
-static zend_function_entry disabled_class_new[] =  {
+static const zend_function_entry disabled_class_new[] =  {
        { NULL, NULL, NULL }
 };
 
@@ -3163,7 +3163,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 40fd16deaff77821b46befcc4010d83ac021abd2..c6a591f988ed9d6174bcd495b8cdaae2ab529a8f 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)
@@ -208,8 +208,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);
@@ -236,7 +236,7 @@ ZEND_API void zend_wrong_param_count(TSRMLS_D);
 ZEND_API zend_bool zend_is_callable_ex(zval *callable, uint check_flags, zval *callable_name, 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, zval *callable_name);
 ZEND_API zend_bool zend_make_callable(zval *callable, zval *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, zstr doc_comment, int doc_comment_len TSRMLS_DC);
@@ -336,12 +336,12 @@ 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));
 
 #define ZSTR_DUPLICATE (1<<0)
 #define ZSTR_AUTOFREE  (1<<1)
 
-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);
 
 #define add_assoc_null_ex(arg, key, key_len) do { \
                zval *___tmp; \
@@ -485,7 +485,7 @@ ZEND_API int add_assoc_zval_ex(zval *arg, char *key, uint key_len, zval *value);
 #define add_assoc_text(arg, key, str, duplicate) add_assoc_text_ex(arg, key, strlen(key)+1, str, duplicate)
 #define add_assoc_textl(arg, key, str, length, duplicate) add_assoc_textl_ex(arg, key, strlen(key)+1, str, length, duplicate)
 
-ZEND_API int add_ascii_assoc_zval_ex(zval *arg, char *key, uint key_len, zval *value);
+ZEND_API int add_ascii_assoc_zval_ex(zval *arg, const char *key, uint key_len, zval *value);
 
 #define add_ascii_assoc_null_ex(arg, key, key_len) do { \
                zval *___tmp; \
@@ -630,7 +630,7 @@ ZEND_API int add_ascii_assoc_zval_ex(zval *arg, char *key, uint key_len, zval *v
 #define add_ascii_assoc_text(__arg, __key, __str, __duplicate) add_ascii_assoc_text_ex(__arg, __key, strlen(__key)+1, __str, __duplicate)
 #define add_ascii_assoc_textl(__arg, __key, __str, __length, __duplicate) add_ascii_assoc_textl_ex(__arg, __key, strlen(__key)+1, __str, __length, __duplicate)
 
-ZEND_API int add_rt_assoc_zval_ex(zval *arg, char *key, uint key_len, zval *value);
+ZEND_API int add_rt_assoc_zval_ex(zval *arg, const char *key, uint key_len, zval *value);
 
 #define add_rt_assoc_null_ex(arg, key, key_len) do { \
                zval *___tmp; \
@@ -775,7 +775,7 @@ ZEND_API int add_rt_assoc_zval_ex(zval *arg, char *key, uint key_len, zval *valu
 #define add_rt_assoc_text(__arg, __key, __str, __duplicate) add_rt_assoc_text_ex(__arg, __key, strlen(__key)+1, __str, __duplicate)
 #define add_rt_assoc_textl(__arg, __key, __str, __length, __duplicate) add_rt_assoc_textl_ex(__arg, __key, strlen(__key)+1, __str, __length, __duplicate)
 
-ZEND_API int add_utf8_assoc_zval_ex(zval *arg, char *key, uint key_len, zval *value);
+ZEND_API int add_utf8_assoc_zval_ex(zval *arg, const char *key, uint key_len, zval *value);
 
 #define add_utf8_assoc_null_ex(arg, key, key_len) do { \
                zval *___tmp; \
@@ -1401,7 +1401,7 @@ ZEND_API int add_next_index_zval(zval *arg, zval *value);
                        UChar *___u_str = zend_ascii_to_unicode((str), (___u_len)+1 ZEND_FILE_LINE_CC); \
                        ___u_str[___u_len] = 0; \
                        if ((flags) & ZSTR_AUTOFREE) { \
-                               efree(str); \
+                               efree((char*)(str)); \
                        } \
                        add_next_index_unicodel(arg, ___u_str, ___u_len, 0); \
                } else { \
@@ -1416,7 +1416,7 @@ ZEND_API int add_next_index_zval(zval *arg, zval *value);
                                add_next_index_unicodel(arg, ___u_str, ___u_len, 0); \
                        } \
                        if ((flags) & ZSTR_AUTOFREE) { \
-                               efree(str); \
+                               efree((char*)(str)); \
                        } \
                } else { \
                        add_next_index_stringl(arg, (char*)(str), length, (flags) & ZSTR_DUPLICATE); \
@@ -1430,7 +1430,7 @@ ZEND_API int add_next_index_zval(zval *arg, zval *value);
                                add_next_index_unicodel(arg, ___u_str, ___u_len, 0); \
                        } \
                        if ((flags) & ZSTR_AUTOFREE) { \
-                               efree(str); \
+                               efree((char*)(str)); \
                        } \
                } else { \
                        add_next_index_stringl(arg, (char*)(str), length, (flags) & ZSTR_DUPLICATE); \
@@ -1448,16 +1448,16 @@ ZEND_API int add_next_index_zval(zval *arg, zval *value);
 #define add_next_index_unset(__arg) add_next_index_null(__arg)
 #define add_property_unset(__arg, __key) add_property_null(__arg, __key)
 
-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_get_index_unicode(zval *arg, ulong idx, UChar *str, void **dest, int duplicate);
 ZEND_API int add_get_index_unicodel(zval *arg, ulong idx, UChar *str, uint length, void **dest, int duplicate);
 
@@ -1636,22 +1636,22 @@ END_EXTERN_C()
        }
 
 #define ZVAL_STRING(z, s, duplicate) { \
-               char *__s=(s);                                  \
+               const char *__s=(s);                                    \
                Z_STRLEN_P(z) = strlen(__s);    \
-               Z_STRVAL_P(z) = (duplicate?estrndup(__s, Z_STRLEN_P(z)):__s);   \
+               Z_STRVAL_P(z) = (duplicate?estrndup(__s, Z_STRLEN_P(z)):(char*)__s);    \
                Z_TYPE_P(z) = IS_STRING;        \
        }
 
 #define ZVAL_STRINGL(z, s, l, duplicate) {     \
-               char *__s=(s); int __l=l;               \
+               const char *__s=(s); int __l=l;         \
                Z_STRLEN_P(z) = __l;                \
-               Z_STRVAL_P(z) = (duplicate?estrndup(__s, __l):__s);     \
+               Z_STRVAL_P(z) = (duplicate?estrndup(__s, __l):(char*)__s);      \
                Z_TYPE_P(z) = IS_STRING;                    \
        }
 
 #define ZVAL_ASCII_STRING(z, s, flags) { \
                if (UG(unicode)) { \
-                       char *__s = (s); \
+                       char *__s = (char*)(s); \
                        int __s_len = strlen(__s); \
                        UChar *u_str = zend_ascii_to_unicode(__s, __s_len+1 ZEND_FILE_LINE_CC); \
                        u_str[__s_len] = 0; \
@@ -1660,16 +1660,16 @@ END_EXTERN_C()
                        } \
                        ZVAL_UNICODEL(z, u_str, __s_len, 0); \
                } else { \
-                       char *__s=(s);                                  \
+                       const char *__s=(s);                                    \
                        Z_STRLEN_P(z) = strlen(__s);    \
-                       Z_STRVAL_P(z) = (((flags) & ZSTR_DUPLICATE) ? estrndup(__s, Z_STRLEN_P(z)) : __s);      \
+                       Z_STRVAL_P(z) = (((flags) & ZSTR_DUPLICATE) ? estrndup(__s, Z_STRLEN_P(z)) :(char*) __s);       \
                        Z_TYPE_P(z) = IS_STRING;        \
                } \
        }
 
 #define ZVAL_ASCII_STRINGL(z, s, l, flags) { \
                if (UG(unicode)) { \
-                       char *__s = (s); \
+                       char *__s = (char*)(s); \
                        int __s_len  = (l); \
                        UChar *u_str = zend_ascii_to_unicode((__s), (__s_len)+1 ZEND_FILE_LINE_CC); \
                        u_str[__s_len] = 0; \
@@ -1678,9 +1678,9 @@ END_EXTERN_C()
                        } \
                        ZVAL_UNICODEL(z, u_str, __s_len, 0); \
                } else { \
-                       char *__s=(s); int __l=l;       \
+                       const char *__s=(s); int __l=l; \
                        Z_STRLEN_P(z) = __l;        \
-                       Z_STRVAL_P(z) = (((flags) & ZSTR_DUPLICATE) ? estrndup(__s, __l) : __s);        \
+                       Z_STRVAL_P(z) = (((flags) & ZSTR_DUPLICATE) ? estrndup(__s, __l) : (char*)__s); \
                        Z_TYPE_P(z) = IS_STRING;    \
                } \
        }
@@ -1700,7 +1700,7 @@ END_EXTERN_C()
                } else { \
                        char *__s=(char *)(s);                                  \
                        Z_STRLEN_P(z) = strlen(__s);    \
-                       Z_STRVAL_P(z) = (((flags) & ZSTR_DUPLICATE) ? estrndup(__s, Z_STRLEN_P(z)) : __s);      \
+                       Z_STRVAL_P(z) = (((flags) & ZSTR_DUPLICATE) ? estrndup(__s, Z_STRLEN_P(z)) : (char*)__s);       \
                        Z_TYPE_P(z) = IS_STRING;        \
                } \
        }
index 059867e60cfa7f86880fdbfb7a5077ff55bc7943..0be6086a4362138f7be8b18ecbe0c20ff16fee50 100644 (file)
@@ -89,7 +89,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)
@@ -1728,7 +1728,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;
 
@@ -2282,7 +2282,7 @@ ZEND_FUNCTION(get_extension_funcs)
        zend_uchar ext_type;
        char *name;
        zend_module_entry *module;
-       zend_function_entry *func;
+       const zend_function_entry *func;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "t", &ext, &ext_len, &ext_type) == FAILURE) {
                return;
index 0b2070d11734e943717786b3f3231172158f57af..64604520c6732f2fcda5d6683965f82994528efc 100644 (file)
@@ -620,7 +620,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[] = {
+static const 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)
@@ -642,7 +642,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 20391dc3e8b6ddea722b6da1ec72301a17c8f9d4..5e2efac49457b24a54fcbe5f720543c2a8a397f9 100644 (file)
@@ -126,7 +126,7 @@ ZEND_API ulong zend_u_hash_func(zend_uchar type, zstr arKey, uint nKeyLength) /*
 }
 /* }}} */
 
-ZEND_API ulong zend_hash_func(char *arKey, uint nKeyLength) /* {{{ */
+ZEND_API ulong zend_hash_func(const char *arKey, uint nKeyLength) /* {{{ */
 {
        return zend_u_hash_func(IS_STRING, ZSTR(arKey), nKeyLength);
 }
@@ -323,13 +323,13 @@ ZEND_API int _zend_u_hash_add_or_update(HashTable *ht, zend_uchar type, zstr arK
 }
 /* }}} */
 
-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) /* {{{ */
 {
        return _zend_u_hash_add_or_update(ht, IS_STRING, ZSTR(arKey), nKeyLength, pData, nDataSize, pDest, flag ZEND_FILE_LINE_CC);
 }
 /* }}} */
 
-ZEND_API int _zend_ascii_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_ascii_hash_add_or_update(HashTable *ht, const char *arKey, uint nKeyLength, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC) /* {{{ */
 {
        TSRMLS_FETCH();
 
@@ -347,7 +347,7 @@ ZEND_API int _zend_ascii_hash_add_or_update(HashTable *ht, char *arKey, uint nKe
 }
 /* }}} */
 
-ZEND_API int _zend_rt_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_rt_hash_add_or_update(HashTable *ht, const char *arKey, uint nKeyLength, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC) /* {{{ */
 {
        TSRMLS_FETCH();
 
@@ -373,7 +373,7 @@ string_key:
 }
 /* }}} */
 
-ZEND_API int _zend_utf8_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_utf8_hash_add_or_update(HashTable *ht, const char *arKey, uint nKeyLength, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC) /* {{{ */
 {
        TSRMLS_FETCH();
 
@@ -483,7 +483,7 @@ ZEND_API int _zend_u_hash_quick_add_or_update(HashTable *ht, zend_uchar type, zs
 }
 /* }}} */
 
-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) /* {{{ */
 {
        return _zend_u_hash_quick_add_or_update(ht, IS_STRING, ZSTR(arKey), nKeyLength, h, pData, nDataSize, pDest, flag ZEND_FILE_LINE_CC);
 }
@@ -497,7 +497,7 @@ ZEND_API int zend_u_hash_add_empty_element(HashTable *ht, zend_uchar type, zstr
 }
 /* }}} */
 
-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;
 
@@ -682,13 +682,13 @@ ZEND_API int zend_u_hash_del_key_or_index(HashTable *ht, zend_uchar type, zstr a
 }
 /* }}} */
 
-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) /* {{{ */
 {
        return zend_u_hash_del_key_or_index(ht, IS_STRING, ZSTR(arKey), nKeyLength, h, flag);
 }
 /* }}} */
 
-ZEND_API int zend_ascii_hash_del(HashTable *ht, char *arKey, uint nKeyLength) /* {{{ */
+ZEND_API int zend_ascii_hash_del(HashTable *ht, const char *arKey, uint nKeyLength) /* {{{ */
 {
        TSRMLS_FETCH();
 
@@ -706,7 +706,7 @@ ZEND_API int zend_ascii_hash_del(HashTable *ht, char *arKey, uint nKeyLength) /*
 }
 /* }}} */
 
-ZEND_API int zend_rt_hash_del(HashTable *ht, char *arKey, uint nKeyLength) /* {{{ */
+ZEND_API int zend_rt_hash_del(HashTable *ht, const char *arKey, uint nKeyLength) /* {{{ */
 {
        TSRMLS_FETCH();
 
@@ -731,7 +731,7 @@ string_key:
 }
 /* }}} */
 
-ZEND_API int zend_utf8_hash_del(HashTable *ht, char *arKey, uint nKeyLength) /* {{{ */
+ZEND_API int zend_utf8_hash_del(HashTable *ht, const char *arKey, uint nKeyLength) /* {{{ */
 {
        TSRMLS_FETCH();
 
@@ -1117,7 +1117,7 @@ ZEND_API ulong zend_u_get_hash_value(zend_uchar type, zstr arKey, uint nKeyLengt
 }
 /* }}} */
 
-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_u_get_hash_value(IS_STRING, ZSTR(arKey), nKeyLength);
 }
@@ -1160,13 +1160,13 @@ ZEND_API int zend_u_hash_find(HashTable *ht, zend_uchar type, zstr arKey, uint n
 }
 /* }}} */
 
-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) /* {{{ */
 {
        return zend_u_hash_find(ht, IS_STRING, ZSTR(arKey), nKeyLength, pData);
 }
 /* }}} */
 
-ZEND_API int zend_ascii_hash_find(HashTable *ht, char *arKey, uint nKeyLength, void **pData) /* {{{ */
+ZEND_API int zend_ascii_hash_find(HashTable *ht, const char *arKey, uint nKeyLength, void **pData) /* {{{ */
 {
        TSRMLS_FETCH();
 
@@ -1184,7 +1184,7 @@ ZEND_API int zend_ascii_hash_find(HashTable *ht, char *arKey, uint nKeyLength, v
 }
 /* }}} */
 
-ZEND_API int zend_rt_hash_find(HashTable *ht, char *arKey, uint nKeyLength, void **pData) /* {{{ */
+ZEND_API int zend_rt_hash_find(HashTable *ht, const char *arKey, uint nKeyLength, void **pData) /* {{{ */
 {
        TSRMLS_FETCH();
 
@@ -1209,7 +1209,7 @@ string_key:
 }
 /* }}} */
 
-ZEND_API int zend_utf8_hash_find(HashTable *ht, char *arKey, uint nKeyLength, void **pData) /* {{{ */
+ZEND_API int zend_utf8_hash_find(HashTable *ht, const char *arKey, uint nKeyLength, void **pData) /* {{{ */
 {
        TSRMLS_FETCH();
 
@@ -1272,7 +1272,7 @@ ZEND_API int zend_u_hash_quick_find(HashTable *ht, zend_uchar type, zstr arKey,
 }
 /* }}} */
 
-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) /* {{{ */
 {
        return zend_u_hash_quick_find(ht, IS_STRING, ZSTR(arKey), nKeyLength, h, pData);
 }
@@ -1310,13 +1310,13 @@ ZEND_API int zend_u_hash_exists(HashTable *ht, zend_uchar type, zstr arKey, uint
 }
 /* }}} */
 
-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) /* {{{ */
 {
        return zend_u_hash_exists(ht, IS_STRING, ZSTR(arKey), nKeyLength);
 }
 /* }}} */
 
-ZEND_API int zend_ascii_hash_exists(HashTable *ht, char *arKey, uint nKeyLength) /* {{{ */
+ZEND_API int zend_ascii_hash_exists(HashTable *ht, const char *arKey, uint nKeyLength) /* {{{ */
 {
        TSRMLS_FETCH();
 
@@ -1334,7 +1334,7 @@ ZEND_API int zend_ascii_hash_exists(HashTable *ht, char *arKey, uint nKeyLength)
 }
 /* }}} */
 
-ZEND_API int zend_rt_hash_exists(HashTable *ht, char *arKey, uint nKeyLength) /* {{{ */
+ZEND_API int zend_rt_hash_exists(HashTable *ht, const char *arKey, uint nKeyLength) /* {{{ */
 {
        TSRMLS_FETCH();
 
@@ -1359,7 +1359,7 @@ string_key:
 }
 /* }}} */
 
-ZEND_API int zend_utf8_hash_exists(HashTable *ht, char *arKey, uint nKeyLength) /* {{{ */
+ZEND_API int zend_utf8_hash_exists(HashTable *ht, const char *arKey, uint nKeyLength) /* {{{ */
 {
        TSRMLS_FETCH();
 
@@ -1421,7 +1421,7 @@ ZEND_API int zend_u_hash_quick_exists(HashTable *ht, zend_uchar type, zstr arKey
 }
 /* }}} */
 
-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) /* {{{ */
 {
        return zend_u_hash_quick_exists(ht, IS_STRING, ZSTR(arKey), nKeyLength, h);
 }
@@ -1937,13 +1937,13 @@ ZEND_API ulong zend_hash_next_free_element(HashTable *ht) /* {{{ */
 
 /* {{{ HANDLE_*_NUMERIC macros */
 #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 */    \
@@ -2066,119 +2066,119 @@ ZEND_API int zend_u_symtable_update_current_key(HashTable *ht, zend_uchar type,
 }
 /* }}} */
 
-ZEND_API int zend_symtable_update(HashTable *ht, char *arKey, uint nKeyLength, void *pData, uint nDataSize, void **pDest) /* {{{ */
+ZEND_API 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);
 }
 /* }}} */
 
-ZEND_API int zend_symtable_del(HashTable *ht, char *arKey, uint nKeyLength) /* {{{ */
+ZEND_API 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);
 }
 /* }}} */
 
-ZEND_API int zend_symtable_find(HashTable *ht, char *arKey, uint nKeyLength, void **pData) /* {{{ */
+ZEND_API 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);
 }
 /* }}} */
 
-ZEND_API int zend_symtable_exists(HashTable *ht, char *arKey, uint nKeyLength) /* {{{ */
+ZEND_API 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);
 }
 /* }}} */
 
-ZEND_API int zend_symtable_update_current_key(HashTable *ht, char *arKey, uint nKeyLength) /* {{{ */
+ZEND_API 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_ZSTR, 0, idx));
        return zend_hash_update_current_key(ht, HASH_KEY_IS_STRING, ZSTR(arKey), nKeyLength, 0);
 }
 /* }}} */
 
-ZEND_API int zend_ascii_symtable_update(HashTable *ht, char *arKey, uint nKeyLength, void *pData, uint nDataSize, void **pDest) /* {{{ */
+ZEND_API int zend_ascii_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_ascii_hash_update(ht, arKey, nKeyLength, pData, nDataSize, pDest);
 }
 /* }}} */
 
-ZEND_API int zend_ascii_symtable_del(HashTable *ht, char *arKey, uint nKeyLength) /* {{{ */
+ZEND_API int zend_ascii_symtable_del(HashTable *ht, const char *arKey, uint nKeyLength) /* {{{ */
 {
        HANDLE_NUMERIC(arKey, nKeyLength, zend_hash_index_del(ht, idx))
        return zend_ascii_hash_del(ht, arKey, nKeyLength);
 }
 /* }}} */
 
-ZEND_API int zend_ascii_symtable_find(HashTable *ht, char *arKey, uint nKeyLength, void **pData) /* {{{ */
+ZEND_API int zend_ascii_symtable_find(HashTable *ht, const char *arKey, uint nKeyLength, void **pData) /* {{{ */
 {
        HANDLE_NUMERIC(arKey, nKeyLength, zend_hash_index_find(ht, idx, pData));
        return zend_ascii_hash_find(ht, arKey, nKeyLength, pData);
 }
 /* }}} */
 
-ZEND_API int zend_ascii_symtable_exists(HashTable *ht, char *arKey, uint nKeyLength) /* {{{ */
+ZEND_API int zend_ascii_symtable_exists(HashTable *ht, const char *arKey, uint nKeyLength) /* {{{ */
 {
        HANDLE_NUMERIC(arKey, nKeyLength, zend_hash_index_exists(ht, idx));
        return zend_ascii_hash_exists(ht, arKey, nKeyLength);
 }
 /* }}} */
 
-ZEND_API int zend_rt_symtable_update(HashTable *ht, char *arKey, uint nKeyLength, void *pData, uint nDataSize, void **pDest) /* {{{ */
+ZEND_API int zend_rt_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_rt_hash_update(ht, arKey, nKeyLength, pData, nDataSize, pDest);
 }
 /* }}} */
 
-ZEND_API int zend_rt_symtable_del(HashTable *ht, char *arKey, uint nKeyLength) /* {{{ */
+ZEND_API int zend_rt_symtable_del(HashTable *ht, const char *arKey, uint nKeyLength) /* {{{ */
 {
        HANDLE_NUMERIC(arKey, nKeyLength, zend_hash_index_del(ht, idx))
        return zend_rt_hash_del(ht, arKey, nKeyLength);
 }
 /* }}} */
 
-ZEND_API int zend_rt_symtable_find(HashTable *ht, char *arKey, uint nKeyLength, void **pData) /* {{{ */
+ZEND_API int zend_rt_symtable_find(HashTable *ht, const char *arKey, uint nKeyLength, void **pData) /* {{{ */
 {
        HANDLE_NUMERIC(arKey, nKeyLength, zend_hash_index_find(ht, idx, pData));
        return zend_rt_hash_find(ht, arKey, nKeyLength, pData);
 }
 /* }}} */
 
-ZEND_API int zend_rt_symtable_exists(HashTable *ht, char *arKey, uint nKeyLength) /* {{{ */
+ZEND_API int zend_rt_symtable_exists(HashTable *ht, const char *arKey, uint nKeyLength) /* {{{ */
 {
        HANDLE_NUMERIC(arKey, nKeyLength, zend_hash_index_exists(ht, idx));
        return zend_rt_hash_exists(ht, arKey, nKeyLength);
 }
 /* }}} */
 
-ZEND_API int zend_utf8_symtable_update(HashTable *ht, char *arKey, uint nKeyLength, void *pData, uint nDataSize, void **pDest) /* {{{ */
+ZEND_API int zend_utf8_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_utf8_hash_update(ht, arKey, nKeyLength, pData, nDataSize, pDest);
 }
 /* }}} */
 
-ZEND_API int zend_utf8_symtable_del(HashTable *ht, char *arKey, uint nKeyLength) /* {{{ */
+ZEND_API int zend_utf8_symtable_del(HashTable *ht, const char *arKey, uint nKeyLength) /* {{{ */
 {
        HANDLE_NUMERIC(arKey, nKeyLength, zend_hash_index_del(ht, idx))
        return zend_utf8_hash_del(ht, arKey, nKeyLength);
 }
 /* }}} */
 
-ZEND_API int zend_utf8_symtable_find(HashTable *ht, char *arKey, uint nKeyLength, void **pData) /* {{{ */
+ZEND_API int zend_utf8_symtable_find(HashTable *ht, const char *arKey, uint nKeyLength, void **pData) /* {{{ */
 {
        HANDLE_NUMERIC(arKey, nKeyLength, zend_hash_index_find(ht, idx, pData));
        return zend_utf8_hash_find(ht, arKey, nKeyLength, pData);
 }
 /* }}} */
 
-ZEND_API int zend_utf8_symtable_exists(HashTable *ht, char *arKey, uint nKeyLength) /* {{{ */
+ZEND_API int zend_utf8_symtable_exists(HashTable *ht, const char *arKey, uint nKeyLength) /* {{{ */
 {
        HANDLE_NUMERIC(arKey, nKeyLength, zend_hash_index_exists(ht, idx));
        return zend_utf8_hash_exists(ht, arKey, nKeyLength);
index 2de1fef6e400c10a069914ceb1b688c5a27505f7..3c40661a9b8a1dc67e2646a735ff3cf45e11f482 100644 (file)
@@ -39,7 +39,7 @@
 
 
 
-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);
@@ -115,10 +115,10 @@ ZEND_API void zend_hash_clean(HashTable *ht);
 #define zend_u_hash_init_ex(ht, nSize, pHashFunction, pDestructor, persistent, unicode, bApplyProtection)              _zend_u_hash_init_ex((ht), (nSize), (pHashFunction), (pDestructor), (persistent), (unicode), (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_ascii_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_rt_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_utf8_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);
+ZEND_API int _zend_ascii_hash_add_or_update(HashTable *ht, const char *arKey, uint nKeyLength, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC);
+ZEND_API int _zend_rt_hash_add_or_update(HashTable *ht, const char *arKey, uint nKeyLength, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC);
+ZEND_API int _zend_utf8_hash_add_or_update(HashTable *ht, const char *arKey, uint nKeyLength, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC);
 ZEND_API int _zend_u_hash_add_or_update(HashTable *ht, zend_uchar type, zstr 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)
@@ -141,7 +141,7 @@ ZEND_API int _zend_u_hash_add_or_update(HashTable *ht, zend_uchar type, zstr arK
 #define zend_u_hash_add(ht, type, arKey, nKeyLength, pData, nDataSize, pDest) \
                _zend_u_hash_add_or_update(ht, type, 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);
 ZEND_API int _zend_u_hash_quick_add_or_update(HashTable *ht, zend_uchar type, zstr 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)
@@ -158,7 +158,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);
 ZEND_API int zend_u_hash_add_empty_element(HashTable *ht, zend_uchar type, zstr arKey, uint nKeyLength);
 
 
@@ -188,10 +188,10 @@ ZEND_API void zend_hash_reverse_apply(HashTable *ht, apply_func_t apply_func TSR
 ZEND_API void zend_hash_to_unicode(HashTable *ht, apply_func_t apply_func TSRMLS_DC);
 
 /* Deletes */
-ZEND_API int zend_hash_del_key_or_index(HashTable *ht, char *arKey, uint nKeyLength, ulong h, int flag);
-ZEND_API int zend_ascii_hash_del(HashTable *ht, char *arKey, uint nKeyLength);
-ZEND_API int zend_rt_hash_del(HashTable *ht, char *arKey, uint nKeyLength);
-ZEND_API int zend_utf8_hash_del(HashTable *ht, char *arKey, uint nKeyLength);
+ZEND_API int zend_hash_del_key_or_index(HashTable *ht, const char *arKey, uint nKeyLength, ulong h, int flag);
+ZEND_API int zend_ascii_hash_del(HashTable *ht, const char *arKey, uint nKeyLength);
+ZEND_API int zend_rt_hash_del(HashTable *ht, const char *arKey, uint nKeyLength);
+ZEND_API int zend_utf8_hash_del(HashTable *ht, const char *arKey, uint nKeyLength);
 ZEND_API int zend_u_hash_del_key_or_index(HashTable *ht, zend_uchar type, zstr 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)
@@ -200,26 +200,26 @@ ZEND_API int zend_u_hash_del_key_or_index(HashTable *ht, zend_uchar type, zstr a
 #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);
 ZEND_API ulong zend_u_get_hash_value(zend_uchar type, zstr arKey, uint nKeyLength);
 
 /* Data retreival */
-ZEND_API int zend_hash_find(HashTable *ht, char *arKey, uint nKeyLength, void **pData);
-ZEND_API int zend_ascii_hash_find(HashTable *ht, char *arKey, uint nKeyLength, void **pData);
-ZEND_API int zend_rt_hash_find(HashTable *ht, char *arKey, uint nKeyLength, void **pData);
-ZEND_API int zend_utf8_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);
+ZEND_API int zend_ascii_hash_find(HashTable *ht, const char *arKey, uint nKeyLength, void **pData);
+ZEND_API int zend_rt_hash_find(HashTable *ht, const char *arKey, uint nKeyLength, void **pData);
+ZEND_API int zend_utf8_hash_find(HashTable *ht, const char *arKey, uint nKeyLength, void **pData);
 ZEND_API int zend_u_hash_find(HashTable *ht, zend_uchar type, zstr 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_quick_find(HashTable *ht, const char *arKey, uint nKeyLength, ulong h, void **pData);
 ZEND_API int zend_u_hash_quick_find(HashTable *ht, zend_uchar type, zstr 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_ascii_hash_exists(HashTable *ht, char *arKey, uint nKeyLength);
-ZEND_API int zend_rt_hash_exists(HashTable *ht, char *arKey, uint nKeyLength);
-ZEND_API int zend_utf8_hash_exists(HashTable *ht, char *arKey, uint nKeyLength);
+ZEND_API int zend_hash_exists(HashTable *ht, const char *arKey, uint nKeyLength);
+ZEND_API int zend_ascii_hash_exists(HashTable *ht, const char *arKey, uint nKeyLength);
+ZEND_API int zend_rt_hash_exists(HashTable *ht, const char *arKey, uint nKeyLength);
+ZEND_API int zend_utf8_hash_exists(HashTable *ht, const char *arKey, uint nKeyLength);
 ZEND_API int zend_u_hash_exists(HashTable *ht, zend_uchar type, zstr 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);
 ZEND_API int zend_u_hash_quick_exists(HashTable *ht, zend_uchar type, zstr 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);
@@ -312,7 +312,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;
 
@@ -344,7 +344,7 @@ EMPTY_SWITCH_DEFAULT_CASE()
 #define zend_u_inline_hash_func(type, arKey, nKeyLength) \
        zend_inline_hash_func(arKey.s, USTR_BYTES(type, nKeyLength))
 
-ZEND_API ulong zend_hash_func(char *arKey, uint nKeyLength);
+ZEND_API ulong zend_hash_func(const char *arKey, uint nKeyLength);
 ZEND_API ulong zend_u_hash_func(zend_uchar type, zstr arKey, uint nKeyLength);
 
 #if ZEND_DEBUG
@@ -362,26 +362,26 @@ END_EXTERN_C()
        zend_hash_init(ht, n, NULL, ZVAL_PTR_DTOR, persistent)
 
 
-ZEND_API int zend_symtable_update(HashTable *ht, char *arKey, uint nKeyLength, void *pData, uint nDataSize, void **pDest);
-ZEND_API int zend_symtable_del(HashTable *ht, char *arKey, uint nKeyLength);
-ZEND_API int zend_symtable_find(HashTable *ht, char *arKey, uint nKeyLength, void **pData);
-ZEND_API int zend_symtable_exists(HashTable *ht, char *arKey, uint nKeyLength);
-ZEND_API int zend_symtable_update_current_key(HashTable *ht, char *arKey, uint nKeyLength);
+ZEND_API int zend_symtable_update(HashTable *ht, const char *arKey, uint nKeyLength, void *pData, uint nDataSize, void **pDest);
+ZEND_API int zend_symtable_del(HashTable *ht, const char *arKey, uint nKeyLength);
+ZEND_API int zend_symtable_find(HashTable *ht, const char *arKey, uint nKeyLength, void **pData);
+ZEND_API int zend_symtable_exists(HashTable *ht, const char *arKey, uint nKeyLength);
+ZEND_API int zend_symtable_update_current_key(HashTable *ht, const char *arKey, uint nKeyLength);
 
-ZEND_API int zend_ascii_symtable_update(HashTable *ht, char *arKey, uint nKeyLength, void *pData, uint nDataSize, void **pDest);
-ZEND_API int zend_ascii_symtable_del(HashTable *ht, char *arKey, uint nKeyLength);
-ZEND_API int zend_ascii_symtable_find(HashTable *ht, char *arKey, uint nKeyLength, void **pData);
-ZEND_API int zend_ascii_symtable_exists(HashTable *ht, char *arKey, uint nKeyLength);
+ZEND_API int zend_ascii_symtable_update(HashTable *ht, const char *arKey, uint nKeyLength, void *pData, uint nDataSize, void **pDest);
+ZEND_API int zend_ascii_symtable_del(HashTable *ht, const char *arKey, uint nKeyLength);
+ZEND_API int zend_ascii_symtable_find(HashTable *ht, const char *arKey, uint nKeyLength, void **pData);
+ZEND_API int zend_ascii_symtable_exists(HashTable *ht, const char *arKey, uint nKeyLength);
 
-ZEND_API int zend_rt_symtable_update(HashTable *ht, char *arKey, uint nKeyLength, void *pData, uint nDataSize, void **pDest);
-ZEND_API int zend_rt_symtable_del(HashTable *ht, char *arKey, uint nKeyLength);
-ZEND_API int zend_rt_symtable_find(HashTable *ht, char *arKey, uint nKeyLength, void **pData);
-ZEND_API int zend_rt_symtable_exists(HashTable *ht, char *arKey, uint nKeyLength);
+ZEND_API int zend_rt_symtable_update(HashTable *ht, const char *arKey, uint nKeyLength, void *pData, uint nDataSize, void **pDest);
+ZEND_API int zend_rt_symtable_del(HashTable *ht, const char *arKey, uint nKeyLength);
+ZEND_API int zend_rt_symtable_find(HashTable *ht, const char *arKey, uint nKeyLength, void **pData);
+ZEND_API int zend_rt_symtable_exists(HashTable *ht, const char *arKey, uint nKeyLength);
 
-ZEND_API int zend_utf8_symtable_update(HashTable *ht, char *arKey, uint nKeyLength, void *pData, uint nDataSize, void **pDest);
-ZEND_API int zend_utf8_symtable_del(HashTable *ht, char *arKey, uint nKeyLength);
-ZEND_API int zend_utf8_symtable_find(HashTable *ht, char *arKey, uint nKeyLength, void **pData);
-ZEND_API int zend_utf8_symtable_exists(HashTable *ht, char *arKey, uint nKeyLength);
+ZEND_API int zend_utf8_symtable_update(HashTable *ht, const char *arKey, uint nKeyLength, void *pData, uint nDataSize, void **pDest);
+ZEND_API int zend_utf8_symtable_del(HashTable *ht, const char *arKey, uint nKeyLength);
+ZEND_API int zend_utf8_symtable_find(HashTable *ht, const char *arKey, uint nKeyLength, void **pData);
+ZEND_API int zend_utf8_symtable_exists(HashTable *ht, const char *arKey, uint nKeyLength);
 
 ZEND_API int zend_u_symtable_update(HashTable *ht, zend_uchar type, zstr arKey, uint nKeyLength, void *pData, uint nDataSize, void **pDest);
 ZEND_API int zend_u_symtable_del(HashTable *ht, zend_uchar type, zstr arKey, uint nKeyLength);
index 9844295ffbf98d8ae4b94fa8592bf8a2910b4139..7028febf23c47aa509993e6fa80a0b99d435e175 100644 (file)
@@ -165,9 +165,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;
@@ -188,12 +188,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 ce40932dbef6c44e68b23dcda6cea6dc296f088d..5fa0fdf059d3d821460af310755bbfc63a433d43 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 19c9337a78c46eedceac24c9b1de8e0ff7d4ebdc..b8460042e1742594cbee0c3084dadf636658d3e5 100755 (executable)
@@ -485,12 +485,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)
@@ -499,7 +499,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)
@@ -517,7 +517,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)
@@ -530,7 +530,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..f3495f2ef7cc6f720d21d21b662e92626ec156bb 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,10 +79,10 @@ 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);
index 44e1536159aba68493d1e57a787b07c7689c081d..be7a4741abb3c4144b56bc0c63b791b99418d157 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 0d27995525b825c6bc9cee16c80b359ac0e2e162..0d83e41d31f84e969ce3d91f9af14524f5ce9367 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 5ecbade3534cac721a90ebf5c9d7441b0c18ef7e..eec315479bd06863adfbfbdb40f1b06c3234ebc8 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 7a803805f85013a4e175aebf27c44c20c13f7fbb..3513fa0ecdefce3b85c597a2c21d9d0b5296f27a 100755 (executable)
@@ -678,7 +678,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 050150fe17ed89fea20b920b50b9d1d17ecd27ac..abf8466653c1ab4f108536c447319156660db4a8 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 f500fd68f811b099fdbcf725dc86baca64e9891d..d47dad8ece3f06f3d9dce09d96a373597e2a3b86 100644 (file)
@@ -289,7 +289,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 930cec6f1fc214724ab320eb83c59ca7a7ef19e6..69187dd9567d9c9d0022cf358d12d87fbf330ed4 100644 (file)
@@ -149,7 +149,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)
@@ -201,7 +201,7 @@ zend_function_entry date_functions[] = {
 };
 
 
-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)
@@ -214,7 +214,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)
@@ -305,7 +305,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 8156d6608bca0c03b9c9b5c92d92b150de6c6748..a24d133e9709c135ab0baef85a701e21160d4463 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 27cde2723549d3c8423689f502dd491c666d2c46..aa302eb8105e79ba8c21f5b8a47c24e1302e4c4d 100644 (file)
@@ -803,7 +803,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 e82c0d933419f9d71d3bf8c5ae132da944cb2d30..e50f009d24503db635b7ead25889693f6f362e0b 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 9931cbff29764bdb6639c46f105777cb1eb6e514..eb451e994bfc43b34b17aef3e525eaa5c6aace79 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 448e4eb0b662426162205c1a909e01b9f6262bf6..d40f40aa243d6102e4dc050e2afe68278bc99983 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 4d68ae5a393a1eab8ecd1faa1e886b61b6b2c7ed..a0670428c7053cf66db4076adfe20e1e7699251e 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 30b31a3240b79fd1f4e7c0dedeabac245fa388cd..54bb94720da702faa8adc0847d19dee892aee3bc 100644 (file)
@@ -50,7 +50,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 caca6f923908870292ff6ca594a301ed7cb2b278..10805133d289bcc28c51a845cecc6ddb3c694039 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 06dc8c917e7176c125445ab0705ed2057faaa8a5..46f298684b14992f5a62933f9913c84f212cdf8b 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 727cd086293fc1addeb1642408865ade66dba032..85d12fb0012f4cf6f2cea5a7aa2c8bfd0bb1643d 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 be2594217acf09785aec057f6802010ab219e0b4..bb7b6a30824de80ab06e48eb652037353671d5ee 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 7f9ec43048ec92366da4addf494a8267cc63c5ed..d398f79b46d2c5f216d227b69e5c7cf9957c39eb 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 afc2fd288b2472d9b1abefb1965bf9393bb190e8..206913e3103fbe30d98d842116a7b941b27338c7 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 a9fb1913532aecbc89bb449c5db9a0e20f907769..475768be39842314f5100f3e513e9846beef69fc 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 6ade1dd2e30db13d41bffd14381c8deb66596a50..84bd5d7538594100e21d56f1eaf2e2abf4238490 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 21d65c53f9dc6168ee35f6f83843f7096f94d54a..9cec9577e5a203df2eefdac563d4ebf1824b2a07 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 adc6b54d82f141d7c92f81a72bea19573b5cd334..3bc939b640aad1595d80bf696af97e22b8510b87 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 ba1de0a97fb9bc6647c0db89be90c3e58706b964..d2e5d701e24f46bf237a5614afcbcdfbaaa72cfe 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 f2b0cad4380a3f6fcaf405e96f35aeef8f3479d0..c1269fe252efe64a8335f04cf3d593af27a197e9 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 4e49f08ddfbdccddd52bdcb9da4118942d811f5a..31882e78b8815eb6ff8adc58fa2eb82415067bdf 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 226badaa72137d6aa7fa1f1d3e2a7e77bf5335f0..81e4e5c10cdd8a630ebe3e185de2ee34ac4f3c8c 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 4c36e2c6ca5833279f8a8250ed2a07949d72faab..20bb36d2be58500bbe93d0daa1ca022a73b7e5dc 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 c045e4254a3a191f141856181bd16b3044008594..3517933474f12e4351813014e1346f1ff965e49c 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 747c043c4e28f457dcd02df30f86f06d2f062a49..121369e690af843a399b5628b8fe3db963eeaeff 100644 (file)
@@ -480,7 +480,7 @@ zend_object_value dom_objects_store_clone_obj(zval *zobject TSRMLS_DC)
        return retval;
 }
 
-static zend_function_entry dom_functions[] = {
+static const zend_function_entry dom_functions[] = {
        PHP_FE(dom_import_simplexml, NULL)
        {NULL, NULL, NULL}
 };
@@ -489,7 +489,7 @@ static zend_object_handlers* dom_get_obj_handlers(TSRMLS_D) {
        return &dom_object_handlers;
 }
 
-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 19b4213b31fb5bcc3dce84714f84f6c0b96540cd..3380e034ce94bf5f6bd7fc2b6d70c4ae3a00f8d1 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 fd758764f0c073dfff62b564c2e87386c47e1301..45a5fb08d7087756d88bd4cdee439c69c3375832 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 43309ae9f78952e12a9bdae624412cf18bc36ffa..e9589f1ae3e0a55094f86ac44570d2c85a91ab8f 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 8f5bdc00498edc38b776bc5b2cd59a4f7ea3d72b..c9e60e4e199dc84fdb3de1e49facde469e360259 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 2862e4a32f630986dd8379857256974c7f648f71..55b277dc8886f08cb585cbeb5676ede47312aa92 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 134657dc5ba0b66b3bedb0054b80c278ce204dac..d21d1b0c784c74305bf7a2c386d308b748e3a63a 100644 (file)
@@ -76,7 +76,7 @@ ZEND_END_ARG_INFO()
 /* }}} */
 
 /* {{{ Function table */
-zend_function_entry ereg_functions[] = {
+const zend_function_entry ereg_functions[] = {
        PHP_FE(ereg,                                            arginfo_ereg)  
        PHP_FE(ereg_replace,                            arginfo_ereg_replace)
        PHP_FE(eregi,                                           arginfo_eregi)
index e896628f4401f8f7610cf399b4db85653efbbeb6..1a9b3fdca698086aa138c5634bae7f1b8704c633 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 b4902311ad7e2817ba745e2d2b4d8f6a64e361c9..a5be3845c0a2a3d18520eee8853f5c28e94e833d 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 115ca9c3d2790e71f2be3c6cb48e8db7b3c2a1c2..2a39758de0e903d37c1d4e6c51e91352587769de 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 dcccd44d255c3294304ebdb68467d40fd4d51328..131d03a456e9f098a8884a323bc749950286944c 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 767332697308227751c60ccec78c9ed598dd6157..76836d6286debf3ad0a4e8962cbd429d381ff1c6 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 19d4def717541ad5ae268ea5bde7d5d574afbd96..26f3199d60f365489fc305582681b74b3d754fa1 100644 (file)
@@ -936,7 +936,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 88daefa739296ca2457c6c9e182d7d02c5945e9b..92e4a9f27dd630da64a8e00901326badd5743929 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 c213f6dfe7431fe1e5cd6c613d2fd6e33ab0e119..48b4f8431c098cb7e1dbdc2059b240cf8434d3cc 100644 (file)
@@ -278,7 +278,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 d12899e510adf8ab5e6c14932682286f54b542a7..bd510ff30e1547a0aa0bb6633e47b451cc0ac3ae 100644 (file)
@@ -856,7 +856,7 @@ ZEND_END_ARG_INFO()
 
 /* {{{ hash_functions[]
  */
-zend_function_entry hash_functions[] = {
+const zend_function_entry hash_functions[] = {
        PHP_HASH_FE(hash)
        PHP_HASH_FE(hash_file)
 
index 72e7b51f3b572e3c8f5f492610175234a79d1d00..9122bd2eb07e1b5b83319fcd9f0cb445064aa986 100644 (file)
@@ -135,7 +135,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(iconv_get_encoding,                                              arginfo_iconv_get_encoding)
        PHP_FE(iconv_set_encoding,                                              arginfo_iconv_set_encoding)
index 8f6f7288dcf2bae99c89507b5244418454e8a114..3ea9a8ef798abce00e1e663595f8b81c611c8f34 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 7cc03edbf0af90803a9eeadf933371fbdff8d189..74287db16a060e212eb5a989d742fc8b75096936 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 6ec0289851770cdd1bd4f2d8a05eee7e4ca65397..cd1d285692a43433b5570517d90d7ed11eb3f358 100644 (file)
@@ -36,7 +36,7 @@ static const char digits[] = "0123456789abcdef";
  *
  * Every user visible function must have an entry in json_functions[].
  */
-function_entry json_functions[] = {
+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 7e942a4b2dfd48ad00cfd99d2ffe3d762f9e2bf3..00a3c3510a37a90f33a77bc5f0d2e057105add85 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 ab20a21a44042013ae996d8f030e22829dc4be71..7ae1f86b3c3ff4a0792e8a79692dbaa15236ec60 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 9d3da33829b7aeb9bac7cb8712fc739b58b34d37..ecf2f07e1e5bface9188b7aeb0474ae6f9420c84 100644 (file)
@@ -196,7 +196,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 6cc9a679e860ad92dd5460d1f8f06badb3739637..0b5b89acd4fc7a2ff31ee8ab62b85b5242da3982 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 969d9e63a00df58c2f2127bb69c8b753888d7df8..2441486ed6b254a02bd12b5b64c3738eed04ddef 100644 (file)
@@ -32,7 +32,7 @@
 #include "php_globals.h"
 #include "ext/standard/info.h"
 
-zend_function_entry mhash_functions[] = {
+const zend_function_entry mhash_functions[] = {
        PHP_FE(mhash_count, NULL)
        PHP_FE(mhash_get_block_size, NULL)
        PHP_FE(mhash_get_hash_name, NULL)
index 502032e1b6366ad92f78469d2b0999298a923e19..e7375c68123cd27a5e19563496cfe045dd96d7a4 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 07e1c1f9ef3816b1272e3345d096554e5dbe1c27..cc31ed9adc7c92e02c20baa1e90c0d6674b53064 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)
@@ -2038,7 +2038,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)
@@ -2115,7 +2115,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 }
 };
@@ -2767,7 +2767,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)
@@ -3298,7 +3298,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)
@@ -3489,7 +3489,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)
@@ -3775,7 +3775,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)
@@ -4086,7 +4086,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 e8d59838f9a1253b3e79fc5b43575619f0c681b9..d4ab43f03675e6e80c473080397cafe1a2e6a1b3 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 95329cd60f607f16e0a830c4dc70b2a091c14a5d..442c4702a91905fbf824a67fe38cbf946d246ca0 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 244f08e3ed61ebaf9571e7ab5ab3ae6f8515d850..b483c76e0a5ff578a5b6ddde0176c3803bc48abc 100644 (file)
@@ -132,7 +132,7 @@ static MYSQLND_QCACHE               *mysql_mysqlnd_qcache;
 
 /* {{{ 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)
@@ -219,7 +219,7 @@ zend_function_entry mysql_functions[] = {
 /* }}} */
 
 /* Dependancies */
-static zend_module_dep mysql_deps[] = {
+static const zend_module_dep mysql_deps[] = {
 #if defined(HAVE_MYSQLND)
        ZEND_MOD_REQUIRED("mysqlnd")
 #endif
index ce7f7eebd112c77e72d5746403a4e3b0cd93d3bb..c68ded2d7cd69b9a967ff21bebc514213e8ab412 100644 (file)
@@ -465,7 +465,7 @@ PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry *class_
 
 
 /* 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 a76c782c2eec06e1f8e30e296e2de053f194e883..2418bbc0b4ded5c1b118c174c8ca318fca9381b6 100644 (file)
@@ -154,7 +154,7 @@ mysqli_property_entry mysqli_driver_property_entries[] = {
 
 /* {{{ mysqli_driver_methods[]
  */
-zend_function_entry mysqli_driver_methods[] = {
+const zend_function_entry mysqli_driver_methods[] = {
 #if defined(HAVE_EMBEDDED_MYSQLI)
        PHP_FALIAS(embedded_server_start, mysqli_embedded_server_start, NULL)
        PHP_FALIAS(embedded_server_end, mysqli_embedded_server_end, NULL)
index 9c00ebde8bddf695ede9c1d54f0f054a67c8bfc1..6273e924fb9c405bb210b92122cf1a0784c4a07c 100644 (file)
@@ -32,7 +32,7 @@
 
 /* {{{ mysqli_exception_methods[]
  */
-zend_function_entry mysqli_exception_methods[] = {
+const zend_function_entry mysqli_exception_methods[] = {
        {NULL, NULL, NULL}
 };
 /* }}} */
index 965379a70470df9aaf579e53476c65790f92ff69..cae2188a0ad6eacd18fa6a6a37d3b62759d64ff1 100644 (file)
@@ -52,7 +52,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)
@@ -195,7 +195,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)
@@ -263,7 +263,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(__construct, mysqli_result_construct, NULL)
        PHP_FALIAS(close,mysqli_free_result,NULL)
        PHP_FALIAS(free,mysqli_free_result,NULL)
@@ -288,7 +288,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(__construct, mysqli_stmt_construct, NULL)
        PHP_FALIAS(attr_get,mysqli_stmt_attr_get,NULL)
        PHP_FALIAS(attr_set,mysqli_stmt_attr_set,NULL)
index e1ba41483ac7059a8087be815546703f02007dd7..685995e20bdf801b0beb47d2b15a40f30b178969 100644 (file)
@@ -313,7 +313,7 @@ PHP_METHOD(mysqli_warning, __construct)
 /* }}} */
 
 /* {{{ mysqli_warning_methods */
-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 447b124b4f570736cab993d6816316f222f70f7e..0bb998ce0f8e5e0306127e3f9fb097256e704ce9 100644 (file)
@@ -165,13 +165,13 @@ typedef long long my_longlong;
 
 #define PHP_MYSQLI_EXPORT(__type) PHP_MYSQLI_API __type
 
-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 02dfedb9dc698e75ec57d3f911c0712ba8b87f00..78ac992ebb9d9e13ccc787fd3a3eb07b5b6ab5d9 100644 (file)
@@ -1562,7 +1562,7 @@ PHPAPI MYSQLND *mysqlnd_init(zend_bool persistent)
  *
  * Every user visible function must have an entry in mysqlnd_functions[].
  */
-static zend_function_entry mysqlnd_functions[] = {
+static const zend_function_entry mysqlnd_functions[] = {
        {NULL, NULL, NULL}      /* Must be the last line in mysqlnd_functions[] */
 };
 /* }}} */
index 08439a42a6826385e6c270de3d87670efdd08bfa..70af334c0792775d6e96659ef69b4e8e0bc97bc2 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 20a8a1f6279b07278bc09b744f2ad927fc930dd0..17a0a092c78ceef79782af3845cc25d3d026208e 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 03df83f02f0d5619b2c03a0c53b45f2347cc867d..412c1bf2c1ec75b5180dca86a2a0c1b81944079b 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 f58a26dd53634af657b61268ba74ac14a53517aa..462a40cc44bd45153062b989405fbf6094cf8ff9 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 16d2195ac0aeea3bfff4b0259b3f3f8238d187d2..55974c7e73f2652d761041e911c5d8df1cbe0d3e 100644 (file)
@@ -2006,7 +2006,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 fca9ec1391f20fc717d2ed6dbe35745972606ebc..519eea65b85a11ae839343d50aa56845b327c4d5 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 d169a59f8e558ad0ac5fd2981ab7b07fa35c5518..42c69606ce7ce11bd23dc98181cea47759feaf14 100755 (executable)
@@ -1137,7 +1137,7 @@ static PHP_METHOD(PDO, getAvailableDrivers)
 }
 /* }}} */
 
-zend_function_entry pdo_dbh_functions[] = {
+const zend_function_entry pdo_dbh_functions[] = {
        ZEND_MALIAS(PDO, __construct, dbh_constructor,  NULL,                   ZEND_ACC_PUBLIC)
        PHP_ME(PDO, prepare,                            NULL,                   ZEND_ACC_PUBLIC)
        PHP_ME(PDO, beginTransaction,           NULL,                   ZEND_ACC_PUBLIC)
@@ -1160,7 +1160,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;
@@ -1183,11 +1183,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;
-               pdo_zstr_sval(ifunc->function_name) = funcs->fname;
+               pdo_zstr_sval(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 9558621593e45a1ba2d80534a8d08227bf4b0090..9c2b488f75ef2f5c99a886dd154d923ace89b3ba 100755 (executable)
@@ -2126,7 +2126,7 @@ static PHP_METHOD(PDOStatement, __sleep)
 }
 /* }}} */
 
-zend_function_entry pdo_dbstmt_functions[] = {
+const zend_function_entry pdo_dbstmt_functions[] = {
        PHP_ME(PDOStatement, execute,           NULL,                                   ZEND_ACC_PUBLIC)
        PHP_ME(PDOStatement, fetch,                     NULL,                                   ZEND_ACC_PUBLIC)
        PHP_ME(PDOStatement, bindParam,         second_arg_force_ref,   ZEND_ACC_PUBLIC)
@@ -2504,7 +2504,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 5e61f3c2d05b2c4fbea2eb13affb447af5668cdf..4bda77a19be7985da2a4f77862bfafb34bb655c4 100755 (executable)
@@ -289,7 +289,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 5225de8d34eb9cfab2e190caf91c6ea5e0253dd7..4e8bc3b2118a21d211464a45df052bf4d327c3ef 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 0c6f45eed61af58eca01c4cf11d30a7a57fabe38..dcd5dbe664fb99a665100e72a644b543dccecdf1 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 deb7f01a189c7640de8f3f06a43696454d44d381..16dc11f78f2d6e3a544b3936e218b1df905ca514 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 2983672592944405dbb2800c8c1ef844fd176278..f73d37344578ec58908504c125d500ffada37e5f 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 ed12c7bf63295fc96805c2cba4565f9d70854771..924853fa094ee81a7e3badda6f2939d71b0ddafd 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 4f75bff72eaa0b2c606162ffaca1e1418e5580f3..c8f8ef3c5b27cbaf6203773d08c0abc45f51626b 100644 (file)
@@ -40,7 +40,7 @@
 #endif
 
 /* {{{ pdo_pgsql_functions[] */
-zend_function_entry pdo_pgsql_functions[] = {
+const zend_function_entry pdo_pgsql_functions[] = {
        {NULL, NULL, NULL}
 };
 /* }}} */
@@ -48,7 +48,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 937f4011596cafbddbe66cca7840b57df689102a..f7a58daa675d915cd6a23618e6d1cc32e3a4ddd5 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 d06559ea8ac33c5eddcf85095915a8b80c974727..5afb51d9cf9fae0dffd65fe9858284ff48a05e5e 100644 (file)
@@ -609,13 +609,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 61fd703b90af8911682822bd97d53dc6f7c60e8e..34ff10319841a2b7806fcc55c2d3c7de1ea9763a 100644 (file)
@@ -91,7 +91,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 5d43434c9cddbc066967ec21e7891c6d5c1a44f7..02188eb29f3598a208c4cdd77cfeee46b8dc7dcd 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 95ba28c0573a27eb267324b9783064d8e5cc94c1..e457a2430b97f614504fc981222ad982ce4339e5 100644 (file)
@@ -74,7 +74,7 @@ static PHP_FUNCTION(pspell_config_save_repl);
 
 /* {{{ pspell_functions[]
  */
-zend_function_entry pspell_functions[] = {
+const zend_function_entry pspell_functions[] = {
        PHP_FE(pspell_new,              NULL)
        PHP_FE(pspell_new_personal,             NULL)
        PHP_FE(pspell_new_config,               NULL)
index 1bae0f6ec95d421b7d225b8d104921db787697b6..3ca511ad04828f500826be3054d0e0b59f7ebe31 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 902fce9e55f36e9183a5f2c8ed96ad55762c2520..5804e8b40e5010f2ff0746f1975bf5870444c18d 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 6ed15776d38d6ec6956298b44a4f908528a85ade..0a402f6cb8751802a710c36897e789fa02d9e9e6 100644 (file)
@@ -926,7 +926,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");
 
@@ -988,7 +988,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");
 
@@ -1058,7 +1058,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;
@@ -4322,7 +4322,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) {
@@ -4466,7 +4466,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);
@@ -4527,7 +4527,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}
 };
 
@@ -4543,13 +4543,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}
@@ -4576,7 +4576,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)
@@ -4597,7 +4597,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)
@@ -4632,7 +4632,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)
@@ -4741,7 +4741,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)
@@ -4798,7 +4798,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}
@@ -4827,7 +4827,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)
@@ -4860,7 +4860,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)
@@ -4890,7 +4890,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)
@@ -4908,7 +4908,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 38c69e0864f9987d990adf3baca3dcb6d5224fdb..5b8885e69b001f7d66be48ba982dec554327bc90 100644 (file)
@@ -597,7 +597,7 @@ static PHP_INI_MH(OnUpdateHashFunc)
 
 #if defined(HAVE_HASH_EXT) && !defined(COMPILE_DL_HASH)
 {
-       php_hash_ops *ops = php_hash_fetch_ops(new_value, new_value_length);
+       php_hash_ops *ops = (php_hash_ops*)php_hash_fetch_ops(new_value, new_value_length);
 
        if (ops) {
                PS(hash_func) = PS_HASH_FUNC_OTHER;
@@ -1774,7 +1774,7 @@ static PHP_FUNCTION(session_write_close)
 
 /* {{{ session_functions[]
  */
-static zend_function_entry session_functions[] = {
+static const zend_function_entry session_functions[] = {
        PHP_FE(session_name,              NULL)
        PHP_FE(session_module_name,       NULL)
        PHP_FE(session_save_path,         NULL)
index 8051e2f84bdffae1319ed0011898f83dfae5da15..a56f2cd54aad4a7cba32584f3271613d2b405faf 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 69a0e9dc931ed519f7d82f1f0fcddaf4969046a3..50fe65bafdd9c37b46918aec5521ceb1721182f4 100644 (file)
@@ -2412,14 +2412,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}
 };
@@ -2444,7 +2444,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 d7043d279f77c9601bc5cd2369849509742d304c..725d5d46a5d69af35de7c9978da9a7054857e66a 100644 (file)
@@ -203,19 +203,19 @@ PHP_METHOD(SoapHeader, SoapHeader);
 
 #define SOAP_CTOR(class_name, func_name, arginfo, flags) ZEND_FENTRY(__construct, ZEND_MN(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)
        PHP_ME(SoapFault, __toString, NULL, 0)
        {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)
@@ -240,7 +240,7 @@ ZEND_BEGIN_ARG_INFO_EX(__soap_call_args, 0, 0, 2)
        ZEND_ARG_PASS_INFO(1)
 ZEND_END_ARG_INFO()
 
-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_FENTRY(__soapCall, ZEND_MN(SoapClient___call), __soap_call_args, 0)
@@ -258,17 +258,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 8fd6d9313f534d4c3f576806faea15c830435ab6..23c26db518723b0d19aa9ae0cef5e240fc70bf05 100755 (executable)
@@ -47,7 +47,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}
 };
 /* }}} */
@@ -718,7 +718,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)
@@ -777,7 +777,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 51d9336de54c7e5b697d47aed36b12aa7f93043d..da554af5f95917f2518e5d3c269d88b5ffb11629 100755 (executable)
@@ -1466,7 +1466,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)
@@ -1491,7 +1491,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)
@@ -1518,7 +1518,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 53d3e88340e71a1cfb64daa2f14640c57a45b0e3..42ea718685639e08b3512c239bfb8f99e149600d 100755 (executable)
@@ -1595,7 +1595,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)
@@ -1637,7 +1637,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)
@@ -1663,7 +1663,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)
@@ -2472,7 +2472,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)
@@ -2513,7 +2513,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 8de74714e7a8111679c186090043ef1b628e0244..071f2b6199fbd059c53ac02baec0a6e288ecbc35 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;
        
@@ -46,7 +46,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;
        
@@ -61,7 +61,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;
        
@@ -85,7 +85,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 286b1fb219329242fb540a7d009092c2fd225f90..be423e67c26d42d235bcbc51f3c92b1e7367c3c1 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 719c81decdf50a326524b8c5818d2e86a6ec9416..8fb31f8e6e6512439edd3a69db5a0b4aedb1b05c 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}
@@ -774,7 +774,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)
@@ -1642,7 +1642,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)
@@ -1659,14 +1659,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}
@@ -1697,7 +1697,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)
@@ -1718,7 +1718,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)
@@ -1850,7 +1850,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}
 };
@@ -1867,7 +1867,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)
@@ -2277,7 +2277,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)
@@ -2337,7 +2337,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)
@@ -2356,7 +2356,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)
@@ -2448,7 +2448,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)
@@ -2485,7 +2485,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}
@@ -2524,7 +2524,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)
@@ -2681,7 +2681,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)
@@ -2876,12 +2876,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 80071af2da522165d93daa37ffd637770842b8c5..c926dc0be6cfb6904f9313410f972182f7bccd6e 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)
@@ -451,7 +451,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 a2cb7ff9130ead8ee4f50ef96c264293d6750ae3..8ec2f823e181ace20e449e7709cb9fe5151aae18 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 10bb3b435453fa2d6a8446a8acd6985da550867a..2c1048205edd4c822d30e978fe0510e75a91e9bd 100644 (file)
@@ -486,12 +486,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 babcf8fcd4a2f9e356158e05f86e9ea193de863f..b29c56cca2052349196b67d5bcd723b49c5906a5 100644 (file)
@@ -210,7 +210,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)
@@ -253,7 +253,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)
@@ -273,7 +273,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)
@@ -297,7 +297,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)
@@ -312,12 +312,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 45106f1cb1200e08b06c6eb0054cdbbf6b8b0292..31bbee8d410d20eea9ec2d1d48e58827d056c078 100644 (file)
@@ -3089,7 +3089,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)
@@ -3774,7 +3774,7 @@ zend_function_entry basic_functions[] = { /* {{{ */
 };
 /* }}} */
 
-static zend_module_dep standard_deps[] = { /* {{{ */
+static const zend_module_dep standard_deps[] = { /* {{{ */
        ZEND_MOD_OPTIONAL("session")
        {NULL, NULL, NULL}
 };
index 07a3df957a95be0aa19be58b20e71daa698fbbf6..803331c267e9c76bc0ebf8b1e930d786a024550c 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 6765087c17f4727813e6a6974325455529f1521f..95b2477948d2d8d3ed7eb5d91c7a55fb8e2f390f 100644 (file)
@@ -191,7 +191,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 11e58342f486b189c4a9169332dcf0d8a3f75e40..0eadc51f5c863f8c7202ce7ccdc2cd9cc9ef194a 100644 (file)
@@ -967,7 +967,7 @@ PHP_FUNCTION(phpversion)
        if (!ext_name) {
                RETURN_ASCII_STRING(PHP_VERSION, 1);
        } else {
-               char *version;
+               const char *version;
                version = zend_get_module_version(ext_name);
                if (version == NULL) {
                        RETURN_FALSE;
index 9c40db5df732ba5e78527a167f31b9c3f92784ff..27966f748c49d7ec3539c0d2859ce1ea1e0eb42a 100644 (file)
@@ -75,7 +75,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 ebf8956db3e65739411d84485f4853619e47519d..a7da813c3ed248c3f579b4cda574dc2b4b5ae89c 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 a9e8752e0dd7b44de755aff4686eebaaf2d244d6..c1d5480c3e804bdf9db5ba8985d46c65c51a6071 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 c81754257d84949b0e8e173ffebcd4fa18f72a6f..ca7610164144928d056ad2c2030d72e8a079c91c 100644 (file)
@@ -66,7 +66,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 c8f279d612c0c3b7849ea501c4e286469537c660..fd2a1330b193626476419f82210d9b23bca4b350 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 d23e20f9709c2cf8de0c35053b477ac558667275..ae3b828e0edb9c3e2f67a1580bcbd64822856168 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 83abefff5a1a0b36fbc78087874f5e7410c175eb..9f0bedaaa4f0c86e94637eb72e66193559a8661e 100644 (file)
@@ -286,7 +286,7 @@ STD_PHP_INI_ENTRY("tidy.default_config",    "",             PHP_INI_SYSTEM,         OnUpdateString,
 STD_PHP_INI_ENTRY("tidy.clean_output",         "0",    PHP_INI_USER,           php_tidy_set_clean_output,      clean_output,           zend_tidy_globals,      tidy_globals)
 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)
@@ -316,7 +316,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)
@@ -341,7 +341,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 3de5616f620833d8b71bf681a78942101b886e45..c0c34d43d5ddb2407d3e8400287d1c1f7787381b 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 9dbd7276457279426affc4b6dd73d8fa4db63c1a..e3d420d9dd4918a2c38411ef6a46a4f23bb402e3 100644 (file)
@@ -24,7 +24,7 @@
 #include <unicode/ucol.h>
 
 
-zend_function_entry collator_funcs_collator[] = {
+const zend_function_entry collator_funcs_collator[] = {
        ZEND_ME(collator, __construct, NULL, ZEND_ACC_PUBLIC)
        ZEND_FENTRY(getDefault,         ZEND_FN(collator_get_default), NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
        ZEND_FENTRY(setDefault,         ZEND_FN(collator_set_default), NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
index 2f130dcb2d6436d79784273208b236447cf84e03..ade1704a9de96fc30fb46c587e20d354ea18f7c8 100644 (file)
@@ -299,7 +299,7 @@ PHP_FUNCTION(unicode_restore_error_handler)
 /* }}} */
 
 /* {{{ unicode_functions[] */
-zend_function_entry unicode_functions[] = {
+const zend_function_entry unicode_functions[] = {
        PHP_FE(locale_get_default, NULL)
        PHP_FE(locale_set_default, NULL)
        PHP_FE(unicode_decode, NULL)
index 7ad6f746fc3e66b31e4a1abb6465f28726194984..aaf060bbf34c8c301d23eb6c37bf91e854069d83 100644 (file)
@@ -1364,7 +1364,7 @@ PHP_METHOD(TextIterator, getAll)
 /* }}} */
 
 /* {{{ TextIterator function entry table */
-static zend_function_entry text_iterator_funcs[] = {
+static const zend_function_entry text_iterator_funcs[] = {
 
        PHP_ME(TextIterator, __construct, NULL, ZEND_ACC_PUBLIC)
 
index 0c1aedf1eb6ce4c4c3f00689a04f7e57ac784812..1954b3716457828f891f8f1c43db582726c2211d 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 58a1083cd0d132bf6110523e8c2aba42d18cb0f9..2cda61a16576491b24cbd71a193fd0082df6e882 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 9922c1a23df3601b2e5b8c3e5733e2cc53b9c345..0257ea5b5bc6c10ee4323ce470b1e084f1079d60 100644 (file)
@@ -320,7 +320,7 @@ static xmlRelaxNGPtr _xmlreader_get_relaxNG(char *source, int source_len, int ty
 #endif
 
 #if ZEND_MODULE_API_NO >= 20050922
-static zend_module_dep xmlreader_deps[] = {
+static const zend_module_dep xmlreader_deps[] = {
        ZEND_MOD_REQUIRED("libxml")
        {NULL, NULL, NULL}
 };
@@ -1337,7 +1337,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 a49448f224c79a27fda294ddaa928518e8ff004e..8209dd43397b4a55e4af3fe4f7268a65d45c2ad0 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 83d0de6dd0b73edd0b61a5c8ecb89be12df5b906..a76ebaf963b8095044660f9a40c8e236906aaaa9 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
@@ -234,7 +234,7 @@ static zend_function_entry xmlwriter_functions[] = {
 #define PHP_ME_MAPPING(name, func_name, arg_types, flags) ZEND_ME_MAPPING(name, func_name, arg_types)
 #endif
 /* {{{ 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 7d4f83989d6fc3181cf5b5a08841be0b07251f28..2bc8e05883008d2f4506311a9c7ba13a4b2cbc12 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..eb8ea06e42675165c8c940d044ef4df2704caff7 100644 (file)
@@ -21,8 +21,8 @@
 #ifndef XSL_FE_H
 #define XSL_FE_H
 
-extern zend_function_entry php_xsl_xsltprocessor_class_functions[];
-extern zend_class_entry *xsl_xsltprocessor_class_entry;
+extern const zend_function_entry php_xsl_xsltprocessor_class_functions[];
+extern const zend_class_entry *xsl_xsltprocessor_class_entry;
 
 PHP_FUNCTION(xsl_xsltprocessor_import_stylesheet);
 PHP_FUNCTION(xsl_xsltprocessor_transform_to_doc);
index 3d16d4136f04897c8b62be3b85223f9f9c30845a..a3f62bc60a272c649ffeb1ac591762b69dbaccc6 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 5609b8919c797aeacaa2f72f49827609f32cb5ae..e443e16035ca2c3412e21fb4b518cc525e286c03 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)
@@ -2065,7 +2065,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 392b7a95f44605ff40cafc185a7b01bdaac62625..025657dc3ed529c0a065bae67f7c81221c218c7c 100644 (file)
@@ -608,7 +608,7 @@ ZEND_GET_MODULE(php_zlib)
 #endif
 
 /* {{{ php_zlib_functions[] */
-zend_function_entry php_zlib_functions[] = {
+const zend_function_entry php_zlib_functions[] = {
        PHP_FE(readgzfile,                                              NULL)
        PHP_FALIAS(gzrewind,    rewind,                 NULL)
        PHP_FALIAS(gzclose,             fclose,                 NULL)
index 21eb8d5c1b50fc23f5ecabc09c3894e7249d5b69..b719016036d8294594294f60cd706020bf7cf6bc 100644 (file)
@@ -260,7 +260,7 @@ struct _sapi_module_struct {
        int phpinfo_as_text;
 
        char *ini_entries;
-       zend_function_entry *additional_functions;
+       const zend_function_entry *additional_functions;
 };
 
 
index 37bb5aab2977dd73c054071ecd0460994aea07a3..0b432f3e4ab9787d166e26f683e74f3315f00682 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[] = {
+static const zend_function_entry aolserver_functions[] = {
        PHP_FE(getallheaders, NULL)
        {NULL, NULL, NULL}
 };
index 868c4c3d9dacf5bc69f5bf4f26e0126dc62de32a..e5e3d3eba802582f0dda4d33c9ad229e99ce2b14 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 277046b33b5652a28672d28b9a3308d24b82e84d..e7a33c602c4b56d511dbf22c60fe644eac9ab5b6 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 c14bc722ef0c75629e8fc0e52c4a1cddd0af8047..fcc5b0578bb58182abfd89187f2def6b48fb3f8f 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[] = {
+static const 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 afddf75a5073da324905c857b229b15fd8d8378f..ee6712c00d2e8fe0f74a9bbeaff1e860a5f88540 100644 (file)
@@ -623,7 +623,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_dl, 0)
 ZEND_END_ARG_INFO()
 /* }}} */
 
-static zend_function_entry additional_functions[] = {
+static const zend_function_entry additional_functions[] = {
        ZEND_FE(dl, arginfo_dl)
        {NULL, NULL, NULL}
 };
index 5fe2a91484ef649107add9b023ad1fadfbe2e5cb..7b8e096620eb5eabb67079a9b7318bbe911bb1b3 100644 (file)
@@ -415,7 +415,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_dl, 0)
 ZEND_END_ARG_INFO()
 /* }}} */
 
-static zend_function_entry additional_functions[] = {
+static const zend_function_entry additional_functions[] = {
        ZEND_FE(dl, arginfo_dl)
        {NULL, NULL, 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 c2469e6eb643b07d68c2804428dfef05575fc115..53316ad2b7c6251d240f0ae453466b3314362976 100644 (file)
@@ -146,7 +146,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_dl, 0)
 ZEND_END_ARG_INFO()
 /* }}} */
 
-static zend_function_entry additional_functions[] = {
+static const zend_function_entry additional_functions[] = {
        ZEND_FE(dl, arginfo_dl)
        {NULL, NULL, NULL}
 };
index 373d7fd70d9b01b5b3452b9dce827caf9f5736b2..5c6e393c4f6a24b6dc97e36e4c3a23680acd93fc 100644 (file)
@@ -770,7 +770,7 @@ PHP_MINFO_FUNCTION(milter)
 
 /* {{{ milter_functions[]
 */
-static zend_function_entry milter_functions[] = {
+static const zend_function_entry milter_functions[] = {
        PHP_FE(smfi_setflags, NULL)
        PHP_FE(smfi_settimeout, NULL)
        PHP_FE(smfi_getsymval, NULL)
index 30da49a2e086b31ae31527b8fbfc08c515ce5fc9..5c8a87d214104d1d84e048322455939e2d72e2e2 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 */