diff options
| -rw-r--r-- | channel.c | 2 | ||||
| -rw-r--r-- | handle.c | 8 | ||||
| -rw-r--r-- | user.c | 2 | ||||
| -rw-r--r-- | writef.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/channel.c b/channel.c index 1b3024b..557e4e9 100644 --- a/channel.c +++ b/channel.c @@ -52,7 +52,7 @@ channel_exit(struct Channel *channel, struct Peer *peer) size_t i; for (i = 0; i < channel->peers_c; ++i) - if (channel->peers[i].p->fd == peer->fd) + if (channel->peers[i].p == peer) break; ensure(i != channel->peers_c, (void)0, 1); channel->peers[i] = channel->peers[--channel->peers_c]; diff --git a/handle.c b/handle.c index 1253cdf..c444ff9 100644 --- a/handle.c +++ b/handle.c @@ -97,7 +97,7 @@ kick(struct Message *msg, struct Peer *peer) ch = &channels[i]; for (i = 0; i < ch->peers_c; ++i) - if (ch->peers[i].p->fd == peer->fd) + if (ch->peers[i].p == peer) break; ensure(i != ch->peers_c, reply(peer, 442, ch->name), 0); ensure(peer->modes & OPER || ch->peers[i].modes & CHANNEL_OPER, reply(peer, 482, ch->name), 0); @@ -165,7 +165,7 @@ mode_channel(struct Message *msg, struct Peer *peer) ensure(msg->params[1] && *msg->params[1], reply(peer, 324, channel->name, ""), 0); for (i = 0; i < channel->peers_c; ++i) - if (channel->peers[i].p->fd == peer->fd) + if (channel->peers[i].p == peer) break; ensure(i != channel->peers_c, reply(peer, 482, channel->name), 0); modes = channel->peers[i].modes; @@ -361,7 +361,7 @@ nick(struct Message *msg, struct Peer *peer) ); for (i = 0; i < peers_c; ++i) - if (peers[i].fd != peer->fd) + if (&peers[i] != peer) ensure( strcmp(peers[i].nick, msg->params[0]), reply(peer, 433, msg->params[0]), @@ -626,7 +626,7 @@ topic(struct Message *msg, struct Peer *peer) if (msg->params[1]) { for (i = 0; i < ch->peers_c; ++i) - if (ch->peers[i].p->fd == peer->fd) + if (ch->peers[i].p == peer) break; ensure(i != ch->peers_c, reply(peer, 442, ch->name), 0); ensure( diff --git a/user.c b/user.c index 0932b0e..638f061 100644 --- a/user.c +++ b/user.c @@ -98,7 +98,7 @@ user_remove(size_t pid) for (i = 0; i < last->channels_c; ++i) { for (j = 0; j < last->channels[i]->peers_c; ++j) - if (last->channels[i]->peers[j].p->fd == last->fd) + if (last->channels[i]->peers[j].p == last) break; if (j == last->channels[i]->peers_c) { diff --git a/writef.c b/writef.c index a2283b9..315eaa9 100644 --- a/writef.c +++ b/writef.c @@ -60,7 +60,7 @@ writechanf(const struct Peer *except, const struct Channel *channel, const char count = 0; for (i = 0; i < channel->peers_c; ++i) - if (!except || channel->peers[i].p->fd != except->fd) + if (!except || channel->peers[i].p != except) count += write(channel->peers[i].p->fd, buf, written) == written; return count; |