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 945eea1ea5739443a1316980c1ee31eb75206cb4..4569023221aa1ba74a60353cecc35247be0476e8 100644 (file)
--- 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 78e9f622ed5d086dc787406343253b43c401e56c..596a8e359cddfbc67a2007ff44629b822365eb55 100644 (file)
--- 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,