3b/a30f741ab7e87a9c6473b40a1c7f492910a816

   1 Return-Path: <amdragon@mit.edu>\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 olra.theworths.org (Postfix) with ESMTP id 939C1431FAF\r
   6         for <notmuch@notmuchmail.org>; Thu, 17 May 2012 15:29:06 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id b9Q9ASctH1LV for <notmuch@notmuchmail.org>;\r
  16         Thu, 17 May 2012 15:29:06 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-5.mit.edu (DMZ-MAILSEC-SCANNER-5.MIT.EDU\r
  18         [18.7.68.34])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 10B85431FAE\r
  20         for <notmuch@notmuchmail.org>; Thu, 17 May 2012 15:29:06 -0700 (PDT)\r
  21 X-AuditID: 12074422-b7fd66d0000008f9-37-4fb57bb10508\r
  22 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
  23         by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 45.06.02297.1BB75BF4; Thu, 17 May 2012 18:29:05 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q4HMT5pC030535; \r
  27         Thu, 17 May 2012 18:29:05 -0400\r
  28 Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
  29         (authenticated bits=0)\r
  30         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  31         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q4HMT4Yn011312\r
  32         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  33         Thu, 17 May 2012 18:29:05 -0400 (EDT)\r
  34 Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)\r
  35         (envelope-from <amdragon@mit.edu>)\r
  36         id 1SV9Bw-0003Uu-7s; Thu, 17 May 2012 18:29:04 -0400\r
  37 Date: Thu, 17 May 2012 18:29:04 -0400\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: Jameson Graef Rollins <jrollins@finestructure.net>\r
  40 Subject: Re: [PATCH 4/6] cli: intialize crypto structure in show and reply\r
  41 Message-ID: <20120517222904.GQ11804@mit.edu>\r
  42 References: <1337205359-2444-1-git-send-email-jrollins@finestructure.net>\r
  43         <1337205359-2444-2-git-send-email-jrollins@finestructure.net>\r
  44         <1337205359-2444-3-git-send-email-jrollins@finestructure.net>\r
  45         <1337205359-2444-4-git-send-email-jrollins@finestructure.net>\r
  46         <1337205359-2444-5-git-send-email-jrollins@finestructure.net>\r
  47 MIME-Version: 1.0\r
  48 Content-Type: text/plain; charset=us-ascii\r
  49 Content-Disposition: inline\r
  50 In-Reply-To: <1337205359-2444-5-git-send-email-jrollins@finestructure.net>\r
  51 User-Agent: Mutt/1.5.21 (2010-09-15)\r
  52 X-Brightmail-Tracker:\r
  53  H4sIAAAAAAAAA+NgFmpkleLIzCtJLcpLzFFi42IR4hTV1t1YvdXf4HKPnsWefV4W12/OZHZg\r
  54         8rh7msvj2apbzAFMUVw2Kak5mWWpRfp2CVwZG3fOZCz4wVfR8XwtewPjVu4uRk4OCQETiReX\r
  55         f7FD2GISF+6tZwOxhQT2MUq8uS3RxcgFZG9glJixsJMVInGSSeLfTh+IxBJGiXebFrCAJFgE\r
  56         VCUmbdvHBGKzCWhIbNu/nBHEFhEwk+j58gfMZhbQkti68QOYLSzgJbHl9XywobwCOhIbt39l\r
  57         hxgKtODIhG52iISgxMmZT1hgmm/8ewm0gAPIlpZY/o8DJMwJNGdl6zWwq0UFVCSmnNzGNoFR\r
  58         aBaS7llIumchdC9gZF7FKJuSW6Wbm5iZU5yarFucnJiXl1qka6qXm1mil5pSuokRFNLsLko7\r
  59         GH8eVDrEKMDBqMTDG3hqs78Qa2JZcWXuIUZJDiYlUd4nlVv9hfiS8lMqMxKLM+KLSnNSiw8x\r
  60         SnAwK4nw7lcHyvGmJFZWpRblw6SkOViUxHnVtd75CQmkJ5akZqemFqQWwWRlODiUJHhXVgE1\r
  61         ChalpqdWpGXmlCCkmTg4QYbzAA1fBVLDW1yQmFucmQ6RP8WoKCXOew8kIQCSyCjNg+uFpZxX\r
  62         jOJArwjzHgKp4gGmK7juV0CDmYAGl+VuAhlckoiQkmpgNLR+dZ63/NYOluDYqXx8bzIOMVhd\r
  63         qlfZfOHGjd7PSdHZGWyOuU7OH04Zl5Run3X3goKOlgaD+uMLE0X9l+lZVpqpzlRUW3AjoL/E\r
  64         Uu6F813njA1pXqIqohaM/H+1NI/b2+73UVuYffD5ui9VKa/qdF5srz1v6FH8yiRmwcKJnror\r
  65         euqm1U5RYinOSDTUYi4qTgQAsPmQuhQDAAA=\r
  66 Cc: Notmuch Mail <notmuch@notmuchmail.org>\r
  67 X-BeenThere: notmuch@notmuchmail.org\r
  68 X-Mailman-Version: 2.1.13\r
  69 Precedence: list\r
  70 List-Id: "Use and development of the notmuch mail system."\r
  71         <notmuch.notmuchmail.org>\r
  72 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  73         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  74 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  75 List-Post: <mailto:notmuch@notmuchmail.org>\r
  76 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  77 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  78         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  79 X-List-Received-Date: Thu, 17 May 2012 22:29:06 -0000\r
  80 \r
  81 Quoth Jameson Graef Rollins on May 16 at  2:55 pm:\r
  82 > This makes sure it has proper initialization values when it's created.\r
  83 > ---\r
  84 >  notmuch-reply.c |    5 ++++-\r
  85 >  notmuch-show.c  |   10 +++++++++-\r
  86 >  2 files changed, 13 insertions(+), 2 deletions(-)\r
  87 > \r
  88 > diff --git a/notmuch-reply.c b/notmuch-reply.c\r
  89 > index 6662adb..3c967a0 100644\r
  90 > --- a/notmuch-reply.c\r
  91 > +++ b/notmuch-reply.c\r
  92 > @@ -673,7 +673,10 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])\r
  93 >      char *query_string;\r
  94 >      int opt_index, ret = 0;\r
  95 >      int (*reply_format_func)(void *ctx, notmuch_config_t *config, notmuch_query_t *query, notmuch_crypto_t *crypto, notmuch_bool_t reply_all);\r
  96 > -    notmuch_crypto_t crypto = { .decrypt = FALSE };\r
  97 > +    notmuch_crypto_t crypto = {\r
  98 > +     .decrypt = FALSE,\r
  99 > +     .gpgctx = NULL,\r
 100 > +    };\r
 101 >      int format = FORMAT_DEFAULT;\r
 102 >      int reply_all = TRUE;\r
 103 >  \r
 104 > diff --git a/notmuch-show.c b/notmuch-show.c\r
 105 > index 8b4d308..c606333 100644\r
 106 > --- a/notmuch-show.c\r
 107 > +++ b/notmuch-show.c\r
 108 > @@ -983,7 +983,15 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
 109 >      char *query_string;\r
 110 >      int opt_index, ret;\r
 111 >      const notmuch_show_format_t *format = &format_text;\r
 112 > -    notmuch_show_params_t params = { .part = -1, .omit_excluded = TRUE };\r
 113 > +    notmuch_crypto_t crypto = {\r
 114 > +     .decrypt = FALSE,\r
 115 > +     .gpgctx = NULL,\r
 116 > +    };\r
 117 > +    notmuch_show_params_t params = {\r
 118 > +     .part = -1,\r
 119 > +     .omit_excluded = TRUE,\r
 120 > +     .crypto = crypto,\r
 121 > +    };\r
 122 \r
 123 You can omit the temporary variable and avoid the struct copy by doing\r
 124 something like this:\r
 125 \r
 126 notmuch_show_params_t params = {\r
 127     .part = -1,\r
 128     .omit_excluded = TRUE,\r
 129     .crypto = {\r
 130         .decrypt = FALSE,\r
 131         .gpgctx = NULL,\r
 132     },\r
 133 };\r
 134 \r
 135 >      int format_sel = NOTMUCH_FORMAT_NOT_SPECIFIED;\r
 136 >      notmuch_bool_t verify = FALSE;\r
 137 >      int exclude = EXCLUDE_TRUE;\r