Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 44541431FBF for ; Fri, 29 Mar 2013 18:48:53 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.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 olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id W6WrAntZro7P for ; Fri, 29 Mar 2013 18:48:49 -0700 (PDT) Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 2E5BB431FAE for ; Fri, 29 Mar 2013 18:48:49 -0700 (PDT) Received: from remotemail by tesseract.cs.unb.ca with local (Exim 4.80) (envelope-from ) id 1ULkuT-00060l-Kp; Fri, 29 Mar 2013 22:48:45 -0300 Received: (nullmailer pid 11278 invoked by uid 1000); Fri, 29 Mar 2013 23:05:54 -0000 From: David Bremner To: Jani Nikula , notmuch@notmuchmail.org Subject: Re: [PATCH 2/2] cli: mime node: abstract decryption and signature verification In-Reply-To: References: User-Agent: Notmuch/0.15.1 (http://notmuchmail.org) Emacs/24.2.1 (x86_64-pc-linux-gnu) Date: Fri, 29 Mar 2013 19:05:54 -0400 Message-ID: <87k3opiz71.fsf@maritornes.cs.unb.ca> MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 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: Sat, 30 Mar 2013 01:48:53 -0000 Jani Nikula writes: > The code filled with #ifdef GMIME_ATLEAST_26 is difficult to > read. Abstract the decryption and signature verification into > functions, with separate implementations for GMime 2.4 and 2.6, to > clarify the code. This series mostly looks OK, although it's a challenge to track all the code movement. I'd like some way to make it more obvious to the reader which version of the functions they are reading (when the #ifdef GMIME_ATLEAST_26 has scrolled off screen). The simplest would just be a comment in front of each function. d