From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id EFJJBJkRbWCdIAEAgWs5BA (envelope-from ) for ; Wed, 07 Apr 2021 03:57:45 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id yCrJOZgRbWDlEgAA1q6Kng (envelope-from ) for ; Wed, 07 Apr 2021 01:57:44 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (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 81F5CAE90 for ; Wed, 7 Apr 2021 03:57:44 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 44BD7290B0; Tue, 6 Apr 2021 21:56:37 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id E06A429056 for ; Tue, 6 Apr 2021 21:55:57 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id D7EFD5FA96; Tue, 6 Apr 2021 21:55:57 -0400 (EDT) Received: (nullmailer pid 2964246 invoked by uid 1000); Wed, 07 Apr 2021 01:55:35 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 20/28] CLI/config: drop cached data from notmuch_config_t Date: Tue, 6 Apr 2021 22:55:22 -0300 Message-Id: <20210407015530.2964017-21-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: 4E6PKYMEGW72G4BXZOBHS3U5IE4A5MBH X-Message-ID-Hash: 4E6PKYMEGW72G4BXZOBHS3U5IE4A5MBH 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=1617760664; 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=lVt1k5KQ7ey5k508nrjZrR2AhNDtG7CGk2uH/36zYtw=; b=l3eOYAxptOZcI1jx/FoazScBFTilsblRDBjjM7BTJshF5F8OA1Zv6W+lVzMGwy7CHyH/O3 2qXzqTRjd4lKXICYACDO1dSmHNKMGDM/WZbyY94Df6CSIjcwjBlsCRYo1iEx0i8IsywmWQ pz3JC8MYUo0JZWkRHhvcD5OIdHO+eEvx7IfK+T2/6UcQF/JIXqguqJdGLo/v1DstQXfhY6 7mZZDLfW8258N4rU/qq+9bwC1beqgux/2SntnrZMJoNLVIjVVYt9LFhoETUY6UE+h8Pg3z NybQWVaP7tNFpkUusWBRLpeXewbpsRyLbNtPUPkxtFdYnvK+Mfnx4yDkYGoG3A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1617760664; a=rsa-sha256; cv=none; b=bNiE2QB8iBmrUrrThoszuxYwsHAyJkMNreuyIxE+qB1MXah9awztk88AEOG0YlkOnGmCe8 +RNwgL61LZ61rLmsX/SnlFiedM7+1kGgAbTs5nxA4LGsp3Yf/T7GmjjcIdmXRaI/EjjoI3 zdrrNrHkgJypN+uBhllxWZ1aqyXCzAX8AhxTkYJomi+fXV42KPGr5cqdK6paeKmvvnPB95 aaCHWvEtL6n8BgeljWLsKNPpdM0vcHD5VVHodpbt4hmnvesYEFVRi4vwoCXRQQs8z5lkFu 18Alc3W6Goh/elwa9XkQAdsdDBORuebkByZzKezGowwZG7dmZftbXcorOmosUw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -0.99 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 81F5CAE90 X-Spam-Score: -0.99 X-Migadu-Scanner: scn0.migadu.com X-TUID: Gk4MKXfuzecu 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 c13f0ecf..24c16833 100644 --- a/notmuch-config.c +++ b/notmuch-config.c @@ -118,19 +118,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 @@ -142,7 +129,6 @@ notmuch_config_destructor (notmuch_config_t *config) return 0; } - static bool get_config_from_file (notmuch_config_t *config, bool create_new) { @@ -275,9 +261,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"))) { @@ -391,48 +374,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 @@ -440,8 +415,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 @@ -449,8 +423,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 @@ -458,8 +431,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 @@ -467,8 +439,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); } @@ -745,5 +716,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.2