CDRIVER-366: Cast allocations to correct types

Author: bjori

src/mongoc/mongoc-array.c

@@ -28,7 +28,7 @@ _mongoc_array_init (mongoc_array_t *array,
    array->len = 0;
    array->element_size = element_size;
    array->allocated = 128;
-   array->data = bson_malloc0(array->allocated);
+   array->data = (void *)bson_malloc0(array->allocated);
 }
 
 
@@ -57,7 +57,7 @@ _mongoc_array_copy (mongoc_array_t       *dst,
    dst->len = src->len;
    dst->element_size = src->element_size;
    dst->allocated = src->allocated;
-   dst->data = bson_malloc (dst->allocated);
+   dst->data = (void *)bson_malloc (dst->allocated);
    memcpy (dst->data, src->data, dst->allocated);
 }
 
@@ -87,7 +87,7 @@ _mongoc_array_append_vals (mongoc_array_t *array,
    len = (size_t)n_elements * array->element_size;
    if ((off + len) > array->allocated) {
       next_size = bson_next_power_of_two(off + len);
-      array->data = bson_realloc(array->data, next_size);
+      array->data = (void *)bson_realloc(array->data, next_size);
       array->allocated = next_size;
    }
 

src/mongoc/mongoc-async-cmd.c

@@ -170,7 +170,7 @@ mongoc_async_cmd_new (mongoc_async_t           *async,
    bson_return_val_if_fail(dbname, NULL);
    bson_return_val_if_fail(stream, NULL);
 
-   acmd = bson_malloc0 (sizeof (*acmd));
+   acmd = (mongoc_async_cmd_t *)bson_malloc0 (sizeof (*acmd));
    acmd->async = async;
    acmd->expire_at = bson_get_monotonic_time () + (timeout_msec * 1000);
    acmd->stream = stream;

src/mongoc/mongoc-async.c

@@ -42,7 +42,7 @@ mongoc_async_cmd (mongoc_async_t           *async,
 mongoc_async_t *
 mongoc_async_new ()
 {
-   mongoc_async_t *async = bson_malloc0 (sizeof (*async));
+   mongoc_async_t *async = (mongoc_async_t *)bson_malloc0 (sizeof (*async));
 
    return async;
 }
@@ -106,7 +106,7 @@ mongoc_async_run (mongoc_async_t *async,
       }
 
       if (poll_size < async->ncmds) {
-         poller = bson_realloc (poller, sizeof (*poller) * async->ncmds);
+         poller = (mongoc_stream_poll_t *)bson_realloc (poller, sizeof (*poller) * async->ncmds);
          poll_size = async->ncmds;
       }
 

src/mongoc/mongoc-buffer.c

@@ -67,7 +67,7 @@ _mongoc_buffer_init (mongoc_buffer_t   *buffer,
    }
 
    if (!buf) {
-      buf = realloc_func (NULL, buflen, NULL);
+      buf = (uint8_t *)realloc_func (NULL, buflen, NULL);
    }
 
    memset (buffer, 0, sizeof *buffer);
@@ -164,7 +164,7 @@ _mongoc_buffer_append_from_stream (mongoc_buffer_t *buffer,
       buffer->off = 0;
       if (!SPACE_FOR (buffer, size)) {
          buffer->datalen = bson_next_power_of_two (size + buffer->len + buffer->off);
-         buffer->data = buffer->realloc_func (buffer->data, buffer->datalen, NULL);
+         buffer->data = (uint8_t *)buffer->realloc_func (buffer->data, buffer->datalen, NULL);
       }
    }
 
@@ -231,7 +231,7 @@ _mongoc_buffer_fill (mongoc_buffer_t *buffer,
 
    if (!SPACE_FOR (buffer, min_bytes)) {
       buffer->datalen = bson_next_power_of_two (buffer->len + min_bytes);
-      buffer->data = buffer->realloc_func (buffer->data, buffer->datalen,
+      buffer->data = (uint8_t *)buffer->realloc_func (buffer->data, buffer->datalen,
                                            buffer->realloc_data);
    }
 
@@ -307,7 +307,7 @@ _mongoc_buffer_try_append_from_stream (mongoc_buffer_t *buffer,
       buffer->off = 0;
       if (!SPACE_FOR (buffer, size)) {
          buffer->datalen = bson_next_power_of_two (size + buffer->len + buffer->off);
-         buffer->data = buffer->realloc_func (buffer->data, buffer->datalen, NULL);
+         buffer->data = (uint8_t *)buffer->realloc_func (buffer->data, buffer->datalen, NULL);
       }
    }
 

src/mongoc/mongoc-bulk-operation.c

@@ -49,7 +49,7 @@ mongoc_bulk_operation_new (bool ordered)
 {
    mongoc_bulk_operation_t *bulk;
 
-   bulk = bson_malloc0 (sizeof *bulk);
+   bulk = (mongoc_bulk_operation_t *)bson_malloc0 (sizeof *bulk);
    bulk->ordered = ordered;
 
    _mongoc_array_init (&bulk->commands, sizeof (mongoc_write_command_t));

src/mongoc/mongoc-client-pool.c

@@ -79,7 +79,7 @@ mongoc_client_pool_new (const mongoc_uri_t *uri)
 
    bson_return_val_if_fail(uri, NULL);
 
-   pool = bson_malloc0(sizeof *pool);
+   pool = (mongoc_client_pool_t *)bson_malloc0(sizeof *pool);
    mongoc_mutex_init(&pool->mutex);
    _mongoc_queue_init(&pool->queue);
    pool->uri = mongoc_uri_copy(uri);

src/mongoc/mongoc-client.c

@@ -785,7 +785,7 @@ _mongoc_client_new_from_uri (const mongoc_uri_t *uri, mongoc_topology_t *topolog
 
    bson_return_val_if_fail(uri, NULL);
 
-   client = bson_malloc0(sizeof *client);
+   client = (mongoc_client_t *)bson_malloc0(sizeof *client);
    client->uri = mongoc_uri_copy (uri);
    client->request_id = rand ();
    client->initiator = mongoc_client_default_stream_initiator;
@@ -1328,14 +1328,14 @@ mongoc_client_get_database_names (mongoc_client_t *client,
           BSON_ITER_HOLDS_UTF8 (&iter) &&
           (name = bson_iter_utf8 (&iter, NULL)) &&
           (0 != strcmp (name, "local"))) {
-            ret = bson_realloc (ret, sizeof(char*) * (i + 2));
+            ret = (char **)bson_realloc (ret, sizeof(char*) * (i + 2));
             ret [i] = bson_strdup (name);
             ret [++i] = NULL;
          }
    }
 
    if (!ret && !mongoc_cursor_error (cursor, error)) {
-      ret = bson_malloc0 (sizeof (void*));
+      ret = (char **)bson_malloc0 (sizeof (void*));
    }
 
    mongoc_cursor_destroy (cursor);

src/mongoc/mongoc-cluster.c

@@ -1108,7 +1108,7 @@ _mongoc_cluster_node_new (mongoc_stream_t *stream)
       return NULL;
    }
 
-   node = bson_malloc0(sizeof *node);
+   node = (mongoc_cluster_node_t *)bson_malloc0(sizeof *node);
 
    node->stream = stream;
    node->timestamp = bson_get_monotonic_time ();

src/mongoc/mongoc-collection.c

@@ -109,7 +109,7 @@ _mongoc_collection_new (mongoc_client_t              *client,
    bson_return_val_if_fail(db, NULL);
    bson_return_val_if_fail(collection, NULL);
 
-   col = bson_malloc0(sizeof *col);
+   col = (mongoc_collection_t *)bson_malloc0(sizeof *col);
    col->client = client;
    col->write_concern = write_concern ?
       mongoc_write_concern_copy(write_concern) :

src/mongoc/mongoc-counters.c

@@ -201,7 +201,7 @@ mongoc_counters_alloc (size_t size)
    MONGOC_WARNING("Falling back to malloc for counters.");
 #endif
 
-   gCounterFallback = bson_malloc0 (size);
+   gCounterFallback = (void *)bson_malloc0 (size);
 
    return gCounterFallback;
 }
@@ -283,7 +283,7 @@ _mongoc_counters_init (void)
    char *segment;
 
    size = mongoc_counters_calc_size();
-   segment = mongoc_counters_alloc(size);
+   segment = (char *)mongoc_counters_alloc(size);
    infos_size = LAST_COUNTER * sizeof *info;
 
    counters = (mongoc_counters_t *)segment;