debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-22 17:34:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Hide away the details of the implementation of notmuch_tags_t.

Browse source 
We will soon be wanting multiple different implementations of
notmuch_tags_t iterators, so we need to keep the actual structure
as an implementation detail inside of tags.cc.
This commit is contained in:
Carl Worth 2009-10-26 06:00:07 -07:00
parent 2affed0851
commit 789495919a
3 changed files with 36 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
message.cc
View file

@ -289,8 +289,7 @@ notmuch_message_get_filename (notmuch_message_t *message)
notmuch_tags_t * notmuch_tags_t *
notmuch_message_get_tags (notmuch_message_t *message) notmuch_message_get_tags (notmuch_message_t *message)
{ {
return _notmuch_terms_create_type (message, message->doc, "tag", return _notmuch_tags_create_terms (message, message->doc, "tag");
notmuch_tags_t);
} }
void void

26
notmuch-private-cxx.h
View file

@ -34,27 +34,9 @@
/* tags.cc */ /* tags.cc */
/***********/ /***********/
typedef struct _notmuch_terms { notmuch_tags_t *
char prefix_char; _notmuch_tags_create_terms (void *ctx,
Xapian::TermIterator iterator; Xapian::Document doc,
Xapian::TermIterator iterator_end; const char *prefix_name);
} notmuch_terms_t;
struct _notmuch_tags {
notmuch_terms_t terms;
};
notmuch_terms_t *
_notmuch_terms_create (void *ctx,
Xapian::Document doc,
const char *prefix_name);
/* The assertion is to ensure that 'type' is a derivative of
* notmuch_terms_t in that it contains a notmuch_terms_t as its first
* member. We do this by name of 'terms' as opposed to type, because
* that's as clever as I've been so far. */
#define _notmuch_terms_create_type(ctx, doc, prefix_name, type) \
(COMPILE_TIME_ASSERT(offsetof(type, terms) == 0), \
(type *) _notmuch_terms_create (ctx, doc, prefix_name))
#endif #endif

31
tags.cc
View file

@ -23,6 +23,29 @@
#include <xapian.h> #include <xapian.h>
typedef struct _notmuch_terms {
char prefix_char;
Xapian::TermIterator iterator;
Xapian::TermIterator iterator_end;
} notmuch_terms_t;
struct _notmuch_tags {
notmuch_terms_t terms;
};
notmuch_terms_t *
_notmuch_terms_create (void *ctx,
Xapian::Document doc,
const char *prefix_name);
/* The assertion is to ensure that 'type' is a derivative of
* notmuch_terms_t in that it contains a notmuch_terms_t as its first
* member. We do this by name of 'terms' as opposed to type, because
* that's as clever as I've been so far. */
#define _notmuch_terms_create_type(ctx, doc, prefix_name, type) \
(COMPILE_TIME_ASSERT(offsetof(type, terms) == 0), \
(type *) _notmuch_terms_create (ctx, doc, prefix_name))
/* We end up having to call the destructors explicitly because we had /* We end up having to call the destructors explicitly because we had
* to use "placement new" in order to initialize C++ objects within a * to use "placement new" in order to initialize C++ objects within a
* block that we allocated with talloc. So C++ is making talloc * block that we allocated with talloc. So C++ is making talloc
@ -101,6 +124,14 @@ _notmuch_terms_destroy (notmuch_terms_t *terms)
talloc_free (terms); talloc_free (terms);
} }
notmuch_tags_t *
_notmuch_tags_create_terms (void *ctx,
Xapian::Document doc,
const char *prefix_name)
{
return _notmuch_terms_create_type (ctx, doc, prefix_name, notmuch_tags_t);
}
notmuch_bool_t notmuch_bool_t
notmuch_tags_has_more (notmuch_tags_t *tags) notmuch_tags_has_more (notmuch_tags_t *tags)
{ {