From d4b083602e9ef476777a9326458c7037aa4e16d1 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Fri, 17 Jan 2014 18:38:58 +0200 Subject: [PATCH] [PATCH] cli: abstract common config get/set code --- 6d/3b78e08bd18abc1034b5a51b07f8fd68f4d7f6 | 223 ++++++++++++++++++++++ 1 file changed, 223 insertions(+) create mode 100644 6d/3b78e08bd18abc1034b5a51b07f8fd68f4d7f6 diff --git a/6d/3b78e08bd18abc1034b5a51b07f8fd68f4d7f6 b/6d/3b78e08bd18abc1034b5a51b07f8fd68f4d7f6 new file mode 100644 index 000000000..bc84bcbdb --- /dev/null +++ b/6d/3b78e08bd18abc1034b5a51b07f8fd68f4d7f6 @@ -0,0 +1,223 @@ +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 AE4F4431FBC + for ; Fri, 17 Jan 2014 08:39:09 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 WVYs4bR+NIm4 for ; + Fri, 17 Jan 2014 08:39:02 -0800 (PST) +Received: from mail-ea0-f169.google.com (mail-ea0-f169.google.com + [209.85.215.169]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 69A14431FB6 + for ; Fri, 17 Jan 2014 08:39:02 -0800 (PST) +Received: by mail-ea0-f169.google.com with SMTP id l9so1625117eaj.28 + for ; Fri, 17 Jan 2014 08:39:01 -0800 (PST) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20130820; + h=x-gm-message-state:from:to:cc:subject:date:message-id; + bh=h8UkzEHbSu9ewJzylDmJmr9Mt/2Tx1AfLcu18xbblaQ=; + b=HruogG3qRP7HKgBU4OhhtT8454dDoVmGDHRQCxfbCL70nGEXFPv04y8trYk4mo3uZp + GCnsHgf0kojQdz+gmPA0sAiRfNm8iH13QhCGAsWLkcS3t0grCZu1TGdq/JP6ZnATIRYk + z5KH6Sk+cHvGCXo+ACKYVSHxfWL/dzrFG3RBJzb1XVSbYC2Gc6bH1v+ntHiiKdg9D5Fk + v7jj5q9LnM70RkqEsEJbBaZ8hTABm1vHPfRRFkzKoGBGFLAd45Lu48Qanx2RfsE/eFKL + HgoB6GXjuOMXpA1K0l99XntRts9czZsBZnlgdADVoQlyjlEXKW5lLyq6IiGLHmm8WdA7 + cVrg== +X-Gm-Message-State: + ALoCoQkWELhL+gPZ9kgX5OrbOuLLi0t3gO6PPpS8Y+79ggCHtGRTymbeaczSl/51ayOCzuOPJEmU +X-Received: by 10.14.32.132 with SMTP id o4mr3713545eea.14.1389976741107; + Fri, 17 Jan 2014 08:39:01 -0800 (PST) +Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi. + [88.195.111.91]) + by mx.google.com with ESMTPSA id v1sm28217872eef.9.2014.01.17.08.38.59 + for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Fri, 17 Jan 2014 08:39:00 -0800 (PST) +From: Jani Nikula +To: notmuch@notmuchmail.org +Subject: [PATCH] cli: abstract common config get/set code +Date: Fri, 17 Jan 2014 18:38:58 +0200 +Message-Id: <1389976738-25056-1-git-send-email-jani@nikula.org> +X-Mailer: git-send-email 1.8.5.2 +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: Fri, 17 Jan 2014 16:39:09 -0000 + +Pretty straightforward abstraction similar to get/set list. + +--- + +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 + -- 2.26.2