X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fvoicetarget.c;h=66de959ce30dbead14633b58b1c922984b6a72a2;hb=a1a0ba19a94a1bfe3c40629aa9c5f3a4b23db3ee;hp=85c26076384a45469db99ca3ad1ad1275eec2339;hpb=477a4a1b836a9693338dd2ef76782013f3fb0a16;p=umurmur.git

diff --git a/src/voicetarget.c b/src/voicetarget.c
index 85c2607..66de959 100644
--- a/src/voicetarget.c
+++ b/src/voicetarget.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2010, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2014, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2014, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -29,14 +29,17 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#include <stdlib.h>
+#include <string.h>
 #include "voicetarget.h"
 #include "log.h"
+#include "memory.h"
 
 void Voicetarget_add_session(client_t *client, int targetId, int sessionId)
 {
 	struct dlist *itr;
 	voicetarget_t *vt;
-	
+
 	list_iterate(itr, &client->voicetargets) {
 		if (targetId == list_get_entry(itr, voicetarget_t, node)->id) {
 			int i;
@@ -57,7 +60,7 @@ void Voicetarget_add_channel(client_t *client, int targetId, int channelId,
 {
 	struct dlist *itr;
 	voicetarget_t *vt;
-	
+
 	list_iterate(itr, &client->voicetargets) {
 		if (targetId == list_get_entry(itr, voicetarget_t, node)->id) {
 			int i;
@@ -72,19 +75,16 @@ void Voicetarget_add_channel(client_t *client, int targetId, int channelId,
 				}
 			}
 		}
-	}	
+	}
 }
 
 void Voicetarget_add_id(client_t *client, int targetId)
 {
 	voicetarget_t *newtarget;
 	int i;
-	
+
 	Voicetarget_del_id(client, targetId);
-	newtarget = malloc(sizeof(voicetarget_t));
-	if (!newtarget)
-		Log_fatal("Out of memory");
-	memset(newtarget, 0, sizeof(voicetarget_t));
+	newtarget = Memory_safeCalloc(1, sizeof(voicetarget_t));
 	for (i = 0; i < TARGET_MAX_CHANNELS; i++)
 		newtarget->channels[i].channel = -1;
 	for (i = 0; i < TARGET_MAX_SESSIONS; i++)