From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id aO+MEfY8MWDAYAAA0tVLHw (envelope-from ) for ; Sat, 20 Feb 2021 16:46:46 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id KJ5ZDfY8MWCcagAAB5/wlQ (envelope-from ) for ; Sat, 20 Feb 2021 16:46:46 +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 aspmx1.migadu.com (Postfix) with ESMTPS id A3D921EDB8 for ; Sat, 20 Feb 2021 17:46:45 +0100 (CET) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id DFF7627125; Sat, 20 Feb 2021 11:45:51 -0500 (EST) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id D0E3926BE5 for ; Sat, 20 Feb 2021 11:45:11 -0500 (EST) Received: by fethera.tethera.net (Postfix, from userid 1001) id B1D9D60666; Sat, 20 Feb 2021 11:45:11 -0500 (EST) Received: (nullmailer pid 3956196 invoked by uid 1000); Sat, 20 Feb 2021 16:44:54 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 17/18] CLI/config: drop cached data from notmuch_config_t Date: Sat, 20 Feb 2021 12:44:47 -0400 Message-Id: <20210220164448.3956011-18-david@tethera.net> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210220164448.3956011-1-david@tethera.net> References: <20210220164448.3956011-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: QEMVEZYJCUF7IHZMHD5FVVE44NGYQ2VX X-Message-ID-Hash: QEMVEZYJCUF7IHZMHD5FVVE44NGYQ2VX 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 X-Migadu-Spam-Score: 0.55 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: A3D921EDB8 X-Spam-Score: 0.55 X-Migadu-Scanner: scn0.migadu.com X-TUID: z1kKGq0/eYe9 The idea is to preserve notmuch_config_t as a thin wrapper for GKeyFile. --- notmuch-config.c | 48 +++++++++--------------------------------------- 1 file changed, 9 insertions(+), 39 deletions(-) diff --git a/notmuch-config.c b/notmuch-config.c index 1382b0a3..0b2976f4 100644 --- a/notmuch-config.c +++ b/notmuch-config.c @@ -117,19 +117,6 @@ struct _notmuch_config { char *filename; GKeyFile *key_file; bool is_new; - - char *database_path; - char *user_name; - char *user_primary_email; - const char **user_other_email; - size_t user_other_email_length; - const char **new_tags; - size_t new_tags_length; - const char **new_ignore; - size_t new_ignore_length; - bool maildir_synchronize_flags; - const char **search_exclude_tags; - size_t search_exclude_tags_length; }; static int @@ -141,7 +128,6 @@ notmuch_config_destructor (notmuch_config_t *config) return 0; } - static bool get_config_from_file (notmuch_config_t *config, bool create_new) { @@ -280,9 +266,6 @@ notmuch_config_open (notmuch_database_t *notmuch, talloc_set_destructor (config, notmuch_config_destructor); - /* non-zero defaults */ - config->maildir_synchronize_flags = true; - if (filename) { config->filename = talloc_strdup (config, filename); } else if ((notmuch_config_env = getenv ("NOTMUCH_CONFIG"))) { @@ -423,48 +406,40 @@ notmuch_config_is_new (notmuch_config_t *config) } static void -_config_set (notmuch_config_t *config, char **field, +_config_set (notmuch_config_t *config, const char *group, const char *key, const char *value) { g_key_file_set_string (config->key_file, group, key, value); - - /* drop the cached value */ - talloc_free (*field); - *field = NULL; } static void _config_set_list (notmuch_config_t *config, const char *group, const char *key, const char *list[], - size_t length, const char ***config_var ) + size_t length) { g_key_file_set_string_list (config->key_file, group, key, list, length); - - /* drop the cached value */ - talloc_free (*config_var); - *config_var = NULL; } void notmuch_config_set_database_path (notmuch_config_t *config, const char *database_path) { - _config_set (config, &config->database_path, "database", "path", database_path); + _config_set (config, "database", "path", database_path); } void notmuch_config_set_user_name (notmuch_config_t *config, const char *user_name) { - _config_set (config, &config->user_name, "user", "name", user_name); + _config_set (config, "user", "name", user_name); } void notmuch_config_set_user_primary_email (notmuch_config_t *config, const char *primary_email) { - _config_set (config, &config->user_primary_email, "user", "primary_email", primary_email); + _config_set (config, "user", "primary_email", primary_email); } void @@ -472,8 +447,7 @@ notmuch_config_set_user_other_email (notmuch_config_t *config, const char *list[], size_t length) { - _config_set_list (config, "user", "other_email", list, length, - &(config->user_other_email)); + _config_set_list (config, "user", "other_email", list, length); } void @@ -481,8 +455,7 @@ notmuch_config_set_new_tags (notmuch_config_t *config, const char *list[], size_t length) { - _config_set_list (config, "new", "tags", list, length, - &(config->new_tags)); + _config_set_list (config, "new", "tags", list, length); } void @@ -490,8 +463,7 @@ notmuch_config_set_new_ignore (notmuch_config_t *config, const char *list[], size_t length) { - _config_set_list (config, "new", "ignore", list, length, - &(config->new_ignore)); + _config_set_list (config, "new", "ignore", list, length); } void @@ -499,8 +471,7 @@ notmuch_config_set_search_exclude_tags (notmuch_config_t *config, const char *list[], size_t length) { - _config_set_list (config, "search", "exclude_tags", list, length, - &(config->search_exclude_tags)); + _config_set_list (config, "search", "exclude_tags", list, length); } @@ -774,5 +745,4 @@ notmuch_config_set_maildir_synchronize_flags (notmuch_config_t *config, { g_key_file_set_boolean (config->key_file, "maildir", "synchronize_flags", synchronize_flags); - config->maildir_synchronize_flags = synchronize_flags; } -- 2.30.0