From a0263cad8675800030a33dacf38d881fa647d0af Mon Sep 17 00:00:00 2001 From: Tilman Sauerbeck Date: Thu, 28 Dec 2017 12:37:38 +0100 Subject: [PATCH] Remove casts made unneeded by the previous changeset. --- src/channel.c | 6 +++--- src/client.c | 2 +- src/messagehandler.c | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/channel.c b/src/channel.c index 346ea44..ec331bb 100644 --- a/src/channel.c +++ b/src/channel.c @@ -282,7 +282,7 @@ int Chan_userLeave(client_t *client) if (client->channel) { list_del(&client->chan_node); - leaving = (channel_t *)client->channel; + leaving = client->channel; if (leaving->temporary && list_empty(&leaving->clients)) { leaving_id = leaving->id; Chan_freeChannel(leaving); @@ -296,14 +296,14 @@ int Chan_userJoin(channel_t *ch, client_t *client) int leaving_id; /* Do nothing if user already is in this channel */ - if ((channel_t *)client->channel == ch) + if (client->channel == ch) return 0; Log_debug("Add user %s to channel %s", client->username, ch->name); /* Only allowed in one channel at a time */ leaving_id = Chan_userLeave(client); list_add_tail(&client->chan_node, &ch->clients); - client->channel = (void *)ch; + client->channel = ch; return leaving_id; } diff --git a/src/client.c b/src/client.c index 3d88462..961bee8 100644 --- a/src/client.c +++ b/src/client.c @@ -877,7 +877,7 @@ int Client_voiceMsg(client_t *client, uint8_t *data, int len) int offset, packetsize; voicetarget_t *vt; - channel_t *ch = (channel_t *)client->channel; + channel_t *ch = client->channel; struct dlist *itr; if (!client->authenticated || client->mute || client->self_mute || ch->silent) diff --git a/src/messagehandler.c b/src/messagehandler.c index c5233f9..514949f 100644 --- a/src/messagehandler.c +++ b/src/messagehandler.c @@ -306,7 +306,7 @@ void Mh_handle_message(client_t *client, message_t *msg) sendmsg->payload.userState->session = client->sessionId; sendmsg->payload.userState->name = strdup(client->username); sendmsg->payload.userState->has_channel_id = true; - sendmsg->payload.userState->channel_id = ((channel_t *)client->channel)->id; + sendmsg->payload.userState->channel_id = client->channel->id; if (defaultChan->silent) { sendmsg->payload.userState->has_suppress = true; @@ -324,11 +324,11 @@ void Mh_handle_message(client_t *client, message_t *msg) sendmsg->payload.userState->session = client_itr->sessionId; sendmsg->payload.userState->name = strdup(client_itr->username); sendmsg->payload.userState->has_channel_id = true; - sendmsg->payload.userState->channel_id = ((channel_t *)client_itr->channel)->id; - sendmsg->payload.userState->has_suppress = ((channel_t *)client_itr->channel)->silent; - sendmsg->payload.userState->suppress = ((channel_t *)client_itr->channel)->silent; + sendmsg->payload.userState->channel_id = client_itr->channel->id; + sendmsg->payload.userState->has_suppress = client_itr->channel->silent; + sendmsg->payload.userState->suppress = client_itr->channel->silent; - client_itr->isSuppressed = ((channel_t *)client_itr->channel)->silent; + client_itr->isSuppressed = client_itr->channel->silent; if (client_itr->self_deaf) { sendmsg->payload.userState->has_self_deaf = true; -- 2.30.2