Re: [PATCH 1/2] cli: abstract common config get/set code

diff --git a/1c/303ee95a70f8b8047189811800f4e8c75f42c2 b/1c/303ee95a70f8b8047189811800f4e8c75f42c2
new file mode 100644 (file)
index 0000000..833ba91
--- /dev/null
+++ b/1c/303ee95a70f8b8047189811800f4e8c75f42c2
@@ -0,0 +1,85 @@
+Return-Path: <david@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id B91C0431FBD\r
+       for <notmuch@notmuchmail.org>; Wed, 15 Jan 2014 05:25:09 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id SqfPCPB7OOlw for <notmuch@notmuchmail.org>;\r
+       Wed, 15 Jan 2014 05:25:01 -0800 (PST)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id E150F431FAF\r
+       for <notmuch@notmuchmail.org>; Wed, 15 Jan 2014 05:25:01 -0800 (PST)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <david@tethera.net>)\r
+       id 1W3QSn-0005ej-0x; Wed, 15 Jan 2014 09:24:57 -0400\r
+Received: (nullmailer pid 24745 invoked by uid 1000); Wed, 15 Jan 2014\r
+       13:24:53 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 1/2] cli: abstract common config get/set code\r
+In-Reply-To: <1376839205-5115-1-git-send-email-jani@nikula.org>\r
+References: <1376839205-5115-1-git-send-email-jani@nikula.org>\r
+User-Agent: Notmuch/0.17+30~g50677dd (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Wed, 15 Jan 2014 09:24:53 -0400\r
+Message-ID: <871u09js2i.fsf@zancas.localnet>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 15 Jan 2014 13:25:09 -0000\r
+\r
+Jani Nikula <jani@nikula.org> writes:\r
+\r
+> Pretty straightforward abstraction similar to get/set list.\r
+> ---\r
+>  notmuch-config.c |   80 ++++++++++++++++++++----------------------------------\r
+>  1 file changed, 29 insertions(+), 51 deletions(-)\r
+>\r
+> diff --git a/notmuch-config.c b/notmuch-config.c\r
+> index befe9b5..305d213 100644\r
+> --- a/notmuch-config.c\r
+> +++ b/notmuch-config.c\r
+> @@ -496,6 +496,29 @@ notmuch_config_is_new (notmuch_config_t *config)\r
+>      return config->is_new;\r
+>  }\r
+>  \r
+> +static const char *\r
+> +_config_get (notmuch_config_t *config, char **field,\r
+> +         const char *group, const char *key)\r
+> +{\r
+> +    if (*field == NULL) {\r
+> +    char *value;\r
+> +    value = g_key_file_get_string (config->key_file, group, key, NULL);\r
+> +    if (value) {\r
+> +        *field = talloc_strdup (config, value);\r
+> +        free (value);\r
+> +    }\r
+> +    }\r
+> +    return *field;\r
+> +}\r
+> +\r
+\r
+The use of NULL here is clear enough in the context of the patch, but I\r
+think it deserves a comment in the code; it is not obviously just code\r
+movement after the patch is applied.\r