Re: [PATCH] lib/database.cc: fix misleading indentation

Subject: Re: [PATCH] lib/database.cc: fix misleading indentation

Date: Thu, 20 Oct 2016 12:54:39 +0000

To: Tomi Ollila, notmuch@notmuchmail.org

Cc: tomi.ollila@iki.fi

From: Franz Fellner


Probably a little bit off-topic, but somewhat related.
There is a wild mix of TABs and spaces used for indenting all over the place.
I had a hard time to follow the code. Could there be done something?
Do we have some sort of coding style? If not could we agree on some? At least
for such important things as indentation... It is possible to use e.g. astyle
to apply the formatting automatically.

Franz

On Tue, 27 Sep 2016 18:06:52 +0300, Tomi Ollila <tomi.ollila@iki.fi> wrote:
> Found by gcc 6.1.1 -Wmisleading-indentation option (set by -Wall).
> ---
> 
> I suggest this change to be included in 0.23: this does not affect
> binary content and this will give users of gcc 6 more enjoyable
> compilation experience.
> 
>  lib/database.cc | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/database.cc b/lib/database.cc
> index 392e8b2..4bfae01 100644
> --- a/lib/database.cc
> +++ b/lib/database.cc
> @@ -1685,8 +1685,8 @@ notmuch_database_begin_atomic (notmuch_database_t *notmuch)
>         notmuch->atomic_nesting > 0)
>         goto DONE;
>  
> -       if (notmuch_database_needs_upgrade(notmuch))
> -               return NOTMUCH_STATUS_UPGRADE_REQUIRED;
> +    if (notmuch_database_needs_upgrade (notmuch))
> +       return NOTMUCH_STATUS_UPGRADE_REQUIRED;
>  
>      try {
>         (static_cast <Xapian::WritableDatabase *> (notmuch->xapian_db))->begin_transaction (false);
> -- 
> 2.7.4
> 
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> https://notmuchmail.org/mailman/listinfo/notmuch
> 
> 
-- 

Thread: