rasmus                                   Tue, 09 Feb 2010 17:38:36 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=294816

Log:
It's a size_t here, not an unsigned int.

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/zip/php_zip.c
    U   php/php-src/trunk/ext/zip/php_zip.c

Modified: php/php-src/branches/PHP_5_3/ext/zip/php_zip.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/zip/php_zip.c      2010-02-09 16:42:40 UTC 
(rev 294815)
+++ php/php-src/branches/PHP_5_3/ext/zip/php_zip.c      2010-02-09 17:38:36 UTC 
(rev 294816)
@@ -182,7 +182,7 @@
                        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 @@
                                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;

Modified: php/php-src/trunk/ext/zip/php_zip.c
===================================================================
--- php/php-src/trunk/ext/zip/php_zip.c 2010-02-09 16:42:40 UTC (rev 294815)
+++ php/php-src/trunk/ext/zip/php_zip.c 2010-02-09 17:38:36 UTC (rev 294816)
@@ -182,7 +182,7 @@
                        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 @@
                                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;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to