ret = EXIT_SUCCESS;
- DONE:
+ DONE:
if (list)
notmuch_config_list_destroy (list);
sep = ",";
}
if (include & DUMP_INCLUDE_TAGS) {
- gzprintf (output, "%sproperties", sep);
+ gzprintf (output, "%stags", sep);
}
gzputs (output, "\n");
}
{
const char *message_id;
notmuch_message_properties_t *list;
- notmuch_bool_t first = TRUE;
+ bool first = true;
message_id = notmuch_message_get_message_id (message);
return 0;
}
- for (list = notmuch_message_get_properties (message, "", FALSE);
+ for (list = notmuch_message_get_properties (message, "", false);
notmuch_message_properties_valid (list); notmuch_message_properties_move_to_next (list)) {
const char *key, *val;
return 1;
}
gzprintf (output, "#= %s", *buffer_p);
- first = FALSE;
+ first = false;
}
key = notmuch_message_properties_key (list);
if (include & DUMP_INCLUDE_CONFIG) {
if (print_status_database ("notmuch dump", notmuch,
- database_dump_config(notmuch,output)))
+ database_dump_config (notmuch, output)))
return EXIT_FAILURE;
}
*/
notmuch_query_set_sort (query, NOTMUCH_SORT_UNSORTED);
- status = notmuch_query_search_messages_st (query, &messages);
+ status = notmuch_query_search_messages (query, &messages);
if (print_status_query ("notmuch dump", query, status))
return EXIT_FAILURE;
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;
const char *query_str,
dump_format_t output_format,
dump_include_t include,
- notmuch_bool_t gzip_output)
+ bool gzip_output)
{
gzFile output = NULL;
const char *mode = gzip_output ? "w9" : "wT";
name_for_error, strerror (errno));
if (close (outfd))
fprintf (stderr, "Error closing %s during shutdown: %s\n",
- name_for_error, strerror (errno));
+ name_for_error, strerror (errno));
goto DONE;
}
}
}
- if (gzclose_w (output) != Z_OK) {
+ ret = gzclose_w (output);
+ if (ret) {
fprintf (stderr, "Error closing %s: %s\n", name_for_error,
gzerror (output, NULL));
ret = EXIT_FAILURE;
output = NULL;
goto DONE;
- }
+ } else
+ output = NULL;
if (output_file_name) {
ret = rename (tempname, output_file_name);
}
}
- DONE:
+ DONE:
if (ret != EXIT_SUCCESS && output)
(void) gzclose_w (output);
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;
int include = 0;
- notmuch_bool_t gzip_output = 0;
+ bool gzip_output = 0;
notmuch_opt_desc_t options[] = {
- { NOTMUCH_OPT_KEYWORD, &output_format, "format", 'f',
- (notmuch_keyword_t []){ { "sup", DUMP_FORMAT_SUP },
- { "batch-tag", DUMP_FORMAT_BATCH_TAG },
- { 0, 0 } } },
- { NOTMUCH_OPT_KEYWORD_FLAGS, &include, "include", 'I',
- (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 *) ¬much_shared_options, NULL, 0, 0 },
- { 0, 0, 0, 0, 0 }
+ { .opt_keyword = &output_format, .name = "format", .keywords =
+ (notmuch_keyword_t []){ { "sup", DUMP_FORMAT_SUP },
+ { "batch-tag", DUMP_FORMAT_BATCH_TAG },
+ { 0, 0 } } },
+ { .opt_flags = &include, .name = "include", .keywords =
+ (notmuch_keyword_t []){ { "config", DUMP_INCLUDE_CONFIG },
+ { "properties", DUMP_INCLUDE_PROPERTIES },
+ { "tags", DUMP_INCLUDE_TAGS } } },
+ { .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);