From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id iD8CNvnaQGD4YwAA0tVLHw (envelope-from ) for ; Thu, 04 Mar 2021 13:04:57 +0000 Received: from aspmx2.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id ENPbMfnaQGCkIAAA1q6Kng (envelope-from ) for ; Thu, 04 Mar 2021 13:04: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)) (No client certificate requested) by aspmx2.migadu.com (Postfix) with ESMTPS id 4D57125812 for ; Thu, 4 Mar 2021 14:04:57 +0100 (CET) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 80D4127D42; Thu, 4 Mar 2021 08:02:46 -0500 (EST) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id 1DFF727582 for ; Thu, 4 Mar 2021 08:02:13 -0500 (EST) Received: by fethera.tethera.net (Postfix, from userid 1001) id 0A30A5FA96; Thu, 4 Mar 2021 08:02:13 -0500 (EST) Received: (nullmailer pid 4047216 invoked by uid 1000); Thu, 04 Mar 2021 13:01:45 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 26/27] CLI: drop notmuch_config_t from subcommand interface. Date: Thu, 4 Mar 2021 09:01:38 -0400 Message-Id: <20210304130139.4046183-27-david@tethera.net> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210304130139.4046183-1-david@tethera.net> References: <20210304130139.4046183-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: YQ7P35T3YGLYQSQLPZ75WYKOXWPT73F3 X-Message-ID-Hash: YQ7P35T3YGLYQSQLPZ75WYKOXWPT73F3 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=1614863097; 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=XCFrB9eE7rgsB8vPE4PRjU+5xUQCw3UBHlmvLEpasHM=; b=PIDFlIPOak8Fog2mhN+nU9wdUhGizp/tBgqTQ2k3ygGgbxmCVVXevavSb9EpjxP+U6YGho vzGYgat8gB+JZ/g4cdxRvWoieEowe5Ysv90EO8xOWj/AR3tOJNzQ47q3N5NaYWKRBLyhP+ iSX6f1ZCErdrCrmdZ4etjjRCIj+Av+IK4xcPpsq5YV/LBz0+X4u5xi3jdnE+jr8brJK9jL fXW3wyUXGXbhd47xYQSbzZEtTokd5H1PzYZiNplIJCoqHgmfQFuFK8QL5mj6MmuqDemLyV smbT9R1jKi02HsrrFChI7U0cYbqwlfFq+9/LvjMOc76rUgfk5BpyvfFEox7E2w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1614863097; a=rsa-sha256; cv=none; b=O3sVzzBipNuI1hsCHY6g3cN9eaxIayfw41bO3ylirk/R45zV4Qgic3UBrtcsueyRqcb04t bOHPBC0N0won22i9lSHcBfmsSG8zz8R3HAchNBk5mRaJjdlKPnX91wGkPfFju+so1AjHJ2 FZS3EUdulOBJnY70hVGt6nD+nf6a1MrZ2gNyB73qwjuwuAQFyGFORAdCGGxphbU5seYGup SQQSnZVZNdk1iInMQjB83Iarb1dQC+0kyseCDu2EduTxTb1ybXZ+EYdPGTL7QtNwURBDzk CgnglJ89I+GRK/a/4kp37g7bJhe59AZ0HKw3dJatRIMUBlmcgEdu1g7wcTMPnw== ARC-Authentication-Results: i=1; aspmx2.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx2.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.80 Authentication-Results: aspmx2.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx2.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: 4D57125812 X-Spam-Score: -0.80 X-Migadu-Scanner: scn1.migadu.com X-TUID: plbSbqE4eUFR At this point it is unused in all subcommands. --- notmuch-client.h | 28 ++++++++++++++-------------- notmuch-compact.c | 2 +- notmuch-config.c | 6 +++--- notmuch-count.c | 2 +- notmuch-dump.c | 2 +- notmuch-insert.c | 2 +- notmuch-new.c | 2 +- notmuch-reindex.c | 2 +- notmuch-reply.c | 2 +- notmuch-restore.c | 2 +- notmuch-search.c | 4 ++-- notmuch-setup.c | 3 +-- notmuch-show.c | 2 +- notmuch-tag.c | 2 +- notmuch.c | 16 +++++++--------- 15 files changed, 37 insertions(+), 40 deletions(-) diff --git a/notmuch-client.h b/notmuch-client.h index 29b78835..1976352f 100644 --- a/notmuch-client.h +++ b/notmuch-client.h @@ -171,46 +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 361583db..2648434e 100644 --- a/notmuch-compact.c +++ b/notmuch-compact.c @@ -27,7 +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 89813aea..0fca2adc 100644 --- a/notmuch-config.c +++ b/notmuch-config.c @@ -577,7 +577,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; @@ -690,7 +690,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; @@ -720,7 +720,7 @@ notmuch_config_command (notmuch_config_t *config, notmuch_database_t *notmuch, i } 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 048b1f44..6f239c7e 100644 --- a/notmuch-count.c +++ b/notmuch-count.c @@ -151,7 +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 d7017929..928f025b 100644 --- a/notmuch-dump.c +++ b/notmuch-dump.c @@ -361,7 +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 38a0dfe6..00c00468 100644 --- a/notmuch-insert.c +++ b/notmuch-insert.c @@ -444,7 +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 8a8ff69a..ebdda067 100644 --- a/notmuch-new.c +++ b/notmuch-new.c @@ -1101,7 +1101,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 fa84d4fc..8904c1f4 100644 --- a/notmuch-reindex.c +++ b/notmuch-reindex.c @@ -83,7 +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 700f3397..ada6eda6 100644 --- a/notmuch-reply.c +++ b/notmuch-reply.c @@ -703,7 +703,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 ce07f89d..fb4302a7 100644 --- a/notmuch-restore.c +++ b/notmuch-restore.c @@ -219,7 +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 aba22799..832223c9 100644 --- a/notmuch-search.c +++ b/notmuch-search.c @@ -794,7 +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; @@ -860,7 +860,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 c7c3ed47..22769a5a 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 4a26f8ce..bfa9548b 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -1215,7 +1215,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 464874b4..667a75d6 100644 --- a/notmuch-tag.c +++ b/notmuch-tag.c @@ -187,7 +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 1ef8f078..e0b0aaa6 100644 --- a/notmuch.c +++ b/notmuch.c @@ -31,7 +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; @@ -41,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); @@ -339,7 +339,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; @@ -363,8 +363,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)) { @@ -380,7 +379,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); } } @@ -446,7 +445,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; @@ -573,7 +571,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.1