[PATCH 5/9] lib/thread: refactor in-reply-to test.
David Bremner
david at tethera.net
Fri Jul 20 16:37:42 PDT 2018
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 | 40 +++++++++++++++++++++++-----------------
1 file changed, 23 insertions(+), 17 deletions(-)
diff --git a/lib/thread.cc b/lib/thread.cc
index e961c76b..93508359 100644
--- a/lib/thread.cc
+++ b/lib/thread.cc
@@ -387,12 +387,30 @@ _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 in_reply_to=%s\n", 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 +418,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,14 +430,8 @@ _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);
}
--
2.18.0
More information about the notmuch
mailing list