From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id iL2bGWkRbWDWHgEAgWs5BA (envelope-from ) for ; Wed, 07 Apr 2021 03:56:57 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id iKNwE2kRbWAHSAAAbx9fmQ (envelope-from ) for ; Wed, 07 Apr 2021 01:56:57 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [IPv6:2607:5300:201:3100::1657]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C0554AE60 for ; Wed, 7 Apr 2021 03:56:56 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 3C9DF29075; Tue, 6 Apr 2021 21:56:12 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id B068528359 for ; Tue, 6 Apr 2021 21:55:47 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id A7ADA5FA96; Tue, 6 Apr 2021 21:55:47 -0400 (EDT) Received: (nullmailer pid 2964260 invoked by uid 1000); Wed, 07 Apr 2021 01:55:35 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 27/28] CLI: drop notmuch_config_t from subcommand interface. Date: Tue, 6 Apr 2021 22:55:29 -0300 Message-Id: <20210407015530.2964017-28-david@tethera.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210407015530.2964017-1-david@tethera.net> References: <20210407015530.2964017-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: PGA4URHRDB2OIQGPUSWBAX3JT464LHRT X-Message-ID-Hash: PGA4URHRDB2OIQGPUSWBAX3JT464LHRT X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1617760616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=qJk+0BUM8pxGQVkGkSONN2qJaMYoMsXsjRLpuOQrCl4=; b=m2rydMuBO/7ic4ETAfDcjHqPVXEG9f8nf87GFm8/JbMUefIfvDdnKHqdQ4E0TBc5tbqDf2 C+YIV8cF7nzc80duarg2FHVR3VQBg8hQeaCM0nxeMdD83g83B3vee+Nld78mKy19RXaRcE uumYOLtyDNlzbHkB7gDyI3ORRI70AgieHmNrjy9mEeahBLwuU8hRQGmxSgIMTnv+m2hXv2 AMQceGtvpa84ieOWffT80SMB2463QVutf+StZavYfQMZwQ6oZkB4M5kSW38ngS5v1LVkDR RQI6CywVRI7C/lwKFZ3CRoGwxrcDFUpCpJSlVYoWJrQLjcZA7oJawkEDH7g8fw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1617760616; a=rsa-sha256; cv=none; b=t4FhKORwDxvzHeky090HNQGVpXOYUq3oKLVYZu4/4A6COY2bws3EuBATF7BeuUcekOoRjg TAXhImbiIhD1DYHnCtZUjkcX7ceb5WgMvqMeMXcY+8L3RLYAoab2AQty/ppshJT9lThGEb DWWaZsDIFJ/WTZJT6IlJWzcJGVjRbk4IVRZNwJZc5abVlZfEuD/iHkNi2TIX6UlwQvFBr4 m4PcBNa5UxAD/e6s2EFdQSpqDrzdlo0bLbTVagK662kOnda8vmueGVVqoaymIr8zq3Z5Xd 7UHrRH/KrA0UgbIwmivKaTmj9KRYj8IsiazjEfjbbFQtCz5LeCyfiH75pzcQXw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -0.88 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: C0554AE60 X-Spam-Score: -0.88 X-Migadu-Scanner: scn0.migadu.com X-TUID: 28a/ABs/6Yzn At this point it is unused in all subcommands. --- notmuch-client.h | 42 ++++++++++++++---------------------------- notmuch-compact.c | 3 +-- notmuch-config.c | 7 +++---- notmuch-count.c | 3 +-- notmuch-dump.c | 3 +-- notmuch-insert.c | 3 +-- notmuch-new.c | 3 +-- notmuch-reindex.c | 3 +-- notmuch-reply.c | 3 +-- notmuch-restore.c | 3 +-- notmuch-search.c | 6 ++---- notmuch-setup.c | 3 +-- notmuch-show.c | 3 +-- notmuch-tag.c | 3 +-- notmuch.c | 18 +++++++----------- 15 files changed, 37 insertions(+), 69 deletions(-) diff --git a/notmuch-client.h b/notmuch-client.h index a5b3c518..8815bb11 100644 --- 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 cc45afa1..2648434e 100644 --- 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 7aac8e94..34482b4e 100644 --- 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 bfa0363a..5ac4292b 100644 --- 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 04ecd6a3..ae89e4da 100644 --- 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 865b6b69..00c00468 100644 --- 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 8e2bf4a8..993359d6 100644 --- 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 df566a7c..8904c1f4 100644 --- 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 b40ce96b..08140799 100644 --- 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 081b504c..1a81212f 100644 --- 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 a5c49477..244817a9 100644 --- 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 221ce934..567e3b56 100644 --- 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 481e5d54..bdb87321 100644 --- 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 9c3d4f8b..667a75d6 100644 --- 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 757d0eae..2429999c 100644 --- 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"); -- 2.30.2