1 Return-Path: <david@tethera.net>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by arlo.cworth.org (Postfix) with ESMTP id 7B3026DE0231
\r
6 for <notmuch@notmuchmail.org>; Wed, 10 Feb 2016 03:45:55 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at cworth.org
\r
11 X-Spam-Status: No, score=-0.308 tagged_above=-999 required=5 tests=[AWL=0.243,
\r
12 RP_MATCHES_RCVD=-0.55, SPF_PASS=-0.001] autolearn=disabled
\r
13 Received: from arlo.cworth.org ([127.0.0.1])
\r
14 by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id jRYsvYSmZi84 for <notmuch@notmuchmail.org>;
\r
16 Wed, 10 Feb 2016 03:45:53 -0800 (PST)
\r
17 Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])
\r
18 by arlo.cworth.org (Postfix) with ESMTPS id 1CDA36DE021E
\r
19 for <notmuch@notmuchmail.org>; Wed, 10 Feb 2016 03:45:52 -0800 (PST)
\r
20 Received: from remotemail by fethera.tethera.net with local (Exim 4.84)
\r
21 (envelope-from <david@tethera.net>)
\r
22 id 1aTTCm-00081w-8l; Wed, 10 Feb 2016 06:45:08 -0500
\r
23 Received: (nullmailer pid 24742 invoked by uid 1000);
\r
24 Wed, 10 Feb 2016 11:45:47 -0000
\r
25 From: David Bremner <david@tethera.net>
\r
26 To: Daniel Kahn Gillmor <dkg@fifthhorseman.net>,
\r
27 Notmuch Mail <notmuch@notmuchmail.org>
\r
28 Subject: Re: [PATCH v3 04/16] Provide _notmuch_crypto_{set,get}_gpg_path
\r
29 In-Reply-To: <1454272801-23623-5-git-send-email-dkg@fifthhorseman.net>
\r
30 References: <1454272801-23623-1-git-send-email-dkg@fifthhorseman.net>
\r
31 <1454272801-23623-5-git-send-email-dkg@fifthhorseman.net>
\r
32 User-Agent: Notmuch/0.21+5~gca076ce (http://notmuchmail.org) Emacs/24.5.1
\r
33 (x86_64-pc-linux-gnu)
\r
34 Date: Wed, 10 Feb 2016 07:45:47 -0400
\r
35 Message-ID: <87r3gkvlec.fsf@maritornes.cs.unb.ca>
\r
37 Content-Type: text/plain
\r
38 X-BeenThere: notmuch@notmuchmail.org
\r
39 X-Mailman-Version: 2.1.20
\r
41 List-Id: "Use and development of the notmuch mail system."
\r
42 <notmuch.notmuchmail.org>
\r
43 List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,
\r
44 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
45 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
\r
46 List-Post: <mailto:notmuch@notmuchmail.org>
\r
47 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
48 List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,
\r
49 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
50 X-List-Received-Date: Wed, 10 Feb 2016 11:45:55 -0000
\r
52 Daniel Kahn Gillmor <dkg@fifthhorseman.net> writes:
\r
54 > +#define try_gpg_path(z) if (test_for_executable(z)) return z
\r
55 > + try_gpg_path("gpg2");
\r
56 > + try_gpg_path("gpg");
\r
57 > +#undef try_gpg_path
\r
61 I think I'd prefer just inlining these two ifs.
\r
64 > +_notmuch_crypto_set_gpg_path (_notmuch_crypto_t *crypto, const char* gpg_path)
\r
66 > + /* return success if this matches what is already configured */
\r
67 > + if ((!gpg_path && !crypto->gpg_path) ||
\r
68 > + (gpg_path && crypto->gpg_path && 0 == strcmp(gpg_path, crypto->gpg_path)))
\r
69 > + return NOTMUCH_STATUS_SUCCESS;
\r
71 these changes probably need a pass of uncrustify or equivalent.
\r