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
---
kike.c | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
(limited to 'kike.c')
diff --git a/kike.c b/kike.c
index fafa38d..f24dbf2 100644
--- a/kike.c
+++ b/kike.c
@@ -870,18 +870,18 @@ client_unregister (struct client *c, const char *reason)
irc_send_to_roommates (c, message);
free (message);
- struct str_map_iter iter;
- str_map_iter_init (&iter, &c->ctx->channels);
- struct channel *chan, *next = str_map_iter_next (&iter);
- for (chan = next; chan; chan = next)
+ struct str_map_unset_iter iter;
+ str_map_unset_iter_init (&iter, &c->ctx->channels);
+ struct channel *chan;
+ while ((chan = str_map_unset_iter_next (&iter)))
{
- next = str_map_iter_next (&iter);
struct channel_user *user;
if (!(user = channel_get_user (chan, c)))
continue;
channel_remove_user (chan, user);
irc_channel_destroy_if_empty (c->ctx, chan);
}
+ str_map_unset_iter_free (&iter);
client_add_to_whowas (c);
@@ -2590,16 +2590,15 @@ irc_try_part (struct client *c, const char *channel_name, const char *reason)
static void
irc_part_all_channels (struct client *c)
{
- struct str_map_iter iter;
- str_map_iter_init (&iter, &c->ctx->channels);
- struct channel *chan, *next = str_map_iter_next (&iter);
- for (chan = next; chan; chan = next)
- {
- // We have to be careful here, the channel might get destroyed
- next = str_map_iter_next (&iter);
+ // We have to be careful here, the channel might get destroyed
+ struct str_map_unset_iter iter;
+ str_map_unset_iter_init (&iter, &c->ctx->channels);
+
+ struct channel *chan;
+ while ((chan = str_map_unset_iter_next (&iter)))
if (channel_get_user (chan, c))
irc_try_part (c, chan->name, NULL);
- }
+ str_map_unset_iter_free (&iter);
}
static void
--
cgit v1.2.3