X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-dump.c;h=7e7bc177ed4995a00c993b773a6630e39a97473c;hp=fc06f3f9a5625581432a4d3956b6cdcc8da411ec;hb=bf159bd829efb6aa73c68542949eb11d9a44d93c;hpb=637f99d8f3f45867d0a856503f9f302333824c07

diff --git a/notmuch-dump.c b/notmuch-dump.c
index fc06f3f9..7e7bc177 100644
--- a/notmuch-dump.c
+++ b/notmuch-dump.c
@@ -58,9 +58,9 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
 	output = stdout;
     }
 
-    for (messages = notmuch_query_search_messages (query, 0, -1);
-	 notmuch_messages_has_more (messages);
-	 notmuch_messages_advance (messages))
+    for (messages = notmuch_query_search_messages (query);
+	 notmuch_messages_valid (messages);
+	 notmuch_messages_move_to_next (messages))
     {
 	int first = 1;
 	message = notmuch_messages_get (messages);
@@ -69,8 +69,8 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
 		 "%s (", notmuch_message_get_message_id (message));
 
 	for (tags = notmuch_message_get_tags (message);
-	     notmuch_tags_has_more (tags);
-	     notmuch_tags_advance (tags))
+	     notmuch_tags_valid (tags);
+	     notmuch_tags_move_to_next (tags))
 	{
 	    if (! first)
 		fprintf (output, " ");