clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix ZTS build

Browse Source
This commit is contained in:
Greg Beaver 2008-04-19 17:24:41 +00:00
parent f870b8ae74
commit ef0139c866
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/phar/phar.c
View File

@ -1541,7 +1541,7 @@ int phar_detect_phar_fname_ext(const char *filename, int check_length, const cha
continue;
}
if (keylen <= filename_len && !memcmp(key, filename, keylen - 1)) {
if (keylen <= (uint) filename_len && !memcmp(key, filename, keylen - 1)) {
/* found plain map, so we grab the extension, if any */
if (is_complete && keylen != filename_len + 1) {
continue;
@ -1574,7 +1574,7 @@ int phar_detect_phar_fname_ext(const char *filename, int check_length, const cha
/* next check for alias in first segment */
pos = strchr(filename, '/');
if (pos) {
if (zend_hash_exists(&(PHAR_GLOBALS->phar_alias_map), filename, pos - filename)) {
if (zend_hash_exists(&(PHAR_GLOBALS->phar_alias_map), (char *) filename, pos - filename)) {
*ext_str = pos;
*ext_len = -1;
return FAILURE;
@ -1783,7 +1783,7 @@ int phar_split_fname(char *filename, int filename_len, char **arch, int *arch_le
}
ext_len = 0;
if (phar_detect_phar_fname_ext(filename, 0, &ext_str, &ext_len, executable, for_create, 0) == FAILURE) {
if (phar_detect_phar_fname_ext(filename, 0, &ext_str, &ext_len, executable, for_create, 0 TSRMLS_CC) == FAILURE) {
if (ext_len != -1) {
if (!ext_str) {
/* no / detected, restore arch for error message */