Re: [PATCH 2/2] cli/count: apply uncrustify changes

diff --git a/a1/99e6a85b53c8cb0e48dee6613105a6350f56d7 b/a1/99e6a85b53c8cb0e48dee6613105a6350f56d7
new file mode 100644 (file)
index 0000000..159fec3
--- /dev/null
+++ b/a1/99e6a85b53c8cb0e48dee6613105a6350f56d7
@@ -0,0 +1,100 @@
+Return-Path: <tomi.ollila@iki.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id AE6566DE163F\r
+ for <notmuch@notmuchmail.org>; Mon,  7 Sep 2015 06:55:25 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 1.164\r
+X-Spam-Level: *\r
+X-Spam-Status: No, score=1.164 tagged_above=-999 required=5 tests=[AWL=-0.232,\r
+  SPF_NEUTRAL=0.652, URIBL_SBL=0.644, URIBL_SBL_A=0.1] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 0UvrBMhZIrz1 for <notmuch@notmuchmail.org>;\r
+ Mon,  7 Sep 2015 06:55:23 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 664636DE147C\r
+ for <notmuch@notmuchmail.org>; Mon,  7 Sep 2015 06:55:22 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+ by guru.guru-group.fi (Postfix) with ESMTP id 4ED4F100033;\r
+ Mon,  7 Sep 2015 16:55:20 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 2/2] cli/count: apply uncrustify changes\r
+In-Reply-To: <1441632818-22483-2-git-send-email-david@tethera.net>\r
+References: <1441632818-22483-1-git-send-email-david@tethera.net>\r
+ <1441632818-22483-2-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.20.2+68~g0c35549 (http://notmuchmail.org) Emacs/24.3.1\r
+ (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+ $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+ !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Mon, 07 Sep 2015 16:55:20 +0300\r
+Message-ID: <m2bndegwqf.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.18\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, 07 Sep 2015 13:55:25 -0000\r
+\r
+On Mon, Sep 07 2015, David Bremner <david@tethera.net> wrote:\r
+\r
+> ---\r
+>  notmuch-count.c | 6 +++---\r
+>  1 file changed, 3 insertions(+), 3 deletions(-)\r
+>\r
+> diff --git a/notmuch-count.c b/notmuch-count.c\r
+> index 66f5e53..a844384 100644\r
+> --- a/notmuch-count.c\r
+> +++ b/notmuch-count.c\r
+> @@ -117,7 +117,7 @@ count_file (notmuch_database_t *notmuch, FILE *input, const char **exclude_tags,\r
+>      size_t line_size;\r
+>      int ret = 0;\r
+>  \r
+> -    while (!ret && (line_len = getline (&line, &line_size, input)) != -1) {\r
+> +    while (! ret && (line_len = getline (&line, &line_size, input)) != -1) {\r
+>      chomp_newline (line);\r
+>      ret = print_count (notmuch, line, exclude_tags, exclude_tags_length,\r
+>                         output, print_lastmod);\r
+> @@ -189,7 +189,7 @@ notmuch_count_command (notmuch_config_t *config, int argc, char *argv[])\r
+>  \r
+>      notmuch_exit_if_unmatched_db_uuid (notmuch);\r
+>  \r
+> -    query_str = query_string_from_args (config, argc-opt_index, argv+opt_index);\r
+> +    query_str = query_string_from_args (config, argc - opt_index, argv + opt_index);\r
+>      if (query_str == NULL) {\r
+>      fprintf (stderr, "Out of memory.\n");\r
+>      return EXIT_FAILURE;\r
+> @@ -197,7 +197,7 @@ notmuch_count_command (notmuch_config_t *config, int argc, char *argv[])\r
+>  \r
+>      if (exclude == EXCLUDE_TRUE) {\r
+>      search_exclude_tags = notmuch_config_get_search_exclude_tags\r
+> -        (config, &search_exclude_tags_length);\r
+> +                              (config, &search_exclude_tags_length);\r
+\r
+With the first 2 uncrustify does a good job, but this last one it disagrees\r
+how emacs(1) indents (and how it is currently indented in other notmuch\r
+source files) -- I'd leave the last (3rd) change out.\r
+\r
+Note that in this file uncrustify had a chance to do pretty good job -- in\r
+some other files there are many more changes that need to be post-edited...\r
+\r
+Tomi\r
+\r
+>      }\r
+>  \r
+>      if (batch)\r
+> -- \r
+> 2.5.1\r