X-Git-Url: http://git.code-monkey.de/?p=umurmur.git;a=blobdiff_plain;f=src%2Fchannel.c;h=da15a52f175e602bc3c0a633b472862f4684e013;hp=fdf4e82df9acab3a9597b56b5449d13508068b23;hb=a1a0ba19a94a1bfe3c40629aa9c5f3a4b23db3ee;hpb=82e80f8f18cbb6fed903621751ba9751dc2b80a2

diff --git a/src/channel.c b/src/channel.c
index fdf4e82..da15a52 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,9 +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");
+	ch = Memory_safeMalloc(1, sizeof(channel_t));
 	memset(ch, 0, sizeof(channel_t));
 	ch->id = id;
 	ch->name = strdup(name);
@@ -222,9 +221,7 @@ void Chan_init()
 		else
 			ch_dst = ch_itr;
 
-		chl = malloc(sizeof(channellist_t));
-		if(!chl)
-			Log_fatal("Out of memory");
+		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);
@@ -382,9 +379,7 @@ void Chan_buildTreeList(channel_t *ch, struct dlist *head)
 	struct dlist *itr;
 	channel_t *sub;
 
-	chl = malloc(sizeof(channellist_t));
-	if(!chl)
-		Log_fatal("Out of memory");
+	chl = Memory_safeMalloc(1, sizeof(channellist_t));
 	chl->chan = ch;
 	init_list_entry(&chl->node);
 	list_add_tail(&chl->node, head);