cli: add utility routine to print error status.

[notmuch] / notmuch-count.c

diff --git a/notmuch-count.c b/notmuch-count.c
index 182710a67b0e8f61867860c6c7ad0c807ce7fb84..07fa5f74f8820116e453f0992ebed6fcb82f04ad 100644 (file)
--- a/notmuch-count.c
+++ b/notmuch-count.c
@@ -25,7 +25,6 @@ enum {
     OUTPUT_THREADS,
     OUTPUT_MESSAGES,
     OUTPUT_FILES,
-    OUTPUT_LASTMOD,
 };
 
 /* The following is to allow future options to be added more easily */
@@ -118,7 +117,7 @@ count_file (notmuch_database_t *notmuch, FILE *input, const char **exclude_tags,
     size_t line_size;
     int ret = 0;
 
-    while (!ret && (line_len = getline (&line, &line_size, input)) != -1) {
+    while (! ret && (line_len = getline (&line, &line_size, input)) != -1) {
        chomp_newline (line);
        ret = print_count (notmuch, line, exclude_tags, exclude_tags_length,
                           output, print_lastmod);
@@ -151,7 +150,6 @@ notmuch_count_command (notmuch_config_t *config, int argc, char *argv[])
          (notmuch_keyword_t []){ { "threads", OUTPUT_THREADS },
                                  { "messages", OUTPUT_MESSAGES },
                                  { "files", OUTPUT_FILES },
-                                 { "modifications", OUTPUT_LASTMOD },
                                  { 0, 0 } } },
        { NOTMUCH_OPT_KEYWORD, &exclude, "exclude", 'x',
          (notmuch_keyword_t []){ { "true", EXCLUDE_TRUE },
@@ -189,7 +187,9 @@ notmuch_count_command (notmuch_config_t *config, int argc, char *argv[])
                               NOTMUCH_DATABASE_MODE_READ_ONLY, &notmuch))
        return EXIT_FAILURE;
 
-    query_str = query_string_from_args (config, argc-opt_index, argv+opt_index);
+    notmuch_exit_if_unmatched_db_uuid (notmuch);
+
+    query_str = query_string_from_args (config, argc - opt_index, argv + opt_index);
     if (query_str == NULL) {
        fprintf (stderr, "Out of memory.\n");
        return EXIT_FAILURE;