From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 0raiIsLaQGDQcwAA0tVLHw (envelope-from ) for ; Thu, 04 Mar 2021 13:04:02 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id QITNHcLaQGDBbQAAbx9fmQ (envelope-from ) for ; Thu, 04 Mar 2021 13:04:02 +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 DD0E41601F for ; Thu, 4 Mar 2021 14:04:01 +0100 (CET) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 286CB27C3E; Thu, 4 Mar 2021 08:02:28 -0500 (EST) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id AFFA22755C for ; Thu, 4 Mar 2021 08:02:03 -0500 (EST) Received: by fethera.tethera.net (Postfix, from userid 1001) id A138C5FA96; Thu, 4 Mar 2021 08:02:03 -0500 (EST) Received: (nullmailer pid 4047200 invoked by uid 1000); Thu, 04 Mar 2021 13:01:45 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 18/27] CLI/config: drop obsolete notmuch_config_get_* Date: Thu, 4 Mar 2021 09:01:30 -0400 Message-Id: <20210304130139.4046183-19-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: LSN2V6XVM4X7IV6J2JL3BQ3QIW35KGML X-Message-ID-Hash: LSN2V6XVM4X7IV6J2JL3BQ3QIW35KGML 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=1614863042; 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=y0hmfkXWbn3gQeFzO7M/fhtFBIpGgu/4KMVo1rDxe+Q=; b=c5PajlNYB5aOTqAeoLumxQrW1YyFAOLAEL8X7wVRLH0ptapbgVEnZKK+oIdui/mn1MAw+2 /WhV30ouoUKqZSsFA8Ch81lo6GKiUs0nNv7Wu4lHs9dVOBN1On9hv1KES3wKImD41N09n8 JX3kkEJSrq87ETz/eVyLUd/8iH4BcNfvzObNyQt/jJ+mAz0dQo9+w9TDzHRbndyD5buOkb u7kr79FXlEFPZAq+S0O5KtpVEMIWvfh7xlPB0HirhBg7rAidSI9mwzXKdcpUTWLendDjph xp0YcJuiFE/3P341n4stro73UvoYoliYzcbCB2MufDGTS4n7yC/nd7fTUnDitQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1614863042; a=rsa-sha256; cv=none; b=JQ6x3fHDESl96h1xCPseZVbBgAWIBOejvdccR5rH+5XEbdIFCoGz1dFVJhzcX5uodRe3UA FJSSUDPujVWa/dYPzkpYpYoWHu+u63ZDXq1ZH+hZA/qJKFZlBNHZuoQomyYLEUg4AXkLRS 1Gcgsv0EpmiIwdhdwIdRwKJW0kfGbJKsqNnkOKpQSwZvRzV6zma9/Wk/l9zrvHnTf4kqXm 2JPoWSs26+XMkHF8JeWHVvFVBjemxKYda2WXfviWDpHeUM34Lz7rprpMkTyMbqtAaKuhnK 9w6auM9sU5UPJv9NywgWk1F87GjLdWYU9Cu+kauICQyi4f026O5i5lthsP/y+w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=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.80 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: DD0E41601F X-Spam-Score: -0.80 X-Migadu-Scanner: scn0.migadu.com X-TUID: 4bi6NKVIme0q These are no longer used, replaced by notmuch_config_get. --- notmuch-client.h | 29 ------------ notmuch-config.c | 119 ----------------------------------------------- 2 files changed, 148 deletions(-) diff --git a/notmuch-client.h b/notmuch-client.h index dfdfc876..677f2f39 100644 --- a/notmuch-client.h +++ b/notmuch-client.h @@ -275,70 +275,41 @@ notmuch_config_save (notmuch_config_t *config); bool notmuch_config_is_new (notmuch_config_t *config); -const char * -notmuch_config_get_database_path (notmuch_config_t *config); - void notmuch_config_set_database_path (notmuch_config_t *config, const char *database_path); -const char * -notmuch_config_get_user_name (notmuch_config_t *config); - void notmuch_config_set_user_name (notmuch_config_t *config, const char *user_name); -const char * -notmuch_config_get_user_primary_email (notmuch_config_t *config); - void notmuch_config_set_user_primary_email (notmuch_config_t *config, const char *primary_email); -const char ** -notmuch_config_get_user_other_email (notmuch_config_t *config, - size_t *length); - void notmuch_config_set_user_other_email (notmuch_config_t *config, const char *other_email[], size_t length); -const char ** -notmuch_config_get_new_tags (notmuch_config_t *config, - size_t *length); void notmuch_config_set_new_tags (notmuch_config_t *config, const char *new_tags[], size_t length); -const char ** -notmuch_config_get_new_ignore (notmuch_config_t *config, - size_t *length); - void notmuch_config_set_new_ignore (notmuch_config_t *config, const char *new_ignore[], size_t length); -bool -notmuch_config_get_maildir_synchronize_flags (notmuch_config_t *config); - void notmuch_config_set_maildir_synchronize_flags (notmuch_config_t *config, bool synchronize_flags); -const char ** -notmuch_config_get_search_exclude_tags (notmuch_config_t *config, size_t *length); - void notmuch_config_set_search_exclude_tags (notmuch_config_t *config, const char *list[], size_t length); -const char * -_notmuch_config_get_path (notmuch_config_t *config); - int notmuch_run_hook (notmuch_database_t *notmuch, const char *hook); diff --git a/notmuch-config.c b/notmuch-config.c index 2ad3f52e..774c8936 100644 --- a/notmuch-config.c +++ b/notmuch-config.c @@ -327,9 +327,6 @@ notmuch_config_close (notmuch_config_t *config) talloc_free (config); } -const char *_notmuch_config_get_path (notmuch_config_t *config) { - return config->filename; -} /* Save any changes made to the notmuch configuration. * * Any comments originally in the file will be preserved. @@ -393,22 +390,6 @@ notmuch_config_is_new (notmuch_config_t *config) return config->is_new; } -static const char * -_config_get (notmuch_config_t *config, char **field, - const char *group, const char *key) -{ - /* read from config file and cache value, if not cached already */ - if (*field == NULL) { - char *value; - value = g_key_file_get_string (config->key_file, group, key, NULL); - if (value) { - *field = talloc_strdup (config, value); - free (value); - } - } - return *field; -} - static void _config_set (notmuch_config_t *config, char **field, const char *group, const char *key, const char *value) @@ -420,38 +401,6 @@ _config_set (notmuch_config_t *config, char **field, *field = NULL; } -static const char ** -_config_get_list (notmuch_config_t *config, - const char *section, const char *key, - const char ***outlist, size_t *list_length, size_t *ret_length) -{ - assert (outlist); - - /* read from config file and cache value, if not cached already */ - if (*outlist == NULL) { - - char **inlist = g_key_file_get_string_list (config->key_file, - section, key, list_length, NULL); - if (inlist) { - unsigned int i; - - *outlist = talloc_size (config, sizeof (char *) * (*list_length + 1)); - - for (i = 0; i < *list_length; i++) - (*outlist)[i] = talloc_strdup (*outlist, inlist[i]); - - (*outlist)[i] = NULL; - - g_strfreev (inlist); - } - } - - if (ret_length) - *ret_length = *list_length; - - return *outlist; -} - static void _config_set_list (notmuch_config_t *config, const char *group, const char *key, @@ -465,24 +414,6 @@ _config_set_list (notmuch_config_t *config, *config_var = NULL; } -const char * -notmuch_config_get_database_path (notmuch_config_t *config) -{ - char *db_path = (char *) _config_get (config, &config->database_path, "database", "path"); - - if (db_path && *db_path != '/') { - /* If the path in the configuration file begins with any - * character other than /, presume that it is relative to - * $HOME and update as appropriate. - */ - char *abs_path = talloc_asprintf (config, "%s/%s", getenv ("HOME"), db_path); - talloc_free (db_path); - db_path = config->database_path = abs_path; - } - - return db_path; -} - void notmuch_config_set_database_path (notmuch_config_t *config, const char *database_path) @@ -490,12 +421,6 @@ notmuch_config_set_database_path (notmuch_config_t *config, _config_set (config, &config->database_path, "database", "path", database_path); } -const char * -notmuch_config_get_user_name (notmuch_config_t *config) -{ - return _config_get (config, &config->user_name, "user", "name"); -} - void notmuch_config_set_user_name (notmuch_config_t *config, const char *user_name) @@ -503,12 +428,6 @@ notmuch_config_set_user_name (notmuch_config_t *config, _config_set (config, &config->user_name, "user", "name", user_name); } -const char * -notmuch_config_get_user_primary_email (notmuch_config_t *config) -{ - return _config_get (config, &config->user_primary_email, "user", "primary_email"); -} - void notmuch_config_set_user_primary_email (notmuch_config_t *config, const char *primary_email) @@ -516,30 +435,6 @@ notmuch_config_set_user_primary_email (notmuch_config_t *config, _config_set (config, &config->user_primary_email, "user", "primary_email", primary_email); } -const char ** -notmuch_config_get_user_other_email (notmuch_config_t *config, size_t *length) -{ - return _config_get_list (config, "user", "other_email", - &(config->user_other_email), - &(config->user_other_email_length), length); -} - -const char ** -notmuch_config_get_new_tags (notmuch_config_t *config, size_t *length) -{ - return _config_get_list (config, "new", "tags", - &(config->new_tags), - &(config->new_tags_length), length); -} - -const char ** -notmuch_config_get_new_ignore (notmuch_config_t *config, size_t *length) -{ - return _config_get_list (config, "new", "ignore", - &(config->new_ignore), - &(config->new_ignore_length), length); -} - void notmuch_config_set_user_other_email (notmuch_config_t *config, const char *list[], @@ -567,14 +462,6 @@ notmuch_config_set_new_ignore (notmuch_config_t *config, &(config->new_ignore)); } -const char ** -notmuch_config_get_search_exclude_tags (notmuch_config_t *config, size_t *length) -{ - return _config_get_list (config, "search", "exclude_tags", - &(config->search_exclude_tags), - &(config->search_exclude_tags_length), length); -} - void notmuch_config_set_search_exclude_tags (notmuch_config_t *config, const char *list[], @@ -849,12 +736,6 @@ notmuch_config_command (notmuch_config_t *config, notmuch_database_t *notmuch, i } -bool -notmuch_config_get_maildir_synchronize_flags (notmuch_config_t *config) -{ - return config->maildir_synchronize_flags; -} - void notmuch_config_set_maildir_synchronize_flags (notmuch_config_t *config, bool synchronize_flags) -- 2.30.1