Re: [Patch 1/2] separate handling when addresses == NULL

diff --git a/10/48b1657f7ce872a025daaf1237bd67e355c3b1 b/10/48b1657f7ce872a025daaf1237bd67e355c3b1
new file mode 100644 (file)
index 0000000..c6020a5
--- /dev/null
+++ b/10/48b1657f7ce872a025daaf1237bd67e355c3b1
@@ -0,0 +1,107 @@
+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 29ED4429E25\r
+       for <notmuch@notmuchmail.org>; Fri,  9 Dec 2011 07:55:46 -0800 (PST)\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 Tys+7oCJkeaq for <notmuch@notmuchmail.org>;\r
+       Fri,  9 Dec 2011 07:55:45 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU\r
+       [18.9.25.13])\r
+       by olra.theworths.org (Postfix) with ESMTP id A5FD5431FB6\r
+       for <notmuch@notmuchmail.org>; Fri,  9 Dec 2011 07:55:45 -0800 (PST)\r
+X-AuditID: 1209190d-b7f726d0000008d1-dc-4ee22f80bb7a\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+       by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id D7.6D.02257.08F22EE4; Fri,  9 Dec 2011 10:55:44 -0500 (EST)\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 pB9FthHX031297; \r
+       Fri, 9 Dec 2011 10:55:43 -0500\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 pB9Fte0s014236\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Fri, 9 Dec 2011 10:55:41 -0500 (EST)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1RZ2p7-0008PQ-7a; Fri, 09 Dec 2011 10:57:21 -0500\r
+Date: Fri, 9 Dec 2011 10:57:21 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: Tomi Ollila <tomi.ollila@iki.fi>\r
+Subject: Re: [Patch 1/2] separate handling when addresses == NULL\r
+Message-ID: <20111209155704.GE3190@mit.edu>\r
+References: <yf61usgywbk.fsf@taco2.nixu.fi> <yf61usgul2n.fsf@taco2.nixu.fi>\r
+       <yf6ehwdx36v.fsf@taco2.nixu.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+In-Reply-To: <yf6ehwdx36v.fsf@taco2.nixu.fi>\r
+User-Agent: Mutt/1.5.21 (2010-09-15)\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFmpileLIzCtJLcpLzFFi42IR4hTV1m3Qf+Rn0LqCx+L6zZnMFm9WzmN1\r
+       YPI4/HUhi8ezVbeYA5iiuGxSUnMyy1KL9O0SuDJe/08umM9Z0bzoD2MD4zz2LkZODgkBE4mz\r
+       u7exQNhiEhfurWfrYuTiEBLYxyixo/EEM4SznlGi59UxFgjnBJPEnH+boTJLGCX+nPnOCNLP\r
+       IqAi8XLhP7BZbAIaEtv2LweLiwDFH7StZwWxmQWkJb79bmbqYuTgEBZwlFh/vRgkzCugLXH/\r
+       +nmwViGBfIk5T9cyQcQFJU7OfMIC0aolcePfS7BWkDHL/3GAhDkFdCTmr9wLNl0UaNOUk9vY\r
+       JjAKzULSPQtJ9yyE7gWMzKsYZVNyq3RzEzNzilOTdYuTE/PyUot0jfRyM0v0UlNKNzGCg1qS\r
+       dwfju4NKhxgFOBiVeHgf8D70E2JNLCuuzD3EKMnBpCTKu1P3kZ8QX1J+SmVGYnFGfFFpTmrx\r
+       IUYJDmYlEV4VeaAcb0piZVVqUT5MSpqDRUmct2YX0CSB9MSS1OzU1ILUIpisDAeHkgTvZj2g\r
+       RsGi1PTUirTMnBKENBMHJ8hwHqDhq0BqeIsLEnOLM9Mh8qcYFaXEeY+CJARAEhmleXC9sKTz\r
+       ilEc6BVh3vUgVTzAhAXX/QpoMBPQ4C/ZD0AGlyQipKQaGLOOaC4w2tJ/wvWHyVSvc0lr4xuW\r
+       HTunLnQ2S2Kh/LXjX1+ZbZ17tO7I+2+BRUfn+au1aMxfnbBIb4vUqqds+jr39568YHFZ9luQ\r
+       jv8S0yVG9bbGqkubfspvVZjnr1CdODHv4pOAaoOS4wlNCzY5sN88lrn4wy7rhvm7A7YVGu9e\r
+       96pGnWGF+2wlluKMREMt5qLiRAC1+ibkFQMAAA==\r
+Cc: 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: Fri, 09 Dec 2011 15:55:46 -0000\r
+\r
+Quoth Tomi Ollila on Dec 09 at  3:52 pm:\r
+> When addresses is NULL, (future) addresses object cleanup is not needed.\r
+> ---\r
+>  notmuch-show.c |    6 +++++-\r
+>  1 files changed, 5 insertions(+), 1 deletions(-)\r
+> \r
+> diff --git a/notmuch-show.c b/notmuch-show.c\r
+> index 603992a..c27ef6a 100644\r
+> --- a/notmuch-show.c\r
+> +++ b/notmuch-show.c\r
+> @@ -239,7 +239,11 @@ _extract_email_address (const void *ctx, const char *from)\r
+>      addresses = internet_address_list_parse_string (from);\r
+>  \r
+>      /* Bail if there is no address here. */\r
+> -    if (addresses == NULL || internet_address_list_length (addresses) < 1)\r
+> +    if (addresses == NULL)\r
+> +    return email;\r
+> +\r
+> +    /* Bail if there is no address here. */\r
+> +    if (internet_address_list_length (addresses) < 1)\r
+>      goto DONE;\r
+\r
+Personally, I would much prefer to see the code as it was---with the\r
+sometimes unnecessary goto DONE---and an if (addresses) around the\r
+later cleanup that the second patch adds.  It's more maintainable in\r
+case someone ever adds more code earlier in this function and this\r
+microoptimization isn't buying you anything.\r
+\r
+>  \r
+>      /* Otherwise, just use the first address. */\r