mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-28 20:34:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

- Kill 10 MSVC compiler warnings due to type conflict

Browse Source 
- 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
This commit is contained in:
Steph Fox 2008-06-18 15:06:50 +00:00
parent 0f5ddaf4ce
commit aa694b8b51
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ext/phar/phar.c
View File

@ -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;

6
ext/phar/tar.c
View File

@ -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;

2
ext/phar/tests/cached_manifest_1.phpt
View File

@ -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';

6
ext/phar/zip.c
View File

@ -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;