From 3a4af3149b5d6745bc7ca362c0cea678b8ff9649 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 24 Jun 2020 17:35:02 +0200
Subject: [PATCH] (libretro-common) Use malloc instead of calloc when possible

---
 libretro-common/queues/fifo_queue.c    | 10 ++++++----
 libretro-common/queues/message_queue.c | 19 ++++++++++---------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/libretro-common/queues/fifo_queue.c b/libretro-common/queues/fifo_queue.c
index 3f7bc66a74..8fddb310ca 100644
--- a/libretro-common/queues/fifo_queue.c
+++ b/libretro-common/queues/fifo_queue.c
@@ -28,12 +28,14 @@
 fifo_buffer_t *fifo_new(size_t size)
 {
    uint8_t    *buffer = NULL;
-   fifo_buffer_t *buf = (fifo_buffer_t*)calloc(1, sizeof(*buf));
+   fifo_buffer_t *buf = (fifo_buffer_t*)malloc(sizeof(*buf));
 
    if (!buf)
       return NULL;
 
-   buffer = (uint8_t*)calloc(1, size + 1);
+   buf->first         = 0;
+   buf->end           = 0;
+   buffer             = (uint8_t*)calloc(1, size + 1);
 
    if (!buffer)
    {
@@ -41,8 +43,8 @@ fifo_buffer_t *fifo_new(size_t size)
       return NULL;
    }
 
-   buf->buffer = buffer;
-   buf->size   = size + 1;
+   buf->buffer        = buffer;
+   buf->size          = size + 1;
 
    return buf;
 }
diff --git a/libretro-common/queues/message_queue.c b/libretro-common/queues/message_queue.c
index 6ef1812a8b..277edb012b 100644
--- a/libretro-common/queues/message_queue.c
+++ b/libretro-common/queues/message_queue.c
@@ -59,14 +59,15 @@ struct msg_queue
 msg_queue_t *msg_queue_new(size_t size)
 {
    struct queue_elem **elems = NULL;
-   msg_queue_t *queue        = (msg_queue_t*)calloc(1, sizeof(*queue));
+   msg_queue_t *queue        = (msg_queue_t*)malloc(sizeof(*queue));
 
    if (!queue)
       return NULL;
 
-   queue->size = size + 1;
+   queue->size               = size + 1;
+   queue->tmp_msg            = NULL;
 
-   elems = (struct queue_elem**)calloc(queue->size,
+   elems                     = (struct queue_elem**)calloc(queue->size,
          sizeof(struct queue_elem*));
 
    if (!elems)
@@ -75,8 +76,8 @@ msg_queue_t *msg_queue_new(size_t size)
       return NULL;
    }
 
-   queue->elems = elems;
-   queue->ptr   = 1;
+   queue->elems              = elems;
+   queue->ptr                = 1;
 
    return queue;
 }
@@ -119,14 +120,14 @@ void msg_queue_push(msg_queue_t *queue, const char *msg,
    if (!queue || queue->ptr >= queue->size)
       return;
 
-   new_elem                      = (struct queue_elem*)
-      calloc(1, sizeof(struct queue_elem));
+   new_elem                      = (struct queue_elem*)malloc(
+      sizeof(struct queue_elem));
    if (!new_elem)
       return;
 
-   new_elem->prio                = prio;
    new_elem->duration            = duration;
-   new_elem->msg                 = msg ? strdup(msg) : NULL;
+   new_elem->prio                = prio;
+   new_elem->msg                 = msg   ? strdup(msg)   : NULL;
    new_elem->title               = title ? strdup(title) : NULL;
    new_elem->icon                = icon;
    new_elem->category            = category;