From: Rasmus Lerdorf Date: Tue, 9 Feb 2010 17:38:36 +0000 (+0000) Subject: It's a size_t here, not an unsigned int. X-Git-Tag: php-5.4.0alpha1~191^2~1971 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e8f829b0bfc5c89c7b711a762be847223fbc6de;p=php It's a size_t here, not an unsigned int. --- diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 8b7ae75696..e1ed8916b4 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -182,7 +182,7 @@ static int php_zip_extract_file(struct zip * za, char *dest, char *file, int fil len = spprintf(&file_dirname_fullpath, 0, "%s/%s", dest, file_dirname); } - php_basename(path_cleaned, path_cleaned_len, NULL, 0, &file_basename, (unsigned int *)&file_basename_len TSRMLS_CC); + php_basename(path_cleaned, path_cleaned_len, NULL, 0, &file_basename, (size_t *)&file_basename_len TSRMLS_CC); if (OPENBASEDIR_CHECKPATH(file_dirname_fullpath)) { efree(file_dirname_fullpath); @@ -1647,7 +1647,7 @@ static void php_zip_add_from_pattern(INTERNAL_FUNCTION_PARAMETERS, int type) /* file = Z_STRVAL_PP(zval_file); if (remove_all_path) { php_basename(Z_STRVAL_PP(zval_file), Z_STRLEN_PP(zval_file), NULL, 0, - &basename, (unsigned int *)&file_stripped_len TSRMLS_CC); + &basename, (size_t *)&file_stripped_len TSRMLS_CC); file_stripped = basename; } else if (remove_path && strstr(Z_STRVAL_PP(zval_file), remove_path) != NULL) { file_stripped = Z_STRVAL_PP(zval_file) + remove_path_len + 1;