CLI: drop notmuch_config_t from subcommand interface.

At this point it is unused in all subcommands.

diff --git a/notmuch-client.h b/notmuch-client.h
index a5b3c51836d754594ce67cfa74505770cdf3c0d7..8815bb11b79ef8f0d6b7346789b06974a3565ea7 100644 (file)
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -171,60 +171,46 @@ void
 notmuch_exit_if_unsupported_format (void);
 
 int
-notmuch_count_command (notmuch_config_t *config, notmuch_database_t *notmuch,
-                      int argc, char *argv[]);
+notmuch_count_command (notmuch_database_t *notmuch, int argc, char *argv[]);
 
 int
-notmuch_dump_command (notmuch_config_t *config, notmuch_database_t *notmuch,
-                     int argc, char *argv[]);
+notmuch_dump_command (notmuch_database_t *notmuch, int argc, char *argv[]);
 
 int
-notmuch_new_command (notmuch_config_t *config, notmuch_database_t *notmuch,
-                    int argc, char *argv[]);
+notmuch_new_command (notmuch_database_t *notmuch, int argc, char *argv[]);
 
 int
-notmuch_insert_command (notmuch_config_t *config, notmuch_database_t *notmuch,
-                       int argc, char *argv[]);
+notmuch_insert_command (notmuch_database_t *notmuch, int argc, char *argv[]);
 
 int
-notmuch_reindex_command (notmuch_config_t *config, notmuch_database_t *notmuch,
-                        int argc, char *argv[]);
+notmuch_reindex_command (notmuch_database_t *notmuch, int argc, char *argv[]);
 
 int
-notmuch_reply_command (notmuch_config_t *config, notmuch_database_t *notmuch,
-                      int argc, char *argv[]);
+notmuch_reply_command (notmuch_database_t *notmuch, int argc, char *argv[]);
 
 int
-notmuch_restore_command (notmuch_config_t *config, notmuch_database_t *notmuch,
-                        int argc, char *argv[]);
+notmuch_restore_command (notmuch_database_t *notmuch, int argc, char *argv[]);
 
 int
-notmuch_search_command (notmuch_config_t *config, notmuch_database_t *notmuch,
-                       int argc, char *argv[]);
+notmuch_search_command (notmuch_database_t *notmuch, int argc, char *argv[]);
 
 int
-notmuch_address_command (notmuch_config_t *config, notmuch_database_t *notmuch,
-                        int argc, char *argv[]);
+notmuch_address_command (notmuch_database_t *notmuch, int argc, char *argv[]);
 
 int
-notmuch_setup_command (notmuch_config_t *config, notmuch_database_t *notmuch,
-                      int argc, char *argv[]);
+notmuch_setup_command (notmuch_database_t *notmuch, int argc, char *argv[]);
 
 int
-notmuch_show_command (notmuch_config_t *config, notmuch_database_t *notmuch,
-                     int argc, char *argv[]);
+notmuch_show_command (notmuch_database_t *notmuch, int argc, char *argv[]);
 
 int
-notmuch_tag_command (notmuch_config_t *config, notmuch_database_t *notmuch,
-                    int argc, char *argv[]);
+notmuch_tag_command (notmuch_database_t *notmuch, int argc, char *argv[]);
 
 int
-notmuch_config_command (notmuch_config_t *config, notmuch_database_t *notmuch,
-                       int argc, char *argv[]);
+notmuch_config_command (notmuch_database_t *notmuch, int argc, char *argv[]);
 
 int
-notmuch_compact_command (notmuch_config_t *config, notmuch_database_t *notmuch,
-                        int argc, char *argv[]);
+notmuch_compact_command (notmuch_database_t *notmuch, int argc, char *argv[]);
 
 const char *
 notmuch_time_relative_date (const void *ctx, time_t then);

diff --git a/notmuch-compact.c b/notmuch-compact.c
index cc45afa105992025bd94ac62056adb4f8b34cdb5..2648434e35ccaad22305326041bab0041cfefe4c 100644 (file)
--- a/notmuch-compact.c
+++ b/notmuch-compact.c
@@ -27,8 +27,7 @@ status_update_cb (const char *msg, unused (void *closure))
 }
 
 int
