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 0E7D46DE1161 for ; Mon, 9 Oct 2017 22:49:30 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] 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 7NvEKIInE-tT for ; Mon, 9 Oct 2017 22:49:29 -0700 (PDT) Received: from che.mayfirst.org (che.mayfirst.org [162.247.75.118]) by arlo.cworth.org (Postfix) with ESMTP id 156BA6DE0941 for ; Mon, 9 Oct 2017 22:49:28 -0700 (PDT) Received: from fifthhorseman.net (cpe-74-71-53-242.nyc.res.rr.com [74.71.53.242]) by che.mayfirst.org (Postfix) with ESMTPSA id 3FE14F99B; Tue, 10 Oct 2017 01:49:26 -0400 (EDT) Received: by fifthhorseman.net (Postfix, from userid 1000) id E68C2202AB; Tue, 10 Oct 2017 00:27:44 -0400 (EDT) From: Daniel Kahn Gillmor To: Jani Nikula , Notmuch Mail Subject: Re: [PATCH v2 05/10] crypto: index encrypted parts when indexopts try_decrypt is set. In-Reply-To: <87shfdflij.fsf@nikula.org> References: <20170912230153.4175-10-dkg@fifthhorseman.net> <20170915055359.24123-1-dkg@fifthhorseman.net> <20170915055359.24123-6-dkg@fifthhorseman.net> <87shfdflij.fsf@nikula.org> Date: Tue, 10 Oct 2017 00:27:44 -0400 Message-ID: <87mv4zk4ov.fsf@fifthhorseman.net> MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.23 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: Tue, 10 Oct 2017 05:49:30 -0000 On Sat 2017-09-23 19:05:40 +0300, Jani Nikula wrote: > I'd like this #if block to be abstracted to separate functions for gmime > 2 vs. 3. Adding conditional compilation within functions is ugly and > hard to track for both branches. That abstraction has already happened -- it's in util/crypto.c; there's simply a chunk of code that gmime 2.6 needs that gmime 3.0 does not. :/ i welcome suggestions for how to rewrite this if you really think it's a problem, but i hope the latest revision of this series (which groups all changes into a single, cleaned-up #if block) will be acceptable. --dkg