Skip to content

Commit febb42c

Browse files
author
Christian Hergert
committed
array: prefix private functions with _.
1 parent 2b3b52c commit febb42c

File tree

8 files changed

+59
-51
lines changed

8 files changed

+59
-51
lines changed

‎mongoc/mongoc-array-private.h

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,25 @@ struct _mongoc_array_t
3737
};
3838

3939

40-
#define mongoc_array_append_val(a, v) mongoc_array_append_vals(a, &v, 1)
41-
#define mongoc_array_index(a, t, i) (((t*)(a)->data)[i])
42-
#define mongoc_array_clear(a) (a)->len = 0
40+
#define _mongoc_array_append_val(a, v) _mongoc_array_append_vals(a, &v, 1)
41+
#define _mongoc_array_index(a, t, i) (((t*)(a)->data)[i])
42+
#define _mongoc_array_clear(a) (a)->len = 0
4343

4444

45-
void mongoc_array_init (mongoc_array_t *array,
46-
size_t element_size);
47-
void mongoc_array_append_vals (mongoc_array_t *array,
48-
const void *data,
49-
bson_uint32_t n_elements);
50-
void mongoc_array_destroy (mongoc_array_t *array);
45+
void
46+
_mongoc_array_init (mongoc_array_t *array,
47+
size_t element_size)
48+
BSON_GNUC_INTERNAL;
49+
50+
void
51+
_mongoc_array_append_vals (mongoc_array_t *array,
52+
const void *data,
53+
bson_uint32_t n_elements)
54+
BSON_GNUC_INTERNAL;
55+
56+
void
57+
_mongoc_array_destroy (mongoc_array_t *array)
58+
BSON_GNUC_INTERNAL;
5159

5260

5361
BSON_END_DECLS

‎mongoc/mongoc-array.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020

