Re: [PATCH 1/2] moved _notmuch_get_list () and _notmuch_set_list () up in file

diff --git a/99/b5a49b14b6d16a9b30e804427ed17d010ab799 b/99/b5a49b14b6d16a9b30e804427ed17d010ab799
new file mode 100644 (file)
index 0000000..75a7bcb
--- /dev/null
+++ b/99/b5a49b14b6d16a9b30e804427ed17d010ab799
@@ -0,0 +1,197 @@
+Return-Path: <jani@nikula.org>\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 09A42431FAE\r
+       for <notmuch@notmuchmail.org>; Thu, 26 Jan 2012 05:03:52 -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 NFuzuU1aQvQh for <notmuch@notmuchmail.org>;\r
+       Thu, 26 Jan 2012 05:03:51 -0800 (PST)\r
+Received: from mail-qw0-f53.google.com (mail-qw0-f53.google.com\r
+       [209.85.216.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id E23C3431FAF\r
+       for <notmuch@notmuchmail.org>; Thu, 26 Jan 2012 05:03:50 -0800 (PST)\r
+Received: by qabg24 with SMTP id g24so544708qab.5\r
+       for <notmuch@notmuchmail.org>; Thu, 26 Jan 2012 05:03:50 -0800 (PST)\r
+Received: by 10.224.59.65 with SMTP id k1mr2319822qah.54.1327583030365;\r
+       Thu, 26 Jan 2012 05:03:50 -0800 (PST)\r
+Received: from localhost (nikula.org. [92.243.24.172])\r
+       by mx.google.com with ESMTPS id gy6sm8465181qab.1.2012.01.26.05.03.48\r
+       (version=SSLv3 cipher=OTHER); Thu, 26 Jan 2012 05:03:49 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: Tomi Ollila <tomi.ollila@iki.fi>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 1/2] moved _notmuch_get_list () and _notmuch_set_list ()\r
+       up in file\r
+In-Reply-To: <1327572718-13411-1-git-send-email-tomi.ollila@iki.fi>\r
+References: <8762g0sj6f.fsf@praet.org>\r
+       <1327572718-13411-1-git-send-email-tomi.ollila@iki.fi>\r
+User-Agent: Notmuch/0.10.2+187~g43d4f26 (http://notmuchmail.org) Emacs/23.1.1\r
+       (i686-pc-linux-gnu)\r
+Date: Thu, 26 Jan 2012 13:03:46 +0000\r
+Message-ID: <87sjj2ipjh.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Cc: Tomi Ollila <tomi.ollila@iki.fi>\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: Thu, 26 Jan 2012 13:03:52 -0000\r
+\r
+On Thu, 26 Jan 2012 12:11:57 +0200, Tomi Ollila <tomi.ollila@iki.fi> wrote:\r
+> Moved _notmuch_get_list () and _notmuch_set_list () to a location\r
+> in notmuch-config.c so that new functions that will be located \r
+> before the old location of those functions can also use these.\r
+\r
+Parse error. ;)\r
+\r
+You mean something along the lines of: "Move _notmuch_get_list () and\r
+_notmuch_set_list () earlier in the file to avoid forward declarations\r
+in further work. No functional changes."\r
+\r
+I'm sure native speakers can bikeshed that further. ;)\r
+\r
+BR,\r
+Jani.\r
+\r
+\r
+> ---\r
+> \r
+> This patch is independent of the next one (just required by it)\r
+> and can (should) be pushed early.\r
+> \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
+> -- \r
+> 1.7.6.4\r
+> \r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r