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

Bump liberty, fix map iterators

Browse Source
This commit is contained in:
Přemysl Eric Janouch
2015-07-14 22:25:30 +02:00
parent 955552f4fa
commit d6a4ca1434
4 changed files with 18 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
kike.c
View File

@@ -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