2121
void
22-
mongoc_array_init (mongoc_array_t *array,
23-
size_t element_size)
22+
_mongoc_array_init (mongoc_array_t *array,
23+
size_t element_size)
2424
{
2525
bson_return_if_fail(array);
2626
bson_return_if_fail(element_size);
@@ -33,7 +33,7 @@ mongoc_array_init (mongoc_array_t *array,
3333

3434

3535
void
36-
mongoc_array_destroy (mongoc_array_t *array)
36+
_mongoc_array_destroy (mongoc_array_t *array)
3737
{
3838
if (array && array->data) {
3939
bson_free(array->data);
@@ -42,9 +42,9 @@ mongoc_array_destroy (mongoc_array_t *array)
4242

4343

4444
void
45-
mongoc_array_append_vals (mongoc_array_t *array,
46-
const void *data,
47-
bson_uint32_t n_elements)
45+
_mongoc_array_append_vals (mongoc_array_t *array,
46+
const void *data,
47+
bson_uint32_t n_elements)
4848
{
4949
size_t len;
5050
size_t off;

‎mongoc/mongoc-cluster.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ _mongoc_cluster_init (mongoc_cluster_t *cluster,
562562
cluster->nodes[i].needs_auth = cluster->requires_auth;
563563
}
564564

565-
mongoc_array_init(&cluster->iov, sizeof(struct iovec));
565+
_mongoc_array_init (&cluster->iov, sizeof(struct iovec));
566566

567567
EXIT;
568568
}
@@ -606,7 +606,7 @@ _mongoc_cluster_destroy (mongoc_cluster_t *cluster) /* INOUT */
606606

607607
_mongoc_cluster_clear_peers (cluster);
608608

609-
mongoc_array_destroy (&cluster->iov);
609+
_mongoc_array_destroy (&cluster->iov);
610610

611611
EXIT;
612612
}
@@ -871,8 +871,8 @@ _mongoc_cluster_run_command (mongoc_cluster_t *cluster,
871871
rpc.query.query = bson_get_data(command);
872872
rpc.query.fields = NULL;
873873

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

877877
_mongoc_rpc_gather(&rpc, &ar);
878878
_mongoc_rpc_swab_to_le(&rpc);
@@ -919,7 +919,7 @@ _mongoc_cluster_run_command (mongoc_cluster_t *cluster,
919919
}
920920

921921
_mongoc_buffer_destroy(&buffer);
922-
mongoc_array_destroy(&ar);
922+
_mongoc_array_destroy(&ar);
923923

924924
RETURN(TRUE);
925925

@@ -931,7 +931,7 @@ _mongoc_cluster_run_command (mongoc_cluster_t *cluster,
931931

932932
failure:
933933
_mongoc_buffer_destroy(&buffer);
934-
mongoc_array_destroy(&ar);
934+
_mongoc_array_destroy(&ar);
935935

936936
if (reply) {
937937
bson_init(reply);
@@ -1911,7 +1911,7 @@ _mongoc_cluster_sendv (mongoc_cluster_t *cluster,
19111911

19121912
BSON_ASSERT(node->stream);
19131913

1914-
mongoc_array_clear(&cluster->iov);
1914+
_mongoc_array_clear (&cluster->iov);
19151915

19161916
/*
19171917
* TODO: We can probably remove the need for sendv and just do send since
@@ -2049,7 +2049,7 @@ _mongoc_cluster_try_sendv (mongoc_cluster_t *cluster,
20492049

20502050
BSON_ASSERT (node->stream);
20512051

2052-
mongoc_array_clear (&cluster->iov);
2052+
_mongoc_array_clear (&cluster->iov);
20532053

20542054
for (i = 0; i < rpcs_len; i++) {
20552055
_mongoc_cluster_inc_egress_rpc (&rpcs[i]);

‎mongoc/mongoc-rpc.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,20 @@
3838
iov.iov_len = 4; \
3939
BSON_ASSERT(iov.iov_len); \
4040
rpc->msg_len += iov.iov_len; \
41-
mongoc_array_append_val(array, iov);
41+
_mongoc_array_append_val(array, iov);
4242
#define INT64_FIELD(_name) \
4343
iov.iov_base = (void *)&rpc->_name; \
4444
iov.iov_len = 8; \
4545
BSON_ASSERT(iov.iov_len); \
4646
rpc->msg_len += iov.iov_len; \
47-
mongoc_array_append_val(array, iov);
47+
_mongoc_array_append_val(array, iov);
4848
#define CSTRING_FIELD(_name) \
4949
BSON_ASSERT(rpc->_name); \
5050
iov.iov_base = (void *)rpc->_name; \
5151
iov.iov_len = strlen(rpc->_name) + 1; \
5252
BSON_ASSERT(iov.iov_len); \
5353
rpc->msg_len += iov.iov_len; \
54-
mongoc_array_append_val(array, iov);
54+
_mongoc_array_append_val(array, iov);
5555
#define BSON_FIELD(_name) \
5656
do { \
5757
bson_int32_t __l; \
@@ -61,7 +61,7 @@
6161
iov.iov_len = __l; \
6262
BSON_ASSERT(iov.iov_len); \
6363
rpc->msg_len += iov.iov_len; \
64-
mongoc_array_append_val(array, iov); \
64+
_mongoc_array_append_val(array, iov); \
6565
} while (0);
6666
#define OPTIONAL(_check, _code) \
6767
if (rpc->_check) { _code }
@@ -70,34 +70,34 @@
7070
iov.iov_len = rpc->_name##_len; \
7171
BSON_ASSERT(iov.iov_len); \
7272
rpc->msg_len += iov.iov_len; \
73-
mongoc_array_append_val(array, iov);
73+
_mongoc_array_append_val(array, iov);
7474
#define IOVEC_ARRAY_FIELD(_name) \
7575
do { \
7676
size_t _i; \
7777
BSON_ASSERT(rpc->n_##_name); \
7878
for (_i = 0; _i < rpc->n_##_name; _i++) { \
7979
BSON_ASSERT(rpc->_name[_i].iov_len); \
8080
rpc->msg_len += rpc->_name[_i].iov_len; \
81-
mongoc_array_append_val(array, rpc->_name[_i]); \
81+
_mongoc_array_append_val(array, rpc->_name[_i]); \
8282
} \
8383
} while (0);
8484
#define RAW_BUFFER_FIELD(_name) \
8585
iov.iov_base = (void *)rpc->_name; \
8686
iov.iov_len = rpc->_name##_len; \
8787
BSON_ASSERT(iov.iov_len); \
8888
rpc->msg_len += iov.iov_len; \
89-
mongoc_array_append_val(array, iov);
89+
_mongoc_array_append_val(array, iov);
9090
#define INT64_ARRAY_FIELD(_len, _name) \
9191
iov.iov_base = (void *)&rpc->_len; \
9292
iov.iov_len = 4; \
9393
BSON_ASSERT(iov.iov_len); \
9494
rpc->msg_len += iov.iov_len; \
95-
mongoc_array_append_val(array, iov); \
95+
_mongoc_array_append_val(array, iov); \
9696
iov.iov_base = (void *)rpc->_name; \
9797
iov.iov_len = rpc->_len * 8; \
9898
BSON_ASSERT(iov.iov_len); \
9999
rpc->msg_len += iov.iov_len; \
100-
mongoc_array_append_val(array, iov);
100+
_mongoc_array_append_val(array, iov);
101101

102102

103103

@@ -426,7 +426,7 @@
426426

427427
void
428428
_mongoc_rpc_gather (mongoc_rpc_t *rpc,
429-
mongoc_array_t *array)
429+
mongoc_array_t *array)
430430
{
431431
bson_return_if_fail(rpc);
432432
bson_return_if_fail(array);

‎tests/mock-server.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ mock_server_reply_simple (mock_server_t *server,
7979
BSON_ASSERT (client);
8080
BSON_ASSERT (doc);
8181

82-
mongoc_array_init (&ar, sizeof (struct iovec));
82+
_mongoc_array_init (&ar, sizeof (struct iovec));
8383

8484
r.reply.msg_len = 0;
8585
r.reply.request_id = ++server->last_response_id;
@@ -106,7 +106,7 @@ mock_server_reply_simple (mock_server_t *server,
106106

107107
assert (n_written == expected);
108108

109-
mongoc_array_destroy (&ar);
109+
_mongoc_array_destroy (&ar);
110110
}
111111

112112

‎tests/test-mock-server.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ handler_cb (mock_server_t *server,
2121

2222
if ((rpc->header.opcode == MONGOC_OPCODE_QUERY) ||
2323
(rpc->header.opcode == MONGOC_OPCODE_REPLY)) {
24-
mongoc_array_init(&ar, sizeof(struct iovec));
24+
_mongoc_array_init(&ar, sizeof(struct iovec));
2525

2626
printf("========\n");
2727
printf("MsgLen: %d\n", rpc->header.msg_len);
@@ -49,7 +49,7 @@ handler_cb (mock_server_t *server,
4949

5050
mongoc_stream_writev(stream, iov, iovcnt, -1);
5151

52-
mongoc_array_destroy(&ar);
52+
_mongoc_array_destroy(&ar);
5353
}
5454
}
5555

‎tests/test-mongoc-array.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,31 @@ test_array (void)
99
int i;
1010
int v;
1111

12-
mongoc_array_init(&ar, sizeof i);
12+
_mongoc_array_init(&ar, sizeof i);
1313
assert(ar.element_size == sizeof i);
1414
assert(ar.len == 0);
1515
assert(ar.allocated);
1616
assert(ar.data);
1717

1818
for (i = 0; i < 100; i++) {
19-
mongoc_array_append_val(&ar, i);
19+
_mongoc_array_append_val(&ar, i);
2020
}
2121

2222
for (i = 0; i < 100; i++) {
23-
v = mongoc_array_index(&ar, int, i);
23+
v = _mongoc_array_index(&ar, int, i);
2424
assert(v == i);
2525
}
2626

2727
assert(ar.len == 100);
2828
assert(ar.allocated >= (100 * sizeof i));
2929

30-
mongoc_array_clear(&ar);
30+
_mongoc_array_clear(&ar);
3131
assert(ar.len == 0);
3232
assert(ar.allocated);
3333
assert(ar.data);
3434
assert(ar.element_size);
3535

36-
mongoc_array_destroy(&ar);
36+
_mongoc_array_destroy(&ar);
3737
}
3838

3939

‎tests/test-mongoc-rpc.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,20 +68,20 @@ test_mongoc_rpc_##_name##_equal (const mongoc_rpc_##_name##_t *a, \
6868
do { \
6969
mongoc_array_t a_buf; \
7070
mongoc_array_t b_buf; \
71-
mongoc_array_init(&a_buf, 1); \
72-
mongoc_array_init(&b_buf, 1); \
71+
_mongoc_array_init(&a_buf, 1); \
72+
_mongoc_array_init(&b_buf, 1); \
7373
size_t _i; \
7474
bson_bool_t is_equal; \
7575
for (_i = 0; _i < a->n_##_name; _i++) { \
76-
mongoc_array_append_vals(&a_buf, a->_name[_i].iov_base, a->_name[_i].iov_len); \
76+
_mongoc_array_append_vals(&a_buf, a->_name[_i].iov_base, a->_name[_i].iov_len); \
7777
} \
7878
for (_i = 0; _i < b->n_##_name; _i++) { \
79-
mongoc_array_append_vals(&b_buf, b->_name[_i].iov_base, b->_name[_i].iov_len); \
79+
_mongoc_array_append_vals(&b_buf, b->_name[_i].iov_base, b->_name[_i].iov_len); \
8080
} \
8181
is_equal = (a_buf.len == b_buf.len) \
8282
&& (memcmp(a_buf.data, b_buf.data, a_buf.len) == 0); \
83-
mongoc_array_destroy(&a_buf); \
84-
mongoc_array_destroy(&b_buf); \
83+
_mongoc_array_destroy(&a_buf); \
84+
_mongoc_array_destroy(&b_buf); \
8585
return is_equal; \
8686
} while(0);
8787
#define OPTIONAL(_check, _code) if (!!a->_check != !!b->_check) { return FALSE; } _code
@@ -156,7 +156,7 @@ assert_rpc_equal (const char *filename,
156156
int i;
157157

158158
data = get_test_file(filename, &length);
159-
mongoc_array_init(&ar, sizeof(struct iovec));
159+
_mongoc_array_init(&ar, sizeof(struct iovec));
160160

161161
/*
162162
* Gather our RPC into a series of iovec that can be compared
@@ -179,7 +179,7 @@ assert_rpc_equal (const char *filename,
179179
#endif
180180

181181
for (i = 0; i < ar.len; i++) {
182-
iov = &mongoc_array_index(&ar, struct iovec, i);
182+
iov = &_mongoc_array_index(&ar, struct iovec, i);
183183
assert(iov->iov_len <= (length - off));
184184
r = memcmp(&data[off], iov->iov_base, iov->iov_len);
185185
if (r) {
@@ -189,7 +189,7 @@ assert_rpc_equal (const char *filename,
189189
off += iov->iov_len;
190190
}
191191

192-
mongoc_array_destroy(&ar);
192+
_mongoc_array_destroy(&ar);
193193
bson_free(data);
194194
}
195195

0 commit comments

Comments
 (0)