TODO: Note that '=' should sometimes count from the end of the buffer.

[notmuch] / notmuch-tag.c

diff --git a/notmuch-tag.c b/notmuch-tag.c
index 07cb8c5f21b53df36452b3fc14415b63f2f0b075..8b6f7dc081f4dcd79cba27539ccc0dca9fdfc246 100644 (file)
--- 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);