Skip to content

Commit 3436070

Browse files
TylerBrockTylerBrock
committed
ABI/documentation fixups for mongoc_bulk_operation_get_write_concern
1 parent 1bfe685 commit 3436070

File tree

7 files changed

+60
-14
lines changed

7 files changed

+60
-14
lines changed

‎build/autotools/versions.ldscript

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,3 +242,8 @@ LIBMONGOC_1.1 {
242242
mongoc_uri_get_credentials;
243243
mongoc_uri_get_mechanism_properties;
244244
} LIBMONGOC_1.0;
245+
246+
LIBMONGOC_1.2 {
247+
global:
248+
mongoc_bulk_operation_get_write_concern;
249+
} LIBMONGOC_1.1;

‎build/cmake/libmongoc-ssl.def

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ mongoc_bulk_operation_delete
33
mongoc_bulk_operation_delete_one
44
mongoc_bulk_operation_destroy
55
mongoc_bulk_operation_execute
6+
mongoc_bulk_operation_get_write_concern
67
mongoc_bulk_operation_insert
78
mongoc_bulk_operation_new
89
mongoc_bulk_operation_remove

‎build/cmake/libmongoc.def

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ mongoc_bulk_operation_delete
33
mongoc_bulk_operation_delete_one
44
mongoc_bulk_operation_destroy
55
mongoc_bulk_operation_execute
6+
mongoc_bulk_operation_get_write_concern
67
mongoc_bulk_operation_insert
78
mongoc_bulk_operation_new
89
mongoc_bulk_operation_remove

‎doc/mongoc_bulk_operation_get_write_concern.page

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0"?>
2+
<page xmlns="http://projectmallard.org/1.0/"
3+
type="topic"
4+
style="function"
5+
xmlns:api="http://projectmallard.org/experimental/api/"
6+
xmlns:ui="http://projectmallard.org/experimental/ui/"
7+
id="mongoc_collection_get_write_concern">
8+
<info>
9+
<link type="guide" xref="mongoc_collection_t" group="function"/>
10+
</info>
11+
<title>mongoc_bulk_operation_get_write_concern()</title>
12+
13+
<section id="synopsis">
14+
<title>Synopsis</title>
15+
<synopsis><code mime="text/x-csrc"><![CDATA[const mongoc_write_concern_t *
16+
mongoc_bulk_operation_get_write_concern (const mongoc_bulk_operation_t *bulk);
17+
]]></code></synopsis>
18+
</section>
19+
20+
<section id="parameters">
21+
<title>Parameters</title>
22+
<table>
23+
<tr><td><p>bulk</p></td><td><p>A <link xref="mongoc_bulk_operation_t">mongoc_bulk_operation_t</link>.</p></td></tr>
24+
</table>
25+
</section>
26+
27+
<section id="description">
28+
<title>Description</title>
29+
<p>Fetches the write concern to be used for <code>bulk</code>.</p>
30+
</section>
31+
32+
<section id="return">
33+
<title>Returns</title>
34+
<p>A <link xref="mongoc_write_concern_t">mongoc_write_concern_t</link> that should not be modified or freed.</p>
35+
</section>
36+
37+
</page>

‎src/libmongoc.symbols

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ mongoc_bulk_operation_delete
22
mongoc_bulk_operation_delete_one
33
mongoc_bulk_operation_destroy
44
mongoc_bulk_operation_execute
5+
mongoc_bulk_operation_get_write_concern
56
mongoc_bulk_operation_insert
67
mongoc_bulk_operation_new
78
mongoc_bulk_operation_remove

‎src/mongoc/mongoc-bulk-operation.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,9 +371,10 @@ mongoc_bulk_operation_set_write_concern (mongoc_bulk_operation_t *bulk,
371371
}
372372

373373
const mongoc_write_concern_t *
374-
mongoc_bulk_operation_get_write_concern (mongoc_bulk_operation_t *bulk)
374+
mongoc_bulk_operation_get_write_concern (const mongoc_bulk_operation_t *bulk)
375375
{
376-
bson_return_val_if_fail(bulk, NULL);
376+
bson_return_val_if_fail (bulk, NULL);
377+
377378
return bulk->write_concern;
378379
}
379380

‎src/mongoc/mongoc-bulk-operation.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,18 @@ void mongoc_bulk_operation_update_one (mongoc_bulk_operation_t *bulk,
6565
* those wanting to replay a bulk operation to a number of clients or
6666
* collections.
6767
*/
68-
mongoc_bulk_operation_t *mongoc_bulk_operation_new (bool ordered);
69-
void mongoc_bulk_operation_set_write_concern (mongoc_bulk_operation_t *bulk,
70-
const mongoc_write_concern_t *write_concern);
71-
void mongoc_bulk_operation_set_database (mongoc_bulk_operation_t *bulk,
72-
const char *database);
73-
void mongoc_bulk_operation_set_collection (mongoc_bulk_operation_t *bulk,
74-
const char *collection);
75-
void mongoc_bulk_operation_set_client (mongoc_bulk_operation_t *bulk,
76-
void *client);
77-
void mongoc_bulk_operation_set_hint (mongoc_bulk_operation_t *bulk,
78-
uint32_t hint);
79-
const mongoc_write_concern_t *mongoc_bulk_operation_get_write_concern (mongoc_bulk_operation_t *bulk);
68+
mongoc_bulk_operation_t *mongoc_bulk_operation_new (bool ordered);
69+
void mongoc_bulk_operation_set_write_concern (mongoc_bulk_operation_t *bulk,
70+
const mongoc_write_concern_t *write_concern);
71+
void mongoc_bulk_operation_set_database (mongoc_bulk_operation_t *bulk,
72+
const char *database);
73+
void mongoc_bulk_operation_set_collection (mongoc_bulk_operation_t *bulk,
74+
const char *collection);
75+
void mongoc_bulk_operation_set_client (mongoc_bulk_operation_t *bulk,
76+
void *client);
77+
void mongoc_bulk_operation_set_hint (mongoc_bulk_operation_t *bulk,
78+
uint32_t hint);
79+
const mongoc_write_concern_t *mongoc_bulk_operation_get_write_concern (const mongoc_bulk_operation_t *bulk);
8080

8181
BSON_END_DECLS
8282

0 commit comments

Comments
 (0)