diff options
author | David Bremner <david@tethera.net> | 2020-10-05 20:35:26 -0300 |
---|---|---|
committer | David Bremner <david@tethera.net> | 2021-02-06 19:19:18 -0400 |
commit | 0ab0b48be2d76c2c9b5581c1b66b21934b2025b7 (patch) | |
tree | 88e1d56cddb7300ce6861a76525d98bb2d1068d8 /notmuch-reindex.c | |
parent | f994f0e7df178eb31c656329bb28ffa832ac4364 (diff) |
cli/reindex: convert new config framework
The only non-trivial part is switching the talloc context for
query_string_from args from 'config' to 'notmuch'.
Diffstat (limited to 'notmuch-reindex.c')
-rw-r--r-- | notmuch-reindex.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/notmuch-reindex.c b/notmuch-reindex.c index 9d337c48..fa84d4fc 100644 --- a/notmuch-reindex.c +++ b/notmuch-reindex.c @@ -83,10 +83,9 @@ reindex_query (notmuch_database_t *notmuch, const char *query_string, } int -notmuch_reindex_command (notmuch_config_t *config, unused(notmuch_database_t *notmuch), int argc, char *argv[]) +notmuch_reindex_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch, int argc, char *argv[]) { char *query_string = NULL; - notmuch_database_t *notmuch; struct sigaction action; int opt_index; int ret; @@ -111,10 +110,6 @@ notmuch_reindex_command (notmuch_config_t *config, unused(notmuch_database_t *no notmuch_process_shared_options (argv[0]); - if (notmuch_database_open (notmuch_config_get_database_path (config), - NOTMUCH_DATABASE_MODE_READ_WRITE, ¬much)) - return EXIT_FAILURE; - notmuch_exit_if_unmatched_db_uuid (notmuch); status = notmuch_process_shared_indexing_options (notmuch); @@ -124,7 +119,7 @@ notmuch_reindex_command (notmuch_config_t *config, unused(notmuch_database_t *no return EXIT_FAILURE; } - query_string = query_string_from_args (config, argc - opt_index, argv + opt_index); + query_string = query_string_from_args (notmuch, argc - opt_index, argv + opt_index); if (query_string == NULL) { fprintf (stderr, "Out of memory\n"); return EXIT_FAILURE; |