-notmuch_compact_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch,
-                        int argc, char *argv[])
+notmuch_compact_command (notmuch_database_t *notmuch, int argc, char *argv[])
 {
     const char *backup_path = NULL;
     notmuch_status_t ret;

diff --git a/notmuch-config.c b/notmuch-config.c
index 7aac8e94f6e2e4648d7c47264eadfc703046723b..34482b4e1e4e82a77ed437d61a34cec23b8b616e 100644 (file)
--- a/notmuch-config.c
+++ b/notmuch-config.c
@@ -578,7 +578,7 @@ _set_db_config (notmuch_database_t *notmuch, const char *key, int argc, char **a
 }
 
 static int
-notmuch_config_command_set (unused(notmuch_config_t *config), notmuch_database_t *notmuch,
+notmuch_config_command_set (notmuch_database_t *notmuch,
                            int argc, char *argv[])
 {
     char *group, *key;
@@ -691,8 +691,7 @@ notmuch_config_command_list (notmuch_database_t *notmuch)
 }
 
 int
-notmuch_config_command (notmuch_config_t *config, notmuch_database_t *notmuch,
-                       int argc, char *argv[])
+notmuch_config_command (notmuch_database_t *notmuch, int argc, char *argv[])
 {
     int ret;
     int opt_index;
@@ -722,7 +721,7 @@ notmuch_config_command (notmuch_config_t *config, notmuch_database_t *notmuch,
        }
        ret = notmuch_config_command_get (notmuch, argv[1]);
     } else if (strcmp (argv[0], "set") == 0) {
-       ret = notmuch_config_command_set (config, notmuch, argc, argv);
+       ret = notmuch_config_command_set (notmuch, argc, argv);
     } else if (strcmp (argv[0], "list") == 0) {
        ret = notmuch_config_command_list (notmuch);
     } else {

diff --git a/notmuch-count.c b/notmuch-count.c
index bfa0363ab3f141b2c456a2b18fd3e1592ca6f90d..5ac4292bc495c2cad1107eb74d67f7ce008d7acf 100644 (file)
--- a/notmuch-count.c
+++ b/notmuch-count.c
@@ -151,8 +151,7 @@ count_file (notmuch_database_t *notmuch, FILE *input, notmuch_config_values_t *e
 }
 
 int
-notmuch_count_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch,
-                      int argc, char *argv[])
+notmuch_count_command (notmuch_database_t *notmuch, int argc, char *argv[])
 {
     char *query_str;
     int opt_index;

diff --git a/notmuch-dump.c b/notmuch-dump.c
index 04ecd6a38564c0359bff08d1897714a44fa9f344..ae89e4da80ccbf90f53109539115a81b45410eb9 100644 (file)
--- a/notmuch-dump.c
+++ b/notmuch-dump.c
@@ -361,8 +361,7 @@ notmuch_database_dump (notmuch_database_t *notmuch,
 }
 
 int
-notmuch_dump_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch,
-                     int argc, char *argv[])
+notmuch_dump_command (notmuch_database_t *notmuch, int argc, char *argv[])
 {
     const char *query_str = NULL;
     int ret;

diff --git a/notmuch-insert.c b/notmuch-insert.c
index 865b6b697c38395658b91761958ac912c540a9f6..00c0046873f50cc788717ebb86ef6a10314bf70a 100644 (file)
--- a/notmuch-insert.c
+++ b/notmuch-insert.c
@@ -444,8 +444,7 @@ add_file (notmuch_database_t *notmuch, const char *path, tag_op_list_t *tag_ops,
 }
 
 int
-notmuch_insert_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch,
-                       int argc, char *argv[])
+notmuch_insert_command (notmuch_database_t *notmuch, int argc, char *argv[])
 {
     notmuch_status_t status, close_status;
     struct sigaction action;

diff --git a/notmuch-new.c b/notmuch-new.c
index 8e2bf4a84babba4fe80e6b2ce72c2e4c8a6cefa1..993359d603a9bf75d9e606014741ee9cc6f0d83f 100644 (file)
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -1104,8 +1104,7 @@ _maybe_upgrade (notmuch_database_t *notmuch, add_files_state_t *state)
 }
 
 int
-notmuch_new_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch,
-                    int argc, char *argv[])
+notmuch_new_command (notmuch_database_t *notmuch, int argc, char *argv[])
 {
     add_files_state_t add_files_state = {
        .verbosity = VERBOSITY_NORMAL,

diff --git a/notmuch-reindex.c b/notmuch-reindex.c
index df566a7c9b588bd68019b6ea2168aed9d47b94c3..8904c1f41dca4d880a23708616705b76ede399eb 100644 (file)
--- a/notmuch-reindex.c
+++ b/notmuch-reindex.c
@@ -83,8 +83,7 @@ reindex_query (notmuch_database_t *notmuch, const char *query_string,
 }
 
 int
-notmuch_reindex_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch,
-                        int argc, char *argv[])
+notmuch_reindex_command (notmuch_database_t *notmuch, int argc, char *argv[])
 {
     char *query_string = NULL;
     struct sigaction action;

diff --git a/notmuch-reply.c b/notmuch-reply.c
index b40ce96bca2a1725dc126dda6ec24eec649fb927..08140799e2b965967ac2496883d091b1fb3a3032 100644 (file)
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -705,8 +705,7 @@ do_reply (notmuch_database_t *notmuch,
 }
 
 int
-notmuch_reply_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch,
-                      int argc, char *argv[])
+notmuch_reply_command (notmuch_database_t *notmuch, int argc, char *argv[])
 {
     notmuch_query_t *query;
     char *query_string;

diff --git a/notmuch-restore.c b/notmuch-restore.c
index 081b504c93b044ba709669752e24f029697ff123..1a81212f0f9810e4db2cb6b07a832b1bc9f1ce2f 100644 (file)
--- a/notmuch-restore.c
+++ b/notmuch-restore.c
@@ -219,8 +219,7 @@ parse_sup_line (void *ctx, char *line,
 }
 
 int
-notmuch_restore_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch,
-                        int argc, char *argv[])
+notmuch_restore_command (notmuch_database_t *notmuch, int argc, char *argv[])
 {
     bool accumulate = false;
     tag_op_flag_t flags = 0;

diff --git a/notmuch-search.c b/notmuch-search.c
index a5c49477a516777746d805f5db0469438552c289..244817a987e1adc2a85fcf5bc6b19be34877c338 100644 (file)
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -794,8 +794,7 @@ static const notmuch_opt_desc_t common_options[] = {
 };
 
 int
-notmuch_search_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch,
-                       int argc, char *argv[])
+notmuch_search_command (notmuch_database_t *notmuch, int argc, char *argv[])
 {
     search_context_t *ctx = &search_context;
     int opt_index, ret;
@@ -862,8 +861,7 @@ notmuch_search_command (unused(notmuch_config_t *config), notmuch_database_t *no
 }
 
 int
-notmuch_address_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch,
-                        int argc, char *argv[])
+notmuch_address_command (notmuch_database_t *notmuch, int argc, char *argv[])
 {
     search_context_t *ctx = &search_context;
     int opt_index, ret;

diff --git a/notmuch-setup.c b/notmuch-setup.c
index 221ce9346b258163cf347ab3c98bcda6b4b362a7..567e3b565359b64018573044828a24d18eb46328 100644 (file)
--- a/notmuch-setup.c
+++ b/notmuch-setup.c
@@ -124,8 +124,7 @@ parse_tag_list (void *ctx, char *response)
 }
 
 int
-notmuch_setup_command (unused(notmuch_config_t *config),
-                      notmuch_database_t *notmuch,
+notmuch_setup_command (notmuch_database_t *notmuch,
                       int argc, char *argv[])
 {
     char *response = NULL;

diff --git a/notmuch-show.c b/notmuch-show.c
index 481e5d540a6f2c2cff23b0e33548726da13ed891..bdb87321f1f02d74a400cffe3c6a4cc02c82b40a 100644 (file)
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -1225,8 +1225,7 @@ static const notmuch_show_format_t *formatters[] = {
 };
 
 int
-notmuch_show_command (unused (notmuch_config_t *config), notmuch_database_t *notmuch,
-                     int argc, char *argv[])
+notmuch_show_command (notmuch_database_t *notmuch, int argc, char *argv[])
 {
     notmuch_query_t *query;
     char *query_string;

diff --git a/notmuch-tag.c b/notmuch-tag.c
index 9c3d4f8b040d9ea87d9b0de7f5fb0d9c6a89ef4e..667a75d6b960c3b2cc27b75d08753a813badc037 100644 (file)
--- a/notmuch-tag.c
+++ b/notmuch-tag.c
@@ -187,8 +187,7 @@ tag_file (void *ctx, notmuch_database_t *notmuch, tag_op_flag_t flags,
 }
 
 int
-notmuch_tag_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch,
-                    int argc, char *argv[])
+notmuch_tag_command (notmuch_database_t *notmuch, int argc, char *argv[])
 {
     tag_op_list_t *tag_ops = NULL;
     char *query_string = NULL;

diff --git a/notmuch.c b/notmuch.c
index 757d0eaede5d1ef6e3f984c21935c061c2170c9c..2429999c2694345dd71b556e282b6dbb5a943dbe 100644 (file)
--- a/notmuch.c
+++ b/notmuch.c
@@ -31,8 +31,7 @@
  * Each subcommand should be passed either a config object, or an open
  * database
  */
-typedef int (*command_function_t) (notmuch_config_t *config, notmuch_database_t *notmuch,
-                                  int argc, char *argv[]);
+typedef int (*command_function_t) (notmuch_database_t *notmuch, int argc, char *argv[]);
 
 typedef struct command {
     const char *name;
@@ -42,10 +41,10 @@ typedef struct command {
 } command_t;
 
 static int
-notmuch_help_command (notmuch_config_t *config, notmuch_database_t *notmuch, int argc, char *argv[]);
+notmuch_help_command (notmuch_database_t *notmuch, int argc, char *argv[]);
 
 static int
-notmuch_command (notmuch_config_t *config, notmuch_database_t *notmuch, int argc, char *argv[]);
+notmuch_command (notmuch_database_t *notmuch, int argc, char *argv[]);
 
 static int
 _help_for (const char *topic);
@@ -349,8 +348,7 @@ _help_for (const char *topic_name)
 }
 
 static int
-notmuch_help_command (unused (notmuch_config_t *config), unused(notmuch_database_t *notmuch), int
-                     argc, char *argv[])
+notmuch_help_command (unused(notmuch_database_t *notmuch), int argc, char *argv[])
 {
     int opt_index;
 
@@ -374,8 +372,7 @@ notmuch_help_command (unused (notmuch_config_t *config), unused(notmuch_database
  * to be more clever about this in the future.
  */
 static int
-notmuch_command (unused(notmuch_config_t *config),
-                notmuch_database_t *notmuch,
+notmuch_command (notmuch_database_t *notmuch,
                 unused(int argc), unused(char **argv))
 {
 
@@ -391,7 +388,7 @@ notmuch_command (unused(notmuch_config_t *config),
                     strerror (errno));
            return EXIT_FAILURE;
        } else {
-           return notmuch_setup_command (NULL, notmuch, 0, NULL);
+           return notmuch_setup_command (notmuch, 0, NULL);
        }
     }
 
@@ -457,7 +454,6 @@ main (int argc, char *argv[])
     const char *command_name = NULL;
     command_t *command;
     const char *config_file_name = NULL;
-    notmuch_config_t *config = NULL;
     notmuch_database_t *notmuch = NULL;
     int opt_index;
     int ret = EXIT_SUCCESS;
@@ -589,7 +585,7 @@ main (int argc, char *argv[])
 
     }
 
-    ret = (command->function)(config, notmuch, argc - opt_index, argv + opt_index);
+    ret = (command->function)(notmuch, argc - opt_index, argv + opt_index);
 
   DONE:
     talloc_report = getenv ("NOTMUCH_TALLOC_REPORT");