cvs: ZendEngine2 / zend_operators.c

jani		Mon May 11 08:31:04 2009 UTC

  Modified files:              
    /ZendEngine2	zend_operators.c 
  Log:
  - Removed unnecessary TSRMLS_FETCH() calls
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_operators.c?r1=1.307&r2=1.308&diff_format=u
Index: ZendEngine2/zend_operators.c
diff -u ZendEngine2/zend_operators.c:1.307 ZendEngine2/zend_operators.c:1.308
--- ZendEngine2/zend_operators.c:1.307	Mon May 11 07:51:43 2009
+++ ZendEngine2/zend_operators.c	Mon May 11 08:31:03 2009
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_operators.c,v 1.307 2009/05/11 07:51:43 jani Exp $ */
+/* $Id: zend_operators.c,v 1.308 2009/05/11 08:31:03 jani Exp $ */
 
 #include <ctype.h>
 
@@ -1001,7 +1001,6 @@
 			break;
 		case IS_RESOURCE: {
 			long tmp = Z_LVAL_P(op);
-			TSRMLS_FETCH();
 
 			zend_list_delete(Z_LVAL_P(op));
 			Z_STRLEN_P(op) = zend_spprintf(&Z_STRVAL_P(op), 0, "Resource id #%ld", tmp);
@@ -1013,7 +1012,6 @@
 			Z_STRLEN_P(op) = zend_spprintf(&Z_STRVAL_P(op), 0, "%ld", lval);
 			break;
 		case IS_DOUBLE: {
-			TSRMLS_FETCH();
 			dval = Z_DVAL_P(op);
 			Z_STRLEN_P(op) = zend_spprintf(&Z_STRVAL_P(op), 0, "%.*G", (int) EG(precision), dval);
 			/* %G already handles removing trailing zeros from the fractional part, yay */
@@ -1028,7 +1026,6 @@
 			return FAILURE;
 		case IS_OBJECT: {
 			int retval = FAILURE;
-			TSRMLS_FETCH();
 
 			convert_object_to_type(op, IS_STRING, convert_to_string);
 
@@ -1070,12 +1067,8 @@
 			Z_TYPE_P(op) = IS_ARRAY;
 			break;
 		case IS_OBJECT:
-			{
-				/* OBJECTS_OPTIMIZE */
-				TSRMLS_FETCH();
-				object_init(op);
-				zend_hash_update(Z_OBJPROP_P(op), "scalar", sizeof("scalar"), (void *) &entry, sizeof(zval *), NULL);
-			}
+			object_init(op);
+			zend_hash_update(Z_OBJPROP_P(op), "scalar", sizeof("scalar"), (void *) &entry, sizeof(zval *), NULL);
 			break;
 	}
 
@@ -1146,13 +1139,8 @@
 		case IS_OBJECT:
 			break;
 		case IS_NULL:
-			{
-				/* OBJECTS_OPTIMIZE */
-				TSRMLS_FETCH();
-
-				object_init(op);
-				break;
-			}
+			object_init(op);
+			break;
 		default:
 			return convert_scalar_to_array(op, IS_OBJECT TSRMLS_CC);
 	}