From d6a4ca14340d6618b782ec04e86281f9a1c2653e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Janouch?= Date: Tue, 14 Jul 2015 22:25:30 +0200 Subject: Bump liberty, fix map iterators --- degesch.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'degesch.c') diff --git a/degesch.c b/degesch.c index c4a7a43..78a5f66 100644 --- a/degesch.c +++ b/degesch.c @@ -6567,14 +6567,12 @@ server_remove (struct app_context *ctx, struct server *s) if (s->buffer) buffer_remove_safe (ctx, s->buffer); - struct str_map_iter iter; - str_map_iter_init (&iter, &s->irc_buffer_map); - struct buffer *buffer, *next = str_map_iter_next (&iter); - for (buffer = next; buffer; buffer = next) - { - next = str_map_iter_next (&iter); + struct str_map_unset_iter iter; + str_map_unset_iter_init (&iter, &s->irc_buffer_map); + struct buffer *buffer; + while ((buffer = str_map_unset_iter_next (&iter))) buffer_remove_safe (ctx, buffer); - } + str_map_unset_iter_free (&iter); hard_assert (!s->buffer); hard_assert (!s->irc_buffer_map.len); -- cgit v1.2.3