cvs: php-src /ext/spl spl_iterators.c

helly Sun Jan 1 19:57:27 2006 UTC Modified files: /php-src/ext/spl spl_iterators.c Log: - MFB http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_iterators.c?r1=1.106&r2=1.107&diff_format=u Index: php-src/ext/spl/spl_iterators.c diff -u php-src/ext/spl/spl_iterators.c:1.106 php-src/ext/spl/spl_iterators.c:1.107 --- php-src/ext/spl/spl_iterators.c:1.106 Sun Jan 1 13:09:54 2006 +++ php-src/ext/spl/spl_iterators.c Sun Jan 1 19:57:27 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_iterators.c,v 1.106 2006/01/01 13:09:54 sniper Exp $ */ +/* $Id: spl_iterators.c,v 1.107 2006/01/01 19:57:27 helly Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -2370,27 +2370,33 @@ iter = Z_OBJCE_P(obj)->get_iterator(Z_OBJCE_P(obj), obj TSRMLS_CC); - iter->funcs->rewind(iter TSRMLS_CC); + if (iter->funcs->rewind) { + iter->funcs->rewind(iter TSRMLS_CC); + } while (iter->funcs->valid(iter TSRMLS_CC) == SUCCESS) { - key_type = iter->funcs->get_current_key(iter, &str_key, &str_key_len, &int_key TSRMLS_CC); iter->funcs->get_current_data(iter, &data TSRMLS_CC); (*data)->refcount++; - switch(key_type) { - case HASH_KEY_IS_STRING: - add_assoc_zval_ex(return_value, str_key, str_key_len, *data); - efree(str_key); - break; - case HASH_KEY_IS_BINARY: - add_u_assoc_zval_ex(return_value, IS_BINARY, str_key, str_key_len, *data); - efree(str_key); - break; - case HASH_KEY_IS_UNICODE: - add_u_assoc_zval_ex(return_value, IS_UNICODE, str_key, str_key_len, *data); - efree(str_key); - break; - case HASH_KEY_IS_LONG: - add_index_zval(return_value, int_key, *data); - break; + if (iter->funcs->get_current_key) { + key_type = iter->funcs->get_current_key(iter, &str_key, &str_key_len, &int_key TSRMLS_CC); + switch(key_type) { + case HASH_KEY_IS_STRING: + add_assoc_zval_ex(return_value, str_key, str_key_len, *data); + efree(str_key); + break; + case HASH_KEY_IS_BINARY: + add_u_assoc_zval_ex(return_value, IS_BINARY, str_key, str_key_len, *data); + efree(str_key); + break; + case HASH_KEY_IS_UNICODE: + add_u_assoc_zval_ex(return_value, IS_UNICODE, str_key, str_key_len, *data); + efree(str_key); + break; + case HASH_KEY_IS_LONG: + add_index_zval(return_value, int_key, *data); + break; + } + } else { + add_next_index_zval(return_value, *data); } iter->funcs->move_forward(iter TSRMLS_CC); } @@ -2412,7 +2418,9 @@ iter = Z_OBJCE_P(obj)->get_iterator(Z_OBJCE_P(obj), obj TSRMLS_CC); - iter->funcs->rewind(iter TSRMLS_CC); + if (iter->funcs->rewind) { + iter->funcs->rewind(iter TSRMLS_CC); + } while (iter->funcs->valid(iter TSRMLS_CC) == SUCCESS) { count++; iter->funcs->move_forward(iter TSRMLS_CC);