From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id CF5B86DE023D for ; Thu, 30 Aug 2018 04:29:37 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: 0.001 X-Spam-Level: X-Spam-Status: No, score=0.001 tagged_above=-999 required=5 tests=[AWL=0.012, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id q43KdCmWlAXY for ; Thu, 30 Aug 2018 04:29:36 -0700 (PDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id C096F6DE0236 for ; Thu, 30 Aug 2018 04:29:36 -0700 (PDT) Received: from remotemail by fethera.tethera.net with local (Exim 4.89) (envelope-from ) id 1fvL8p-0007EN-BO; Thu, 30 Aug 2018 07:29:35 -0400 Received: (nullmailer pid 12123 invoked by uid 1000); Thu, 30 Aug 2018 11:29:32 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH 06/15] lib/thread: refactor in_reply_to test Date: Thu, 30 Aug 2018 08:29:06 -0300 Message-Id: <20180830112915.11761-7-david@tethera.net> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180830112915.11761-1-david@tethera.net> References: <20180830112915.11761-1-david@tethera.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.26 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, 30 Aug 2018 11:29:37 -0000 This is not a complete win in code-size, but it makes the code (which is about to get more complicated) easier to follow. --- lib/thread.cc | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/lib/thread.cc b/lib/thread.cc index b599a97d..8074b625 100644 --- a/lib/thread.cc +++ b/lib/thread.cc @@ -387,12 +387,31 @@ _thread_add_matched_message (notmuch_thread_t *thread, _thread_add_matched_author (thread, _notmuch_message_get_author (hashed_message)); } +static bool +_parent_via_in_reply_to (notmuch_thread_t *thread, notmuch_message_t *message) { + notmuch_message_t *parent; + const char *in_reply_to; + + in_reply_to = _notmuch_message_get_in_reply_to (message); + DEBUG_PRINTF("checking message = %s in_reply_to=%s\n", + notmuch_message_get_message_id (message), in_reply_to); + + if (in_reply_to && strlen (in_reply_to) && + g_hash_table_lookup_extended (thread->message_hash, + in_reply_to, NULL, + (void **) &parent)) { + _notmuch_message_add_reply (parent, message); + return true; + } else { + return false; + } +} + static void _resolve_thread_relationships (notmuch_thread_t *thread) { notmuch_message_node_t *node, *first_node; - notmuch_message_t *message, *parent; - const char *in_reply_to; + notmuch_message_t *message; first_node = thread->message_list->head; if (! first_node) @@ -400,13 +419,7 @@ _resolve_thread_relationships (notmuch_thread_t *thread) for (node = first_node->next; node; node = node->next) { message = node->message; - in_reply_to = _notmuch_message_get_in_reply_to (message); - if (in_reply_to && strlen (in_reply_to) && - g_hash_table_lookup_extended (thread->message_hash, - in_reply_to, NULL, - (void **) &parent)) - _notmuch_message_add_reply (parent, message); - else + if (! _parent_via_in_reply_to (thread, message)) _notmuch_message_list_add_message (thread->toplevel_list, message); } @@ -418,15 +431,10 @@ _resolve_thread_relationships (notmuch_thread_t *thread) */ if (first_node) { message = first_node->message; - in_reply_to = _notmuch_message_get_in_reply_to (message); - if (thread->toplevel_list->head && - in_reply_to && strlen (in_reply_to) && - g_hash_table_lookup_extended (thread->message_hash, - in_reply_to, NULL, - (void **) &parent)) - _notmuch_message_add_reply (parent, message); - else + if (! thread->toplevel_list->head || + ! _parent_via_in_reply_to (thread, message)) { _notmuch_message_list_add_message (thread->toplevel_list, message); + } } /* XXX this could be made conditional on messages being inserted -- 2.18.0