cvs: php-src /ext/phar func_interceptors.c
| From: | Kalle Sommer Nielsen | Date: | Wed, 13 May 2009 15:54:49 +0000 |
| Subject: | cvs: php-src /ext/phar func_interceptors.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-57773@lists.php.net to get a copy of this message | ||
kalle Wed May 13 15:54:49 2009 UTC
Modified files:
/php-src/ext/phar func_interceptors.c
Log:
Nuke compiler warning
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/func_interceptors.c?r1=1.30&r2=1.31&diff_format=u
Index: php-src/ext/phar/func_interceptors.c
diff -u php-src/ext/phar/func_interceptors.c:1.30 php-src/ext/phar/func_interceptors.c:1.31
--- php-src/ext/phar/func_interceptors.c:1.30 Wed Dec 31 11:12:35 2008
+++ php-src/ext/phar/func_interceptors.c Wed May 13 15:54:48 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: func_interceptors.c,v 1.30 2008/12/31 11:12:35 sebastian Exp $ */
+/* $Id: func_interceptors.c,v 1.31 2009/05/13 15:54:48 kalle Exp $ */
#include "phar_internal.h"
@@ -98,7 +98,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;
@@ -205,6 +205,7 @@
if ((len = php_stream_copy_to_mem(stream, &contents, maxlen, 0)) > 0) {
#if PHP_MAJOR_VERSION < 6
if (PG(magic_quotes_runtime)) {
+ int newlen;
contents = php_addslashes(contents, len, &newlen, 1 TSRMLS_CC); /* 1 = free source string
*/
len = newlen;
}