diff options
| -rw-r--r-- | message.cc | 3 | ||||
| -rw-r--r-- | notmuch-private-cxx.h | 26 | ||||
| -rw-r--r-- | tags.cc | 31 |
3 files changed, 36 insertions, 24 deletions
@@ -289,8 +289,7 @@ notmuch_message_get_filename (notmuch_message_t *message) notmuch_tags_t * notmuch_message_get_tags (notmuch_message_t *message) { - return _notmuch_terms_create_type (message, message->doc, "tag", - notmuch_tags_t); + return _notmuch_tags_create_terms (message, message->doc, "tag"); } void diff --git a/notmuch-private-cxx.h b/notmuch-private-cxx.h index e177bf1..c7aa97a 100644 --- a/notmuch-private-cxx.h +++ b/notmuch-private-cxx.h @@ -34,27 +34,9 @@ /* tags.cc */ /***********/ -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)) +notmuch_tags_t * +_notmuch_tags_create_terms (void *ctx, + Xapian::Document doc, + const char *prefix_name); #endif @@ -23,6 +23,29 @@ #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 * to use "placement new" in order to initialize C++ objects within a * 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); } +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_tags_has_more (notmuch_tags_t *tags) { |