- 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

diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index e4f917cce974262e36eee60cb1c3265c18ad204a..2e3a9019459ecd92b0aa6336fb33c33ac13273df 100644 (file)
--- 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 4537f024b480e4e7d3b9483e9b4bb87174cb7832..062b1c9e6d303522c6109ee550300fe1799dd97b 100644 (file)
--- 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 54ab6f0065b377c226027d067877f1bf85bc941a..f656e98dd8f9926ec6646cda480d50545db76014 100644 (file)
--- 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--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --INI--
-phar.cache_list={PWD}/files/nophar.phar
+phar.cache_list={$cwd}/files/nophar.phar
 --FILE--
 <?php
 $pname = 'phar://' . dirname(__FILE__) . '/files/nophar.phar';

diff --git a/ext/phar/zip.c b/ext/phar/zip.c
index a32576231fd2066c4ff20d42c0096c60201c421e..1651580fe7f82017c79c6b7526c34ff6576f7b4a 100644 (file)
--- a/ext/phar/zip.c
+++ b/ext/phar/zip.c
@@ -255,11 +255,11 @@ foundit:
        php_stream_seek(fp, PHAR_GET_32(locator.cdir_offset), SEEK_SET);
        /* read in central directory */
        zend_hash_init(&mydata->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;