CLI: make variable n_requested_db_uuid file scope.

[notmuch-old] / notmuch-reply.c

diff --git a/notmuch-reply.c b/notmuch-reply.c
index 700f33978a14f1328a95e0dbbcf7c17d7bf7aa01..5d5f95a333d287c633c86a3dd846e0a5047c64c1 100644 (file)
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -639,7 +639,9 @@ do_reply (notmuch_database_t *notmuch,
            return 1;
 
        if (count != 1) {
-           fprintf (stderr, "Error: search term did not match precisely one message (matched %u messages).\n", count);
+           fprintf (stderr,
+                    "Error: search term did not match precisely one message (matched %u messages).\n",
+                    count);
            return 1;
        }
 
@@ -703,7 +705,7 @@ do_reply (notmuch_database_t *notmuch,
 }
 
 int
-notmuch_reply_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch, int argc, char *argv[])
+notmuch_reply_command (notmuch_database_t *notmuch, int argc, char *argv[])
 {
     notmuch_query_t *query;
     char *query_string;
@@ -741,7 +743,7 @@ notmuch_reply_command (unused(notmuch_config_t *config), notmuch_database_t *not
     if (opt_index < 0)
        return EXIT_FAILURE;
 
-    notmuch_process_shared_options (argv[0]);
+    notmuch_process_shared_options (notmuch, argv[0]);
 
     notmuch_exit_if_unsupported_format ();
 
@@ -756,8 +758,6 @@ notmuch_reply_command (unused(notmuch_config_t *config), notmuch_database_t *not
        return EXIT_FAILURE;
     }
 
-    notmuch_exit_if_unmatched_db_uuid (notmuch);
-
     query = notmuch_query_create (notmuch, query_string);
     if (query == NULL) {
        fprintf (stderr, "Out of memory\n");