[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/main/streams/cast.c trunk/main/streams/cast.c

[Ilia Alshanetsky]

iliaa                                    Thu, 13 Jan 2011 12:56:28 +0000

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

Log:
Fixed variable re-declaration

Changed paths:
    U   php/php-src/branches/PHP_5_3/main/streams/cast.c
    U   php/php-src/trunk/main/streams/cast.c

Modified: php/php-src/branches/PHP_5_3/main/streams/cast.c
===================================================================
--- php/php-src/branches/PHP_5_3/main/streams/cast.c    2011-01-13 12:46:39 UTC 
(rev 307436)
+++ php/php-src/branches/PHP_5_3/main/streams/cast.c    2011-01-13 12:56:28 UTC 
(rev 307437)
@@ -271,7 +271,7 @@

                        newstream = php_stream_fopen_tmpfile();
                        if (newstream) {
-                               int ret = php_stream_copy_to_stream_ex(stream, 
newstream, PHP_STREAM_COPY_ALL, NULL);
+                               int retval = 
php_stream_copy_to_stream_ex(stream, newstream, PHP_STREAM_COPY_ALL, NULL);

                                if (ret != SUCCESS) {
                                        php_stream_close(newstream);
@@ -279,7 +279,7 @@
                                        int retcode = 
php_stream_cast(newstream, castas | flags, (void **)ret, show_err);

                                        if (retcode == SUCCESS) {
-                                               rewind(*(FILE**)ret);
+                                               rewind(*(FILE**)retval);
                                        }

                                        /* do some specialized cleanup */

Modified: php/php-src/trunk/main/streams/cast.c
===================================================================
--- php/php-src/trunk/main/streams/cast.c       2011-01-13 12:46:39 UTC (rev 
307436)
+++ php/php-src/trunk/main/streams/cast.c       2011-01-13 12:56:28 UTC (rev 
307437)
@@ -271,7 +271,7 @@

                        newstream = php_stream_fopen_tmpfile();
                        if (newstream) {
-                               int ret = php_stream_copy_to_stream_ex(stream, 
newstream, PHP_STREAM_COPY_ALL, NULL);
+                               int retval = 
php_stream_copy_to_stream_ex(stream, newstream, PHP_STREAM_COPY_ALL, NULL);

                                if (ret != SUCCESS) {
                                        php_stream_close(newstream);
@@ -279,7 +279,7 @@
                                        int retcode = 
php_stream_cast(newstream, castas | flags, (void **)ret, show_err);

                                        if (retcode == SUCCESS) {
-                                               rewind(*(FILE**)ret);
+                                               rewind(*(FILE**)retval);
                                        }

                                        /* do some specialized cleanup */


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