X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=lib%2Fmessages.c;h=54c0ab07805ab33b171a2107a7ac7196cc2e5ca5;hb=93af7b574598637c2766dd1f8ef343962c9a8efb;hp=8b627750b5838a90abc31fe26b055b77df1f6c68;hpb=d3349358c6a5048559bd2a4faebe476ebd222170;p=notmuch

diff --git a/lib/messages.c b/lib/messages.c
index 8b627750..54c0ab07 100644
--- a/lib/messages.c
+++ b/lib/messages.c
@@ -20,74 +20,119 @@
 
 #include "notmuch-private.h"
 
-#include <glib.h> /* GList */
-
-typedef struct _message_list {
-    notmuch_message_t *message;
-    struct _message_list *next;
-} message_list_t;
-
-struct _notmuch_messages {
-    message_list_t *head;
-    message_list_t **tail;
-};
-
-/* Create a new notmuch_messages_t object, with 'ctx' as its talloc owner.
+/* Create a new notmuch_message_list_t object, with 'ctx' as its
+ * talloc owner.
  *
  * This function can return NULL in case of out-of-memory.
  */
-notmuch_messages_t *
-_notmuch_messages_create (void *ctx)
+notmuch_message_list_t *
+_notmuch_message_list_create (const void *ctx)
 {
-    notmuch_messages_t *messages;
+    notmuch_message_list_t *list;
 
-    messages = talloc (ctx, notmuch_messages_t);
-    if (unlikely (messages == NULL))
+    list = talloc (ctx, notmuch_message_list_t);
+    if (unlikely (list == NULL))
 	return NULL;
 
-    messages->head = NULL;
-    messages->tail = &messages->head;
+    list->head = NULL;
+    list->tail = &list->head;
 
-    return messages;
+    return list;
+}
+
+/* Append 'node' (which can of course point to an arbitrarily long
+ * list of nodes) to the end of 'list'.
+ */
+void
+_notmuch_message_list_append (notmuch_message_list_t *list,
+			      notmuch_message_node_t *node)
+{
+    *(list->tail) = node;
+    list->tail = &node->next;
 }
 
-/* Add a new message to 'messages'.
+/* Allocate a new node for 'message' and append it to the end of
+ * 'list'.
  */
 void
-_notmuch_messages_add_message (notmuch_messages_t *messages,
-			       notmuch_message_t *message)
+_notmuch_message_list_add_message (notmuch_message_list_t *list,
+				   notmuch_message_t *message)
+{
+    notmuch_message_node_t *node = talloc (list, notmuch_message_node_t);
+
+    node->message = message;
+    node->next = NULL;
+
+    _notmuch_message_list_append (list, node);
+}
+
+notmuch_messages_t *
+_notmuch_messages_create (notmuch_message_list_t *list)
 {
-    message_list_t *new = talloc (messages, message_list_t);
+    notmuch_messages_t *messages;
+
+    if (list->head == NULL)
+	return NULL;
+
+    messages = talloc (list, notmuch_messages_t);
+    if (unlikely (messages == NULL))
+	return NULL;
 
-    new->message = message;
-    new->next = NULL;
+    messages->is_of_list_type = TRUE;
+    messages->iterator = list->head;
 
-    *(messages->tail) = new;
-    messages->tail = &new->next;
+    return messages;
 }
 
+/* We're using the "is_of_type_list" to conditionally defer to the
+ * notmuch_mset_messages_t implementation of notmuch_messages_t in
+ * query.cc. It's ugly that that's over in query.cc, and it's ugly
+ * that we're not using a union here. Both of those uglies are due to
+ * C++:
+ *
+ *	1. I didn't want to force a C++ header file onto
+ *	   notmuch-private.h and suddenly subject all our code to a
+ *	   C++ compiler and its rules.
+ *
+ *	2. C++ won't allow me to put C++ objects, (with non-trivial
+ *	   constructors) into a union anyway. Even though I'd
+ *	   carefully control object construction with placement new
+ *	   anyway. *sigh*
+ */
 notmuch_bool_t
 notmuch_messages_has_more (notmuch_messages_t *messages)
 {
-    return messages->head != NULL;
+    if (messages == NULL)
+	return FALSE;
+
+    if (! messages->is_of_list_type)
+	return _notmuch_mset_messages_has_more (messages);
+
+    return (messages->iterator != NULL);
 }
 
 notmuch_message_t *
 notmuch_messages_get (notmuch_messages_t *messages)
 {
-    if (messages->head == NULL)
+    if (! messages->is_of_list_type)
+	return _notmuch_mset_messages_get (messages);
+
+    if (messages->iterator == NULL)
 	return NULL;
 
-    return messages->head->message;
+    return messages->iterator->message;
 }
 
 void
 notmuch_messages_advance (notmuch_messages_t *messages)
 {
-    if (messages->head == NULL)
+    if (! messages->is_of_list_type)
+	return _notmuch_mset_messages_advance (messages);
+
+    if (messages->iterator == NULL)
 	return;
 
-    messages->head = messages->head->next;
+    messages->iterator = messages->iterator->next;
 }
 
 void