From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id CE7436DE0B2B for ; Thu, 20 Oct 2016 05:51:06 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.197 X-Spam-Level: X-Spam-Status: No, score=-0.197 tagged_above=-999 required=5 tests=[AWL=-0.077, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001] 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 n9yzgeJTxSJH for ; Thu, 20 Oct 2016 05:51:05 -0700 (PDT) Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by arlo.cworth.org (Postfix) with ESMTPS id 26C8B6DE0962 for ; Thu, 20 Oct 2016 05:51:05 -0700 (PDT) Received: by mail-lf0-f67.google.com with SMTP id x23so823505lfi.1 for ; Thu, 20 Oct 2016 05:51:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:subject:to:cc:references:in-reply-to:mime-version:date :message-id; bh=+zwWcieqIxT+HxPzR9T4skK0g6jsLLje+/+WXlDvnY4=; b=y1Wja7NB/epFpmknB1Q9dgQuFkgd/GUqdDaOFHbCshMhF+5bPBU/KYYmfMxfx7m/hW B9bsz1sv71Kio3Xv2Z3mpo3hV817A+qDVv5GuzkI2yMio8m9vwgr4lbiMtUR9ITULZgu /QTjm0PmRvTaS0s+joUCsccLAM8C06ueDiZBwvCONxVYmgTZ5CJrHnfFGE00wz6Er6dL d94iU+cj7qC6pT2I8QZt02w+8X8usjVSsvECpeDwsCW37xR8a8bB5wt95fm7C9VhBBvS r+nwwycLC0km2lss4hqDM/Cf2nREO0DEtTEC13wlugD/wDMc6vbBByES7jCUDkIaT66n BuAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:subject:to:cc:references:in-reply-to :mime-version:date:message-id; bh=+zwWcieqIxT+HxPzR9T4skK0g6jsLLje+/+WXlDvnY4=; b=WVVfm89Bj0aXsTd6WsYOtHQTkt9xzSgHcOrLImXhPLCy2UTRolKBUIChY4UfmoWsmO iNcNa1Um55Jm6lCk6PGecIJbaDH2LO401E288OYYHgvs5Qk1XF3S+4yFXpn0L4TONyCJ jI8vllhkiVZ7EDc45PDEDg22WzrXCz2M38FJnnEx3FgGZT07diVaEBBOc3h6Y22sy0Ym +uiO2N0E2xgoENeiDylJ6oDkQeX0ruOIrqMoyE4F1G3vyLIz3RCnM80qTie1QSd/b1GC lZ38JyNh0jCmZZdiI6d2zWH3/4V0I1f/3FWwbkOFHwOkyXFWloKtjN6Iqm2fHzdT+Hv/ lxRQ== X-Gm-Message-State: AA6/9RkrhoifazMNqaDjxFKdgVsIAJQR/ijq5GGrHCGeQMfmaFtwLUHBmURp9An3HvHCpg== X-Received: by 10.28.54.209 with SMTP id y78mr356923wmh.94.1476967861561; Thu, 20 Oct 2016 05:51:01 -0700 (PDT) Received: from localhost ([87.155.186.233]) by smtp.gmail.com with ESMTPSA id vx1sm45205939wjc.3.2016.10.20.05.50.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Oct 2016 05:51:00 -0700 (PDT) From: Franz Fellner Subject: Re: [PATCH] lib/database.cc: fix misleading indentation To: Tomi Ollila , notmuch@notmuchmail.org Cc: tomi.ollila@iki.fi References: <1474988812-21365-1-git-send-email-tomi.ollila@iki.fi> In-Reply-To: <1474988812-21365-1-git-send-email-tomi.ollila@iki.fi> MIME-Version: 1.0 Date: Thu, 20 Oct 2016 12:54:39 +0000 Message-Id: <1.476.968.079-ner-1.779@TP_L520> Content-Type: text/plain X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.22 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: Thu, 20 Oct 2016 12:51:06 -0000 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 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 (notmuch->xapian_db))->begin_transaction (false); > -- > 2.7.4 > > _______________________________________________ > notmuch mailing list > notmuch@notmuchmail.org > https://notmuchmail.org/mailman/listinfo/notmuch > > --