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

Rename our talloc destructor functions to _destructor.

Browse source 
I want to reserve the _destroy names for some public functions
I'm about to add.
This commit is contained in:
Carl Worth 2009-10-20 22:08:31 -07:00
parent 466a7bbf62
commit f6c7810945
2 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
message.cc
View file

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

10
query.cc
View file

@ -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.~PostingIterator ();
results->iterator_end.~PostingIterator (); results->iterator_end.~PostingIterator ();
@ -94,7 +100,7 @@ notmuch_query_search (notmuch_query_t *query)
new (&results->iterator) Xapian::PostingIterator (); new (&results->iterator) Xapian::PostingIterator ();
new (&results->iterator_end) 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 = query->notmuch->xapian_db->postlist_begin ("");
results->iterator_end = query->notmuch->xapian_db->postlist_end (""); results->iterator_end = query->notmuch->xapian_db->postlist_end ("");