X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-tag.c;h=8b6f7dc081f4dcd79cba27539ccc0dca9fdfc246;hp=07cb8c5f21b53df36452b3fc14415b63f2f0b075;hb=e2dd4ac00b9979de34bd517fa57de56260d38755;hpb=c1e16435cfe4471c3415d9f625f7230d59c8afb4

diff --git a/notmuch-tag.c b/notmuch-tag.c
index 07cb8c5f..8b6f7dc0 100644
--- a/notmuch-tag.c
+++ b/notmuch-tag.c
@@ -25,8 +25,10 @@ static volatile sig_atomic_t interrupted;
 static void
 handle_sigint (unused (int sig))
 {
+    ssize_t ignored;
+
     static char msg[] = "Stopping...         \n";
-    write(2, msg, sizeof(msg)-1);
+    ignored = write(2, msg, sizeof(msg)-1);
     interrupted = 1;
 }
 
@@ -106,8 +108,8 @@ notmuch_tag_command (void *ctx, unused (int argc), unused (char *argv[]))
     }
 
     for (messages = notmuch_query_search_messages (query);
-	 notmuch_messages_has_more (messages) && !interrupted;
-	 notmuch_messages_advance (messages))
+	 notmuch_messages_valid (messages) && !interrupted;
+	 notmuch_messages_move_to_next (messages))
     {
 	message = notmuch_messages_get (messages);