helly           Mon Jan 26 18:59:50 2004 EDT

  Modified files:              
    /php-src/ext/spl    spl_iterators.c 
  Log:
  Must use zval* here
  
http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.16&r2=1.17&ty=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.16 php-src/ext/spl/spl_iterators.c:1.17
--- php-src/ext/spl/spl_iterators.c:1.16        Mon Jan 26 17:30:24 2004
+++ php-src/ext/spl/spl_iterators.c     Mon Jan 26 18:59:50 2004
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: spl_iterators.c,v 1.16 2004/01/26 22:30:24 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.17 2004/01/26 23:59:50 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -865,7 +865,7 @@
 
 static INLINE void spl_limit_it_seek(spl_dual_it_object *intern, long pos TSRMLS_DC)
 {
-       zval  zpos;
+       zval  *zpos;
 
        spl_dual_it_free(intern TSRMLS_CC);
        if (pos < intern->u.limit.offset) {
@@ -877,9 +877,10 @@
                return;
        }
        if (instanceof_function(intern->inner.ce, spl_ce_SeekableIterator TSRMLS_CC)) {
-               INIT_PZVAL(&zpos);
-               ZVAL_LONG(&zpos, pos);
-               zend_call_method_with_1_params(&intern->inner.zobject, 
intern->inner.ce, NULL, "seek", NULL, &zpos);
+               MAKE_STD_ZVAL(zpos);
+               ZVAL_LONG(zpos, pos);
+               zend_call_method_with_1_params(&intern->inner.zobject, 
intern->inner.ce, NULL, "seek", NULL, zpos);
+               zval_ptr_dtor(&zpos);
                spl_dual_it_free(intern TSRMLS_CC);
                zend_user_it_free_current(intern->inner.iterator TSRMLS_CC);
                spl_dual_it_fetch(intern, 1 TSRMLS_CC);

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

Reply via email to