[PATCH v2 04/16] Provide _notmuch_crypto_{set,get}_gpg_path

Daniel Kahn Gillmor dkg at fifthhorseman.net
Sun Jan 24 07:55:12 PST 2016


Thanks for the review, Tomi!

On Sun 2016-01-24 10:23:02 -0500, Tomi Ollila wrote:
> On Wed, Jan 20 2016, Daniel Kahn Gillmor <dkg at fifthhorseman.net> wrote:
>
>> Use functions to access the gpg_path for a _notmuch_crypto_t object.
>> This lets us return sensible defaults based on the state of the user's
>> machine.
>> ---
>>  notmuch-reply.c | 13 ++++++++++---
>>  notmuch-show.c  | 12 ++++++++++--
>>  util/crypto.c   | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
>>  util/crypto.h   |  8 +++++++-
>>  4 files changed, 75 insertions(+), 7 deletions(-)
>>
>> diff --git a/util/crypto.c b/util/crypto.c
>> index c18c82c..0b51347 100644
>> --- a/util/crypto.c
>> +++ b/util/crypto.c
>> @@ -21,7 +21,11 @@
>>  
>>  #include "notmuch.h"
>>  #include "crypto.h"
>> +#include "search-path.h"
>>  #include <string.h>
>> +#include <talloc.h>
>> +
>> +#define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))
>>  
>>  #define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))
>
> duplicate ARRAY_SIZE definition ?

whoops, thanks for catching that.  I think that got inserted from a git
rebase.  fixing in my local copy now.

         --dkg


More information about the notmuch mailing list