felipe Thu Mar 26 22:16:48 2009 UTC
Modified files:
/ZendEngine2 zend_constants.c zend_hash.c zend_object_handlers.c
zend_operators.c
/php-src/ext/date php_date.c
/php-src/ext/libxml libxml.c
/php-src/ext/soap soap.c
/php-src/ext/standard string.c var_unserializer.c
var_unserializer.re
Log:
- Removed unused variables
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_constants.c?r1=1.118&r2=1.119&diff_format=u
Index: ZendEngine2/zend_constants.c
diff -u ZendEngine2/zend_constants.c:1.118 ZendEngine2/zend_constants.c:1.119
--- ZendEngine2/zend_constants.c:1.118 Thu Mar 26 20:01:38 2009
+++ ZendEngine2/zend_constants.c Thu Mar 26 22:16:47 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_constants.c,v 1.118 2009/03/26 20:01:38 felipe Exp $ */
+/* $Id: zend_constants.c,v 1.119 2009/03/26 22:16:47 felipe Exp $ */
#include "zend.h"
#include "zend_constants.h"
@@ -37,8 +37,6 @@
void copy_zend_constant(zend_constant *c) /* {{{ */
{
- TSRMLS_FETCH();
-
c->name.u = zend_ustrndup(c->name.u, c->name_len - 1);
if (!(c->flags & CONST_PERSISTENT)) {
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_hash.c?r1=1.163&r2=1.164&diff_format=u
Index: ZendEngine2/zend_hash.c
diff -u ZendEngine2/zend_hash.c:1.163 ZendEngine2/zend_hash.c:1.164
--- ZendEngine2/zend_hash.c:1.163 Thu Mar 26 20:01:38 2009
+++ ZendEngine2/zend_hash.c Thu Mar 26 22:16:47 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_hash.c,v 1.163 2009/03/26 20:01:38 felipe Exp $ */
+/* $Id: zend_hash.c,v 1.164 2009/03/26 22:16:47 felipe Exp $ */
#include "zend.h"
#include "zend_operators.h"
@@ -333,7 +333,6 @@
{
zstr key;
int ret;
- TSRMLS_FETCH();
key.u = zend_ascii_to_unicode(arKey, nKeyLength ZEND_FILE_LINE_CC);
ret = _zend_u_hash_add_or_update(ht, IS_UNICODE, key, nKeyLength,
pData, nDataSize, pDest, flag ZEND_FILE_LINE_CC);
@@ -673,7 +672,6 @@
{
zstr key;
int ret;
- TSRMLS_FETCH();
key.u = zend_ascii_to_unicode(arKey, nKeyLength ZEND_FILE_LINE_CC);
ret = zend_u_hash_del_key_or_index(ht, IS_UNICODE, key, nKeyLength, 0,
HASH_DEL_KEY);
@@ -1135,7 +1133,6 @@
{
zstr key;
int ret;
- TSRMLS_FETCH();
key.u = zend_ascii_to_unicode(arKey, nKeyLength ZEND_FILE_LINE_CC);
ret = zend_u_hash_find(ht, IS_UNICODE, key, nKeyLength, pData);
@@ -1268,7 +1265,6 @@
{
zstr key;
int ret;
- TSRMLS_FETCH();
key.u = zend_ascii_to_unicode(arKey, nKeyLength ZEND_FILE_LINE_CC);
ret = zend_u_hash_exists(ht, IS_UNICODE, key, nKeyLength);
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_object_handlers.c?r1=1.213&r2=1.214&diff_format=u
Index: ZendEngine2/zend_object_handlers.c
diff -u ZendEngine2/zend_object_handlers.c:1.213
ZendEngine2/zend_object_handlers.c:1.214
--- ZendEngine2/zend_object_handlers.c:1.213 Thu Mar 26 20:01:38 2009
+++ ZendEngine2/zend_object_handlers.c Thu Mar 26 22:16:47 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_object_handlers.c,v 1.213 2009/03/26 20:01:38 felipe Exp $ */
+/* $Id: zend_object_handlers.c,v 1.214 2009/03/26 22:16:47 felipe Exp $ */
#include "zend.h"
#include "zend_globals.h"
@@ -785,7 +785,6 @@
static inline union _zend_function *zend_get_user_call_function(zend_object
*zobj, zstr method_name, int method_len) /* {{{ */
{
zend_internal_function *call_user_call =
emalloc(sizeof(zend_internal_function));
- TSRMLS_FETCH();
call_user_call->type = ZEND_INTERNAL_FUNCTION;
call_user_call->module = zobj->ce->module;
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_operators.c?r1=1.303&r2=1.304&diff_format=u
Index: ZendEngine2/zend_operators.c
diff -u ZendEngine2/zend_operators.c:1.303 ZendEngine2/zend_operators.c:1.304
--- ZendEngine2/zend_operators.c:1.303 Thu Mar 26 20:01:38 2009
+++ ZendEngine2/zend_operators.c Thu Mar 26 22:16:47 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_operators.c,v 1.303 2009/03/26 20:01:38 felipe Exp $ */
+/* $Id: zend_operators.c,v 1.304 2009/03/26 22:16:47 felipe Exp $ */
#include <ctype.h>
@@ -2330,8 +2330,6 @@
int ch;
if (Z_USTRLEN_P(str) == 0) {
- TSRMLS_FETCH();
-
USTR_FREE(Z_USTRVAL_P(str));
ZVAL_ASCII_STRINGL(str, "1", sizeof("1")-1, 1);
return;
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.220&r2=1.221&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.220 php-src/ext/date/php_date.c:1.221
--- php-src/ext/date/php_date.c:1.220 Thu Mar 26 20:01:38 2009
+++ php-src/ext/date/php_date.c Thu Mar 26 22:16:48 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.220 2009/03/26 20:01:38 felipe Exp $ */
+/* $Id: php_date.c,v 1.221 2009/03/26 22:16:48 felipe Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -2630,7 +2630,6 @@
{
int i;
zval *element;
- TSRMLS_FETCH();
add_ascii_assoc_long(z, "warning_count", error->warning_count);
MAKE_STD_ZVAL(element);
http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/libxml.c?r1=1.76&r2=1.77&diff_format=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.76 php-src/ext/libxml/libxml.c:1.77
--- php-src/ext/libxml/libxml.c:1.76 Thu Mar 26 20:01:57 2009
+++ php-src/ext/libxml/libxml.c Thu Mar 26 22:16:48 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: libxml.c,v 1.76 2009/03/26 20:01:57 felipe Exp $ */
+/* $Id: libxml.c,v 1.77 2009/03/26 22:16:48 felipe Exp $ */
#define IS_EXT_MODULE
@@ -850,7 +850,6 @@
int php_libxml_register_export(zend_class_entry *ce, php_libxml_export_node
export_function)
{
php_libxml_func_handler export_hnd;
- TSRMLS_FETCH();
/* Initialize in case this module hasnt been loaded yet */
php_libxml_initialize();
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.262&r2=1.263&diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.262 php-src/ext/soap/soap.c:1.263
--- php-src/ext/soap/soap.c:1.262 Thu Mar 26 20:02:12 2009
+++ php-src/ext/soap/soap.c Thu Mar 26 22:16:48 2009
@@ -17,7 +17,7 @@
| Dmitry Stogov <[email protected]> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.262 2009/03/26 20:02:12 felipe Exp $ */
+/* $Id: soap.c,v 1.263 2009/03/26 22:16:48 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1373,7 +1373,7 @@
if (Z_TYPE_PP(tmp) != IS_ARRAY) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Wrong
'typemap' option");
- return;
+ return NULL;
}
ht2 = Z_ARRVAL_PP(tmp);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.695&r2=1.696&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.695 php-src/ext/standard/string.c:1.696
--- php-src/ext/standard/string.c:1.695 Thu Mar 26 20:02:29 2009
+++ php-src/ext/standard/string.c Thu Mar 26 22:16:48 2009
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.695 2009/03/26 20:02:29 felipe Exp $ */
+/* $Id: string.c,v 1.696 2009/03/26 22:16:48 felipe Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -3643,7 +3643,6 @@
UChar buf[2];
int buf_len;
long num;
- char temp[2];
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &num) ==
FAILURE) {
return;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.c?r1=1.100&r2=1.101&diff_format=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.100
php-src/ext/standard/var_unserializer.c:1.101
--- php-src/ext/standard/var_unserializer.c:1.100 Thu Mar 26 20:02:29 2009
+++ php-src/ext/standard/var_unserializer.c Thu Mar 26 22:16:48 2009
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Thu Mar 26 15:18:13 2009 */
+/* Generated by re2c 0.13.6.dev on Thu Mar 26 19:10:33 2009 */
#line 1 "ext/standard/var_unserializer.re"
/*
+----------------------------------------------------------------------+
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var_unserializer.c,v 1.100 2009/03/26 20:02:29 felipe Exp $ */
+/* $Id: var_unserializer.c,v 1.101 2009/03/26 22:16:48 felipe Exp $ */
#include "php.h"
#include "ext/standard/php_var.h"
@@ -609,7 +609,7 @@
++YYCURSOR;
#line 693 "ext/standard/var_unserializer.re"
{
- size_t len, len2, len3, maxlen;
+ size_t len, len2, maxlen;
long elements;
zstr class_name;
zend_class_entry *ce;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.re?r1=1.78&r2=1.79&diff_format=u
Index: php-src/ext/standard/var_unserializer.re
diff -u php-src/ext/standard/var_unserializer.re:1.78
php-src/ext/standard/var_unserializer.re:1.79
--- php-src/ext/standard/var_unserializer.re:1.78 Thu Mar 26 20:02:29 2009
+++ php-src/ext/standard/var_unserializer.re Thu Mar 26 22:16:48 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var_unserializer.re,v 1.78 2009/03/26 20:02:29 felipe Exp $ */
+/* $Id: var_unserializer.re,v 1.79 2009/03/26 22:16:48 felipe Exp $ */
#include "php.h"
#include "ext/standard/php_var.h"
@@ -691,7 +691,7 @@
}
object ":" uiv ":" ["] {
- size_t len, len2, len3, maxlen;
+ size_t len, len2, maxlen;
long elements;
zstr class_name;
zend_class_entry *ce;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
