From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <dkg@fifthhorseman.net>
Received: from localhost (localhost [127.0.0.1])
 by arlo.cworth.org (Postfix) with ESMTP id E365E6DE0FF8
 for <notmuch@notmuchmail.org>; Wed, 10 Feb 2016 08:32:10 -0800 (PST)
X-Virus-Scanned: Debian amavisd-new at cworth.org
X-Spam-Flag: NO
X-Spam-Score: -0.018
X-Spam-Level: 
X-Spam-Status: No, score=-0.018 tagged_above=-999 required=5
 tests=[AWL=-0.018] 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 F9Zx95u-FQqD for <notmuch@notmuchmail.org>;
 Wed, 10 Feb 2016 08:32:09 -0800 (PST)
Received: from che.mayfirst.org (che.mayfirst.org [209.234.253.108])
 by arlo.cworth.org (Postfix) with ESMTP id 392006DE0BF6
 for <notmuch@notmuchmail.org>; Wed, 10 Feb 2016 08:32:09 -0800 (PST)
Received: from fifthhorseman.net (unknown [38.109.115.130])
 by che.mayfirst.org (Postfix) with ESMTPSA id 04F90F997;
 Wed, 10 Feb 2016 11:31:56 -0500 (EST)
Received: by fifthhorseman.net (Postfix, from userid 1000)
 id 037FF1FF3A; Wed, 10 Feb 2016 11:31:57 -0500 (EST)
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
To: David Bremner <david@tethera.net>, Notmuch Mail <notmuch@notmuchmail.org>
Subject: Re: [PATCH v3 04/16] Provide _notmuch_crypto_{set,get}_gpg_path
In-Reply-To: <87r3gkvlec.fsf@maritornes.cs.unb.ca>
References: <1454272801-23623-1-git-send-email-dkg@fifthhorseman.net>
 <1454272801-23623-5-git-send-email-dkg@fifthhorseman.net>
 <87r3gkvlec.fsf@maritornes.cs.unb.ca>
User-Agent: Notmuch/0.21+72~gd8c4f1c (http://notmuchmail.org) Emacs/24.5.1
 (x86_64-pc-linux-gnu)
Date: Wed, 10 Feb 2016 11:31:56 -0500
Message-ID: <87a8n8o7b7.fsf@alice.fifthhorseman.net>
MIME-Version: 1.0
Content-Type: text/plain
X-BeenThere: notmuch@notmuchmail.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "Use and development of the notmuch mail system."
 <notmuch.notmuchmail.org>
List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,
 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,
 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Feb 2016 16:32:11 -0000

On Wed 2016-02-10 06:45:47 -0500, David Bremner wrote:
> Daniel Kahn Gillmor <dkg@fifthhorseman.net> writes:
>
>> +#define try_gpg_path(z) if (test_for_executable(z)) return z
>> +    try_gpg_path("gpg2");
>> +    try_gpg_path("gpg");
>> +#undef try_gpg_path
>> +    return NULL;
>> +}
>
> I think I'd prefer just inlining these two ifs.
>
>> +notmuch_status_t
>> +_notmuch_crypto_set_gpg_path (_notmuch_crypto_t *crypto, const char* gpg_path)
>> +{
>> +    /* return success if this matches what is already configured */
>> +    if ((!gpg_path && !crypto->gpg_path) ||
>> +	(gpg_path && crypto->gpg_path && 0 == strcmp(gpg_path, crypto->gpg_path)))
>> +	return NOTMUCH_STATUS_SUCCESS;
>
> these changes probably need a pass of uncrustify or equivalent.

I've made these changes in my working copy; i'll publish them as part of
v4 soon.

   --dkg