Remove casts made unneeded by the previous changeset.

diff --git a/src/channel.c b/src/channel.c
index 346ea44ddfd9699f19da2181b77de2b85aefeab1..ec331bb1cca9b83b5daa3a04edaa6b36ca117825 100644 (file)
--- 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);
 
        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);
                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 */
        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);
                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;
 }
 
        return leaving_id;
 }
 

diff --git a/src/client.c b/src/client.c
index 3d884629dc66235e3311a6462e2c60e1814af79c..961bee8a86a579c1f82f4665da80e8384bd74e8a 100644 (file)
--- 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;
 
        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)
        struct dlist *itr;
 
        if (!client->authenticated || client->mute || client->self_mute || ch->silent)

diff --git a/src/messagehandler.c b/src/messagehandler.c
index c5233f9647a31fd158f049591b664dc2358d0ef1..514949f7ba9f64fcd981c59d82b796680d309425 100644 (file)
--- 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->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;
 
                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->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;
 
                        if (client_itr->self_deaf) {
                                sendmsg->payload.userState->has_self_deaf = true;