cvs: ZendEngine2(PHP_5_3) / zend_operators.c

jani		Mon May 11 08:31:16 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /ZendEngine2	zend_operators.c 
  Log:
  MFH:- Removed unnecessary TSRMLS_FETCH() calls
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_operators.c?r1=1.208.2.4.2.23.2.25&r2=1.208.2.4.2.23.2.26&diff_format=u
Index: ZendEngine2/zend_operators.c
diff -u ZendEngine2/zend_operators.c:1.208.2.4.2.23.2.25 ZendEngine2/zend_operators.c:1.208.2.4.2.23.2.26
--- ZendEngine2/zend_operators.c:1.208.2.4.2.23.2.25	Mon May 11 07:52:49 2009
+++ ZendEngine2/zend_operators.c	Mon May 11 08:31:15 2009
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_operators.c,v 1.208.2.4.2.23.2.25 2009/05/11 07:52:49 jani Exp $ */
+/* $Id: zend_operators.c,v 1.208.2.4.2.23.2.26 2009/05/11 08:31:15 jani Exp $ */
 
 #include <ctype.h>
 
@@ -624,12 +624,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;
 	}
 }
@@ -694,13 +690,8 @@
 		case IS_OBJECT:
 			break;
 		case IS_NULL:
-			{
-				/* OBJECTS_OPTIMIZE */
-				TSRMLS_FETCH();
-
-				object_init(op);
-				break;
-			}
+			object_init(op);
+			break;
 		default:
 			convert_scalar_to_array(op, IS_OBJECT TSRMLS_CC);
 			break;