X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fchannel.c;h=ec331bb1cca9b83b5daa3a04edaa6b36ca117825;hb=a0263cad8675800030a33dacf38d881fa647d0af;hp=3a5fac02c41ffc70032798e7da3ca49ab870b8d9;hpb=d53d3911ebf68f70e39d0cd660af7aac923127cb;p=umurmur.git

diff --git a/src/channel.c b/src/channel.c
index 3a5fac0..ec331bb 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -32,6 +32,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "log.h"
+#include "memory.h"
 #include "list.h"
 #include "client.h"
 #include "channel.h"
@@ -46,10 +47,7 @@ static channel_t *createChannel(int id, const char *name, const char *desc)
 {
 	channel_t *ch;
 
-	ch = malloc(sizeof(channel_t));
-	if (ch == NULL)
-		Log_fatal("out of memory");
-	memset(ch, 0, sizeof(channel_t));
+	ch = Memory_safeCalloc(1, sizeof(channel_t));
 	ch->id = id;
 	ch->name = strdup(name);
 	if (desc)
@@ -221,8 +219,8 @@ void Chan_init()
 					  chlink.destination);
 		else
 			ch_dst = ch_itr;
-		
-		chl = malloc(sizeof(channellist_t));
+
+		chl = Memory_safeMalloc(1, sizeof(channellist_t));
 		chl->chan = ch_dst;
 		init_list_entry(&chl->node);
 		list_add_tail(&chl->node, &ch_src->channel_links);
@@ -284,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);
@@ -298,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;
 }
 
@@ -380,7 +378,7 @@ void Chan_buildTreeList(channel_t *ch, struct dlist *head)
 	struct dlist *itr;
 	channel_t *sub;
 
-	chl = malloc(sizeof(channellist_t));
+	chl = Memory_safeMalloc(1, sizeof(channellist_t));
 	chl->chan = ch;
 	init_list_entry(&chl->node);
 	list_add_tail(&chl->node, head);