Import wiredtiger: f71af27c5a39b1490a5f78029d205280cfd03174 from branch mongodb-master

ref: 8f0a6e229b..f71af27c5a
for: 6.3.0-rc0

WT-9974 Enforce C and C++ style commenting in WiredTiger

6 files changed, 12 insertions, 13 deletions

diff --git a/src/third_party/wiredtiger/test/csuite/rwlock/main.c b/src/third_party/wiredtiger/test/csuite/rwlock/main.c
index 43e4b308ccc..7dabeff7ddc 100644
--- a/src/third_party/wiredtiger/test/csuite/rwlock/main.c
+++ b/src/third_party/wiredtiger/test/csuite/rwlock/main.c
@@ -32,11 +32,8 @@
  */
 #define MAX_THREADS 1000
 #define READS_PER_WRITE 10000
-//#define	READS_PER_WRITE	1000000
-//#define	READS_PER_WRITE	100
 
 #define CHECK_CORRECTNESS 1
-//#define	USE_POSIX	1
 
 static WT_RWLOCK rwlock;
 static pthread_rwlock_t p_rwlock;
diff --git a/src/third_party/wiredtiger/test/csuite/wt2999_join_extractor/main.c b/src/third_party/wiredtiger/test/csuite/wt2999_join_extractor/main.c
index ab10d11111f..0de3dda9fbc 100644
--- a/src/third_party/wiredtiger/test/csuite/wt2999_join_extractor/main.c
+++ b/src/third_party/wiredtiger/test/csuite/wt2999_join_extractor/main.c
@@ -156,7 +156,7 @@ main(int argc, char *argv[])
     testutil_check(session->join(session, jcursor, cursor1, "compare=gt"));
     testutil_check(session->join(session, jcursor, cursor2, "compare=gt"));
 
-    while ((ret = jcursor->next(jcursor)) == 0) // leak
+    while ((ret = jcursor->next(jcursor)) == 0) /* leak */
         ;
     testutil_assert(ret == WT_NOTFOUND);
 
diff --git a/src/third_party/wiredtiger/test/syscall/wt2336_base/main.c b/src/third_party/wiredtiger/test/syscall/wt2336_base/main.c
index 56d75dc835e..31fa857eb62 100644
--- a/src/third_party/wiredtiger/test/syscall/wt2336_base/main.c
+++ b/src/third_party/wiredtiger/test/syscall/wt2336_base/main.c
@@ -28,8 +28,8 @@
 
 #include <stdlib.h>
 
-#include <unistd.h> // TODO
-#include <fcntl.h>  // TODO
+#include <unistd.h>
+#include <fcntl.h>
 #include <wt_internal.h>
 
 static void fail(int) WT_GCC_FUNC_DECL_ATTRIBUTE((noreturn));
diff --git a/src/third_party/wiredtiger/test/unittest/tests/block/test_block_ckpt.cpp b/src/third_party/wiredtiger/test/unittest/tests/block/test_block_ckpt.cpp
index 81b6260cb1d..8057629b032 100644
--- a/src/third_party/wiredtiger/test/unittest/tests/block/test_block_ckpt.cpp
+++ b/src/third_party/wiredtiger/test/unittest/tests/block/test_block_ckpt.cpp
@@ -64,8 +64,10 @@ TEST_CASE("Block manager: __ckpt_add_blkmod_entry", "[block]")
     // Edge case, this should just fit in 256 bits
     test_ckpt_add_blkmod_entry(255, 1, 256);
 
-    // This case relies on the "+ 1" introduced in WT-6366 in __ckpt_add_blkmod_entry.
-    // Without it, this test would fail as it would only allocate 256 bits.
-    // We expect an extra 8 bytes (64 bits to be added), 256 + 64 = 320;
+    /*
+     * This case relies on the "+ 1" introduced in WT-6366 in __ckpt_add_blkmod_entry. Without it,
+     * this test would fail as it would only allocate 256 bits. We expect an extra 8 bytes (64 bits
+     * to be added), 256 + 64 = 320;
+     */
     test_ckpt_add_blkmod_entry(256, 1, 320);
 }
diff --git a/src/third_party/wiredtiger/test/unittest/tests/test_extent_list.cpp b/src/third_party/wiredtiger/test/unittest/tests/test_extent_list.cpp
index bddd8b3edd5..934396ae85c 100644
--- a/src/third_party/wiredtiger/test/unittest/tests/test_extent_list.cpp
+++ b/src/third_party/wiredtiger/test/unittest/tests/test_extent_list.cpp
@@ -312,9 +312,10 @@ TEST_CASE("Extent Lists: block_off_srch", "[extent_list]")
 
         __ut_block_off_srch(&head[0], 2, &stack[0], true);
 
-        // For each level of the extent list, if the searched-for element was
-        // visible, we should point to it. otherwise, we should point to the
-        // next-largest item.
+        /*
+         * For each level of the extent list, if the searched-for element was visible, we should
+         * point to it. otherwise, we should point to the next-largest item.
+         */
         REQUIRE((*stack[0])->off == 2);
         REQUIRE((*stack[1])->off == 2);
         REQUIRE((*stack[2])->off == 3);
diff --git a/src/third_party/wiredtiger/test/utility/misc.c b/src/third_party/wiredtiger/test/utility/misc.c
index c43da94e7f4..98b788834cc 100644
--- a/src/third_party/wiredtiger/test/utility/misc.c
+++ b/src/third_party/wiredtiger/test/utility/misc.c
@@ -415,7 +415,6 @@ testutil_wiredtiger_open(TEST_OPTS *opts, const char *home, const char *config,
     testutil_check(__wt_snprintf(buf, sizeof(buf), "%s%s%s%s", config,
       (rerun ? TESTUTIL_ENV_CONFIG_REC : ""), (opts->compat ? TESTUTIL_ENV_CONFIG_COMPAT : ""),
       (opts->tiered_storage ? tiered_ext_cfg : "")));
-    // printf("wiredtiger_open configuration: %s\n", buf);
     testutil_check(wiredtiger_open(home, event_handler, buf, connectionp));
 }