diff options
author | Luke Chen <luke.chen@mongodb.com> | 2022-10-24 10:16:23 +1100 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-10-23 23:51:20 +0000 |
commit | 2c8eb809349a83d2ba8dd69c2ecfee65b7a1342d (patch) | |
tree | 2862047ea73dbea87f938bc0fc7a7bcfa9f5778b /src/third_party | |
parent | bea6435ebea69317be7650a85d9a1a09ea0823ea (diff) | |
download | mongo-2c8eb809349a83d2ba8dd69c2ecfee65b7a1342d.tar.gz |
Import wiredtiger: b55f1f03a66fbe568a3681862b672311b9280b2c from branch mongodb-master
ref: a4a03f0117..b55f1f03a6
for: 6.2.0-rc0
WT-9994 - Fix coverity warnings in wt9937_parse_opts (#8392)
Diffstat (limited to 'src/third_party')
-rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
-rw-r--r-- | src/third_party/wiredtiger/test/csuite/wt9937_parse_opts/main.c | 40 | ||||
-rw-r--r-- | src/third_party/wiredtiger/test/utility/parse_opts.c | 1 |
3 files changed, 21 insertions, 22 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 6d4dbe0e029..dd205f2ee70 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -2,5 +2,5 @@ "vendor": "wiredtiger", "github": "wiredtiger/wiredtiger.git", "branch": "mongodb-master", - "commit": "a4a03f0117f2c1a9868cc6aa33d1e6e432a41cf7" + "commit": "b55f1f03a66fbe568a3681862b672311b9280b2c" } diff --git a/src/third_party/wiredtiger/test/csuite/wt9937_parse_opts/main.c b/src/third_party/wiredtiger/test/csuite/wt9937_parse_opts/main.c index bae6f601266..e5a07a3215f 100644 --- a/src/third_party/wiredtiger/test/csuite/wt9937_parse_opts/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt9937_parse_opts/main.c @@ -87,29 +87,29 @@ typedef struct { #define UNUSED_OPTS 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 static TEST_DRIVER driver[] = { {{"parse_opts", "-b", "builddir", "-T", "21", NULL}, - {NULL, NULL, {0}, NULL, (char *)"builddir", NULL, 0, NULL, NULL, false, false, false, false, 0, - 0, 21, UNUSED_OPTS}, + {NULL, NULL, {0}, NULL, (char *)"builddir", NULL, TABLE_NOT_SET, NULL, NULL, false, false, + false, false, 0, 0, 21, UNUSED_OPTS}, {NULL, 0, 0, 0}}, {{"parse_opts", "-bbuilddir", "-T21", NULL}, - {NULL, NULL, {0}, NULL, (char *)"builddir", NULL, 0, NULL, NULL, false, false, false, false, 0, - 0, 21, UNUSED_OPTS}, + {NULL, NULL, {0}, NULL, (char *)"builddir", NULL, TABLE_NOT_SET, NULL, NULL, false, false, + false, false, 0, 0, 21, UNUSED_OPTS}, {NULL, 0, 0, 0}}, /* If -PT is used, the tiered_storage source is set to dir_store, even if -Po is not used. */ {{"parse_opts", "-v", "-PT", NULL}, - {NULL, NULL, {0}, NULL, NULL, (char *)"dir_store", 0, NULL, NULL, false, false, true, true, 0, - 0, 0, UNUSED_OPTS}, + {NULL, NULL, {0}, NULL, NULL, (char *)"dir_store", TABLE_NOT_SET, NULL, NULL, false, false, + true, true, 0, 0, 0, UNUSED_OPTS}, {NULL, 0, 0, 0}}, {{"parse_opts", "-v", "-Po", "my_store", "-PT", NULL}, - {NULL, NULL, {0}, NULL, NULL, (char *)"my_store", 0, NULL, NULL, false, false, true, true, 0, 0, - 0, UNUSED_OPTS}, + {NULL, NULL, {0}, NULL, NULL, (char *)"my_store", TABLE_NOT_SET, NULL, NULL, false, false, true, + true, 0, 0, 0, UNUSED_OPTS}, {NULL, 0, 0, 0}}, {{"parse_opts", "-vPomy_store", "-PT", NULL}, - {NULL, NULL, {0}, NULL, NULL, (char *)"my_store", 0, NULL, NULL, false, false, true, true, 0, 0, - 0, UNUSED_OPTS}, + {NULL, NULL, {0}, NULL, NULL, (char *)"my_store", TABLE_NOT_SET, NULL, NULL, false, false, true, + true, 0, 0, 0, UNUSED_OPTS}, {NULL, 0, 0, 0}}, /* @@ -117,28 +117,28 @@ static TEST_DRIVER driver[] = { * "parse_single_opt" to indicate to use the extended parsing idiom. */ {{"parse_single_opt", "-vd", "-Pomy_store", "-c", "string_opt", "-PT", NULL}, - {NULL, NULL, {0}, NULL, NULL, (char *)"my_store", 0, NULL, NULL, false, false, true, true, 0, 0, - 0, UNUSED_OPTS}, + {NULL, NULL, {0}, NULL, NULL, (char *)"my_store", TABLE_NOT_SET, NULL, NULL, false, false, true, + true, 0, 0, 0, UNUSED_OPTS}, {(char *)"string_opt", true, false, 0}}, {{"parse_single_opt", "-dv", "-Pomy_store", "-cstring_opt", "-PT", NULL}, - {NULL, NULL, {0}, NULL, NULL, (char *)"my_store", 0, NULL, NULL, false, false, true, true, 0, 0, - 0, UNUSED_OPTS}, + {NULL, NULL, {0}, NULL, NULL, (char *)"my_store", TABLE_NOT_SET, NULL, NULL, false, false, true, + true, 0, 0, 0, UNUSED_OPTS}, {(char *)"string_opt", true, false, 0}}, {{"parse_single_opt", "-ev", "-cstring_opt", "-Pomy_store", "-PT", "-f", "22", NULL}, - {NULL, NULL, {0}, NULL, NULL, (char *)"my_store", 0, NULL, NULL, false, false, true, true, 0, 0, - 0, UNUSED_OPTS}, + {NULL, NULL, {0}, NULL, NULL, (char *)"my_store", TABLE_NOT_SET, NULL, NULL, false, false, true, + true, 0, 0, 0, UNUSED_OPTS}, {(char *)"string_opt", false, true, 22}}, {{"parse_single_opt", "-evd", "-Pomy_store", "-PT", "-f22", NULL}, - {NULL, NULL, {0}, NULL, NULL, (char *)"my_store", 0, NULL, NULL, false, false, true, true, 0, 0, - 0, UNUSED_OPTS}, + {NULL, NULL, {0}, NULL, NULL, (char *)"my_store", TABLE_NOT_SET, NULL, NULL, false, false, true, + true, 0, 0, 0, UNUSED_OPTS}, {NULL, true, true, 22}}, {{"parse_single_opt", "-v", "-Pomy_store", "-PT", NULL}, - {NULL, NULL, {0}, NULL, NULL, (char *)"my_store", 0, NULL, NULL, false, false, true, true, 0, 0, - 0, UNUSED_OPTS}, + {NULL, NULL, {0}, NULL, NULL, (char *)"my_store", TABLE_NOT_SET, NULL, NULL, false, false, true, + true, 0, 0, 0, UNUSED_OPTS}, {NULL, false, false, 0}}, }; diff --git a/src/third_party/wiredtiger/test/utility/parse_opts.c b/src/third_party/wiredtiger/test/utility/parse_opts.c index 50e300cc3e3..e8d5b9a18c7 100644 --- a/src/third_party/wiredtiger/test/utility/parse_opts.c +++ b/src/third_party/wiredtiger/test/utility/parse_opts.c @@ -199,7 +199,6 @@ testutil_parse_single_opt(TEST_OPTS *opts, int ch) case 'W': /* Number of writer threads */ opts->n_write_threads = (uint64_t)atoll(__wt_optarg); break; - case '?': default: return (1); } |