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

diff --git a/3b/a30f741ab7e87a9c6473b40a1c7f492910a816 b/3b/a30f741ab7e87a9c6473b40a1c7f492910a816
new file mode 100644 (file)
index 0000000..6be468a
--- /dev/null
+++ b/3b/a30f741ab7e87a9c6473b40a1c7f492910a816
@@ -0,0 +1,137 @@
+Return-Path: <amdragon@mit.edu>\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 939C1431FAF\r
+       for <notmuch@notmuchmail.org>; Thu, 17 May 2012 15:29:06 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 b9Q9ASctH1LV for <notmuch@notmuchmail.org>;\r
+       Thu, 17 May 2012 15:29:06 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-5.mit.edu (DMZ-MAILSEC-SCANNER-5.MIT.EDU\r
+       [18.7.68.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 10B85431FAE\r
+       for <notmuch@notmuchmail.org>; Thu, 17 May 2012 15:29:06 -0700 (PDT)\r
+X-AuditID: 12074422-b7fd66d0000008f9-37-4fb57bb10508\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+       by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 45.06.02297.1BB75BF4; Thu, 17 May 2012 18:29:05 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q4HMT5pC030535; \r
+       Thu, 17 May 2012 18:29:05 -0400\r
+Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
+       (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q4HMT4Yn011312\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Thu, 17 May 2012 18:29:05 -0400 (EDT)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1SV9Bw-0003Uu-7s; Thu, 17 May 2012 18:29:04 -0400\r
+Date: Thu, 17 May 2012 18:29:04 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: Jameson Graef Rollins <jrollins@finestructure.net>\r
+Subject: Re: [PATCH 4/6] cli: intialize crypto structure in show and reply\r
+Message-ID: <20120517222904.GQ11804@mit.edu>\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
+       <1337205359-2444-5-git-send-email-jrollins@finestructure.net>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+In-Reply-To: <1337205359-2444-5-git-send-email-jrollins@finestructure.net>\r
+User-Agent: Mutt/1.5.21 (2010-09-15)\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFmpkleLIzCtJLcpLzFFi42IR4hTV1t1YvdXf4HKPnsWefV4W12/OZHZg\r
+       8rh7msvj2apbzAFMUVw2Kak5mWWpRfp2CVwZG3fOZCz4wVfR8XwtewPjVu4uRk4OCQETiReX\r
+       f7FD2GISF+6tZwOxhQT2MUq8uS3RxcgFZG9glJixsJMVInGSSeLfTh+IxBJGiXebFrCAJFgE\r
+       VCUmbdvHBGKzCWhIbNu/nBHEFhEwk+j58gfMZhbQkti68QOYLSzgJbHl9XywobwCOhIbt39l\r
+       hxgKtODIhG52iISgxMmZT1hgmm/8ewm0gAPIlpZY/o8DJMwJNGdl6zWwq0UFVCSmnNzGNoFR\r
+       aBaS7llIumchdC9gZF7FKJuSW6Wbm5iZU5yarFucnJiXl1qka6qXm1mil5pSuokRFNLsLko7\r
+       GH8eVDrEKMDBqMTDG3hqs78Qa2JZcWXuIUZJDiYlUd4nlVv9hfiS8lMqMxKLM+KLSnNSiw8x\r
+       SnAwK4nw7lcHyvGmJFZWpRblw6SkOViUxHnVtd75CQmkJ5akZqemFqQWwWRlODiUJHhXVgE1\r
+       ChalpqdWpGXmlCCkmTg4QYbzAA1fBVLDW1yQmFucmQ6RP8WoKCXOew8kIQCSyCjNg+uFpZxX\r
+       jOJArwjzHgKp4gGmK7juV0CDmYAGl+VuAhlckoiQkmpgNLR+dZ63/NYOluDYqXx8bzIOMVhd\r
+       qlfZfOHGjd7PSdHZGWyOuU7OH04Zl5Run3X3goKOlgaD+uMLE0X9l+lZVpqpzlRUW3AjoL/E\r
+       Uu6F813njA1pXqIqohaM/H+1NI/b2+73UVuYffD5ui9VKa/qdF5srz1v6FH8yiRmwcKJnror\r
+       euqm1U5RYinOSDTUYi4qTgQAsPmQuhQDAAA=\r
+Cc: Notmuch Mail <notmuch@notmuchmail.org>\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: Thu, 17 May 2012 22:29:06 -0000\r
+\r
+Quoth Jameson Graef Rollins on May 16 at  2:55 pm:\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
+\r
+You can omit the temporary variable and avoid the struct copy by doing\r
+something like this:\r
+\r
+notmuch_show_params_t params = {\r
+    .part = -1,\r
+    .omit_excluded = TRUE,\r
+    .crypto = {\r
+       .decrypt = FALSE,\r
+       .gpgctx = NULL,\r
+    },\r
+};\r
+\r
+>      int format_sel = NOTMUCH_FORMAT_NOT_SPECIFIED;\r
+>      notmuch_bool_t verify = FALSE;\r
+>      int exclude = EXCLUDE_TRUE;\r