Remove multiplication from second argument to Memory_safeMalloc().

[umurmur.git] / src / messages.c

diff --git a/src/messages.c b/src/messages.c
index d661c9e356e674cdc1a69592179131c82b847ee6..36bd20ccd6c236ec5dc8f4c146eefec3648e59ca 100644 (file)
--- a/src/messages.c
+++ b/src/messages.c
@@ -267,9 +267,8 @@ int Msg_messageToNetwork(message_t *msg, uint8_t *buffer)
 
 static message_t *Msg_create_nopayload(messageType_t messageType)
 {
-       message_t *msg = Memory_safeMalloc(1, sizeof(message_t));
+       message_t *msg = Memory_safeCalloc(1, sizeof(message_t));
 
-       memset(msg, 0, sizeof(message_t));
        msg->refcount = 1;
        msg->messageType = messageType;
        init_list_entry(&msg->node);
@@ -382,14 +381,12 @@ message_t *Msg_banList_create(int n_bans)
        message_t *msg = Msg_create_nopayload(BanList);
        int i;
 
-       msg->payload.banList = Memory_safeMalloc(1, sizeof(MumbleProto__BanList));
-       memset(msg->payload.banList, 0, sizeof(MumbleProto__BanList));
+       msg->payload.banList = Memory_safeCalloc(1, sizeof(MumbleProto__BanList));
        mumble_proto__ban_list__init(msg->payload.banList);
        msg->payload.banList->n_bans = n_bans;
-       msg->payload.banList->bans = Memory_safeMalloc(1, sizeof(MumbleProto__BanList__BanEntry *) * n_bans);
+       msg->payload.banList->bans = Memory_safeMalloc(n_bans, sizeof(MumbleProto__BanList__BanEntry *));
        for (i = 0; i < n_bans; i++) {
-               msg->payload.banList->bans[i] = Memory_safeMalloc(1, sizeof(MumbleProto__BanList__BanEntry));
-               memset(msg->payload.banList->bans[i], 0, sizeof(MumbleProto__BanList__BanEntry));
+               msg->payload.banList->bans[i] = Memory_safeCalloc(1, sizeof(MumbleProto__BanList__BanEntry));
                mumble_proto__ban_list__ban_entry__init(msg->payload.banList->bans[i]);
        }
        return msg;