From aa979d599779add614d840a87a2f6c51fed9b432 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sat, 18 Jan 2014 13:36:50 +0000 Subject: [PATCH] Re: [PATCH] cli: abstract common config get/set code --- c9/741cd4139038f4658d16d68d974ab55ef63ae1 | 251 ++++++++++++++++++++++ 1 file changed, 251 insertions(+) create mode 100644 c9/741cd4139038f4658d16d68d974ab55ef63ae1 diff --git a/c9/741cd4139038f4658d16d68d974ab55ef63ae1 b/c9/741cd4139038f4658d16d68d974ab55ef63ae1 new file mode 100644 index 000000000..b7572b56a --- /dev/null +++ b/c9/741cd4139038f4658d16d68d974ab55ef63ae1 @@ -0,0 +1,251 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 1C675431FBD + for ; Sat, 18 Jan 2014 05:37:04 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -1.098 +X-Spam-Level: +X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5 + tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001, + NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id ot2y1al5P3uX for ; + Sat, 18 Jan 2014 05:36:55 -0800 (PST) +Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 85824431FBC + for ; Sat, 18 Jan 2014 05:36:55 -0800 (PST) +Received: from smtp.qmul.ac.uk ([138.37.6.40]) + by mail2.qmul.ac.uk with esmtp (Exim 4.71) + (envelope-from ) + id 1W4W4y-0006gz-8h; Sat, 18 Jan 2014 13:36:52 +0000 +Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost) + by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71) + (envelope-from ) + id 1W4W4x-0007pk-Py; Sat, 18 Jan 2014 13:36:52 +0000 +From: Mark Walters +To: Tomi Ollila , Jani Nikula , + notmuch@notmuchmail.org +Subject: Re: [PATCH] cli: abstract common config get/set code +In-Reply-To: +References: <1389976738-25056-1-git-send-email-jani@nikula.org> + +User-Agent: Notmuch/0.15.2+484~gfb59956 (http://notmuchmail.org) Emacs/23.4.1 + (x86_64-pc-linux-gnu) +Date: Sat, 18 Jan 2014 13:36:50 +0000 +Message-ID: <87iothcsy5.fsf@qmul.ac.uk> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Sender-Host-Address: 93.97.24.31 +X-QM-Geographic: According to ripencc, + this message was delivered by a machine in Britain (UK) (GB). +X-QM-SPAM-Info: Sender has good ham record. :) +X-QM-Body-MD5: 38fb6047ae03a1a1eaa0bbd1fbff5b57 (of first 20000 bytes) +X-SpamAssassin-Score: 0.0 +X-SpamAssassin-SpamBar: / +X-SpamAssassin-Report: The QM spam filters have analysed this message to + determine if it is + spam. We require at least 5.0 points to mark a message as spam. + This message scored 0.0 points. Summary of the scoring: + * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail + provider * (markwalters1009[at]gmail.com) + * 0.0 AWL AWL: From: address is in the auto white-list +X-QM-Scan-Virus: ClamAV says the message is clean +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sat, 18 Jan 2014 13:37:04 -0000 + + +LGTM too + +Mark + +On Sat, 18 Jan 2014, Tomi Ollila wrote: +> On Fri, Jan 17 2014, Jani Nikula wrote: +> +>> Pretty straightforward abstraction similar to get/set list. +>> +>> --- +> +> LGTM. tests pass. +> +>> +>> v2 of id:1376839205-5115-1-git-send-email-jani@nikula.org adding a few +>> comments about config value caching per David's request. Dropped the +>> 2nd patch as too tricky. +>> --- +>> notmuch-config.c | 86 +++++++++++++++++++++++--------------------------------- +>> 1 file changed, 35 insertions(+), 51 deletions(-) +>> +>> diff --git a/notmuch-config.c b/notmuch-config.c +>> index 6845e3c..4aad9eb 100644 +>> --- a/notmuch-config.c +>> +++ b/notmuch-config.c +>> @@ -496,6 +496,32 @@ 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) +>> +{ +>> + g_key_file_set_string (config->key_file, group, key, value); +>> + +>> + /* drop the cached value */ +>> + talloc_free (*field); +>> + *field = NULL; +>> +} +>> +>> static const char ** +>> _config_get_list (notmuch_config_t *config, +>> @@ -504,6 +530,7 @@ _config_get_list (notmuch_config_t *config, +>> { +>> 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, +>> @@ -535,6 +562,8 @@ _config_set_list (notmuch_config_t *config, +>> size_t length, const char ***config_var ) +>> { +>> g_key_file_set_string_list (config->key_file, group, name, list, length); +>> + +>> + /* drop the cached value */ +>> talloc_free (*config_var); +>> *config_var = NULL; +>> } +>> @@ -542,85 +571,40 @@ _config_set_list (notmuch_config_t *config, +>> const char * +>> notmuch_config_get_database_path (notmuch_config_t *config) +>> { +>> - char *path; +>> - +>> - if (config->database_path == NULL) { +>> - path = g_key_file_get_string (config->key_file, +>> - "database", "path", NULL); +>> - if (path) { +>> - config->database_path = talloc_strdup (config, path); +>> - free (path); +>> - } +>> - } +>> - +>> - return config->database_path; +>> + return _config_get (config, &config->database_path, "database", "path"); +>> } +>> +>> void +>> notmuch_config_set_database_path (notmuch_config_t *config, +>> const char *database_path) +>> { +>> - g_key_file_set_string (config->key_file, +>> - "database", "path", database_path); +>> - +>> - talloc_free (config->database_path); +>> - config->database_path = NULL; +>> + _config_set (config, &config->database_path, "database", "path", database_path); +>> } +>> +>> const char * +>> notmuch_config_get_user_name (notmuch_config_t *config) +>> { +>> - char *name; +>> - +>> - if (config->user_name == NULL) { +>> - name = g_key_file_get_string (config->key_file, +>> - "user", "name", NULL); +>> - if (name) { +>> - config->user_name = talloc_strdup (config, name); +>> - free (name); +>> - } +>> - } +>> - +>> - return config->user_name; +>> + return _config_get (config, &config->user_name, "user", "name"); +>> } +>> +>> void +>> notmuch_config_set_user_name (notmuch_config_t *config, +>> const char *user_name) +>> { +>> - g_key_file_set_string (config->key_file, +>> - "user", "name", user_name); +>> - +>> - talloc_free (config->user_name); +>> - config->user_name = NULL; +>> + _config_set (config, &config->user_name, "user", "name", user_name); +>> } +>> +>> const char * +>> notmuch_config_get_user_primary_email (notmuch_config_t *config) +>> { +>> - char *email; +>> - +>> - if (config->user_primary_email == NULL) { +>> - email = g_key_file_get_string (config->key_file, +>> - "user", "primary_email", NULL); +>> - if (email) { +>> - config->user_primary_email = talloc_strdup (config, email); +>> - free (email); +>> - } +>> - } +>> - +>> - return config->user_primary_email; +>> + 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) +>> { +>> - g_key_file_set_string (config->key_file, +>> - "user", "primary_email", primary_email); +>> - +>> - talloc_free (config->user_primary_email); +>> - config->user_primary_email = NULL; +>> + _config_set (config, &config->user_primary_email, "user", "primary_email", primary_email); +>> } +>> +>> const char ** +>> -- +>> 1.8.5.2 +>> +>> _______________________________________________ +>> notmuch mailing list +>> notmuch@notmuchmail.org +>> http://notmuchmail.org/mailman/listinfo/notmuch +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2