diff options
author | Anton Khirnov <anton@khirnov.net> | 2012-08-06 18:10:31 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2012-08-06 18:10:31 +0200 |
commit | 7192d0221a361d3d9cfd6626058e4a1c86ea7b44 (patch) | |
tree | 11d3db0604f47498e16b50ef7f559e138bfe4482 /notmuch-dump.c | |
parent | 6bc2f5a999d9ff77779d98b7cc688a4350ea65d9 (diff) | |
parent | 6b820673fc9c2483572af5ec7ea91e4d7d7258c9 (diff) |
Merge remote-tracking branch 'origin/master' into vim
Diffstat (limited to 'notmuch-dump.c')
-rw-r--r-- | notmuch-dump.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/notmuch-dump.c b/notmuch-dump.c index a735875..d8186fb 100644 --- a/notmuch-dump.c +++ b/notmuch-dump.c @@ -36,16 +36,15 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[]) if (config == NULL) return 1; - notmuch = notmuch_database_open (notmuch_config_get_database_path (config), - NOTMUCH_DATABASE_MODE_READ_ONLY); - if (notmuch == NULL) + if (notmuch_database_open (notmuch_config_get_database_path (config), + NOTMUCH_DATABASE_MODE_READ_ONLY, ¬much)) return 1; char *output_file_name = NULL; int opt_index; notmuch_opt_desc_t options[] = { - { NOTMUCH_OPT_POSITION, &output_file_name, 0, 0, 0 }, + { NOTMUCH_OPT_STRING, &output_file_name, "output", 'o', 0 }, { 0, 0, 0, 0, 0 } }; @@ -57,7 +56,6 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[]) } if (output_file_name) { - fprintf (stderr, "Warning: the output file argument of dump is deprecated.\n"); output = fopen (output_file_name, "w"); if (output == NULL) { fprintf (stderr, "Error opening %s for writing: %s\n", @@ -116,7 +114,7 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[]) fclose (output); notmuch_query_destroy (query); - notmuch_database_close (notmuch); + notmuch_database_destroy (notmuch); return 0; } |