X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-dump.c;h=7e7bc177ed4995a00c993b773a6630e39a97473c;hp=86570d09070d26474210f5c62f4481b3fd5e7f8c;hb=e2dd4ac00b9979de34bd517fa57de56260d38755;hpb=f379aa52845f5594aa6cc2e7cf131d5f57202bbf

diff --git a/notmuch-dump.c b/notmuch-dump.c
index 86570d09..7e7bc177 100644
--- a/notmuch-dump.c
+++ b/notmuch-dump.c
@@ -36,7 +36,7 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
 	return 1;
 
     notmuch = notmuch_database_open (notmuch_config_get_database_path (config),
-				     NOTMUCH_DATABASE_MODE_READONLY);
+				     NOTMUCH_DATABASE_MODE_READ_ONLY);
     if (notmuch == NULL)
 	return 1;
 
@@ -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, " ");