X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=notmuch-tag.c;h=aa8860326a9a69eb4e77d97d294aed715d4dab99;hb=d447b694b498c3e18a22f1eb15139a798c6aab26;hp=9c3d4f8b040d9ea87d9b0de7f5fb0d9c6a89ef4e;hpb=eef21c284742fa5ae14d7d352acc3a4dc98821ce;p=notmuch

diff --git a/notmuch-tag.c b/notmuch-tag.c
index 9c3d4f8b..aa886032 100644
--- a/notmuch-tag.c
+++ b/notmuch-tag.c
@@ -27,7 +27,7 @@ static volatile sig_atomic_t interrupted;
 static void
 handle_sigint (unused (int sig))
 {
-    static char msg[] = "Stopping...         \n";
+    static const char msg[] = "Stopping...         \n";
 
     /* This write is "opportunistic", so it's okay to ignore the
      * result.  It is not required for correctness, and if it does
@@ -187,8 +187,7 @@ tag_file (void *ctx, notmuch_database_t *notmuch, tag_op_flag_t flags,
 }
 
 int
-notmuch_tag_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch,
-		     int argc, char *argv[])
+notmuch_tag_command (notmuch_database_t *notmuch, int argc, char *argv[])
 {
     tag_op_list_t *tag_ops = NULL;
     char *query_string = NULL;
@@ -221,7 +220,7 @@ notmuch_tag_command (unused(notmuch_config_t *config), notmuch_database_t *notmu
     if (opt_index < 0)
 	return EXIT_FAILURE;
 
-    notmuch_process_shared_options (argv[0]);
+    notmuch_process_shared_options (notmuch, argv[0]);
 
     if (input_file_name) {
 	batch = true;
@@ -262,8 +261,6 @@ notmuch_tag_command (unused(notmuch_config_t *config), notmuch_database_t *notmu
 	}
     }
 
-    notmuch_exit_if_unmatched_db_uuid (notmuch);
-
     if (print_status_database (
 	    "notmuch restore",
 	    notmuch,