p
/
liberty
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Constify str_map_iter

This commit is contained in:
Přemysl Eric Janouch 2015-12-28 04:01:20 +01:00
parent 8b2e41ed8f
commit a4313ee4b9
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
liberty.c
View File

@ -977,13 +977,13 @@ str_map_steal (struct str_map *self, const char *key)
struct str_map_iter struct str_map_iter
{ {
struct str_map *map; ///< The map we're iterating const struct str_map *map; ///< The map we're iterating
size_t next_index; ///< Next table index to search size_t next_index; ///< Next table index to search
struct str_map_link *link; ///< Current link struct str_map_link *link; ///< Current link
}; };
static void static void
str_map_iter_init (struct str_map_iter *self, struct str_map *map) str_map_iter_init (struct str_map_iter *self, const struct str_map *map)
{ {
self->map = map; self->map = map;
self->next_index = 0; self->next_index = 0;
@ -993,7 +993,7 @@ str_map_iter_init (struct str_map_iter *self, struct str_map *map)
static void * static void *
str_map_iter_next (struct str_map_iter *self) str_map_iter_next (struct str_map_iter *self)
{ {
struct str_map *map = self->map; const struct str_map *map = self->map;
if (self->link) if (self->link)
self->link = self->link->next; self->link = self->link->next;
while (!self->link) while (!self->link)
@ -1021,7 +1021,7 @@ static void
str_map_unset_iter_init (struct str_map_unset_iter *self, struct str_map *map) str_map_unset_iter_init (struct str_map_unset_iter *self, struct str_map *map)
{ {
str_map_iter_init (&self->iter, map); str_map_iter_init (&self->iter, map);
self->iter.map->shrink_lock = true; map->shrink_lock = true;
(void) str_map_iter_next (&self->iter); (void) str_map_iter_next (&self->iter);
self->next = self->iter.link; self->next = self->iter.link;
} }
@ -1039,8 +1039,11 @@ str_map_unset_iter_next (struct str_map_unset_iter *self)
static void static void
str_map_unset_iter_free (struct str_map_unset_iter *self) str_map_unset_iter_free (struct str_map_unset_iter *self)
{ {
self->iter.map->shrink_lock = false; // So that we don't have to store another non-const pointer
str_map_shrink (self->iter.map); struct str_map *map = (struct str_map *) self->iter.map;
map->shrink_lock = false;
str_map_shrink (map);
} }
// --- Event loop -------------------------------------------------------------- // --- Event loop --------------------------------------------------------------