--- /dev/null
+Return-Path: <amdragon@mit.edu>\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 E5DC7431E64\r
+ for <notmuch@notmuchmail.org>; Mon, 30 Jan 2012 07:07:40 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 yGP-6M15We7i for <notmuch@notmuchmail.org>;\r
+ Mon, 30 Jan 2012 07:07:40 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-6.mit.edu (DMZ-MAILSEC-SCANNER-6.MIT.EDU\r
+ [18.7.68.35])\r
+ by olra.theworths.org (Postfix) with ESMTP id 528DD431FBC\r
+ for <notmuch@notmuchmail.org>; Mon, 30 Jan 2012 07:07:40 -0800 (PST)\r
+X-AuditID: 12074423-b7f9c6d0000008c3-90-4f26b23bd67f\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+ by dmz-mailsec-scanner-6.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 1A.FC.02243.C32B62F4; Mon, 30 Jan 2012 10:07:40 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q0UF7dfH001398; \r
+ Mon, 30 Jan 2012 10:07:39 -0500\r
+Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
+ (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q0UF7ZEo021512\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Mon, 30 Jan 2012 10:07:38 -0500 (EST)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1Rrsof-0001u3-Mx; Mon, 30 Jan 2012 10:06:45 -0500\r
+Date: Mon, 30 Jan 2012 10:06:45 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: Tomi Ollila <tomi.ollila@iki.fi>\r
+Subject: Re: [PATCH] moved _config_(get|set)_list () functions earlyer in the\r
+ file\r
+Message-ID: <20120130150645.GR17991@mit.edu>\r
+References: <4F22EA91.4020006@cs.rpi.edu>\r
+ <1327919485-15027-1-git-send-email-tomi.ollila@iki.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+In-Reply-To: <1327919485-15027-1-git-send-email-tomi.ollila@iki.fi>\r
+User-Agent: Mutt/1.5.21 (2010-09-15)\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFmpkleLIzCtJLcpLzFFi42IRYrdT17XZpOZvMOcMq8X1mzOZLd6snMfq\r
+ wORx+OtCFo9nq24xBzBFcdmkpOZklqUW6dslcGVsP/SMuWCKXMX+T78ZGxiniXcxcnJICJhI\r
+ rL4zhRXCFpO4cG89WxcjF4eQwD5GiYtPp7KBJIQENjBKPDuZD5E4ySRxeukZqKoljBInH/Yw\r
+ dTFycLAIqAIV8YI0sAloSGzbv5wRxBYRUJF40LYebAOzgLTEt9/NYOXCAiESLy/IgoR5BXQk\r
+ Vj+8xwSxK0li1oNjTBBxQYmTM5+wQLRqSdz49xKsFWTM8n8cIGFOAWeJ1tlt7CC2KNCmKSe3\r
+ sU1gFJqFpHsWku5ZCN0LGJlXMcqm5Fbp5iZm5hSnJusWJyfm5aUW6Zrp5WaW6KWmlG5iBIe0\r
+ i/IOxj8HlQ4xCnAwKvHwBv1T9RdiTSwrrsw9xCjJwaQkyhu9Uc1fiC8pP6UyI7E4I76oNCe1\r
+ +BCjBAezkgjvm9VAOd6UxMqq1KJ8mJQ0B4uSOK+G1js/IYH0xJLU7NTUgtQimKwMB4eSBG86\r
+ yFDBotT01Iq0zJwShDQTByfIcB6g4TNBaniLCxJzizPTIfKnGBWlxHlLQRICIImM0jy4XljK\r
+ ecUoDvSKMO9skCoeYLqC634FNJgJaPBzBlWQwSWJCCmpBkaj0ouaPm9+PTYQ0f1y3Lb9xxvL\r
+ plROHctsCUWXi+VJ3q4ZbPdjxG9lrlIRsm3kCZjqbrC0bLb+1zPVyow2VXPrX6bd2nD0v0jC\r
+ 95q3F7bv31h6Kt/T42WAhqn9PI9j/b9trv3qtahMOzk/RU3gtM15Bya1F35/GxcxG7EHPlzR\r
+ G/Z5coK2nhJLcUaioRZzUXEiAL3j45cUAwAA\r
+Cc: notmuch@notmuchmail.org\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: Mon, 30 Jan 2012 15:07:41 -0000\r
+\r
+s/earlyer/earlier/, but unless someone feels strongly about that, I\r
+don't think we need another version of this trivial patch.\r
+\r
+Quoth Tomi Ollila on Jan 30 at 12:31 pm:\r
+> Moved static functions _config_get_list () and _config_set_list ()\r
+> closer to the beginning of file so that their definition is known\r
+> (without adding forward declarations) in upcoming changes.\r
+> ---\r
+> \r
+> This addresses Ethan's comments. Thanks.\r
+> \r
+> s/_notmuch_/_config_/ and changed 'in further work' to 'in upcoming\r
+> changes' -- 'changes' being more generic that 'patches'.\r
+> notmuch-config.c | 84 +++++++++++++++++++++++++++---------------------------\r
+> 1 files changed, 42 insertions(+), 42 deletions(-)\r
+> \r
+> diff --git a/notmuch-config.c b/notmuch-config.c\r
+> index 0ded6d7..a124e34 100644\r
+> --- a/notmuch-config.c\r
+> +++ b/notmuch-config.c\r
+> @@ -467,6 +467,48 @@ notmuch_config_save (notmuch_config_t *config)\r
+> return 0;\r
+> }\r
+> \r
+> +static const char **\r
+> +_config_get_list (notmuch_config_t *config,\r
+> + const char *section, const char *key,\r
+> + const char ***outlist, size_t *list_length, size_t *ret_length)\r
+> +{\r
+> + assert(outlist);\r
+> +\r
+> + if (*outlist == NULL) {\r
+> +\r
+> + char **inlist = g_key_file_get_string_list (config->key_file,\r
+> + section, key, list_length, NULL);\r
+> + if (inlist) {\r
+> + unsigned int i;\r
+> +\r
+> + *outlist = talloc_size (config, sizeof (char *) * (*list_length + 1));\r
+> +\r
+> + for (i = 0; i < *list_length; i++)\r
+> + (*outlist)[i] = talloc_strdup (*outlist, inlist[i]);\r
+> +\r
+> + (*outlist)[i] = NULL;\r
+> +\r
+> + g_strfreev (inlist);\r
+> + }\r
+> + }\r
+> +\r
+> + if (ret_length)\r
+> + *ret_length = *list_length;\r
+> +\r
+> + return *outlist;\r
+> +}\r
+> +\r
+> +static void\r
+> +_config_set_list (notmuch_config_t *config,\r
+> + const char *group, const char *name,\r
+> + const char *list[],\r
+> + size_t length, const char ***config_var )\r
+> +{\r
+> + g_key_file_set_string_list (config->key_file, group, name, list, length);\r
+> + talloc_free (*config_var);\r
+> + *config_var = NULL;\r
+> +}\r
+> +\r
+> const char *\r
+> notmuch_config_get_database_path (notmuch_config_t *config)\r
+> {\r
+> @@ -551,37 +593,6 @@ notmuch_config_set_user_primary_email (notmuch_config_t *config,\r
+> config->user_primary_email = NULL;\r
+> }\r
+> \r
+> -static const char **\r
+> -_config_get_list (notmuch_config_t *config,\r
+> - const char *section, const char *key,\r
+> - const char ***outlist, size_t *list_length, size_t *ret_length)\r
+> -{\r
+> - assert(outlist);\r
+> -\r
+> - if (*outlist == NULL) {\r
+> -\r
+> - char **inlist = g_key_file_get_string_list (config->key_file,\r
+> - section, key, list_length, NULL);\r
+> - if (inlist) {\r
+> - unsigned int i;\r
+> -\r
+> - *outlist = talloc_size (config, sizeof (char *) * (*list_length + 1));\r
+> -\r
+> - for (i = 0; i < *list_length; i++)\r
+> - (*outlist)[i] = talloc_strdup (*outlist, inlist[i]);\r
+> -\r
+> - (*outlist)[i] = NULL;\r
+> -\r
+> - g_strfreev (inlist);\r
+> - }\r
+> - }\r
+> -\r
+> - if (ret_length)\r
+> - *ret_length = *list_length;\r
+> -\r
+> - return *outlist;\r
+> -}\r
+> -\r
+> const char **\r
+> notmuch_config_get_user_other_email (notmuch_config_t *config, size_t *length)\r
+> {\r
+> @@ -598,17 +609,6 @@ notmuch_config_get_new_tags (notmuch_config_t *config, size_t *length)\r
+> &(config->new_tags_length), length);\r
+> }\r
+> \r
+> -static void\r
+> -_config_set_list (notmuch_config_t *config,\r
+> - const char *group, const char *name,\r
+> - const char *list[],\r
+> - size_t length, const char ***config_var )\r
+> -{\r
+> - g_key_file_set_string_list (config->key_file, group, name, list, length);\r
+> - talloc_free (*config_var);\r
+> - *config_var = NULL;\r
+> -}\r
+> -\r
+> void\r
+> notmuch_config_set_user_other_email (notmuch_config_t *config,\r
+> const char *list[],\r
projects / notmuch-archives.git / commitdiff