From: Marcus Boerger <helly@php.net>
Date: Mon, 8 Mar 2004 21:17:39 +0000 (+0000)
Subject: Rename hasMore() to valid() as discussed. (Part V)
X-Git-Tag: RELEASE_0_2_0~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7dd5b1f126356ba8f47fcc859939b59f49b08ad9;p=php

Rename hasMore() to valid() as discussed. (Part V)
---

diff --git a/ext/com_dotnet/com_iterator.c b/ext/com_dotnet/com_iterator.c
index 945eea1ea5..4569023221 100644
--- a/ext/com_dotnet/com_iterator.c
+++ b/ext/com_dotnet/com_iterator.c
@@ -52,7 +52,7 @@ static void com_iter_dtor(zend_object_iterator *iter TSRMLS_DC)
 	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 int com_iter_move_forwards(zend_object_iterator *iter TSRMLS_DC)
 
 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,
diff --git a/ext/com_dotnet/com_saproxy.c b/ext/com_dotnet/com_saproxy.c
index 78e9f622ed..596a8e359c 100644
--- a/ext/com_dotnet/com_saproxy.c
+++ b/ext/com_dotnet/com_saproxy.c
@@ -331,7 +331,7 @@ static void saproxy_iter_dtor(zend_object_iterator *iter TSRMLS_DC)
 	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 int saproxy_iter_move_forwards(zend_object_iterator *iter TSRMLS_DC)
 
 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,