]> granicus.if.org Git - php/commitdiff
MFH:- Removed unnecessary TSRMLS_FETCH() calls
authorJani Taskinen <jani@php.net>
Mon, 11 May 2009 08:31:15 +0000 (08:31 +0000)
committerJani Taskinen <jani@php.net>
Mon, 11 May 2009 08:31:15 +0000 (08:31 +0000)
Zend/zend_operators.c

index 167a2a3f196c9342f22e9a94e389637981a4288f..7b4919713fffa9caf32b3c951f4f852cf8825588 100644 (file)
@@ -624,12 +624,8 @@ static void convert_scalar_to_array(zval *op, int type TSRMLS_DC) /* {{{ */
                        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 @@ ZEND_API void convert_to_object(zval *op) /* {{{ */
                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;