From: stephan <stephan@noemail.net>
Date: Fri, 23 Dec 2022 21:23:26 +0000 (+0000)
Subject: Merge trunk into wasm-session-api branch.
X-Git-Tag: version-3.41.0~183^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb769f0b4a025761fa2f5150582cf7736cb14345;p=thirdparty%2Fsqlite.git

Merge trunk into wasm-session-api branch.

FossilOrigin-Name: 6cdb036d8e8c5ddb0c6578aeefe318e74d7a90228e57b9f9047057dae3252963
---

bb769f0b4a025761fa2f5150582cf7736cb14345
diff --cc ext/wasm/api/sqlite3-api-glue.js
index f5a6c5753d,a760e921fe..25201f5809
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@@ -517,14 -328,14 +517,14 @@@ self.sqlite3ApiBootstrap.initializers.p
        }.bind(Object.create(null))
      );
    }/* special-case string-type argument conversions */
-   
-   if(1){// WhWasmUtil.xWrap() bindings...
+ 
+   if(1){// wasm.xWrap() bindings...
      /**
         Add some descriptive xWrap() aliases for '*' intended to (A)
 -       initially improve readability/correctness of capi.signatures
 -       and (B) provide automatic conversion from higher-level
 -       representations, e.g. capi.sqlite3_vfs to `sqlite3_vfs*` via
 -       capi.sqlite3_vfs.pointer.
 +       initially improve readability/correctness of
 +       wasm.bindingSignatures and (B) provide automatic conversion
 +       from higher-level representations, e.g. capi.sqlite3_vfs to
 +       `sqlite3_vfs*` via capi.sqlite3_vfs.pointer.
      */
      const aPtr = wasm.xWrap.argAdapter('*');
      const nilType = function(){};
diff --cc manifest
index 6075755a96,0476b9eced..5e1b7d3140
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
 -C Internal\sJS\scleanups.\sCorrect\spart\sof\s[ac136925a645]\sto\saccount\sfor\sthe\seTextRep\sflag\sbeing\sable\sto\shold\sflags\sother\sthan\sthe\sencoding.
 -D 2022-12-23T21:10:49.493
 +C Merge\strunk\sinto\swasm-session-api\sbranch.
- D 2022-12-23T19:33:22.552
++D 2022-12-23T21:23:26.788
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -503,9 -503,9 +503,9 @@@ F ext/wasm/api/post-js-footer.js cd0a8e
  F ext/wasm/api/post-js-header.js 47b6b281f39ad59fa6e8b658308cd98ea292c286a68407b35ff3ed9cfd281a62
  F ext/wasm/api/pre-js.c-pp.js b88499dc303c21fc3f55f2c364a0f814f587b60a95784303881169f9e91c1d5f
  F ext/wasm/api/sqlite3-api-cleanup.js 680d5ccfff54459db136a49b2199d9f879c8405d9c99af1dda0cc5e7c29056f4
- F ext/wasm/api/sqlite3-api-glue.js d284d156812c9994067319997892fd0181dbbbca38401528a57d652478659d31
- F ext/wasm/api/sqlite3-api-oo1.js c0c4ccc269cccee657ffd03f094da7e270e1367b7928926b3730d543555a12a6
- F ext/wasm/api/sqlite3-api-prologue.js 1767dfcd94bb4fa9dd4bd9ff6327117783d3656faf1058dcc1369db320d871fc
 -F ext/wasm/api/sqlite3-api-glue.js f50211dc11f1debf972cdaea87cb4df9772022828072e7100cf5025d1dca2a78
++F ext/wasm/api/sqlite3-api-glue.js ad1316f162fc19f92e563e9ae6794c002d0ffe6c0756f5f7e701affc7443aac0
+ F ext/wasm/api/sqlite3-api-oo1.js 4cce9671e8a31ac9b76bd8559e7827ccc2b121734e460fa9c7d243735a771ec8
+ F ext/wasm/api/sqlite3-api-prologue.js 789639d256e3134563c5c9be25ade28b40e06e783885d26cccc01cd1ed4b820d
  F ext/wasm/api/sqlite3-api-worker1.js e94ba98e44afccfa482874cd9acb325883ade50ed1f9f9526beb9de1711f182f
  F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
  F ext/wasm/api/sqlite3-opfs-async-proxy.js 7795b84b66a7a8dedc791340709b310bb497c3c72a80bef364fa2a58e2ddae3f
@@@ -521,7 -521,7 +521,7 @@@ F ext/wasm/c-pp.c 92285f7bce67ed7b7020b
  F ext/wasm/common/SqliteTestUtil.js d8bf97ecb0705a2299765c8fc9e11b1a5ac7f10988bbf375a6558b7ca287067b
  F ext/wasm/common/emscripten.css 11bd104b6c0d597c67d40cc8ecc0a60dae2b965151e3b6a37fa5708bac3acd15
  F ext/wasm/common/testing.css 0ff15602a3ab2bad8aef2c3bd120c7ee3fd1c2054ad2ace7e214187ae68d926f
- F ext/wasm/common/whwasmutil.js ccfd4addd60f0c3f02ee1669c4e5c8935ca770ed7b737ea3e9e82cc6505576c8
 -F ext/wasm/common/whwasmutil.js 97807770ec452fdcaa48509c5decd3a2c1e3001164a62a3223a347f66967533e
++F ext/wasm/common/whwasmutil.js e057af1aa1bd756864528b26ab26286bab3562117db550b173ffdbe867710114
  F ext/wasm/demo-123-worker.html a0b58d9caef098a626a1a1db567076fca4245e8d60ba94557ede8684350a81ed
  F ext/wasm/demo-123.html 8c70a412ce386bd3796534257935eb1e3ea5c581e5d5aea0490b8232e570a508
  F ext/wasm/demo-123.js ebae30756585bca655b4ab2553ec9236a87c23ad24fc8652115dcedb06d28df6
@@@ -2067,8 -2067,8 +2067,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P c4dab53b8ea3401abd57671b8f3cb39fa4431b864d4c4e14ae24592f8d4cba0a deffe6fb211410fa1a1fbca824a52b4e09b54d4b4f4a4e12d71c9e4b7e8606fb
- R cadaf517f45465d31dbfac473e33edf0
 -P deffe6fb211410fa1a1fbca824a52b4e09b54d4b4f4a4e12d71c9e4b7e8606fb
 -R 537077e8e7a576993086a957d5c52d05
++P f1decc831fe0dc8523956e74474d9663852b0e5b56240dd8504952726e713a97 1dfc03ab1e0269807beef27bf884ab9ead7553d4a5f6ed213f812d7fa052045f
++R 9aa2a2dc0a7c0fcc30fe7505f3bf3c8f
  U stephan
- Z b1718e628e033cfc457bb4000e452e0e
 -Z 379d99233453fc912eb71dcbaf16b8ce
++Z 59d68c6f9d56bc64393e66c46594b9c5
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index a169f3c4f1,a091b64a43..a6097d9337
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f1decc831fe0dc8523956e74474d9663852b0e5b56240dd8504952726e713a97
 -1dfc03ab1e0269807beef27bf884ab9ead7553d4a5f6ed213f812d7fa052045f
++6cdb036d8e8c5ddb0c6578aeefe318e74d7a90228e57b9f9047057dae3252963