From: Jameson Graef Rollins Date: Wed, 16 May 2012 21:55:57 +0000 (+1700) Subject: [PATCH 4/6] cli: intialize crypto structure in show and reply X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=30062484be770b911837628a2320b1482ea82ad1;p=notmuch-archives.git [PATCH 4/6] cli: intialize crypto structure in show and reply --- diff --git a/3f/65473bacb172bb652dd57f6e07e7fcd5323771 b/3f/65473bacb172bb652dd57f6e07e7fcd5323771 new file mode 100644 index 000000000..1fb99731b --- /dev/null +++ b/3f/65473bacb172bb652dd57f6e07e7fcd5323771 @@ -0,0 +1,101 @@ +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 5EEE0431FBC + for ; Wed, 16 May 2012 14:56:12 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -2.3 +X-Spam-Level: +X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_MED=-2.3] 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 vtRjI2Ib8EKO for ; + Wed, 16 May 2012 14:56:11 -0700 (PDT) +Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu + [131.215.239.19]) + by olra.theworths.org (Postfix) with ESMTP id 0E478431FBF + for ; Wed, 16 May 2012 14:56:10 -0700 (PDT) +Received: from fire-doxen.imss.caltech.edu (localhost [127.0.0.1]) + by fire-doxen-postvirus (Postfix) with ESMTP id 9DEC632805B + for ; Wed, 16 May 2012 14:56:05 -0700 (PDT) +X-Spam-Scanned: at Caltech-IMSS on fire-doxen by amavisd-new +Received: from finestructure.net (rrcs-184-74-199-219.nyc.biz.rr.com + [184.74.199.219]) (Authenticated sender: jrollins) + by fire-doxen-submit (Postfix) with ESMTP id 9BF342E50BEE + for ; Wed, 16 May 2012 14:56:03 -0700 (PDT) +Received: by finestructure.net (Postfix, from userid 1000) + id 1D8B9605; Wed, 16 May 2012 14:56:02 -0700 (PDT) +From: Jameson Graef Rollins +To: Notmuch Mail +Subject: [PATCH 4/6] cli: intialize crypto structure in show and reply +Date: Wed, 16 May 2012 14:55:57 -0700 +Message-Id: <1337205359-2444-5-git-send-email-jrollins@finestructure.net> +X-Mailer: git-send-email 1.7.10 +In-Reply-To: <1337205359-2444-4-git-send-email-jrollins@finestructure.net> +References: <1337205359-2444-1-git-send-email-jrollins@finestructure.net> + <1337205359-2444-2-git-send-email-jrollins@finestructure.net> + <1337205359-2444-3-git-send-email-jrollins@finestructure.net> + <1337205359-2444-4-git-send-email-jrollins@finestructure.net> +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: Wed, 16 May 2012 21:56:12 -0000 + +This makes sure it has proper initialization values when it's created. +--- + notmuch-reply.c | 5 ++++- + notmuch-show.c | 10 +++++++++- + 2 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/notmuch-reply.c b/notmuch-reply.c +index 6662adb..3c967a0 100644 +--- a/notmuch-reply.c ++++ b/notmuch-reply.c +@@ -673,7 +673,10 @@ notmuch_reply_command (void *ctx, int argc, char *argv[]) + char *query_string; + int opt_index, ret = 0; + int (*reply_format_func)(void *ctx, notmuch_config_t *config, notmuch_query_t *query, notmuch_crypto_t *crypto, notmuch_bool_t reply_all); +- notmuch_crypto_t crypto = { .decrypt = FALSE }; ++ notmuch_crypto_t crypto = { ++ .decrypt = FALSE, ++ .gpgctx = NULL, ++ }; + int format = FORMAT_DEFAULT; + int reply_all = TRUE; + +diff --git a/notmuch-show.c b/notmuch-show.c +index 8b4d308..c606333 100644 +--- a/notmuch-show.c ++++ b/notmuch-show.c +@@ -983,7 +983,15 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) + char *query_string; + int opt_index, ret; + const notmuch_show_format_t *format = &format_text; +- notmuch_show_params_t params = { .part = -1, .omit_excluded = TRUE }; ++ notmuch_crypto_t crypto = { ++ .decrypt = FALSE, ++ .gpgctx = NULL, ++ }; ++ notmuch_show_params_t params = { ++ .part = -1, ++ .omit_excluded = TRUE, ++ .crypto = crypto, ++ }; + int format_sel = NOTMUCH_FORMAT_NOT_SPECIFIED; + notmuch_bool_t verify = FALSE; + int exclude = EXCLUDE_TRUE; +-- +1.7.10 +