diff options
| author | Jani Taskinen <jani@php.net> | 2009-05-11 08:31:15 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2009-05-11 08:31:15 +0000 |
| commit | 2a31dbbadfb90317737e9b0d4d606e75b26e0ebd (patch) | |
| tree | 59c19a88fc29283c64501081d69d55c981ce2ca1 /Zend/zend_operators.c | |
| parent | daae8fb6fc38a20c55398e53ea68335fd182b664 (diff) | |
| download | php-git-2a31dbbadfb90317737e9b0d4d606e75b26e0ebd.tar.gz | |
MFH:- Removed unnecessary TSRMLS_FETCH() calls
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 167a2a3f19..7b4919713f 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -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; |