]> granicus.if.org Git - php/commitdiff
drop unused parameter from zend_startup
authorJoe Watkins <krakjoe@php.net>
Mon, 11 Mar 2019 09:10:14 +0000 (10:10 +0100)
committerJoe Watkins <krakjoe@php.net>
Mon, 11 Mar 2019 09:10:14 +0000 (10:10 +0100)
Zend/zend.c
Zend/zend.h
main/main.c

index 079581c99f28d95912dbcc5ae971f36c4324d50c..7361efcb0ea6826d81dc9bad3e8ab97f8dcab2de 100644 (file)
@@ -773,7 +773,7 @@ static zend_bool php_auto_globals_create_globals(zend_string *name) /* {{{ */
 }
 /* }}} */
 
-int zend_startup(zend_utility_functions *utility_functions, char **extensions) /* {{{ */
+int zend_startup(zend_utility_functions *utility_functions) /* {{{ */
 {
 #ifdef ZTS
        zend_compiler_globals *compiler_globals;
index 76d1bb2bb5d57c80b044f0d9e1ae7b7356a69559..4839b994b9deded01896451556d3200d27dee700 100644 (file)
@@ -234,7 +234,7 @@ typedef int (*zend_write_func_t)(const char *str, size_t str_length);
 #define zend_first_try         EG(bailout)=NULL;       zend_try
 
 BEGIN_EXTERN_C()
-int zend_startup(zend_utility_functions *utility_functions, char **extensions);
+int zend_startup(zend_utility_functions *utility_functions);
 void zend_shutdown(void);
 void zend_register_standard_ini_entries(void);
 int zend_post_startup(void);
index 5692c76ca4930358673129115503c49b4f87e2fd..5e18630bd90caf6d2b24521db67d3d68626756d0 100644 (file)
@@ -2174,7 +2174,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
        zuf.printf_to_smart_str_function = php_printf_to_smart_str;
        zuf.getenv_function = sapi_getenv;
        zuf.resolve_path_function = php_resolve_path_for_zend;
-       zend_startup(&zuf, NULL);
+       zend_startup(&zuf);
 
 #if HAVE_SETLOCALE
        setlocale(LC_CTYPE, "");