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