X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fvoicetarget.c;h=66de959ce30dbead14633b58b1c922984b6a72a2;hb=a1a0ba19a94a1bfe3c40629aa9c5f3a4b23db3ee;hp=e69e68cd90eec1fa07f2306fb55d915db9cf6cde;hpb=808f6f490d6e93002b5ac8e0ba201aa82b128fc4;p=umurmur.git diff --git a/src/voicetarget.c b/src/voicetarget.c index e69e68c..66de959 100644 --- a/src/voicetarget.c +++ b/src/voicetarget.c @@ -33,12 +33,13 @@ #include #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; @@ -59,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; @@ -74,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++)