diff options
author | Carl Worth <cworth@cworth.org> | 2009-10-20 22:08:31 -0700 |
---|---|---|
committer | Carl Worth <cworth@cworth.org> | 2009-10-20 22:10:07 -0700 |
commit | f6c7810945f1bc25b15dee72257c3b68bd0e8a40 (patch) | |
tree | 839159fb8cc3b0679f26468f63a50efe0433cb03 /message.cc | |
parent | 466a7bbf620e4bf1b57097a6d3c474159c475b6d (diff) |
Rename our talloc destructor functions to _destructor.
I want to reserve the _destroy names for some public functions
I'm about to add.
Diffstat (limited to 'message.cc')
-rw-r--r-- | message.cc | 20 |
1 files changed, 16 insertions, 4 deletions
@@ -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"); |