Rename our talloc destructor functions to _destructor.

I want to reserve the _destroy names for some public functions
I'm about to add.

diff --git a/message.cc b/message.cc
index 5d99321d01a9c1d19b6d359b152ee46125e502f9..cc157c8b010f3f5aaa0c0f9675639da12d10e1ec 100644 (file)
--- a/message.cc
+++ b/message.cc
@@ -32,8 +32,14 @@ struct _notmuch_tags {
     Xapian::TermIterator iterator_end;
 };
 
     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
 static int

-_notmuch_message_destroy (notmuch_message_t *message)
+_notmuch_message_destructor (notmuch_message_t *message)

 {
     message->doc.~Document ();
 
 {
     message->doc.~Document ();
 


@@ -53,7 +59,7 @@ _notmuch_message_create (notmuch_results_t *owner,
 
     new (&message->doc) Xapian::Document;
 
 
     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);
 
 
     message->doc = notmuch->xapian_db->get_document (doc_id);
 


@@ -73,8 +79,14 @@ notmuch_message_get_message_id (notmuch_message_t *message)
        return NULL;
 }
 
        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
 static int

-_notmuch_tags_destroy (notmuch_tags_t *tags)
+_notmuch_tags_destructor (notmuch_tags_t *tags)

 {
     tags->iterator.~TermIterator ();
     tags->iterator_end.~TermIterator ();
 {
     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;
 
     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");
 
     tags->iterator = message->doc.termlist_begin ();
     tags->iterator.skip_to ("L");

diff --git a/query.cc b/query.cc
index d3614dc3ee8d012ab5a868b03b096bda001c82a5..c669fb9110a6fed7347ae454ddafa12fac3edbaa 100644 (file)
--- a/query.cc
+++ b/query.cc
@@ -66,8 +66,14 @@ notmuch_query_set_sort (notmuch_query_t *query, notmuch_sort_t sort)
     query->sort = sort;
 }
 
     query->sort = sort;
 }
 

+/* 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
 static int

-_notmuch_results_destroy (notmuch_results_t *results)
+_notmuch_results_destructor (notmuch_results_t *results)

 {
     results->iterator.~PostingIterator ();
     results->iterator_end.~PostingIterator ();
 {
     results->iterator.~PostingIterator ();
     results->iterator_end.~PostingIterator ();


@@ -94,7 +100,7 @@ notmuch_query_search (notmuch_query_t *query)
        new (&results->iterator) Xapian::PostingIterator ();
        new (&results->iterator_end) Xapian::PostingIterator ();
 
        new (&results->iterator) Xapian::PostingIterator ();
        new (&results->iterator_end) Xapian::PostingIterator ();
 

-       talloc_set_destructor (results, _notmuch_results_destroy);
+       talloc_set_destructor (results, _notmuch_results_destructor);

 
        results->iterator = query->notmuch->xapian_db->postlist_begin ("");
        results->iterator_end = query->notmuch->xapian_db->postlist_end ("");
 
        results->iterator = query->notmuch->xapian_db->postlist_begin ("");
        results->iterator_end = query->notmuch->xapian_db->postlist_end ("");