Skip to content

Commit 2b3b52c

Browse files
author
Christian Hergert
committed
buffer: prefix private functions with _.
1 parent 8a5ff98 commit 2b3b52c

9 files changed

+135
-127
lines changed

‎mongoc/mongoc-buffer-private.h

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -40,23 +40,37 @@ struct _mongoc_buffer_t
4040
};
4141

4242

43-
void mongoc_buffer_init (mongoc_buffer_t *buffer,
44-
bson_uint8_t *buf,
45-
size_t buflen,
46-
bson_realloc_func realloc_func);
47-
bson_bool_t mongoc_buffer_append_from_stream (mongoc_buffer_t *buffer,
48-
mongoc_stream_t *stream,
49-
size_t size,
50-
bson_int32_t timeout_msec,
51-
bson_error_t *error);
52-
ssize_t mongoc_buffer_fill (mongoc_buffer_t *buffer,
53-
mongoc_stream_t *stream,
54-
size_t min_bytes,
55-
bson_int32_t timeout_msec,
56-
bson_error_t *error);
57-
void mongoc_buffer_destroy (mongoc_buffer_t *buffer);
58-
void mongoc_buffer_clear (mongoc_buffer_t *buffer,
59-
bson_bool_t zero);
43+
void
44+
_mongoc_buffer_init (mongoc_buffer_t *buffer,
45+
bson_uint8_t *buf,
46+
size_t buflen,
47+
bson_realloc_func realloc_func)
48+
BSON_GNUC_INTERNAL;
49+
50+
bson_bool_t
51+
_mongoc_buffer_append_from_stream (mongoc_buffer_t *buffer,
52+
mongoc_stream_t *stream,
53+
size_t size,
54+
bson_int32_t timeout_msec,
55+
bson_error_t *error)
56+
BSON_GNUC_INTERNAL;
57+
58+
ssize_t
59+
_mongoc_buffer_fill (mongoc_buffer_t *buffer,
60+
mongoc_stream_t *stream,
61+
size_t min_bytes,
62+
bson_int32_t timeout_msec,
63+
bson_error_t *error)
64+
BSON_GNUC_INTERNAL;
65+
66+
void
67+
_mongoc_buffer_destroy (mongoc_buffer_t *buffer)
68+
BSON_GNUC_INTERNAL;
69+
70+
void
71+
_mongoc_buffer_clear (mongoc_buffer_t *buffer,
72+
bson_bool_t zero)
73+
BSON_GNUC_INTERNAL;
6074

6175

6276
BSON_END_DECLS

‎mongoc/mongoc-buffer.c

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232

