Re: [PATCH 4/6] cli: intialize crypto structure in show and reply
authorJani Nikula <jani@nikula.org>
Thu, 17 May 2012 07:47:07 +0000 (10:47 +0300)
committerW. Trevor King <wking@tremily.us>
Fri, 7 Nov 2014 17:47:10 +0000 (09:47 -0800)
13/c17202057e45893a6a2fd869c1edb3492ccc45 [new file with mode: 0644]

diff --git a/13/c17202057e45893a6a2fd869c1edb3492ccc45 b/13/c17202057e45893a6a2fd869c1edb3492ccc45
new file mode 100644 (file)
index 0000000..ce8c2c4
--- /dev/null
@@ -0,0 +1,131 @@
+Return-Path: <jani@nikula.org>\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 3B801431FAF\r
+       for <notmuch@notmuchmail.org>; Thu, 17 May 2012 00:47:17 -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 CebulSJXHkZN for <notmuch@notmuchmail.org>;\r
+       Thu, 17 May 2012 00:47:15 -0700 (PDT)\r
+Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com\r
+       [209.85.217.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 28EF4431FAE\r
+       for <notmuch@notmuchmail.org>; Thu, 17 May 2012 00:47:15 -0700 (PDT)\r
+Received: by lbbgk8 with SMTP id gk8so1278806lbb.26\r
+       for <notmuch@notmuchmail.org>; Thu, 17 May 2012 00:47:13 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=from:to:subject:in-reply-to:references:user-agent:date:message-id\r
+       :mime-version:content-type:x-gm-message-state;\r
+       bh=F2dp61T4JfihWbyCBxJMKzIYg4q2EY6Q4lSGrFBN8mk=;\r
+       b=eXfEgdXUgdn5eRqtgpagdCda9f0dLkE0oBbU5UCilwMUlhGz6/FtphldWAFoxTVzOW\r
+       Y4RYovgZa5NX5YNEBR4krKOeqTN3yBpxvck3pajCTe4HZBiVhXd6Bd/iXgsUTJUo1g7w\r
+       yadTmLthoKh0XRXz7u6xQ1WrgKDVOCT3L7/fUdB6QTFuBKcAloWv3ONQGkuQOEQEo4Hh\r
+       qohpr93i7RKPPH7RNg3pNSspsG0mFtCnQeFEXG26CnBvbyKO+4SnopaswyLv/WjvwL/C\r
+       GGiPRqhh9HnOXm+8iKcp8VPni1AR7GFnMxfgpHeAxaCJrnaHGJ1M7ci8E7GW+2eS7pJB\r
+       QYAg==\r
+Received: by 10.112.37.164 with SMTP id z4mr2554077lbj.100.1337240833446;\r
+       Thu, 17 May 2012 00:47:13 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw4-fe50dc00-68.dhcp.inet.fi.\r
+       [80.220.80.68])\r
+       by mx.google.com with ESMTPS id pi5sm6733290lab.7.2012.05.17.00.47.11\r
+       (version=SSLv3 cipher=OTHER); Thu, 17 May 2012 00:47:12 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: Jameson Graef Rollins <jrollins@finestructure.net>,\r
+       Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: Re: [PATCH 4/6] cli: intialize crypto structure in show and reply\r
+In-Reply-To: <1337205359-2444-5-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
+       <1337205359-2444-5-git-send-email-jrollins@finestructure.net>\r
+User-Agent: Notmuch/0.13+13~gc259b9a (http://notmuchmail.org) Emacs/23.3.1\r
+       (i686-pc-linux-gnu)\r
+Date: Thu, 17 May 2012 10:47:07 +0300\r
+Message-ID: <8762bvi70k.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Gm-Message-State:\r
+ ALoCoQn5SbS6ewBw7rpg/F3w+q/SnKJ/MYYEJqaCIWL12lH+jGk2CJsWkTnzSNT0yHvED5nA3yY4\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 07:47:17 -0000\r
+\r
+On Thu, 17 May 2012, Jameson Graef Rollins <jrollins@finestructure.net> wrote:\r
+> This makes sure it has proper initialization values when it's created.\r
+\r
+Please don't do this. It's unnecessary; if one field is initialized with\r
+a designated initializer, the rest are initialized to zero (or NULL).\r
+\r
+BR,\r
+Jani.\r
+\r
+\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
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r