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

[Tomi Ollila <tomi.ollila@iki.fi>]

On Mon, Sep 07 2015, David Bremner <david@tethera.net> 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