]> granicus.if.org Git - php/commitdiff
- It's a size_t here, not an unsigned int
authorPierre Joye <pajoye@php.net>
Tue, 9 Feb 2010 17:51:39 +0000 (17:51 +0000)
committerPierre Joye <pajoye@php.net>
Tue, 9 Feb 2010 17:51:39 +0000 (17:51 +0000)
ext/zip/php_zip.c

index db546361df009a508b66b5856a697ae6bd73cb57..6de4f629f6b2e6a26cd9a8a3582cbe38f09fc49b 100644 (file)
@@ -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);
@@ -1637,7 +1637,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;