[PATCH 4/6] cli: intialize crypto structure in show and reply

diff --git a/3f/65473bacb172bb652dd57f6e07e7fcd5323771 b/3f/65473bacb172bb652dd57f6e07e7fcd5323771
new file mode 100644 (file)
index 0000000..1fb9973
--- /dev/null
+++ b/3f/65473bacb172bb652dd57f6e07e7fcd5323771
@@ -0,0 +1,101 @@
+Return-Path: <jrollins@finestructure.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 5EEE0431FBC\r
+       for <notmuch@notmuchmail.org>; Wed, 16 May 2012 14:56:12 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id vtRjI2Ib8EKO for <notmuch@notmuchmail.org>;\r
+       Wed, 16 May 2012 14:56:11 -0700 (PDT)\r
+Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu\r
+       [131.215.239.19])\r
+       by olra.theworths.org (Postfix) with ESMTP id 0E478431FBF\r
+       for <notmuch@notmuchmail.org>; Wed, 16 May 2012 14:56:10 -0700 (PDT)\r
+Received: from fire-doxen.imss.caltech.edu (localhost [127.0.0.1])\r
+       by fire-doxen-postvirus (Postfix) with ESMTP id 9DEC632805B\r
+       for <notmuch@notmuchmail.org>; Wed, 16 May 2012 14:56:05 -0700 (PDT)\r
+X-Spam-Scanned: at Caltech-IMSS on fire-doxen by amavisd-new\r
+Received: from finestructure.net (rrcs-184-74-199-219.nyc.biz.rr.com\r
+       [184.74.199.219]) (Authenticated sender: jrollins)\r
+       by fire-doxen-submit (Postfix) with ESMTP id 9BF342E50BEE\r
+       for <notmuch@notmuchmail.org>; Wed, 16 May 2012 14:56:03 -0700 (PDT)\r
+Received: by finestructure.net (Postfix, from userid 1000)\r
+       id 1D8B9605; Wed, 16 May 2012 14:56:02 -0700 (PDT)\r
+From: Jameson Graef Rollins <jrollins@finestructure.net>\r
+To: Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: [PATCH 4/6] cli: intialize crypto structure in show and reply\r
+Date: Wed, 16 May 2012 14:55:57 -0700\r
+Message-Id: <1337205359-2444-5-git-send-email-jrollins@finestructure.net>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To: <1337205359-2444-4-git-send-email-jrollins@finestructure.net>\r
+References: <1337205359-2444-1-git-send-email-jrollins@finestructure.net>\r
+       <1337205359-2444-2-git-send-email-jrollins@finestructure.net>\r
+       <1337205359-2444-3-git-send-email-jrollins@finestructure.net>\r
+       <1337205359-2444-4-git-send-email-jrollins@finestructure.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 16 May 2012 21:56:12 -0000\r
+\r
+This makes sure it has proper initialization values when it's created.\r
+---\r
+ notmuch-reply.c |    5 ++++-\r
+ notmuch-show.c  |   10 +++++++++-\r
+ 2 files changed, 13 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/notmuch-reply.c b/notmuch-reply.c\r
+index 6662adb..3c967a0 100644\r
+--- a/notmuch-reply.c\r
++++ b/notmuch-reply.c\r
+@@ -673,7 +673,10 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])\r
+     char *query_string;\r
+     int opt_index, ret = 0;\r
+     int (*reply_format_func)(void *ctx, notmuch_config_t *config, notmuch_query_t *query, notmuch_crypto_t *crypto, notmuch_bool_t reply_all);\r
+-    notmuch_crypto_t crypto = { .decrypt = FALSE };\r
++    notmuch_crypto_t crypto = {\r
++      .decrypt = FALSE,\r
++      .gpgctx = NULL,\r
++    };\r
+     int format = FORMAT_DEFAULT;\r
+     int reply_all = TRUE;\r
+ \r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 8b4d308..c606333 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -983,7 +983,15 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+     char *query_string;\r
+     int opt_index, ret;\r
+     const notmuch_show_format_t *format = &format_text;\r
+-    notmuch_show_params_t params = { .part = -1, .omit_excluded = TRUE };\r
++    notmuch_crypto_t crypto = {\r
++      .decrypt = FALSE,\r
++      .gpgctx = NULL,\r
++    };\r
++    notmuch_show_params_t params = {\r
++      .part = -1,\r
++      .omit_excluded = TRUE,\r
++      .crypto = crypto,\r
++    };\r
+     int format_sel = NOTMUCH_FORMAT_NOT_SPECIFIED;\r
+     notmuch_bool_t verify = FALSE;\r
+     int exclude = EXCLUDE_TRUE;\r
+-- \r
+1.7.10\r
+\r