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