10/48b1657f7ce872a025daaf1237bd67e355c3b1

   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 29ED4429E25\r
   6         for <notmuch@notmuchmail.org>; Fri,  9 Dec 2011 07:55:46 -0800 (PST)\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 Tys+7oCJkeaq for <notmuch@notmuchmail.org>;\r
  16         Fri,  9 Dec 2011 07:55:45 -0800 (PST)\r
  17 Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU\r
  18         [18.9.25.13])\r
  19         by olra.theworths.org (Postfix) with ESMTP id A5FD5431FB6\r
  20         for <notmuch@notmuchmail.org>; Fri,  9 Dec 2011 07:55:45 -0800 (PST)\r
  21 X-AuditID: 1209190d-b7f726d0000008d1-dc-4ee22f80bb7a\r
  22 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
  23         by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id D7.6D.02257.08F22EE4; Fri,  9 Dec 2011 10:55:44 -0500 (EST)\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 pB9FthHX031297; \r
  27         Fri, 9 Dec 2011 10:55:43 -0500\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 pB9Fte0s014236\r
  32         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  33         Fri, 9 Dec 2011 10:55:41 -0500 (EST)\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 1RZ2p7-0008PQ-7a; Fri, 09 Dec 2011 10:57:21 -0500\r
  37 Date: Fri, 9 Dec 2011 10:57:21 -0500\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: Tomi Ollila <tomi.ollila@iki.fi>\r
  40 Subject: Re: [Patch 1/2] separate handling when addresses == NULL\r
  41 Message-ID: <20111209155704.GE3190@mit.edu>\r
  42 References: <yf61usgywbk.fsf@taco2.nixu.fi> <yf61usgul2n.fsf@taco2.nixu.fi>\r
  43         <yf6ehwdx36v.fsf@taco2.nixu.fi>\r
  44 MIME-Version: 1.0\r
  45 Content-Type: text/plain; charset=us-ascii\r
  46 Content-Disposition: inline\r
  47 In-Reply-To: <yf6ehwdx36v.fsf@taco2.nixu.fi>\r
  48 User-Agent: Mutt/1.5.21 (2010-09-15)\r
  49 X-Brightmail-Tracker:\r
  50  H4sIAAAAAAAAA+NgFmpileLIzCtJLcpLzFFi42IR4hTV1m3Qf+Rn0LqCx+L6zZnMFm9WzmN1\r
  51         YPI4/HUhi8ezVbeYA5iiuGxSUnMyy1KL9O0SuDJe/08umM9Z0bzoD2MD4zz2LkZODgkBE4mz\r
  52         u7exQNhiEhfurWfrYuTiEBLYxyixo/EEM4SznlGi59UxFgjnBJPEnH+boTJLGCX+nPnOCNLP\r
  53         IqAi8XLhP7BZbAIaEtv2LweLiwDFH7StZwWxmQWkJb79bmbqYuTgEBZwlFh/vRgkzCugLXH/\r
  54         +nmwViGBfIk5T9cyQcQFJU7OfMIC0aolcePfS7BWkDHL/3GAhDkFdCTmr9wLNl0UaNOUk9vY\r
  55         JjAKzULSPQtJ9yyE7gWMzKsYZVNyq3RzEzNzilOTdYuTE/PyUot0jfRyM0v0UlNKNzGCg1qS\r
  56         dwfju4NKhxgFOBiVeHgf8D70E2JNLCuuzD3EKMnBpCTKu1P3kZ8QX1J+SmVGYnFGfFFpTmrx\r
  57         IUYJDmYlEV4VeaAcb0piZVVqUT5MSpqDRUmct2YX0CSB9MSS1OzU1ILUIpisDAeHkgTvZj2g\r
  58         RsGi1PTUirTMnBKENBMHJ8hwHqDhq0BqeIsLEnOLM9Mh8qcYFaXEeY+CJARAEhmleXC9sKTz\r
  59         ilEc6BVh3vUgVTzAhAXX/QpoMBPQ4C/ZD0AGlyQipKQaGLOOaC4w2tJ/wvWHyVSvc0lr4xuW\r
  60         HTunLnQ2S2Kh/LXjX1+ZbZ17tO7I+2+BRUfn+au1aMxfnbBIb4vUqqds+jr39568YHFZ9luQ\r
  61         jv8S0yVG9bbGqkubfspvVZjnr1CdODHv4pOAaoOS4wlNCzY5sN88lrn4wy7rhvm7A7YVGu9e\r
  62         96pGnWGF+2wlluKMREMt5qLiRAC1+ibkFQMAAA==\r
  63 Cc: notmuch@notmuchmail.org\r
  64 X-BeenThere: notmuch@notmuchmail.org\r
  65 X-Mailman-Version: 2.1.13\r
  66 Precedence: list\r
  67 List-Id: "Use and development of the notmuch mail system."\r
  68         <notmuch.notmuchmail.org>\r
  69 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  70         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  71 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  72 List-Post: <mailto:notmuch@notmuchmail.org>\r
  73 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  74 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  75         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  76 X-List-Received-Date: Fri, 09 Dec 2011 15:55:46 -0000\r
  77 \r
  78 Quoth Tomi Ollila on Dec 09 at  3:52 pm:\r
  79 > When addresses is NULL, (future) addresses object cleanup is not needed.\r
  80 > ---\r
  81 >  notmuch-show.c |    6 +++++-\r
  82 >  1 files changed, 5 insertions(+), 1 deletions(-)\r
  83 > \r
  84 > diff --git a/notmuch-show.c b/notmuch-show.c\r
  85 > index 603992a..c27ef6a 100644\r
  86 > --- a/notmuch-show.c\r
  87 > +++ b/notmuch-show.c\r
  88 > @@ -239,7 +239,11 @@ _extract_email_address (const void *ctx, const char *from)\r
  89 >      addresses = internet_address_list_parse_string (from);\r
  90 >  \r
  91 >      /* Bail if there is no address here. */\r
  92 > -    if (addresses == NULL || internet_address_list_length (addresses) < 1)\r
  93 > +    if (addresses == NULL)\r
  94 > +     return email;\r
  95 > +\r
  96 > +    /* Bail if there is no address here. */\r
  97 > +    if (internet_address_list_length (addresses) < 1)\r
  98 >       goto DONE;\r
  99 \r
 100 Personally, I would much prefer to see the code as it was---with the\r
 101 sometimes unnecessary goto DONE---and an if (addresses) around the\r
 102 later cleanup that the second patch adds.  It's more maintainable in\r
 103 case someone ever adds more code earlier in this function and this\r
 104 microoptimization isn't buying you anything.\r
 105 \r
 106 >  \r
 107 >      /* Otherwise, just use the first address. */\r