devel/check-out-of-tree-build.sh: consistent naming, consistent quoting

[notmuch] / notmuch-dump.c

diff --git a/notmuch-dump.c b/notmuch-dump.c
index 0cbcdc16695c3686ff6d1058da913be336a8ad63..03e64d608c85722ffe9c13bb3fb7bae33e82b822 100644 (file)
--- a/notmuch-dump.c
+++ b/notmuch-dump.c
@@ -84,7 +84,7 @@ print_dump_header (gzFile output, int output_format, int include)
        sep = ",";
     }
     if (include & DUMP_INCLUDE_TAGS) {
-       gzprintf (output, "%sproperties", sep);
+       gzprintf (output, "%stags", sep);
     }
     gzputs (output, "\n");
 }
@@ -250,7 +250,8 @@ database_dump_file (notmuch_database_t *notmuch, gzFile output,
 
        message = notmuch_messages_get (messages);
 
-       if (dump_tags_message (notmuch, message, output_format, output,
+       if ((include & DUMP_INCLUDE_TAGS) &&
+           dump_tags_message (notmuch, message, output_format, output,
                               &buffer, &buffer_size))
            return EXIT_FAILURE;
 
@@ -368,7 +369,7 @@ notmuch_dump_command (notmuch_config_t *config, int argc, char *argv[])
 
     notmuch_exit_if_unmatched_db_uuid (notmuch);
 
-    char *output_file_name = NULL;
+    const char *output_file_name = NULL;
     int opt_index;
 
     int output_format = DUMP_FORMAT_BATCH_TAG;
@@ -376,18 +377,18 @@ notmuch_dump_command (notmuch_config_t *config, int argc, char *argv[])
     notmuch_bool_t gzip_output = 0;
 
     notmuch_opt_desc_t options[] = {
-       { NOTMUCH_OPT_KEYWORD, &output_format, "format", 'f',
+       { .opt_keyword = &output_format, .name = "format", .keywords =
          (notmuch_keyword_t []){ { "sup", DUMP_FORMAT_SUP },
                                  { "batch-tag", DUMP_FORMAT_BATCH_TAG },
                                  { 0, 0 } } },
-       { NOTMUCH_OPT_KEYWORD_FLAGS, &include, "include", 'I',
+       { .opt_flags = &include, .name = "include", .keywords =
          (notmuch_keyword_t []){ { "config", DUMP_INCLUDE_CONFIG },
                                  { "properties", DUMP_INCLUDE_PROPERTIES },
                                  { "tags", DUMP_INCLUDE_TAGS} } },
-       { NOTMUCH_OPT_STRING, &output_file_name, "output", 'o', 0  },
-       { NOTMUCH_OPT_BOOLEAN, &gzip_output, "gzip", 'z', 0 },
-       { NOTMUCH_OPT_INHERIT, (void *) &notmuch_shared_options, NULL, 0, 0 },
-       { 0, 0, 0, 0, 0 }
+       { .opt_string = &output_file_name, .name = "output" },
+       { .opt_bool = &gzip_output, .name = "gzip" },
+       { .opt_inherit = notmuch_shared_options },
+       { }
     };
 
     opt_index = parse_arguments (argc, argv, options, 1);