[at-spi2-core: 7/47] Rename _atspi_dbus_return_accessible_from_iter to _atspi_dbus_consume_accessible

[Federico Mena Quintero <federico src gnome org>]

commit 399db82999ac50b8621ac8019b45e7da4d5160f6
Author: Federico Mena Quintero <federico gnome org>
Date:   Fri Jul 8 13:52:39 2022 -0500

    Rename _atspi_dbus_return_accessible_from_iter to _atspi_dbus_consume_accessible
    
    Makes it clear that the iter is being advanced, hopefully?

 atspi/atspi-accessible.c     |  2 +-
 atspi/atspi-collection.c     |  2 +-
 atspi/atspi-event-listener.c |  2 +-
 atspi/atspi-misc-private.h   |  2 +-
 atspi/atspi-misc.c           | 13 +++++++------
 atspi/atspi-relation.c       |  2 +-
 atspi/atspi-table-cell.c     |  2 +-
 7 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/atspi/atspi-accessible.c b/atspi/atspi-accessible.c
index 353c61f9..9c4725a4 100644
--- a/atspi/atspi-accessible.c
+++ b/atspi/atspi-accessible.c
@@ -424,7 +424,7 @@ atspi_accessible_get_parent (AtspiAccessible *obj, GError **error)
     dbus_message_iter_init (reply, &iter);
     dbus_message_iter_recurse (&iter, &iter_variant);
     g_clear_object (&obj->accessible_parent);
-    obj->accessible_parent = _atspi_dbus_return_accessible_from_iter (&iter_variant);
+    obj->accessible_parent = _atspi_dbus_consume_accessible (&iter_variant);
     dbus_message_unref (reply);
     _atspi_accessible_add_cache (obj, ATSPI_CACHE_PARENT);
   }
diff --git a/atspi/atspi-collection.c b/atspi/atspi-collection.c
index d4d15372..34fbbabe 100644
--- a/atspi/atspi-collection.c
+++ b/atspi/atspi-collection.c
@@ -91,7 +91,7 @@ return_accessibles (DBusMessage *message)
   while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID)
   {
     AtspiAccessible *accessible;
-    accessible = _atspi_dbus_return_accessible_from_iter (&iter_array);
+    accessible = _atspi_dbus_consume_accessible (&iter_array);
     ret = g_array_append_val (ret, accessible);
     /* Iter was moved already, so no need to call dbus_message_iter_next */
   }
