diff options
| author | Felipe Pena <felipe@php.net> | 2008-08-15 19:47:33 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2008-08-15 19:47:33 +0000 |
| commit | 85ab4235655b1feef3afe0b64a73e41f670743fd (patch) | |
| tree | f922fdc60d0536312c1a269d390c82996180e1d4 /Zend/zend_operators.c | |
| parent | 5bf4d72487224624f4fdb523fda351259fe5d469 (diff) | |
| download | php-git-85ab4235655b1feef3afe0b64a73e41f670743fd.tar.gz | |
- MFH: Removed some TSRMLS_FETCH()s
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 5332b17bae..b050a8d94d 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -1358,7 +1358,7 @@ ZEND_API int numeric_compare_function(zval *result, zval *op1, zval *op2 TSRMLS_ } -static inline void zend_free_obj_get_result(zval *op) +static inline void zend_free_obj_get_result(zval *op TSRMLS_DC) { if (Z_REFCOUNT_P(op) == 0) { GC_REMOVE_ZVAL_FROM_BUFFER(op); @@ -1455,18 +1455,18 @@ ZEND_API int compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) if (Z_OBJ_HT_P(op1)->get) { op_free = Z_OBJ_HT_P(op1)->get(op1 TSRMLS_CC); ret = compare_function(result, op_free, op2 TSRMLS_CC); - zend_free_obj_get_result(op_free); + zend_free_obj_get_result(op_free TSRMLS_CC); return ret; } else if (Z_TYPE_P(op2) != IS_OBJECT && Z_OBJ_HT_P(op1)->cast_object) { ALLOC_INIT_ZVAL(op_free); if (Z_OBJ_HT_P(op1)->cast_object(op1, op_free, Z_TYPE_P(op2) TSRMLS_CC) == FAILURE) { ZVAL_LONG(result, 1); - zend_free_obj_get_result(op_free); + zend_free_obj_get_result(op_free TSRMLS_CC); return SUCCESS; } ret = compare_function(result, op_free, op2 TSRMLS_CC); - zend_free_obj_get_result(op_free); + zend_free_obj_get_result(op_free TSRMLS_CC); return ret; } } @@ -1474,18 +1474,18 @@ ZEND_API int compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) if (Z_OBJ_HT_P(op2)->get) { op_free = Z_OBJ_HT_P(op2)->get(op2 TSRMLS_CC); ret = compare_function(result, op1, op_free TSRMLS_CC); - zend_free_obj_get_result(op_free); + zend_free_obj_get_result(op_free TSRMLS_CC); return ret; } else if (Z_TYPE_P(op1) != IS_OBJECT && Z_OBJ_HT_P(op2)->cast_object) { ALLOC_INIT_ZVAL(op_free); if (Z_OBJ_HT_P(op2)->cast_object(op2, op_free, Z_TYPE_P(op1) TSRMLS_CC) == FAILURE) { ZVAL_LONG(result, -1); - zend_free_obj_get_result(op_free); + zend_free_obj_get_result(op_free TSRMLS_CC); return SUCCESS; } ret = compare_function(result, op1, op_free TSRMLS_CC); - zend_free_obj_get_result(op_free); + zend_free_obj_get_result(op_free TSRMLS_CC); return ret; } } |