diff options
| author | Marcus Boerger <helly@php.net> | 2003-08-07 22:43:01 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2003-08-07 22:43:01 +0000 |
| commit | 0040355af86ed307114856d9d01f61ab2d40096a (patch) | |
| tree | d3d8276645c42daaeb7df07066b7999983b1d00d /ext/spl/spl_array.c | |
| parent | 47a80fee58c75464028a78c5a48c074cb22e8a71 (diff) | |
| download | php-git-0040355af86ed307114856d9d01f61ab2d40096a.tar.gz | |
- Reduce number of c-functions/macros involved in function invocation
- Unify names of remaining c-function/macro names
Diffstat (limited to 'ext/spl/spl_array.c')
| -rwxr-xr-x | ext/spl/spl_array.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c index a51dc734e9..bc82c66865 100755 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c @@ -66,7 +66,7 @@ int spl_fetch_dimension_address(znode *result, znode *op1, znode *op2, temp_vari zval *dim = spl_get_zval_ptr(op2, Ts, &EG(free_op2) TSRMLS_CC); zval *exists; - spl_begin_method_call_arg_ex1(obj, obj_ce, NULL, "exists", sizeof("exists")-1, &exists, dim); + spl_call_method_1(obj, obj_ce, NULL, "exists", sizeof("exists")-1, &exists, dim); if (!i_zend_is_true(exists)) { if (type == BP_VAR_R || type == BP_VAR_RW) { SEPARATE_ZVAL(&dim); @@ -85,7 +85,7 @@ int spl_fetch_dimension_address(znode *result, znode *op1, znode *op2, temp_vari } DELETE_RET_ZVAL(exists); if (type == BP_VAR_R || type == BP_VAR_IS) { - spl_begin_method_call_arg_ex1(obj, obj_ce, NULL, "get", sizeof("get")-1, retval, dim); + spl_call_method_1(obj, obj_ce, NULL, "get", sizeof("get")-1, retval, dim); } FREE_OP(Ts, op2, EG(free_op2)); return 0; @@ -210,7 +210,7 @@ ZEND_EXECUTE_HOOK_FUNCTION(ZEND_ASSIGN_DIM) value->refcount = 0; } - spl_begin_method_call_arg_ex2(obj, obj_ce, NULL, "set", sizeof("set")-1, &retval, index, value); + spl_call_method_2(obj, obj_ce, NULL, "set", sizeof("set")-1, &retval, index, value); if (index == &tmp) { zval_dtor(index); @@ -284,7 +284,7 @@ ZEND_EXECUTE_HOOK_FUNCTION(ZEND_UNSET_DIM_OBJ) break; } - spl_begin_method_call_arg_ex1(obj, obj_ce, NULL, "del", sizeof("del")-1, &retval, index); + spl_call_method_1(obj, obj_ce, NULL, "del", sizeof("del")-1, &retval, index); if (index == &tmp) { zval_dtor(index); |