X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=message.cc;h=ca4a16c79bc941c3be27299af8615fd85f90ccf0;hp=5d99321d01a9c1d19b6d359b152ee46125e502f9;hb=6519aff957df7a69d86ed9a00707c911d60259f6;hpb=466a7bbf620e4bf1b57097a6d3c474159c475b6d

diff --git a/message.cc b/message.cc
index 5d99321d..ca4a16c7 100644
--- a/message.cc
+++ b/message.cc
@@ -32,8 +32,14 @@ struct _notmuch_tags {
     Xapian::TermIterator iterator_end;
 };
 
+/* We end up having to call the destructor explicitly because we had
+ * to use "placement new" in order to initialize C++ objects within a
+ * block that we allocated with talloc. So C++ is making talloc
+ * slightly less simple to use, (we wouldn't need
+ * talloc_set_destructor at all otherwise).
+ */
 static int
-_notmuch_message_destroy (notmuch_message_t *message)
+_notmuch_message_destructor (notmuch_message_t *message)
 {
     message->doc.~Document ();
 
@@ -53,7 +59,7 @@ _notmuch_message_create (notmuch_results_t *owner,
 
     new (&message->doc) Xapian::Document;
 
-    talloc_set_destructor (message, _notmuch_message_destroy);
+    talloc_set_destructor (message, _notmuch_message_destructor);
 
     message->doc = notmuch->xapian_db->get_document (doc_id);
 
@@ -73,8 +79,14 @@ notmuch_message_get_message_id (notmuch_message_t *message)
 	return NULL;
 }
 
+/* We end up having to call the destructors explicitly because we had
+ * to use "placement new" in order to initialize C++ objects within a
+ * block that we allocated with talloc. So C++ is making talloc
+ * slightly less simple to use, (we wouldn't need
+ * talloc_set_destructor at all otherwise).
+ */
 static int
-_notmuch_tags_destroy (notmuch_tags_t *tags)
+_notmuch_tags_destructor (notmuch_tags_t *tags)
 {
     tags->iterator.~TermIterator ();
     tags->iterator_end.~TermIterator ();
@@ -94,7 +106,7 @@ notmuch_message_get_tags (notmuch_message_t *message)
     new (&tags->iterator) Xapian::TermIterator;
     new (&tags->iterator_end) Xapian::TermIterator;
 
-    talloc_set_destructor (tags, _notmuch_tags_destroy);
+    talloc_set_destructor (tags, _notmuch_tags_destructor);
 
     tags->iterator = message->doc.termlist_begin ();
     tags->iterator.skip_to ("L");
@@ -103,6 +115,12 @@ notmuch_message_get_tags (notmuch_message_t *message)
     return tags;
 }
 
+void
+notmuch_message_destroy (notmuch_message_t *message)
+{
+    talloc_free (message);
+}
+
 notmuch_bool_t
 notmuch_tags_has_more (notmuch_tags_t *tags)
 {
@@ -129,3 +147,9 @@ notmuch_tags_advance (notmuch_tags_t *tags)
 {
     tags->iterator++;
 }
+
+void
+notmuch_tags_destroy (notmuch_tags_t *tags)
+{
+    talloc_free (tags);
+}