diff options
| author | Marcus Boerger <helly@php.net> | 2004-03-08 18:05:41 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2004-03-08 18:05:41 +0000 |
| commit | 6b0f57ee5022fd3062c594cd145da363dc723590 (patch) | |
| tree | 88668d12fcf14d9ef4c8f75048402b20b587d728 /Zend/zend_interfaces.c | |
| parent | b6b7c9eb6521f75955e285036e901a6b11ec86b5 (diff) | |
| download | php-git-6b0f57ee5022fd3062c594cd145da363dc723590.tar.gz | |
Rename hasMore() to valid() as discussed. (Part II)
Diffstat (limited to 'Zend/zend_interfaces.c')
| -rwxr-xr-x | Zend/zend_interfaces.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c index 3b58a6ff2b..96e994cc2f 100755 --- a/Zend/zend_interfaces.c +++ b/Zend/zend_interfaces.c @@ -134,8 +134,8 @@ static void zend_user_it_dtor(zend_object_iterator *_iter TSRMLS_DC) } /* }}} */ -/* {{{ zend_user_it_has_more */ -static int zend_user_it_has_more(zend_object_iterator *_iter TSRMLS_DC) +/* {{{ zend_user_it_valid */ +static int zend_user_it_valid(zend_object_iterator *_iter TSRMLS_DC) { if (_iter) { zend_user_iterator *iter = (zend_user_iterator*)_iter; @@ -143,7 +143,7 @@ static int zend_user_it_has_more(zend_object_iterator *_iter TSRMLS_DC) zval *more; int result; - zend_call_method_with_0_params(&object, iter->ce, &iter->ce->iterator_funcs.zf_has_more, "valid", &more); + zend_call_method_with_0_params(&object, iter->ce, &iter->ce->iterator_funcs.zf_valid, "valid", &more); if (more) { result = i_zend_is_true(more); zval_ptr_dtor(&more); @@ -245,7 +245,7 @@ static void zend_user_it_rewind(zend_object_iterator *_iter TSRMLS_DC) zend_object_iterator_funcs zend_interface_iterator_funcs_iterator = { zend_user_it_dtor, - zend_user_it_has_more, + zend_user_it_valid, zend_user_it_get_current_data, zend_user_it_get_current_key, zend_user_it_move_forward, @@ -339,7 +339,7 @@ static int zend_implement_iterator(zend_class_entry *interface, zend_class_entry } } class_type->get_iterator = zend_user_it_get_iterator; - class_type->iterator_funcs.zf_has_more = NULL; + class_type->iterator_funcs.zf_valid = NULL; class_type->iterator_funcs.zf_current = NULL; class_type->iterator_funcs.zf_key = NULL; class_type->iterator_funcs.zf_next = NULL; |