Re: [RFC PATCH 4/5] cli: change the data structure for notmuch address deduplication

diff --git a/a9/ce0b99a11d6c1b2fc6a06def556bf5b2e53be8 b/a9/ce0b99a11d6c1b2fc6a06def556bf5b2e53be8
new file mode 100644 (file)
index 0000000..4bd3145
--- /dev/null
+++ b/a9/ce0b99a11d6c1b2fc6a06def556bf5b2e53be8
@@ -0,0 +1,79 @@
+Return-Path: <david@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 1866D6DE17AA\r
+ for <notmuch@notmuchmail.org>; Sun, 30 Aug 2015 04:48:46 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.117\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.117 tagged_above=-999 required=5 tests=[AWL=0.117]\r
+ autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id NgB_06bLHupY for <notmuch@notmuchmail.org>;\r
+ Sun, 30 Aug 2015 04:48:44 -0700 (PDT)\r
+Received: from gitolite.debian.net (gitolite.debian.net [87.98.215.224])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id EFE3E6DE1642\r
+ for <notmuch@notmuchmail.org>; Sun, 30 Aug 2015 04:48:43 -0700 (PDT)\r
+Received: from remotemail by gitolite.debian.net with local (Exim 4.80)\r
+ (envelope-from <david@tethera.net>)\r
+ id 1ZW14a-0007D2-Fk; Sun, 30 Aug 2015 11:46:56 +0000\r
+Received: (nullmailer pid 15097 invoked by uid 1000); Sun, 30 Aug 2015\r
+ 11:46:35 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [RFC PATCH 4/5] cli: change the data structure for notmuch\r
+ address deduplication\r
+In-Reply-To: <87h9nh1aol.fsf@nikula.org>\r
+References: <cover.1440859765.git.jani@nikula.org>\r
+ <ffe5975fd070d3e8e22602b01ceb8bf0d7d47ae0.1440859765.git.jani@nikula.org>\r
+ <87a8t9tuka.fsf@maritornes.cs.unb.ca> <87h9nh1aol.fsf@nikula.org>\r
+User-Agent: Notmuch/0.20.2+60~gcb08a2e (http://notmuchmail.org) Emacs/24.5.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Sun, 30 Aug 2015 08:46:35 -0300\r
+Message-ID: <877fodt2w4.fsf@maritornes.cs.unb.ca>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.18\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: Sun, 30 Aug 2015 11:48:46 -0000\r
+\r
+Jani Nikula <jani@nikula.org> writes:\r
+\r
+>> I found this use of mailbox as a temporary variable confusing; despite\r
+>> the obvious return I thought it might have something to do with the\r
+>> g_list_append below.  Maybe just make a block scope temporary variable?\r
+>\r
+> This is how the function would turn out with that. Better, I guess? I\r
+> also tried to think of ways to combine the two g_list_append paths here,\r
+> but in the end doing it like this has most clarity I think.\r
+>\r
+\r
+Your (new) version is fine for me. As it happens I was thinking of a\r
+smaller tweak:\r
+\r
+\r
+       l = g_list_find_custom (list, mailbox, mailbox_compare);\r
+       if (l) {\r
+            mailbox_t *found;\r
+            \r
+           talloc_free (mailbox);\r
+\r
+            found = l->data;\r
+            found->count++;\r
+            \r
+           return TRUE;\r
+       }\r
+\r