3333
/**
34-
* mongoc_buffer_init:
34+
* _mongoc_buffer_init:
3535
* @buffer: A mongoc_buffer_t to initialize.
3636
* @buf: A data buffer to attach to @buffer.
3737
* @buflen: The size of @buflen.
@@ -44,10 +44,10 @@
4444
* cleaning up the data structure.
4545
*/
4646
void
47-
mongoc_buffer_init (mongoc_buffer_t *buffer,
48-
bson_uint8_t *buf,
49-
size_t buflen,
50-
bson_realloc_func realloc_func)
47+
_mongoc_buffer_init (mongoc_buffer_t *buffer,
48+
bson_uint8_t *buf,
49+
size_t buflen,
50+
bson_realloc_func realloc_func)
5151
{
5252
bson_return_if_fail(buffer);
5353
bson_return_if_fail(buf || !buflen);
@@ -72,13 +72,13 @@ mongoc_buffer_init (mongoc_buffer_t *buffer,
7272

7373

7474
/**
75-
* mongoc_buffer_destroy:
75+
* _mongoc_buffer_destroy:
7676
* @buffer: A mongoc_buffer_t.
7777
*
7878
* Cleanup after @buffer and release any allocated resources.
7979
*/
8080
void
81-
mongoc_buffer_destroy (mongoc_buffer_t *buffer)
81+
_mongoc_buffer_destroy (mongoc_buffer_t *buffer)
8282
{
8383
bson_return_if_fail(buffer);
8484

@@ -91,7 +91,7 @@ mongoc_buffer_destroy (mongoc_buffer_t *buffer)
9191

9292

9393
/**
94-
* mongoc_buffer_clear:
94+
* _mongoc_buffer_clear:
9595
* @buffer: A mongoc_buffer_t.
9696
* @zero: If the memory should be zeroed.
9797
*
@@ -100,8 +100,8 @@ mongoc_buffer_destroy (mongoc_buffer_t *buffer)
100100
* contain security related information.
101101
*/
102102
void
103-
mongoc_buffer_clear (mongoc_buffer_t *buffer,
104-
bson_bool_t zero)
103+
_mongoc_buffer_clear (mongoc_buffer_t *buffer,
104+
bson_bool_t zero)
105105
{
106106
bson_return_if_fail(buffer);
107107

@@ -129,11 +129,11 @@ mongoc_buffer_clear (mongoc_buffer_t *buffer,
129129
* Returns: TRUE if successful; otherwise FALSE and @error is set.
130130
*/
131131
bson_bool_t
132-
mongoc_buffer_append_from_stream (mongoc_buffer_t *buffer,
133-
mongoc_stream_t *stream,
134-
size_t size,
135-
bson_int32_t timeout_msec,
136-
bson_error_t *error)
132+
_mongoc_buffer_append_from_stream (mongoc_buffer_t *buffer,
133+
mongoc_stream_t *stream,
134+
size_t size,
135+
bson_int32_t timeout_msec,
136+
bson_error_t *error)
137137
{
138138
bson_uint8_t *buf;
139139
ssize_t ret;
@@ -173,7 +173,7 @@ mongoc_buffer_append_from_stream (mongoc_buffer_t *buffer,
173173

174174

175175
/**
176-
* mongoc_buffer_fill:
176+
* _mongoc_buffer_fill:
177177
* @buffer: A mongoc_buffer_t.
178178
* @stream: A stream to read from.
179179
* @min_bytes: The minumum number of bytes to read.
@@ -184,11 +184,11 @@ mongoc_buffer_append_from_stream (mongoc_buffer_t *buffer,
184184
* Returns: The number of buffered bytes, or -1 on failure.
185185
*/
186186
ssize_t
187-
mongoc_buffer_fill (mongoc_buffer_t *buffer,
188-
mongoc_stream_t *stream,
189-
size_t min_bytes,
190-
bson_int32_t timeout_msec,
191-
bson_error_t *error)
187+
_mongoc_buffer_fill (mongoc_buffer_t *buffer,
188+
mongoc_stream_t *stream,
189+
size_t min_bytes,
190+
bson_int32_t timeout_msec,
191+
bson_error_t *error)
192192
{
193193
ssize_t ret;
194194
size_t avail_bytes;

‎mongoc/mongoc-client.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ _mongoc_client_recv_gle (mongoc_client_t *client,
565565
bson_return_val_if_fail (hint, FALSE);
566566
bson_return_val_if_fail (error, FALSE);
567567

568-
mongoc_buffer_init (&buffer, NULL, 0, NULL);
568+
_mongoc_buffer_init (&buffer, NULL, 0, NULL);
569569

570570
if (!_mongoc_cluster_try_recv (&client->cluster, &rpc, &buffer,
571571
hint, error)) {
@@ -600,7 +600,7 @@ _mongoc_client_recv_gle (mongoc_client_t *client,
600600
ret = TRUE;
601601

602602
cleanup:
603-
mongoc_buffer_destroy (&buffer);
603+
_mongoc_buffer_destroy (&buffer);
604604

605605
RETURN (ret);
606606
}

‎mongoc/mongoc-cluster.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,7 @@ _mongoc_cluster_run_command (mongoc_cluster_t *cluster,
872872
rpc.query.fields = NULL;
873873

874874
mongoc_array_init(&ar, sizeof(struct iovec));
875-
mongoc_buffer_init(&buffer, NULL, 0, NULL);
875+
_mongoc_buffer_init(&buffer, NULL, 0, NULL);
876876

877877
_mongoc_rpc_gather(&rpc, &ar);
878878
_mongoc_rpc_swab_to_le(&rpc);
@@ -882,8 +882,8 @@ _mongoc_cluster_run_command (mongoc_cluster_t *cluster,
882882
GOTO(failure);
883883
}
884884

885-
if (!mongoc_buffer_append_from_stream(&buffer, node->stream, 4,
886-
cluster->sockettimeoutms, error)) {
885+
if (!_mongoc_buffer_append_from_stream(&buffer, node->stream, 4,
886+
cluster->sockettimeoutms, error)) {
887887
GOTO(failure);
888888
}
889889

@@ -895,8 +895,8 @@ _mongoc_cluster_run_command (mongoc_cluster_t *cluster,
895895
GOTO(invalid_reply);
896896
}
897897

898-
if (!mongoc_buffer_append_from_stream(&buffer, node->stream, msg_len - 4,
899-
cluster->sockettimeoutms, error)) {
898+
if (!_mongoc_buffer_append_from_stream(&buffer, node->stream, msg_len - 4,
899+
cluster->sockettimeoutms, error)) {
900900
GOTO(failure);
901901
}
902902

@@ -918,7 +918,7 @@ _mongoc_cluster_run_command (mongoc_cluster_t *cluster,
918918
bson_destroy(&reply_local);
919919
}
920920

921-
mongoc_buffer_destroy(&buffer);
921+
_mongoc_buffer_destroy(&buffer);
922922
mongoc_array_destroy(&ar);
923923

924924
RETURN(TRUE);
@@ -930,7 +930,7 @@ _mongoc_cluster_run_command (mongoc_cluster_t *cluster,
930930
"Invalid reply from server.");
931931

932932
failure:
933-
mongoc_buffer_destroy(&buffer);
933+
_mongoc_buffer_destroy(&buffer);
934934
mongoc_array_destroy(&ar);
935935

936936
if (reply) {
@@ -2188,8 +2188,8 @@ _mongoc_cluster_try_recv (mongoc_cluster_t *cluster,
21882188
* Buffer the message length to determine how much more to read.
21892189
*/
21902190
pos = buffer->len;
2191-
if (!mongoc_buffer_append_from_stream (buffer, node->stream, 4,
2192-
cluster->sockettimeoutms, error)) {
2191+
if (!_mongoc_buffer_append_from_stream (buffer, node->stream, 4,
2192+
cluster->sockettimeoutms, error)) {
21932193
mongoc_counter_protocol_ingress_error_inc ();
21942194
_mongoc_cluster_disconnect_node (cluster, node);
21952195
RETURN (FALSE);
@@ -2213,8 +2213,8 @@ _mongoc_cluster_try_recv (mongoc_cluster_t *cluster,
22132213
/*
22142214
* Read the rest of the message from the stream.
22152215
*/
2216-
if (!mongoc_buffer_append_from_stream (buffer, node->stream, msg_len - 4,
2217-
cluster->sockettimeoutms, error)) {
2216+
if (!_mongoc_buffer_append_from_stream (buffer, node->stream, msg_len - 4,
2217+
cluster->sockettimeoutms, error)) {
22182218
_mongoc_cluster_disconnect_node (cluster, node);
22192219
mongoc_counter_protocol_ingress_error_inc ();
22202220
RETURN (FALSE);

0 commit comments

Comments
 (0)