[PHP-CVS] cvs: php-src /ext/spl spl_array.c

[Marcus Boerger]

helly           Mon Feb  6 01:49:13 2006 UTC

  Modified files:              
    /php-src/ext/spl    spl_array.c 
  Log:
  - WS
  - current() doesn't return anything
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_array.c?r1=1.94&r2=1.95&diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.94 php-src/ext/spl/spl_array.c:1.95
--- php-src/ext/spl/spl_array.c:1.94    Mon Feb  6 01:42:37 2006
+++ php-src/ext/spl/spl_array.c Mon Feb  6 01:49:13 2006
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: spl_array.c,v 1.94 2006/02/06 01:42:37 helly Exp $ */
+/* $Id: spl_array.c,v 1.95 2006/02/06 01:49:13 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -712,8 +712,8 @@
        spl_array_object   *object   = iterator->object;
        HashTable          *aht      = spl_array_get_hash_table(object, 0 
TSRMLS_CC);
 
-       if (object->ar_flags & SPL_ARRAY_OVERLOADED_CURRENT)    {
-               return zend_user_it_get_current_data(iter, data TSRMLS_CC);
+       if (object->ar_flags & SPL_ARRAY_OVERLOADED_CURRENT) {
+               zend_user_it_get_current_data(iter, data TSRMLS_CC);
        } else {
                if (zend_hash_get_current_data_ex(aht, (void**)data, 
&object->pos) == FAILURE) {
                        *data = NULL;
@@ -728,7 +728,7 @@
        spl_array_object   *object   = iterator->object;
        HashTable          *aht      = spl_array_get_hash_table(object, 0 
TSRMLS_CC);
 
-       if (object->ar_flags & SPL_ARRAY_OVERLOADED_KEY)        {
+       if (object->ar_flags & SPL_ARRAY_OVERLOADED_KEY) {
                return zend_user_it_get_current_key(iter, str_key, str_key_len, 
int_key TSRMLS_CC);
        } else {
                if (!aht) {
@@ -752,7 +752,7 @@
        spl_array_object   *object   = iterator->object;
        HashTable          *aht      = spl_array_get_hash_table(object, 0 
TSRMLS_CC);
 
-       if (object->ar_flags & SPL_ARRAY_OVERLOADED_NEXT)       {
+       if (object->ar_flags & SPL_ARRAY_OVERLOADED_NEXT) {
                zend_user_it_move_forward(iter TSRMLS_CC);
        } else {
                if (!aht) {
@@ -788,7 +788,7 @@
        spl_array_it       *iterator = (spl_array_it *)iter;
        spl_array_object   *object   = iterator->object;
 
-       if (object->ar_flags & SPL_ARRAY_OVERLOADED_REWIND)     {
+       if (object->ar_flags & SPL_ARRAY_OVERLOADED_REWIND) {
                zend_user_it_rewind(iter TSRMLS_CC);
        } else {
                spl_array_rewind(object TSRMLS_CC);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php