From aa694b8b512ca3d78a0b6d57781211c52c7e9fd0 Mon Sep 17 00:00:00 2001 From: Steph Fox Date: Wed, 18 Jun 2008 15:06:50 +0000 Subject: [PATCH] - Kill 10 MSVC compiler warnings due to type conflict - Make cached manifest test platform agnostic - Comment out zend_(init|destroy)_rsrc_list() and associated references @Greg: cached manifest test (now) passes here regardless, make of that what you will --- ext/phar/phar.c | 18 +++++++++--------- ext/phar/tar.c | 6 +++--- ext/phar/tests/cached_manifest_1.phpt | 2 +- ext/phar/zip.c | 6 +++--- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ext/phar/phar.c b/ext/phar/phar.c index e4f917cce9..2e3a901945 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -115,7 +115,7 @@ static void phar_split_cache_list(TSRMLS_D) /* fake request startup */ PHAR_GLOBALS->request_init = 1; - zend_init_rsrc_list(TSRMLS_C); + //zend_init_rsrc_list(TSRMLS_C); PHAR_G(has_bz2) = zend_hash_exists(&module_registry, "bz2", sizeof("bz2")); PHAR_G(has_zlib) = zend_hash_exists(&module_registry, "zlib", sizeof("zlib")); /* these two are dummies and will be destroyed later */ @@ -149,8 +149,8 @@ finish_error: PHAR_GLOBALS->phar_alias_map.arBuckets = 0; zend_hash_destroy(&cached_phars); zend_hash_destroy(&cached_alias); - zend_destroy_rsrc_list(&EG(regular_list) TSRMLS_CC); - memset(&EG(regular_list), 0, sizeof(HashTable)); + //zend_destroy_rsrc_list(&EG(regular_list) TSRMLS_CC); + //memset(&EG(regular_list), 0, sizeof(HashTable)); /* free cached manifests */ PHAR_GLOBALS->request_init = 0; return; @@ -172,8 +172,8 @@ finish_error: cached_alias = PHAR_GLOBALS->phar_alias_map; PHAR_GLOBALS->phar_fname_map.arBuckets = 0; PHAR_GLOBALS->phar_alias_map.arBuckets = 0; - zend_destroy_rsrc_list(&EG(regular_list) TSRMLS_CC); - memset(&EG(regular_list), 0, sizeof(HashTable)); + //zend_destroy_rsrc_list(&EG(regular_list) TSRMLS_CC); + //memset(&EG(regular_list), 0, sizeof(HashTable)); efree(tmp); } /* }}} */ @@ -976,11 +976,11 @@ static int phar_parse_pharfile(php_stream *fp, char *fname, int fname_len, char /* set up our manifest */ zend_hash_init(&mydata->manifest, manifest_count, - zend_get_hash_value, destroy_phar_manifest_entry, mydata->is_persistent); + zend_get_hash_value, destroy_phar_manifest_entry, (zend_bool)mydata->is_persistent); zend_hash_init(&mydata->mounted_dirs, 5, - zend_get_hash_value, NULL, mydata->is_persistent); + zend_get_hash_value, NULL, (zend_bool)mydata->is_persistent); zend_hash_init(&mydata->virtual_dirs, manifest_count * 2, - zend_get_hash_value, NULL, mydata->is_persistent); + zend_get_hash_value, NULL, (zend_bool)mydata->is_persistent); offset = halt_offset + manifest_len + 4; memset(&entry, 0, sizeof(phar_entry_info)); entry.phar = mydata; @@ -1301,7 +1301,7 @@ int phar_create_or_parse_filename(char *fname, int fname_len, char *alias, int a zend_hash_init(&mydata->mounted_dirs, sizeof(char *), zend_get_hash_value, NULL, 0); zend_hash_init(&mydata->virtual_dirs, sizeof(char *), - zend_get_hash_value, NULL, mydata->is_persistent); + zend_get_hash_value, NULL, (zend_bool)mydata->is_persistent); mydata->fname_len = fname_len; snprintf(mydata->version, sizeof(mydata->version), "%s", PHP_PHAR_API_VERSION); mydata->is_temporary_alias = alias ? 0 : 1; diff --git a/ext/phar/tar.c b/ext/phar/tar.c index 4537f024b4..062b1c9e6d 100644 --- a/ext/phar/tar.c +++ b/ext/phar/tar.c @@ -218,11 +218,11 @@ int phar_parse_tarfile(php_stream* fp, char *fname, int fname_len, char *alias, myphar->is_persistent = PHAR_G(persist); /* estimate number of entries, can't be certain with tar files */ zend_hash_init(&myphar->manifest, 2 + (totalsize >> 12), - zend_get_hash_value, destroy_phar_manifest_entry, myphar->is_persistent); + zend_get_hash_value, destroy_phar_manifest_entry, (zend_bool)myphar->is_persistent); zend_hash_init(&myphar->mounted_dirs, 5, - zend_get_hash_value, NULL, myphar->is_persistent); + zend_get_hash_value, NULL, (zend_bool)myphar->is_persistent); zend_hash_init(&myphar->virtual_dirs, 4 + (totalsize >> 11), - zend_get_hash_value, NULL, myphar->is_persistent); + zend_get_hash_value, NULL, (zend_bool)myphar->is_persistent); myphar->is_tar = 1; /* remember whether this entire phar was compressed with gz/bzip2 */ myphar->flags = compression; diff --git a/ext/phar/tests/cached_manifest_1.phpt b/ext/phar/tests/cached_manifest_1.phpt index 54ab6f0065..f656e98dd8 100644 --- a/ext/phar/tests/cached_manifest_1.phpt +++ b/ext/phar/tests/cached_manifest_1.phpt @@ -3,7 +3,7 @@ Phar: phar.cache_list basic read test --SKIPIF-- --INI-- -phar.cache_list={PWD}/files/nophar.phar +phar.cache_list={$cwd}/files/nophar.phar --FILE-- manifest, PHAR_GET_16(locator.count), - zend_get_hash_value, destroy_phar_manifest_entry, mydata->is_persistent); + zend_get_hash_value, destroy_phar_manifest_entry, (zend_bool)mydata->is_persistent); zend_hash_init(&mydata->mounted_dirs, 5, - zend_get_hash_value, NULL, mydata->is_persistent); + zend_get_hash_value, NULL, (zend_bool)mydata->is_persistent); zend_hash_init(&mydata->virtual_dirs, PHAR_GET_16(locator.count) * 2, - zend_get_hash_value, NULL, mydata->is_persistent); + zend_get_hash_value, NULL, (zend_bool)mydata->is_persistent); entry.phar = mydata; entry.is_zip = 1; entry.fp_type = PHAR_FP; -- 2.50.1