*
* The internal creator of 'tags' should call this function before
* returning 'tags' to the user to call the public functions such as
- * notmuch_tags_has_more, notmuch_tags_get, and notmuch_tags_advance. */
+ * notmuch_tags_valid, notmuch_tags_get, and
+ * notmuch_tags_move_to_next. */
void
_notmuch_tags_prepare_iterator (notmuch_tags_t *tags)
{
}
notmuch_bool_t
-notmuch_tags_has_more (notmuch_tags_t *tags)
+notmuch_tags_valid (notmuch_tags_t *tags)
{
return tags->iterator != NULL;
}
const char *
notmuch_tags_get (notmuch_tags_t *tags)
{
- if (tags->iterator)
- return (char *) tags->iterator->data;
- else
+ if (tags->iterator == NULL)
return NULL;
+
+ return (char *) tags->iterator->data;
}
void
-notmuch_tags_advance (notmuch_tags_t *tags)
+notmuch_tags_move_to_next (notmuch_tags_t *tags)
{
+ if (tags->iterator == NULL)
+ return;
+
tags->iterator = tags->iterator->next;
}