lib: Rename iterator functions to prepare for reverse iteration.

[notmuch] / lib / database.cc

diff --git a/lib/database.cc b/lib/database.cc
index 2b5b64dffd9bf0499a0ca70534eba115366610b3..88c85ed49494c1f23eb7737c0f2daef0e109cc17 100644 (file)
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -751,8 +751,8 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,
        total = notmuch_query_count_messages (query);
 
        for (messages = notmuch_query_search_messages (query);
-            notmuch_messages_has_more (messages);
-            notmuch_messages_advance (messages))
+            notmuch_messages_valid (messages);
+            notmuch_messages_move_to_next (messages))
        {
            if (do_progress_notify) {
                progress_notify (closure, (double) count / total);
@@ -827,8 +827,8 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,
        char *filename;
 
        for (messages = notmuch_query_search_messages (query);
-            notmuch_messages_has_more (messages);
-            notmuch_messages_advance (messages))
+            notmuch_messages_valid (messages);
+            notmuch_messages_move_to_next (messages))
        {
            if (do_progress_notify) {
                progress_notify (closure, (double) count / total);