[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-cvs
Subject:    [PHP-CVS] cvs: php-src(PHP_5_0) /ext/spl spl_iterators.c
From:       "Marcus Boerger" <helly () php ! net>
Date:       2004-10-30 19:22:00
Message-ID: cvshelly1099164120 () cvsserver
[Download RAW message or body]

helly		Sat Oct 30 15:22:00 2004 EDT

  Modified files:              (Branch: PHP_5_0)
    /php-src/ext/spl	spl_iterators.c 
  Log:
  MFH
  
http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.38.2.2&r2=1.38.2.3&ty=u
                
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.38.2.2 \
                php-src/ext/spl/spl_iterators.c:1.38.2.3
--- php-src/ext/spl/spl_iterators.c:1.38.2.2	Sat Oct 30 06:46:24 2004
+++ php-src/ext/spl/spl_iterators.c	Sat Oct 30 15:21:59 2004
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: spl_iterators.c,v 1.38.2.2 2004/10/30 10:46:24 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.38.2.3 2004/10/30 19:21:59 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -489,18 +489,19 @@
 }
 #endif
 
-static union _zend_function *spl_dual_it_get_method(zval *object, char *method, int \
method_len TSRMLS_DC) +static union _zend_function *spl_dual_it_get_method(zval \
**object_ptr, char *method, int method_len TSRMLS_DC)  {
 	union _zend_function *function_handler;
 	spl_dual_it_object   *intern;
 
-	intern = (spl_dual_it_object*)zend_object_store_get_object(object TSRMLS_CC);
+	intern = (spl_dual_it_object*)zend_object_store_get_object(*object_ptr TSRMLS_CC);
 
-	function_handler = std_object_handlers.get_method(object, method, method_len \
TSRMLS_CC); +	function_handler = std_object_handlers.get_method(object_ptr, method, \
method_len TSRMLS_CC);  if (!function_handler) {
 		if (zend_hash_find(&intern->inner.ce->function_table, method, method_len+1, (void \
**) &function_handler) == FAILURE) {  if \
                (Z_OBJ_HT_P(intern->inner.zobject)->get_method) {
-				function_handler = \
Z_OBJ_HT_P(intern->inner.zobject)->get_method(intern->inner.zobject, method, \
method_len TSRMLS_CC); +				*object_ptr = intern->inner.zobject;
+				function_handler = Z_OBJ_HT_P(*object_ptr)->get_method(object_ptr, method, \
method_len TSRMLS_CC);  }
 		}
 	}
@@ -609,7 +610,7 @@
 	return intern;
 }
 
-/* {{{ proto FilterIterator::__construct(Iterator $it) 
+/* {{{ proto FilterIterator::__construct(Iterator it) 
    Create an Iterator from another iterator */
 SPL_METHOD(dual_it, __construct)
 {

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


[prev in list] [next in list] [prev in thread] [next in thread]