From 1b2ec73c1d9175769c3ad4dd40825546851287bc Mon Sep 17 00:00:00 2001 From: George Peter Banyard Date: Wed, 26 Aug 2020 12:57:24 +0200 Subject: Drop various unused macros/APIs Also convert_libmagic_pattern() to return a zend_string* Closes GH-6029 --- Zend/zend_ini.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Zend/zend_ini.c') diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c index eaa95621d4..488468f0e0 100644 --- a/Zend/zend_ini.c +++ b/Zend/zend_ini.c @@ -96,7 +96,7 @@ ZEND_API int zend_ini_startup(void) /* {{{ */ EG(ini_directives) = registered_zend_ini_directives; EG(modified_ini_directives) = NULL; EG(error_reporting_ini_entry) = NULL; - zend_hash_init_ex(registered_zend_ini_directives, 128, NULL, free_ini_entry, 1, 0); + zend_hash_init(registered_zend_ini_directives, 128, NULL, free_ini_entry, 1); return SUCCESS; } /* }}} */ @@ -164,7 +164,7 @@ ZEND_API int zend_copy_ini_directives(void) /* {{{ */ EG(modified_ini_directives) = NULL; EG(error_reporting_ini_entry) = NULL; EG(ini_directives) = (HashTable *) malloc(sizeof(HashTable)); - zend_hash_init_ex(EG(ini_directives), registered_zend_ini_directives->nNumOfElements, NULL, free_ini_entry, 1, 0); + zend_hash_init(EG(ini_directives), registered_zend_ini_directives->nNumOfElements, NULL, free_ini_entry, 1); zend_hash_copy(EG(ini_directives), registered_zend_ini_directives, copy_ini_entry); return SUCCESS; } -- cgit v1.2.1