From: Jeroen van der Heijden <jeroen@transceptor.technology>
Date: Thu, 3 Jan 2019 14:56:41 +0000 (+0100)
Subject: Removed not required void* casts
X-Git-Tag: archive/raspbian/2.0.44-1+rpi1~1^2~3^2~7^2~2^2~14
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ce9d90e53a063ff846e5a19da273418fe9027431;p=siridb-server.git

Removed not required void* casts
---

diff --git a/src/siri/db/ffile.c b/src/siri/db/ffile.c
index cff65438..b484b3b7 100644
--- a/src/siri/db/ffile.c
+++ b/src/siri/db/ffile.c
@@ -44,7 +44,7 @@ siridb_ffile_t * siridb_ffile_new(
         const char * path,
         sirinet_pkg_t * pkg)
 {
-    siridb_ffile_t * ffile = (siridb_ffile_t *) malloc(sizeof(siridb_ffile_t));
+    siridb_ffile_t * ffile = malloc(sizeof(siridb_ffile_t));
 
     if (ffile == NULL)
     {
@@ -210,7 +210,7 @@ sirinet_pkg_t * siridb_ffile_pop(siridb_ffile_t * ffile)
         log_critical("Seek error in '%s'", ffile->fn);
         return NULL;
     }
-    sirinet_pkg_t * pkg = (sirinet_pkg_t *) malloc(ffile->next_size);
+    sirinet_pkg_t * pkg = malloc(ffile->next_size);
 
     if (pkg == NULL)
     {
diff --git a/src/siri/db/replicate.c b/src/siri/db/replicate.c
index 5f222f19..714cc6fe 100644
--- a/src/siri/db/replicate.c
+++ b/src/siri/db/replicate.c
@@ -37,8 +37,7 @@ int siridb_replicate_init(siridb_t * siridb, siridb_initsync_t * initsync)
 {
     assert (siri.loop != NULL);
 
-    siridb->replicate =
-            (siridb_replicate_t *) malloc(sizeof(siridb_replicate_t));
+    siridb->replicate = malloc(sizeof(siridb_replicate_t));
     if (siridb->replicate == NULL)
     {
         ERR_ALLOC
@@ -47,7 +46,7 @@ int siridb_replicate_init(siridb_t * siridb, siridb_initsync_t * initsync)
 
     siridb->replicate->initsync = initsync;
 
-    siridb->replicate->timer = (uv_timer_t *) malloc(sizeof(uv_timer_t));
+    siridb->replicate->timer = malloc(sizeof(uv_timer_t));
     if (siridb->replicate->timer == NULL)
     {
         ERR_ALLOC
diff --git a/src/siri/help/help.c b/src/siri/help/help.c
index bf620587..cfb8ae15 100644
--- a/src/siri/help/help.c
+++ b/src/siri/help/help.c
@@ -74,7 +74,7 @@ const char * siri_help_get(
                 size = ftello(fp);
                 fseeko(fp, 0, SEEK_SET);
 
-                *content = (char *) malloc (size + 1);
+                *content = malloc (size + 1);
 
                 if (*content == NULL)
                 {
diff --git a/src/siri/net/clserver.c b/src/siri/net/clserver.c
index 01da4499..21c37092 100644
--- a/src/siri/net/clserver.c
+++ b/src/siri/net/clserver.c
@@ -785,8 +785,8 @@ static void on_register_server(sirinet_stream_t * client, sirinet_pkg_t * pkg)
     }
     else if (new_server != NULL)
     {
-        siridb_server_async_t * server_reg = (siridb_server_async_t *)
-                malloc(sizeof(siridb_server_async_t));
+        siridb_server_async_t * server_reg = malloc(
+                sizeof(siridb_server_async_t));
 
         if (server_reg == NULL)
         {
diff --git a/src/siri/net/pkg.c b/src/siri/net/pkg.c
index c94ee780..699fbae0 100644
--- a/src/siri/net/pkg.c
+++ b/src/siri/net/pkg.c
@@ -28,8 +28,7 @@ sirinet_pkg_t * sirinet_pkg_new(
         uint8_t tp,
         const unsigned char * data)
 {
-    sirinet_pkg_t * pkg =
-            (sirinet_pkg_t *) malloc(sizeof(sirinet_pkg_t) + len);
+    sirinet_pkg_t * pkg = malloc(sizeof(sirinet_pkg_t) + len);
 
     if (pkg == NULL)
     {
diff --git a/src/siri/net/promises.c b/src/siri/net/promises.c
index 80bdea0b..079ac52d 100644
--- a/src/siri/net/promises.c
+++ b/src/siri/net/promises.c
@@ -16,8 +16,7 @@ sirinet_promises_t * sirinet_promises_new(
         void * data,
         sirinet_pkg_t * pkg)
 {
-    sirinet_promises_t * promises =
-            (sirinet_promises_t *) malloc(sizeof(sirinet_promises_t));
+    sirinet_promises_t * promises = malloc(sizeof(sirinet_promises_t));
     if (promises == NULL)
     {
         ERR_ALLOC
diff --git a/src/siri/net/stream.c b/src/siri/net/stream.c
index 2c522775..53d15c9a 100644
--- a/src/siri/net/stream.c
+++ b/src/siri/net/stream.c
@@ -111,7 +111,7 @@ void sirinet_stream_alloc_buffer(
     if (!client->len && client->size > RESET_BUF_SIZE)
     {
         free(client->buf);
-        client->buf = (char *) malloc(suggested_size);
+        client->buf = malloc(suggested_size);
         if (client->buf == NULL)
         {
             ERR_ALLOC
diff --git a/src/siri/service/account.c b/src/siri/service/account.c
index fa765273..44870b72 100644
--- a/src/siri/service/account.c
+++ b/src/siri/service/account.c
@@ -141,7 +141,7 @@ int siri_service_account_new(
         return -1;
     }
 
-    account = (siri_service_account_t *) malloc(sizeof(siri_service_account_t));
+    account = malloc(sizeof(siri_service_account_t));
     if (account == NULL)
     {
         ACCOUNT_msg(err_msg, "memory allocation error");
diff --git a/src/vec/vec.c b/src/vec/vec.c
index c9792dbc..9e377203 100644
--- a/src/vec/vec.c
+++ b/src/vec/vec.c
@@ -20,8 +20,7 @@ vec_t * vec_new(size_t size)
     /* sizeof(vec_t) is 16 bytes, only for len and size and data[] is
      * excluded.
      */
-    vec_t * vec = (vec_t *)
-            malloc(sizeof(vec_t) + sizeof(void *) * size);
+    vec_t * vec = malloc(sizeof(vec_t) + sizeof(void *) * size);
 
     if (vec == NULL)
     {
@@ -51,7 +50,7 @@ void vec_destroy(vec_t * vec, vec_destroy_cb cb)
 vec_t * vec_copy(vec_t * source)
 {
     size_t size = sizeof(vec_t) + sizeof(void *) * source->size;
-    vec_t * vec = (vec_t *) malloc(size);
+    vec_t * vec = malloc(size);
     if (vec == NULL)
     {
         return NULL;
@@ -77,10 +76,7 @@ int vec_append_safe(vec_t ** vec, void * data)
                 (sz <= VEC_MAX_SZ) ?
                         sz * 2 : sz + VEC_MAX_SZ : VEC_DEFAULT_SIZE;
 
-        tmp = (vec_t *) realloc(
-                *vec,
-                sizeof(vec_t) + sizeof(void *) * (*vec)->size);
-
+        tmp = realloc(*vec, sizeof(vec_t) + sizeof(void *) * (*vec)->size);
         if (tmp == NULL)
         {
             /* an error has occurred */
@@ -112,9 +108,7 @@ void vec_compact(vec_t ** vec)
 
         (*vec)->size = (*vec)->len + VEC_DEFAULT_SIZE;
 
-        tmp = (vec_t *) realloc(
-                *vec,
-                sizeof(vec_t) + sizeof(void *) * (*vec)->size);
+        tmp = realloc(*vec, sizeof(vec_t) + sizeof(void *) * (*vec)->size);
 
         if (tmp == NULL)
         {
diff --git a/src/xpath/xpath.c b/src/xpath/xpath.c
index 949efd32..20d26edb 100644
--- a/src/xpath/xpath.c
+++ b/src/xpath/xpath.c
@@ -58,7 +58,7 @@ ssize_t xpath_get_content(char ** buffer, const char * fn)
         (size = ftello(fp)) != -1 &&
         fseeko(fp, 0, SEEK_SET) == 0)
     {
-        *buffer = (char *) malloc(size);
+        *buffer = malloc(size);
         if (*buffer != NULL)
         {
             if (fread(*buffer, size, 1, fp) != 1)
diff --git a/src/xstr/xstr.c b/src/xstr/xstr.c
index 95dc46c1..76fed61c 100644
--- a/src/xstr/xstr.c
+++ b/src/xstr/xstr.c
@@ -342,7 +342,7 @@ uint64_t xstr_to_uint64(const char * src, size_t len)
 char * xstr_dup(const char * src, size_t * n)
 {
     *n = strlen(src);
-    char * nstr = (char *) malloc(*n + 1);
+    char * nstr = malloc(*n + 1);
     if (nstr)
     {
         memcpy(nstr, src, *n + 1);