debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-24 20:08:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: Separate list of all messages from top-level messages

Browse source 
Previously, thread.cc built up a list of all messages, then
proceeded to tear it apart to transform it into a list of
top-level messages.  Now we simply build a new list of top-level
messages.

This simplifies the interface to _notmuch_message_add_reply,
eliminates the pointer acrobatics from
_resolve_thread_relationships, and will enable us to do things
with the list of all messages in the following patches.
This commit is contained in:
Austin Clements 2012-11-24 23:57:03 -05:00 committed by David Bremner
parent 086dab4333
commit 5394924e6c
3 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/message.cc
View file

@ -462,9 +462,9 @@ notmuch_message_get_thread_id (notmuch_message_t *message)
void
_notmuch_message_add_reply (notmuch_message_t *message,
notmuch_message_node_t *reply)
notmuch_message_t *reply)
{
_notmuch_message_list_append (message->replies, reply);
_notmuch_message_list_add_message (message->replies, reply);
}
notmuch_messages_t *

2
lib/notmuch-private.h
View file

@ -462,7 +462,7 @@ _notmuch_doc_id_set_remove (notmuch_doc_id_set_t *doc_ids,
void
_notmuch_message_add_reply (notmuch_message_t *message,
notmuch_message_node_t *reply);
notmuch_message_t *reply);
/* sha1.c */

29
lib/thread.cc
View file

@ -35,7 +35,11 @@ struct visible _notmuch_thread {
char *authors;
GHashTable *tags;
/* All messages, oldest first. */
notmuch_message_list_t *message_list;
/* Top-level messages, oldest first. */
notmuch_message_list_t *toplevel_list;
GHashTable *message_hash;
int total_messages;
int matched_messages;
@ -345,29 +349,22 @@ _thread_add_matched_message (notmuch_thread_t *thread,
}
static void
_resolve_thread_relationships (unused (notmuch_thread_t *thread))
_resolve_thread_relationships (notmuch_thread_t *thread)
{
notmuch_message_node_t **prev, *node;
notmuch_message_node_t *node;
notmuch_message_t *message, *parent;
const char *in_reply_to;
prev = &thread->message_list->head;
while ((node = *prev)) {
for (node = thread->message_list->head; 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))
{
*prev = node->next;
if (thread->message_list->tail == &node->next)
thread->message_list->tail = prev;
node->next = NULL;
_notmuch_message_add_reply (parent, node);
} else {
prev = &((*prev)->next);
}
_notmuch_message_add_reply (parent, message);
else
_notmuch_message_list_add_message (thread->toplevel_list, message);
}
/* XXX: After scanning through the entire list looking for parents
@ -451,7 +448,9 @@ _notmuch_thread_create (void *ctx,
free, NULL);
thread->message_list = _notmuch_message_list_create (thread);
if (unlikely (thread->message_list == NULL)) {
thread->toplevel_list = _notmuch_message_list_create (thread);
if (unlikely (thread->message_list == NULL ||
thread->toplevel_list == NULL)) {
thread = NULL;
goto DONE;
}
@ -506,7 +505,7 @@ _notmuch_thread_create (void *ctx,
notmuch_messages_t *
notmuch_thread_get_toplevel_messages (notmuch_thread_t *thread)
{
return _notmuch_messages_create (thread->message_list);
return _notmuch_messages_create (thread->toplevel_list);
}
const char *