From: Ilia Alshanetsky <iliaa@php.net>
Date: Thu, 13 Jan 2011 12:56:28 +0000 (+0000)
Subject: Fixed variable re-declaration
X-Git-Tag: php-5.3.6RC1~125
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c33795b25b5d4206f6d0a358e788301bd199698f;p=php

Fixed variable re-declaration
---

diff --git a/main/streams/cast.c b/main/streams/cast.c
index 9f5898c47c..6c3854b934 100644
--- a/main/streams/cast.c
+++ b/main/streams/cast.c
@@ -271,7 +271,7 @@ PHPAPI int _php_stream_cast(php_stream *stream, int castas, void **ret, int show
 
 			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 @@ PHPAPI int _php_stream_cast(php_stream *stream, int castas, void **ret, int show
 					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 */