summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiddhartha Mahajan <siddhartha.mahajan8899@mongodb.com>2023-01-06 01:18:48 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2023-01-06 02:01:19 +0000
commit572a14bd26b06af0870ee3e84abdf076a5f879c1 (patch)
treed976b420e156eb189a91d337c631f95df4c9ac66
parent297d43f81b51320356fd0cdbdef116023931cea7 (diff)
downloadmongo-572a14bd26b06af0870ee3e84abdf076a5f879c1.tar.gz
Import wiredtiger: b183ecb40882d967627093766b27bab9eca52db1 from branch mongodb-master
ref: f0f2aa4917..b183ecb408 for: 6.3.0-rc0 WT-9985 Compilation Ubuntu - Implicit conversion 20.04 (ARM64) changes signedness
-rw-r--r--src/third_party/wiredtiger/examples/c/ex_encrypt.c4
-rw-r--r--src/third_party/wiredtiger/ext/encryptors/rotn/rotn_encrypt.c4
-rw-r--r--src/third_party/wiredtiger/import.data2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/third_party/wiredtiger/examples/c/ex_encrypt.c b/src/third_party/wiredtiger/examples/c/ex_encrypt.c
index ce94394985a..f8657b39961 100644
--- a/src/third_party/wiredtiger/examples/c/ex_encrypt.c
+++ b/src/third_party/wiredtiger/examples/c/ex_encrypt.c
@@ -110,9 +110,9 @@ do_rotate(char *buf, size_t len, int rotn)
for (i = 0; i < len; i++)
if (isalpha((unsigned char)buf[i])) {
if (islower((unsigned char)buf[i]))
- buf[i] = ((buf[i] - 'a') + rotn) % 26 + 'a';
+ buf[i] = (char)(((buf[i] - 'a') + rotn) % 26 + 'a');
else
- buf[i] = ((buf[i] - 'A') + rotn) % 26 + 'A';
+ buf[i] = (char)(((buf[i] - 'A') + rotn) % 26 + 'A');
}
}
diff --git a/src/third_party/wiredtiger/ext/encryptors/rotn/rotn_encrypt.c b/src/third_party/wiredtiger/ext/encryptors/rotn/rotn_encrypt.c
index ccf87c642b5..6b05a12cb65 100644
--- a/src/third_party/wiredtiger/ext/encryptors/rotn/rotn_encrypt.c
+++ b/src/third_party/wiredtiger/ext/encryptors/rotn/rotn_encrypt.c
@@ -150,9 +150,9 @@ do_rotate(char *buf, size_t len, int rotn)
*/
for (i = 0; i < len; i++) {
if ('a' <= buf[i] && buf[i] <= 'z')
- buf[i] = ((buf[i] - 'a') + rotn) % 26 + 'a';
+ buf[i] = (char)(((buf[i] - 'a') + rotn) % 26 + 'a');
else if ('A' <= buf[i] && buf[i] <= 'Z')
- buf[i] = ((buf[i] - 'A') + rotn) % 26 + 'A';
+ buf[i] = (char)(((buf[i] - 'A') + rotn) % 26 + 'A');
}
}
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index db5cd8ba824..91b63795da2 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": "f0f2aa4917ed962228591f242468bc68d8eef68f"
+ "commit": "b183ecb40882d967627093766b27bab9eca52db1"
}