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

lib: extend private string map API with iterators

Browse source 
Support for prefix based iterators is perhaps overengineering, but I
wanted to mimic the existing database_config API.
This commit is contained in:
David Bremner 2016-06-12 22:05:51 -03:00
parent b8bb6d7964
commit b846bdb482
2 changed files with 92 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/notmuch-private.h
View file

@ -543,7 +543,7 @@ _notmuch_string_list_sort (notmuch_string_list_t *list);
/* string-map.c */
typedef struct _notmuch_string_map notmuch_string_map_t;
typedef struct _notmuch_string_map_iterator notmuch_string_map_iterator_t;
notmuch_string_map_t *
_notmuch_string_map_create (const void *ctx);
@ -555,6 +555,25 @@ _notmuch_string_map_append (notmuch_string_map_t *map,
const char *
_notmuch_string_map_get (notmuch_string_map_t *map, const char *key);
notmuch_string_map_iterator_t *
_notmuch_string_map_iterator_create (notmuch_string_map_t *map, const char *key,
notmuch_bool_t exact);
notmuch_bool_t
_notmuch_string_map_iterator_valid (notmuch_string_map_iterator_t *iter);
void
_notmuch_string_map_iterator_move_to_next (notmuch_string_map_iterator_t *iter);
const char *
_notmuch_string_map_iterator_key (notmuch_string_map_iterator_t *iterator);
const char *
_notmuch_string_map_iterator_value (notmuch_string_map_iterator_t *iterator);
void
_notmuch_string_map_iterator_destroy (notmuch_string_map_iterator_t *iterator);
/* tags.c */
notmuch_tags_t *

72
lib/string-map.c
View file

@ -38,6 +38,12 @@ struct _notmuch_string_map {
notmuch_string_pair_t *pairs;
};
struct _notmuch_string_map_iterator {
notmuch_string_pair_t *current;
notmuch_bool_t exact;
const char *key;
};
notmuch_string_map_t *
_notmuch_string_map_create (const void *ctx)
{
@ -151,3 +157,69 @@ _notmuch_string_map_get (notmuch_string_map_t *map, const char *key)
return pair->value;
}
notmuch_string_map_iterator_t *
_notmuch_string_map_iterator_create (notmuch_string_map_t *map, const char *key,
notmuch_bool_t exact)
{
notmuch_string_map_iterator_t *iter;
_notmuch_string_map_sort (map);
iter = talloc (map, notmuch_string_map_iterator_t);
if (unlikely (iter == NULL))
return NULL;
iter->key = talloc_strdup (iter, key);
iter->exact = exact;
iter->current = bsearch_first (map->pairs, map->length, key, exact);
return iter;
}
notmuch_bool_t
_notmuch_string_map_iterator_valid (notmuch_string_map_iterator_t *iterator)
{
if (iterator->current == NULL)
return FALSE;
/* sentinel */
if (iterator->current->key == NULL)
return FALSE;
return (0 == string_cmp (iterator->key, iterator->current->key, iterator->exact));
}
void
_notmuch_string_map_iterator_move_to_next (notmuch_string_map_iterator_t *iterator)
{
if (! _notmuch_string_map_iterator_valid (iterator))
return;
(iterator->current)++;
}
const char *
_notmuch_string_map_iterator_key (notmuch_string_map_iterator_t *iterator)
{
if (! _notmuch_string_map_iterator_valid (iterator))
return NULL;
return iterator->current->key;
}
const char *
_notmuch_string_map_iterator_value (notmuch_string_map_iterator_t *iterator)
{
if (! _notmuch_string_map_iterator_valid (iterator))
return NULL;
return iterator->current->value;
}
void
_notmuch_string_map_iterator_destroy (notmuch_string_map_iterator_t *iterator)
{
talloc_free (iterator);
}