From: stephan <stephan@noemail.net>
Date: Mon, 26 Sep 2022 11:34:31 +0000 (+0000)
Subject: wasm: change StructBinder signature for sqlite3_file::pMethods from 'P' to 'p' to... 
X-Git-Tag: version-3.40.0~169^2~69
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a643e4bcdc81f835be75377d1c6306f5e23f541;p=thirdparty%2Fsqlite.git

wasm: change StructBinder signature for sqlite3_file::pMethods from 'P' to 'p' to eliminate an unnecessary and inconsistent level of magic.

FossilOrigin-Name: 85f2e877e53899860af4dc6630044b471a9c7c82faba1f4e1e60ae991460b943
---

diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index e1e5be2483..cf9a1a3db6 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -503,7 +503,7 @@ const char * sqlite3_wasm_enum_json(void){
 
 #define CurrentStruct sqlite3_file
     StructBinder {
-      M(pMethods,"P");
+      M(pMethods,"p");
     } _StructBinder;
 #undef CurrentStruct
 
diff --git a/ext/wasm/testing1.js b/ext/wasm/testing1.js
index 5743719096..e412b9c17d 100644
--- a/ext/wasm/testing1.js
+++ b/ext/wasm/testing1.js
@@ -717,17 +717,14 @@
       //log("sfile",sfile,sfile.constructor.prototype);
       T.assert(0===sfile.$pMethods).assert(iom.pointer > 0);
       //log("iom",iom);
-      /** Some of the following tests require that pMethods has a
-          signature of "P", as opposed to "p". */
-      sfile.$pMethods = iom;
-      T.assert(iom === sfile.$pMethods);
       sfile.$pMethods = iom.pointer;
-      T.assert(iom === sfile.$pMethods)
+      T.assert(iom.pointer === sfile.$pMethods)
         .assert(IOM.resolveToInstance(iom))
         .assert(undefined ===IOM.resolveToInstance(sfile))
         .mustThrow(()=>IOM.resolveToInstance(0,true))
         .assert(S3F.resolveToInstance(sfile.pointer))
-        .assert(undefined===S3F.resolveToInstance(iom));
+        .assert(undefined===S3F.resolveToInstance(iom))
+        .assert(iom===IOM.resolveToInstance(sfile.$pMethods));
       T.assert(0===iom.$iVersion);
       installIOMethods(iom);
       T.assert(1===iom.$iVersion);
diff --git a/manifest b/manifest
index 7947368a89..4778b3cf4b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fiddle:\smove,\srather\sthan\scopy,\sdata\sbuffers\sbetween\sthe\sthreads.\sFix\sthe\scase\sof\san\suploaded\sdb\sfailing\sto\sinstall\sbecause\sits\sfilename\sis\sthe\ssame\sas\sthe\sopened\sdb.
-D 2022-09-24T11:32:00.293
+C wasm:\schange\sStructBinder\ssignature\sfor\ssqlite3_file::pMethods\sfrom\s'P'\sto\s'p'\sto\seliminate\san\sunnecessary\sand\sinconsistent\slevel\sof\smagic.
+D 2022-09-26T11:34:31.822
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -488,7 +488,7 @@ F ext/wasm/api/sqlite3-api-opfs.js 5585dc80aea9df54c3d5d3a6c62771bf741f21b237063
 F ext/wasm/api/sqlite3-api-prologue.js 76db12cce58ec6724ec01a977dfbedabfd4916e915a6e7679ffc24dd52eef64e
 F ext/wasm/api/sqlite3-api-worker1.js 2eeb2a24e1a90322d84a9b88a99919b806623de62792436446099c0988f2030b
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c d1c0724136480a459d9dda4b76a665691a172d5cba96729d26d26acf6480bc9b
+F ext/wasm/api/sqlite3-wasm.c 7010405f1981cd5929568403a618f80398f7acbf76b3eb11c4f23789206eb164
 F ext/wasm/batch-runner.html 2857a6db7292ac83d1581af865d643fd34235db2df830d10b43b01388c599e04
 F ext/wasm/batch-runner.js 6f5b86e0b5519a9a941d9f17ee9c5ecdc63f452f157602fe7fdf87f6275a2b49
 F ext/wasm/common/SqliteTestUtil.js 529161a624265ba84271a52db58da022649832fa1c71309fb1e02cc037327a2b
@@ -527,7 +527,7 @@ F ext/wasm/test-opfs-vfs.js 753c6b86dd8ce0813121add44726a038ba1b83acebdc8414189c
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
 F ext/wasm/testing-worker1-promiser.js 63448fddfd3b8c89ff667d17c8b31c6c2259dd4647ebbbd28f3a921c48e924da
 F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d7669fb17fcae
-F ext/wasm/testing1.js 507001a970fe8a8eb67b6c8d783e1c1daa3db2719f727c4551af29349410e538
+F ext/wasm/testing1.js 7b90ea5f50fbb9529d10f384d2a89ab7aed4d72112fa2765bbdf72a087f47303
 F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
 F ext/wasm/testing2.js 25584bcc30f19673ce13a6f301f89f8820a59dfe044e0c4f2913941f4097fe3c
 F ext/wasm/wasmfs.make 52f24bc9c10e404d26bd0b0ee28d450269808a78e359d6ddedc45d31e7b9c29c
@@ -2026,8 +2026,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 114ef3552af977b272a0baddeb9a2326484b60acfc75284e43c55530f86b413f
-R 2919c32f82c004411030482647bf2402
+P bcec4f964a7b02f59be05286ff715bac654a32b19f05a743e402f4cdb207cab8
+R 793f9e89b06d2236f21d1ef1114135f2
 U stephan
-Z 37118e27ece07b1ea1fafa2d63837d11
+Z 73b30ac4eb53afa297401f4b1b820a88
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index e99dea6748..27efa67a09 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bcec4f964a7b02f59be05286ff715bac654a32b19f05a743e402f4cdb207cab8
\ No newline at end of file
+85f2e877e53899860af4dc6630044b471a9c7c82faba1f4e1e60ae991460b943
\ No newline at end of file