diff options
Diffstat (limited to 'channel.c')
| -rw-r--r-- | channel.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/channel.c b/channel.c index 94b0d6c..21a777a 100644 --- a/channel.c +++ b/channel.c @@ -28,12 +28,12 @@ size_t channels_c; int channel_join(struct Channel *channel, struct Peer *peer) { - if (channel->users_c == lengthof(channel->users) + if (channel->peers_c == lengthof(channel->peers) || peer->channels_c == lengthof(peer->channels)) return 1; peer->channels[peer->channels_c++] = channel; - channel->users[channel->users_c++] = peer; + channel->peers[channel->peers_c++].p = peer; writechanf( 0, channel, @@ -51,11 +51,11 @@ channel_exit(struct Channel *channel, struct Peer *peer) { size_t i; - for (i = 0; i < channel->users_c; ++i) - if (channel->users[i]->fd == peer->fd) + for (i = 0; i < channel->peers_c; ++i) + if (channel->peers[i].p->fd == peer->fd) break; - ensure(i != channel->users_c, (void)0, 1); - channel->users[i] = channel->users[--channel->users_c]; + ensure(i != channel->peers_c, (void)0, 1); + channel->peers[i] = channel->peers[--channel->peers_c]; for (i = 0; i < peer->channels_c; ++i) if (!strcmp(peer->channels[i]->name, channel->name)) @@ -65,7 +65,7 @@ channel_exit(struct Channel *channel, struct Peer *peer) ), 1) peer->channels[i] = peer->channels[--peer->channels_c]; - if (!channel->users_c) + if (!channel->peers_c) { for (i = 0; i < channels_c; ++i) if (!strcmp(channels[i].name, channel->name)) @@ -86,24 +86,24 @@ channel_remove(size_t cid) size_t i, j; tofix = &channels[channels_c-1]; - for (i = 0; i < tofix->users_c; ++i) + for (i = 0; i < tofix->peers_c; ++i) { - for (j = 0; j < tofix->users[i]->channels_c; ++j) - if (!strcmp(tofix->users[i]->channels[j]->name, tofix->name)) + for (j = 0; j < tofix->peers[i].p->channels_c; ++j) + if (!strcmp(tofix->peers[i].p->channels[j]->name, tofix->name)) break; - if (j == tofix->users[i]->channels_c) + if (j == tofix->peers[i].p->channels_c) { warnx( "channel_remove(): %s doesn't belong to %s@%s, " "though they believe in the opposite", tofix->name, - getnick(tofix->users[i]), - tofix->users[i]->host + getnick(tofix->peers[i].p), + tofix->peers[i].p->host ); continue; } - tofix->users[i]->channels[j] = &channels[cid]; + tofix->peers[i].p->channels[j] = &channels[cid]; } channels[cid] = channels[--channels_c]; |