lstrojny Sat Dec 13 15:06:20 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard file.c
Log:
One len variable is enough here, we can reuse it
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.28.2.26&r2=1.409.2.6.2.28.2.27&diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.409.2.6.2.28.2.26
php-src/ext/standard/file.c:1.409.2.6.2.28.2.27
--- php-src/ext/standard/file.c:1.409.2.6.2.28.2.26 Fri Dec 12 12:44:48 2008
+++ php-src/ext/standard/file.c Sat Dec 13 15:06:20 2008
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.409.2.6.2.28.2.26 2008/12/12 12:44:48 bjori Exp $ */
+/* $Id: file.c,v 1.409.2.6.2.28.2.27 2008/12/13 15:06:20 lstrojny Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -521,7 +521,7 @@
char *contents;
zend_bool use_include_path = 0;
php_stream *stream;
- int len, newlen;
+ int len;
long offset = -1;
long maxlen = PHP_STREAM_COPY_ALL;
zval *zcontext = NULL;
@@ -556,8 +556,7 @@
if ((len = php_stream_copy_to_mem(stream, &contents, maxlen, 0)) > 0) {
if (PG(magic_quotes_runtime)) {
- contents = php_addslashes(contents, len, &newlen, 1
TSRMLS_CC); /* 1 = free source string */
- len = newlen;
+ contents = php_addslashes(contents, len, &len, 1
TSRMLS_CC); /* 1 = free source string */
}
RETVAL_STRINGL(contents, len, 0);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