diff --git a/atspi/atspi-event-listener.c b/atspi/atspi-event-listener.c
index d591115c..68eb921e 100644
--- a/atspi/atspi-event-listener.c
+++ b/atspi/atspi-event-listener.c
@@ -1139,7 +1139,7 @@ _atspi_dbus_handle_event (DBusConnection *bus, DBusMessage *message)
       else
       {
         AtspiAccessible *accessible;
-       accessible = _atspi_dbus_return_accessible_from_iter (&iter_variant);
+       accessible = _atspi_dbus_consume_accessible (&iter_variant);
         if (!strcmp (category, "ScreenReader"))
         {
           g_object_unref (e.source);
diff --git a/atspi/atspi-misc-private.h b/atspi/atspi-misc-private.h
index e76a1a94..b3040d5d 100644
--- a/atspi/atspi-misc-private.h
+++ b/atspi/atspi-misc-private.h
@@ -81,7 +81,7 @@ AtspiAccessible *
 _atspi_dbus_return_accessible_from_message (DBusMessage *message);
 
 AtspiAccessible *
-_atspi_dbus_return_accessible_from_iter (DBusMessageIter *iter);
+_atspi_dbus_consume_accessible (DBusMessageIter *iter);
 
 AtspiHyperlink *
 _atspi_dbus_return_hyperlink_from_message (DBusMessage *message);
diff --git a/atspi/atspi-misc.c b/atspi/atspi-misc.c
index 157d3406..18abfceb 100644
--- a/atspi/atspi-misc.c
+++ b/atspi/atspi-misc.c
@@ -436,7 +436,7 @@ add_accessible_from_iter (DBusMessageIter *iter)
   dbus_message_iter_recurse (iter, &iter_struct);
 
   /* get accessible */
-  accessible = _atspi_dbus_return_accessible_from_iter (&iter_struct);
+  accessible = _atspi_dbus_consume_accessible (&iter_struct);
   if (!accessible)
     return;
 
@@ -444,7 +444,7 @@ add_accessible_from_iter (DBusMessageIter *iter)
   dbus_message_iter_next (&iter_struct);
 
   /* get parent */
-  parent = _atspi_dbus_return_accessible_from_iter (&iter_struct);
+  parent = _atspi_dbus_consume_accessible (&iter_struct);
   if (accessible->accessible_parent)
     g_object_unref (accessible->accessible_parent);
   accessible->accessible_parent = parent;
@@ -486,7 +486,7 @@ add_accessible_from_iter (DBusMessageIter *iter)
     while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID)
     {
       AtspiAccessible *child;
-      child = _atspi_dbus_return_accessible_from_iter (&iter_array);
+      child = _atspi_dbus_consume_accessible (&iter_array);
       g_ptr_array_remove (accessible->children, child);
       g_ptr_array_add (accessible->children, child);
     }
@@ -659,7 +659,7 @@ _atspi_dbus_return_accessible_from_message (DBusMessage *message)
   if (!strcmp (signature, "(so)"))
   {
     dbus_message_iter_init (message, &iter);
-    retval =  _atspi_dbus_return_accessible_from_iter (&iter);
+    retval =  _atspi_dbus_consume_accessible (&iter);
   }
   else
   {
@@ -669,8 +669,9 @@ _atspi_dbus_return_accessible_from_message (DBusMessage *message)
   return retval;
 }
 
+/* Enters an iter which must be already pointing to a (so) and returns the accessible for it */
 AtspiAccessible *
-_atspi_dbus_return_accessible_from_iter (DBusMessageIter *iter)
+_atspi_dbus_consume_accessible (DBusMessageIter *iter)
 {
   const char *app_name, *path;
 
@@ -1249,7 +1250,7 @@ _atspi_dbus_get_property (gpointer obj, const char *interface, const char *name,
   }
   if (!strcmp (type, "(so)"))
   {
-    *((AtspiAccessible **)data) = _atspi_dbus_return_accessible_from_iter (&iter_variant);
+    *((AtspiAccessible **)data) = _atspi_dbus_consume_accessible (&iter_variant);
   }
   else
   {
diff --git a/atspi/atspi-relation.c b/atspi/atspi-relation.c
index c441f2bb..10063439 100644
--- a/atspi/atspi-relation.c
+++ b/atspi/atspi-relation.c
@@ -99,7 +99,7 @@ _atspi_relation_new_from_iter (DBusMessageIter *iter)
   while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID)
   {
     AtspiAccessible *accessible;
-    accessible = _atspi_dbus_return_accessible_from_iter (&iter_array);
+    accessible = _atspi_dbus_consume_accessible (&iter_array);
     relation->targets = g_array_append_val (relation->targets, accessible);
     /* Iter was moved already, so no need to call dbus_message_iter_next */
   }
diff --git a/atspi/atspi-table-cell.c b/atspi/atspi-table-cell.c
index 83fe534c..a33e0a89 100644
--- a/atspi/atspi-table-cell.c
+++ b/atspi/atspi-table-cell.c
@@ -46,7 +46,7 @@ get_object_array_and_unref (DBusMessage *reply)
   dbus_message_iter_recurse (&iter, &iter_array);
   while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID)
   {
-    AtspiAccessible *accessible = _atspi_dbus_return_accessible_from_iter (&iter_array);
+    AtspiAccessible *accessible = _atspi_dbus_consume_accessible (&iter_array);
     g_ptr_array_add (array, accessible);
   }
   dbus_message_unref (reply);