buffer: fix references to new buffer init.

Author: Christian Hergert

src/mongoc/mongoc-buffer-private.h

@@ -32,19 +32,21 @@ typedef struct _mongoc_buffer_t mongoc_buffer_t;
 
 struct _mongoc_buffer_t
 {
-   uint8_t       *data;
+   uint8_t            *data;
    size_t              datalen;
    off_t               off;
    size_t              len;
    bson_realloc_func   realloc_func;
+   void               *realloc_data;
 };
 
 
 void
 _mongoc_buffer_init (mongoc_buffer_t   *buffer,
-                     uint8_t      *buf,
+                     uint8_t           *buf,
                      size_t             buflen,
-                     bson_realloc_func  realloc_func)
+                     bson_realloc_func  realloc_func,
+                     void              *realloc_data)
    BSON_GNUC_INTERNAL;
 
 bool

src/mongoc/mongoc-buffer.c

@@ -52,7 +52,8 @@ void
 _mongoc_buffer_init (mongoc_buffer_t   *buffer,
                      uint8_t           *buf,
                      size_t             buflen,
-                     bson_realloc_func  realloc_func)
+                     bson_realloc_func  realloc_func,
+                     void              *realloc_data)
 {
    bson_return_if_fail (buffer);
    bson_return_if_fail (buflen || !buf);
@@ -76,6 +77,7 @@ _mongoc_buffer_init (mongoc_buffer_t   *buffer,
    buffer->len = 0;
    buffer->off = 0;
    buffer->realloc_func = realloc_func;
+   buffer->realloc_data = realloc_data;
 }
 
 
@@ -91,7 +93,7 @@ _mongoc_buffer_destroy (mongoc_buffer_t *buffer)
    bson_return_if_fail(buffer);
 
    if (buffer->data && buffer->realloc_func) {
-      buffer->realloc_func(buffer->data, 0, NULL);
+      buffer->realloc_func (buffer->data, 0, buffer->realloc_data);
    }
 
    memset(buffer, 0, sizeof *buffer);
@@ -209,8 +211,8 @@ _mongoc_buffer_fill (mongoc_buffer_t *buffer,
    bson_return_val_if_fail(stream, false);
    bson_return_val_if_fail(min_bytes >= 0, false);
 
-   BSON_ASSERT(buffer->data);
-   BSON_ASSERT(buffer->datalen);
+   BSON_ASSERT (buffer->data);
+   BSON_ASSERT (buffer->datalen);
 
    if (min_bytes <= buffer->len) {
       RETURN (buffer->len);
@@ -226,7 +228,8 @@ _mongoc_buffer_fill (mongoc_buffer_t *buffer,
 
    if (!SPACE_FOR (buffer, min_bytes)) {
       buffer->datalen = bson_next_power_of_two ((uint32_t)(buffer->len + min_bytes));
-      buffer->data = bson_realloc (buffer->data, buffer->datalen);
+      buffer->data = buffer->realloc_func (buffer->data, buffer->datalen,
+                                           buffer->realloc_data);
    }
 
    avail_bytes = buffer->datalen - buffer->len;

src/mongoc/mongoc-client.c

@@ -595,7 +595,7 @@ _mongoc_client_recv_gle (mongoc_client_t  *client,
       *gle_doc = NULL;
    }
 
-   _mongoc_buffer_init (&buffer, NULL, 0, NULL);
+   _mongoc_buffer_init (&buffer, NULL, 0, NULL, NULL);
 
    if (!_mongoc_cluster_try_recv (&client->cluster, &rpc, &buffer,
                                   hint, error)) {

src/mongoc/mongoc-cluster.c

@@ -872,7 +872,7 @@ _mongoc_cluster_run_command (mongoc_cluster_t      *cluster,
    rpc.query.fields = NULL;
 
    _mongoc_array_init (&ar, sizeof (mongoc_iovec_t));
-   _mongoc_buffer_init (&buffer, NULL, 0, NULL);
+   _mongoc_buffer_init (&buffer, NULL, 0, NULL, NULL);
 
    _mongoc_rpc_gather(&rpc, &ar);
    _mongoc_rpc_swab_to_le(&rpc);

src/mongoc/mongoc-collection.c

@@ -166,7 +166,7 @@ _mongoc_collection_new (mongoc_client_t              *client,
    col->collectionlen = (uint32_t)strlen(col->collection);
    col->nslen = (uint32_t)strlen(col->ns);
 
-   _mongoc_buffer_init(&col->buffer, NULL, 0, NULL);
+   _mongoc_buffer_init(&col->buffer, NULL, 0, NULL, NULL);
 
    col->gle = NULL;
 

src/mongoc/mongoc-cursor.c

@@ -271,7 +271,7 @@ _mongoc_cursor_new (mongoc_client_t           *client,
       bson_init(&cursor->fields);
    }
 
-   _mongoc_buffer_init(&cursor->buffer, NULL, 0, NULL);
+   _mongoc_buffer_init(&cursor->buffer, NULL, 0, NULL, NULL);
 
 finish:
    mongoc_counter_cursors_active_inc();
@@ -960,7 +960,7 @@ _mongoc_cursor_clone (const mongoc_cursor_t *cursor)
 
    bson_strncpy (_clone->ns, cursor->ns, sizeof _clone->ns);
 
-   _mongoc_buffer_init (&_clone->buffer, NULL, 0, NULL);
+   _mongoc_buffer_init (&_clone->buffer, NULL, 0, NULL, NULL);
 
    mongoc_counter_cursors_active_inc ();
 

src/mongoc/mongoc-stream-buffered.c

@@ -338,7 +338,7 @@ mongoc_stream_buffered_new (mongoc_stream_t *base_stream, /* IN */
 
    stream->base_stream = base_stream;
 
-   _mongoc_buffer_init (&stream->buffer, NULL, buffer_size, bson_realloc_ctx);
+   _mongoc_buffer_init (&stream->buffer, NULL, buffer_size, NULL, NULL);
 
    mongoc_counter_streams_active_inc();
 

tests/mock-server.c

@@ -215,7 +215,7 @@ mock_server_worker (void *data)
    server = closure[0];
    stream = closure[1];
 
-   _mongoc_buffer_init(&buffer, NULL, 0, NULL);
+   _mongoc_buffer_init(&buffer, NULL, 0, NULL, NULL);
 
 again:
    if (_mongoc_buffer_fill (&buffer, stream, 4, -1, &error) == -1) {

tests/test-mongoc-buffer.c

@@ -17,7 +17,7 @@ test_mongoc_buffer_basic (void)
    stream = mongoc_stream_file_new_for_path (BINARY_DIR"/reply1.dat", O_RDONLY, 0);
    ASSERT(stream);
 
-   _mongoc_buffer_init(&buf, data, 1024, bson_realloc_ctx);
+   _mongoc_buffer_init(&buf, data, 1024, NULL, NULL);
 
    r = _mongoc_buffer_fill(&buf, stream, 537, 0, &error);
    ASSERT_CMPINT((int)r, ==, -1);