From 25a6be6cde1f71ee4856e6599bb0881643504d73 Mon Sep 17 00:00:00 2001 From: Greg Beaver Date: Thu, 8 May 2008 03:10:18 +0000 Subject: [PATCH] fix windows build --- ext/phar/phar.c | 6 +++--- ext/phar/tar.c | 2 +- ext/phar/zip.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ext/phar/phar.c b/ext/phar/phar.c index cf84213265..e1cbb5f1da 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -936,7 +936,7 @@ int phar_open_file(php_stream *fp, char *fname, int fname_len, char *alias, int MAPPHAR_FAIL("Cannot open archive \"%s\", invalid alias"); } if (SUCCESS == zend_hash_find(&(PHAR_GLOBALS->phar_alias_map), alias, alias_len, (void **)&fd_ptr)) { - if (SUCCESS != phar_free_alias(*fd_ptr, alias, alias_len)) { + if (SUCCESS != phar_free_alias(*fd_ptr, alias, alias_len TSRMLS_CC)) { signature = NULL; fp = NULL; MAPPHAR_FAIL("Cannot open archive \"%s\", alias is already in use by existing archive"); @@ -1540,7 +1540,7 @@ int phar_detect_phar_fname_ext(const char *filename, int check_length, const cha phar_archive_data **pphar; if (is_complete) { - if (SUCCESS == zend_hash_find(&(PHAR_GLOBALS->phar_fname_map), filename, filename_len, (void **)&pphar)) { + if (SUCCESS == zend_hash_find(&(PHAR_GLOBALS->phar_fname_map), (char *) filename, filename_len, (void **)&pphar)) { *ext_str = filename + (filename_len - (*pphar)->ext_len); woohoo: *ext_len = (*pphar)->ext_len; @@ -1566,7 +1566,7 @@ woohoo: break; } - if (keylen > filename_len) { + if (keylen > (uint) filename_len) { zend_hash_move_forward(&(PHAR_GLOBALS->phar_fname_map)); continue; } diff --git a/ext/phar/tar.c b/ext/phar/tar.c index 0f141bc0ae..a97bbf0125 100644 --- a/ext/phar/tar.c +++ b/ext/phar/tar.c @@ -401,7 +401,7 @@ int phar_open_tarfile(php_stream* fp, char *fname, int fname_len, char *alias, i myphar->is_temporary_alias = 0; if (SUCCESS == zend_hash_find(&(PHAR_GLOBALS->phar_alias_map), alias, alias_len, (void **)&fd_ptr)) { - if (SUCCESS != phar_free_alias(*fd_ptr, alias, alias_len)) { + if (SUCCESS != phar_free_alias(*fd_ptr, alias, alias_len TSRMLS_CC)) { if (error) { spprintf(error, 4096, "phar error: Unable to add tar-based phar \"%s\", alias is already in use", fname); } diff --git a/ext/phar/zip.c b/ext/phar/zip.c index 43f2a75997..cb004bf9f9 100644 --- a/ext/phar/zip.c +++ b/ext/phar/zip.c @@ -444,7 +444,7 @@ foundit: PHAR_ZIP_FAIL("invalid alias"); } if (SUCCESS == zend_hash_find(&(PHAR_GLOBALS->phar_alias_map), alias, alias_len, (void **)&fd_ptr)) { - if (SUCCESS != phar_free_alias(*fd_ptr, alias, alias_len)) { + if (SUCCESS != phar_free_alias(*fd_ptr, alias, alias_len TSRMLS_CC)) { PHAR_ZIP_FAIL("alias is already in use by existing archive"); } } -- 2.50.1