Remove casts made unneeded by the previous changeset.

[umurmur.git] / src / channel.c

diff --git a/src/channel.c b/src/channel.c
index da15a52f175e602bc3c0a633b472862f4684e013..ec331bb1cca9b83b5daa3a04edaa6b36ca117825 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -47,8 +47,7 @@ static channel_t *createChannel(int id, const char *name, const char *desc)
 {
        channel_t *ch;
 
-       ch = Memory_safeMalloc(1, sizeof(channel_t));
-       memset(ch, 0, sizeof(channel_t));
+       ch = Memory_safeCalloc(1, sizeof(channel_t));
        ch->id = id;
        ch->name = strdup(name);
        if (desc)
@@ -283,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);
@@ -297,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;
 }