} notmuch_string_pair_t;
struct _notmuch_string_map {
- notmuch_bool_t sorted;
+ bool sorted;
size_t length;
notmuch_string_pair_t *pairs;
};
struct _notmuch_string_map_iterator {
notmuch_string_pair_t *current;
- notmuch_bool_t exact;
+ bool exact;
const char *key;
};
map->length = 0;
map->pairs = NULL;
- map->sorted = TRUE;
+ map->sorted = true;
return map;
}
{
map->length++;
- map->sorted = FALSE;
+ map->sorted = false;
if (map->pairs)
map->pairs = talloc_realloc (map, map->pairs, notmuch_string_pair_t, map->length + 1);
qsort (map->pairs, map->length, sizeof (notmuch_string_pair_t), cmppair);
- map->sorted = TRUE;
+ map->sorted = true;
}
-static notmuch_bool_t
-string_cmp (const char *a, const char *b, notmuch_bool_t exact)
+static bool
+string_cmp (const char *a, const char *b, bool exact)
{
if (exact)
return (strcmp (a, b));
}
static notmuch_string_pair_t *
-bsearch_first (notmuch_string_pair_t *array, size_t len, const char *key, notmuch_bool_t exact)
+bsearch_first (notmuch_string_pair_t *array, size_t len, const char *key, bool exact)
{
size_t first = 0;
size_t last = len - 1;
/* this means that calling append invalidates iterators */
_notmuch_string_map_sort (map);
- pair = bsearch_first (map->pairs, map->length, key, TRUE);
+ pair = bsearch_first (map->pairs, map->length, key, true);
if (! pair)
return NULL;
notmuch_string_map_iterator_t *
_notmuch_string_map_iterator_create (notmuch_string_map_t *map, const char *key,
- notmuch_bool_t exact)
+ bool exact)
{
notmuch_string_map_iterator_t *iter;
if (unlikely (iter == NULL))
return NULL;
+ if (unlikely (talloc_reference (iter, map) == 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
+bool
_notmuch_string_map_iterator_valid (notmuch_string_map_iterator_t *iterator)
{
if (iterator->current == NULL)
- return FALSE;
+ return false;
/* sentinel */
if (iterator->current->key == NULL)
- return FALSE;
+ return false;
return (0 == string_cmp (iterator->key, iterator->current->key, iterator->exact));