Skip to content

Commit 4c6f743

Browse files
samantharittersamantharitter
committed
cr fixes
1 parent 0d76435 commit 4c6f743

File tree

8 files changed

+34
-31
lines changed

8 files changed

+34
-31
lines changed

‎src/libmongoc/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -529,6 +529,7 @@ set (SOURCES ${SOURCES}
529529
${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-matcher-op.c
530530
${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-memcmp.c
531531
${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-cmd.c
532+
${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-optional.c
532533
${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-opts-helpers.c
533534
${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-opts.c
534535
${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-queue.c

‎src/libmongoc/src/mongoc/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ set (src_libmongoc_src_mongoc_DIST_cs
225225
mongoc-memcmp.c
226226
mongoc-cmd.c
227227
mongoc-ocsp-cache.c
228+
mongoc-optional.c
228229
mongoc-opts.c
229230
mongoc-opts-helpers.c
230231
mongoc-queue.c

‎src/libmongoc/src/mongoc/mongoc-cmd.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,16 +1000,16 @@ mongoc_cmd_parts_assemble (mongoc_cmd_parts_t *parts,
10001000
bson_append_utf8 (
10011001
&parts->assembled_body, "apiVersion", -1, string_version, -1);
10021002

1003-
if (api->strict_set) {
1003+
if (api->strict.is_set) {
10041004
bson_append_bool (
1005-
&parts->assembled_body, "apiStrict", -1, api->strict);
1005+
&parts->assembled_body, "apiStrict", -1, api->strict.value);
10061006
}
10071007

1008-
if (api->deprecation_errors_set) {
1008+
if (api->deprecation_errors.is_set) {
10091009
bson_append_bool (&parts->assembled_body,
10101010
"apiDeprecationErrors",
10111011
-1,
1012-
api->deprecation_errors);
1012+
api->deprecation_errors.value);
10131013
}
10141014
}
10151015
}

‎src/libmongoc/src/mongoc/mongoc-optional.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ mongoc_optional_init (mongoc_optional_t *opt)
2424
}
2525

2626
bool
27-
mongoc_optional_set (mongoc_optional_t *opt)
27+
mongoc_optional_is_set (mongoc_optional_t *opt)
2828
{
2929
BSON_ASSERT (opt);
3030
return opt->is_set;
@@ -46,7 +46,8 @@ mongoc_optional_set_value (mongoc_optional_t *opt, bool val)
4646
}
4747

4848
void
49-
mongoc_optional_copy (const mongoc_optional_t *source, mongoc_optional_t *copy) {
49+
mongoc_optional_copy (const mongoc_optional_t *source, mongoc_optional_t *copy)
50+
{
5051
copy->value = source->value;
5152
copy->is_set = source->is_set;
5253
}

‎src/libmongoc/src/mongoc/mongoc-optional.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@
2626
BSON_BEGIN_DECLS
2727

2828
typedef struct {
29-
bool value;
30-
bool is_set;
29+
bool value;
30+
bool is_set;
3131
} mongoc_optional_t;
3232

3333
MONGOC_EXPORT (void)
3434
mongoc_optional_init (mongoc_optional_t *opt);
3535

3636
MONGOC_EXPORT (bool)
37-
mongoc_optional_set (mongoc_optional_t *opt);
37+
mongoc_optional_is_set (mongoc_optional_t *opt);
3838

3939
MONGOC_EXPORT (bool)
4040
mongoc_optional_value (mongoc_optional_t *opt);

‎src/libmongoc/src/mongoc/mongoc-server-api-private.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323

2424
struct _mongoc_server_api_t {
2525
mongoc_server_api_version_t version;
26-
mongoc_optional_t *strict;
27-
mongoc_optional_t *deprecation_errors;
26+
mongoc_optional_t strict;
27+
mongoc_optional_t deprecation_errors;
2828
};
2929

3030
#endif /* MONGOC_SERVER_API_PRIVATE_H */

‎src/libmongoc/src/mongoc/mongoc-server-api.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ mongoc_server_api_new (mongoc_server_api_version_t version)
4848

4949
api = (mongoc_server_api_t *) bson_malloc0 (sizeof (mongoc_server_api_t));
5050
api->version = version;
51-
api->strict = mongoc_optional_new ();
52-
api->deprecation_errors = mongoc_optional_new ();
51+
mongoc_optional_init (&api->strict);
52+
mongoc_optional_init (&api->deprecation_errors);
5353

5454
return api;
5555
}
@@ -65,8 +65,8 @@ mongoc_server_api_copy (const mongoc_server_api_t *api)
6565

6666
copy = (mongoc_server_api_t *) bson_malloc0 (sizeof (mongoc_server_api_t));
6767
copy->version = api->version;
68-
copy->strict = mongoc_optional_copy (api->strict);
69-
copy->deprecation_errors = mongoc_optional_copy (api->deprecation_errors);
68+
mongoc_optional_copy (&api->strict, &copy->strict);
69+
mongoc_optional_copy (&api->deprecation_errors, &copy->deprecation_errors);
7070

7171
return copy;
7272
}
@@ -85,27 +85,27 @@ void
8585
mongoc_server_api_strict (mongoc_server_api_t *api, bool strict)
8686
{
8787
BSON_ASSERT (api);
88-
mongoc_optional_set_value (api->strict, strict);
88+
mongoc_optional_set_value (&api->strict, strict);
8989
}
9090

9191
void
9292
mongoc_server_api_deprecation_errors (mongoc_server_api_t *api,
9393
bool deprecation_errors)
9494
{
9595
BSON_ASSERT (api);
96-
mongoc_optional_set_value (api->deprecation_errors, deprecation_errors);
96+
mongoc_optional_set_value (&api->deprecation_errors, deprecation_errors);
9797
}
9898

9999
const mongoc_optional_t *
100100
mongoc_server_api_get_deprecation_errors (mongoc_server_api_t *api)
101101
{
102102
BSON_ASSERT (api);
103-
return api->deprecation_errors;
103+
return &api->deprecation_errors;
104104
}
105105

106106
const mongoc_optional_t *
107107
mongo_server_api_get_strict (mongoc_server_api_t *api)
108108
{
109109
BSON_ASSERT (api);
110-
return api->strict;
110+
return &api->strict;
111111
}

‎src/libmongoc/tests/test-mongoc-versioned-api.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ _test_mongoc_server_api_copy (void)
3333
copy = mongoc_server_api_copy (api);
3434

3535
BSON_ASSERT (api->version == copy->version);
36-
BSON_ASSERT (!copy->strict);
37-
BSON_ASSERT (copy->strict_set);
38-
BSON_ASSERT (!copy->deprecation_errors);
39-
BSON_ASSERT (!copy->deprecation_errors_set);
36+
BSON_ASSERT (!copy->strict.value);
37+
BSON_ASSERT (copy->strict.is_set);
38+
BSON_ASSERT (!copy->deprecation_errors.value);
39+
BSON_ASSERT (!copy->deprecation_errors.is_set);
4040

4141
mongoc_server_api_destroy (api);
4242
mongoc_server_api_destroy (copy);
@@ -48,18 +48,18 @@ _test_mongoc_server_api_setters (void)
4848
mongoc_server_api_t *api = mongoc_server_api_new (MONGOC_SERVER_API_V1);
4949

5050
BSON_ASSERT (api->version == MONGOC_SERVER_API_V1);
51-
BSON_ASSERT (!api->strict_set);
52-
BSON_ASSERT (!api->deprecation_errors_set);
53-
BSON_ASSERT (!api->strict);
54-
BSON_ASSERT (!api->deprecation_errors);
51+
BSON_ASSERT (!api->strict.is_set);
52+
BSON_ASSERT (!api->deprecation_errors.is_set);
53+
BSON_ASSERT (!api->strict.value);
54+
BSON_ASSERT (!api->deprecation_errors.value);
5555

5656
mongoc_server_api_strict (api, true);
57-
BSON_ASSERT (api->strict_set);
58-
BSON_ASSERT (api->strict);
57+
BSON_ASSERT (api->strict.is_set);
58+
BSON_ASSERT (api->strict.value);
5959

6060
mongoc_server_api_deprecation_errors (api, false);
61-
BSON_ASSERT (api->deprecation_errors_set);
62-
BSON_ASSERT (!api->deprecation_errors);
61+
BSON_ASSERT (api->deprecation_errors.is_set);
62+
BSON_ASSERT (!api->deprecation_errors.value);
6363

6464
mongoc_server_api_destroy (api);
6565
}

0 commit comments

Comments
 (0)