diff options
Diffstat (limited to 'ext/phar/phar.c')
| -rw-r--r-- | ext/phar/phar.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/ext/phar/phar.c b/ext/phar/phar.c index 5bfb278881..867c664171 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -82,7 +82,7 @@ ZEND_INI_MH(phar_ini_modify_handler) /* {{{ */ if (entry->name_length == 14) { PHAR_G(readonly) = ini; - if (PHAR_GLOBALS->request_init && PHAR_GLOBALS->phar_fname_map.arBuckets) { + if (PHAR_GLOBALS->request_init && PHAR_GLOBALS->phar_fname_map.arHash) { zend_hash_apply_with_argument(&(PHAR_GLOBALS->phar_fname_map), phar_set_writeable_bit, (void *)&ini TSRMLS_CC); } } else { @@ -147,9 +147,9 @@ finish_error: PHAR_GLOBALS->manifest_cached = 0; efree(tmp); zend_hash_destroy(&(PHAR_G(phar_fname_map))); - PHAR_GLOBALS->phar_fname_map.arBuckets = 0; + PHAR_GLOBALS->phar_fname_map.arHash = 0; zend_hash_destroy(&(PHAR_G(phar_alias_map))); - PHAR_GLOBALS->phar_alias_map.arBuckets = 0; + PHAR_GLOBALS->phar_alias_map.arHash = 0; zend_hash_destroy(&cached_phars); zend_hash_destroy(&cached_alias); zend_hash_graceful_reverse_destroy(&EG(regular_list)); @@ -174,8 +174,8 @@ finish_error: zend_hash_destroy(&cached_alias); cached_phars = PHAR_GLOBALS->phar_fname_map; cached_alias = PHAR_GLOBALS->phar_alias_map; - PHAR_GLOBALS->phar_fname_map.arBuckets = 0; - PHAR_GLOBALS->phar_alias_map.arBuckets = 0; + PHAR_GLOBALS->phar_fname_map.arHash = 0; + PHAR_GLOBALS->phar_alias_map.arHash = 0; zend_hash_graceful_reverse_destroy(&EG(regular_list)); memset(&EG(regular_list), 0, sizeof(HashTable)); efree(tmp); @@ -221,19 +221,19 @@ void phar_destroy_phar_data(phar_archive_data *phar TSRMLS_DC) /* {{{ */ phar->signature = NULL; } - if (phar->manifest.arBuckets) { + if (phar->manifest.arHash) { zend_hash_destroy(&phar->manifest); - phar->manifest.arBuckets = NULL; + phar->manifest.arHash = NULL; } - if (phar->mounted_dirs.arBuckets) { + if (phar->mounted_dirs.arHash) { zend_hash_destroy(&phar->mounted_dirs); - phar->mounted_dirs.arBuckets = NULL; + phar->mounted_dirs.arHash = NULL; } - if (phar->virtual_dirs.arBuckets) { + if (phar->virtual_dirs.arHash) { zend_hash_destroy(&phar->virtual_dirs); - phar->virtual_dirs.arBuckets = NULL; + phar->virtual_dirs.arHash = NULL; } if (phar->metadata) { @@ -3527,11 +3527,11 @@ PHP_RSHUTDOWN_FUNCTION(phar) /* {{{ */ { phar_release_functions(TSRMLS_C); zend_hash_destroy(&(PHAR_GLOBALS->phar_alias_map)); - PHAR_GLOBALS->phar_alias_map.arBuckets = NULL; + PHAR_GLOBALS->phar_alias_map.arHash = NULL; zend_hash_destroy(&(PHAR_GLOBALS->phar_fname_map)); - PHAR_GLOBALS->phar_fname_map.arBuckets = NULL; + PHAR_GLOBALS->phar_fname_map.arHash = NULL; zend_hash_destroy(&(PHAR_GLOBALS->phar_persist_map)); - PHAR_GLOBALS->phar_persist_map.arBuckets = NULL; + PHAR_GLOBALS->phar_persist_map.arHash = NULL; PHAR_GLOBALS->phar_SERVER_mung_list = 0; if (PHAR_GLOBALS->cached_fp) { |