helly Mon Mar 8 16:17:41 2004 EDT
Modified files:
/php-src/ext/com_dotnet com_iterator.c com_saproxy.c
Log:
Rename hasMore() to valid() as discussed. (Part V)
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_iterator.c?r1=1.6&r2=1.7&ty=u
Index: php-src/ext/com_dotnet/com_iterator.c
diff -u php-src/ext/com_dotnet/com_iterator.c:1.6
php-src/ext/com_dotnet/com_iterator.c:1.7
--- php-src/ext/com_dotnet/com_iterator.c:1.6 Thu Feb 12 05:43:19 2004
+++ php-src/ext/com_dotnet/com_iterator.c Mon Mar 8 16:17:39 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_iterator.c,v 1.6 2004/02/12 10:43:19 zeev Exp $ */
+/* $Id: com_iterator.c,v 1.7 2004/03/08 21:17:39 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -52,7 +52,7 @@
efree(I);
}
-static int com_iter_has_more(zend_object_iterator *iter TSRMLS_DC)
+static int com_iter_valid(zend_object_iterator *iter TSRMLS_DC)
{
struct php_com_iterator *I = (struct php_com_iterator*)iter->data;
@@ -133,7 +133,7 @@
static zend_object_iterator_funcs com_iter_funcs = {
com_iter_dtor,
- com_iter_has_more,
+ com_iter_valid,
com_iter_get_data,
com_iter_get_key,
com_iter_move_forwards,
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_saproxy.c?r1=1.6&r2=1.7&ty=u
Index: php-src/ext/com_dotnet/com_saproxy.c
diff -u php-src/ext/com_dotnet/com_saproxy.c:1.6
php-src/ext/com_dotnet/com_saproxy.c:1.7
--- php-src/ext/com_dotnet/com_saproxy.c:1.6 Sun Feb 15 07:58:17 2004
+++ php-src/ext/com_dotnet/com_saproxy.c Mon Mar 8 16:17:39 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_saproxy.c,v 1.6 2004/02/15 12:58:17 zeev Exp $ */
+/* $Id: com_saproxy.c,v 1.7 2004/03/08 21:17:39 helly Exp $ */
/* This module implements a SafeArray proxy which is used internally
* by the engine when resolving multi-dimensional array accesses on
@@ -331,7 +331,7 @@
efree(I);
}
-static int saproxy_iter_has_more(zend_object_iterator *iter TSRMLS_DC)
+static int saproxy_iter_valid(zend_object_iterator *iter TSRMLS_DC)
{
php_com_saproxy_iter *I = (php_com_saproxy_iter*)iter->data;
@@ -396,7 +396,7 @@
static zend_object_iterator_funcs saproxy_iter_funcs = {
saproxy_iter_dtor,
- saproxy_iter_has_more,
+ saproxy_iter_valid,
saproxy_iter_get_data,
saproxy_iter_get_key,
saproxy_iter_move_forwards,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
