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

tags: Replace sort() and reset() with prepare_iterator().

Browse source 
The previous functions were always called together, so we might as
well just have one function for this. Also, the reset() name was
poor, and prepare_iterator() is much more descriptive.
This commit is contained in:
Carl Worth 2009-10-26 14:12:56 -07:00
parent 1726c5c814
commit ef3ab5781a
3 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
message.cc
View file

@ -318,9 +318,7 @@ notmuch_message_get_tags (notmuch_message_t *message)
i++;
}
_notmuch_tags_sort (tags);
_notmuch_tags_reset (tags);
_notmuch_tags_prepare_iterator (tags);
return tags;
}

5
notmuch-private.h
View file

@ -283,10 +283,7 @@ void
_notmuch_tags_add_tag (notmuch_tags_t *tags, const char *tag);
void
_notmuch_tags_sort (notmuch_tags_t *tags);
void
_notmuch_tags_reset (notmuch_tags_t *tags);
_notmuch_tags_prepare_iterator (notmuch_tags_t *tags);
NOTMUCH_END_DECLS

24
tags.c
View file

@ -23,6 +23,7 @@
#include <glib.h> /* GList */
struct _notmuch_tags {
int sorted;
GList *tags;
GList *iterator;
};
@ -52,27 +53,38 @@ _notmuch_tags_create (void *ctx)
talloc_set_destructor (tags, _notmuch_tags_destructor);
tags->sorted = 1;
tags->tags = NULL;
tags->iterator = NULL;
return tags;
}
/* Add a new tag to 'tags'. The tags object will create its own copy
* of the string.
*
* Note: The tags object will not do anything to prevent duplicate
* tags being stored, so the caller really shouldn't pass
* duplicates. */
void
_notmuch_tags_add_tag (notmuch_tags_t *tags, const char *tag)
{
tags->tags = g_list_prepend (tags->tags, talloc_strdup (tags, tag));
tags->sorted = 0;
}
/* Prepare 'tag' for iteration.
*
* 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. */
void
_notmuch_tags_sort (notmuch_tags_t *tags)
_notmuch_tags_prepare_iterator (notmuch_tags_t *tags)
{
tags->tags = g_list_sort (tags->tags, (GCompareFunc) strcmp);
}
if (! tags->sorted)
tags->tags = g_list_sort (tags->tags, (GCompareFunc) strcmp);
tags->sorted = 1;
void
_notmuch_tags_reset (notmuch_tags_t *tags)
{
tags->iterator = tags->tags;
}