iliaa Thu, 20 Jan 2011 19:32:36 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=307637
Log:
Fixed variable overloading
Changed paths:
U php/php-src/branches/PHP_5_3/ext/phar/zip.c
U php/php-src/trunk/ext/phar/zip.c
Modified: php/php-src/branches/PHP_5_3/ext/phar/zip.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/phar/zip.c 2011-01-20 19:25:10 UTC (rev
307636)
+++ php/php-src/branches/PHP_5_3/ext/phar/zip.c 2011-01-20 19:32:36 UTC (rev
307637)
@@ -1434,9 +1434,9 @@
php_stream_seek(pass.centralfp, 0, SEEK_SET);
{
- size_t len;
- int ret = phar_stream_copy_to_stream(pass.centralfp,
pass.filefp, PHP_STREAM_COPY_ALL, &len);
- if (SUCCESS != ret || len != cdir_size) {
+ size_t clen;
+ int ret = phar_stream_copy_to_stream(pass.centralfp,
pass.filefp, PHP_STREAM_COPY_ALL, &clen);
+ if (SUCCESS != ret || clen != cdir_size) {
if (error) {
spprintf(error, 4096, "phar zip flush of \"%s\"
failed: unable to write central-directory", phar->fname);
}
Modified: php/php-src/trunk/ext/phar/zip.c
===================================================================
--- php/php-src/trunk/ext/phar/zip.c 2011-01-20 19:25:10 UTC (rev 307636)
+++ php/php-src/trunk/ext/phar/zip.c 2011-01-20 19:32:36 UTC (rev 307637)
@@ -1434,9 +1434,9 @@
php_stream_seek(pass.centralfp, 0, SEEK_SET);
{
- size_t len;
- int ret = phar_stream_copy_to_stream(pass.centralfp,
pass.filefp, PHP_STREAM_COPY_ALL, &len);
- if (SUCCESS != ret || len != cdir_size) {
+ size_t clen;
+ int ret = phar_stream_copy_to_stream(pass.centralfp,
pass.filefp, PHP_STREAM_COPY_ALL, &clen);
+ if (SUCCESS != ret || clen != cdir_size) {
if (error) {
spprintf(error, 4096, "phar zip flush of \"%s\"
failed: unable to write central-directory", phar->fname);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
