From: stephan <stephan@noemail.net>
Date: Sat, 25 Jun 2022 02:54:20 +0000 (+0000)
Subject: Minor wasm doc tweaks.
X-Git-Tag: version-3.40.0~246^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af260308b3bd433f759644cbb81609f8e54905e9;p=thirdparty%2Fsqlite.git

Minor wasm doc tweaks.

FossilOrigin-Name: 42dc500819bfc1308a9542aa2cae4f6dfd98a29237c59cec82e0e6f9e0bf3779
---

diff --git a/ext/fiddle/sqlite3-api.js b/ext/fiddle/sqlite3-api.js
index 3ee57f6818..74f3e35480 100644
--- a/ext/fiddle/sqlite3-api.js
+++ b/ext/fiddle/sqlite3-api.js
@@ -321,7 +321,13 @@ Module.postRun.push(function(namespace/*the module object, the target for
        function assumes case (1) and calls the underling C function
        with:
 
-       (pDb, sql, -1, ppStmt, null)
+       (pDb, sqlAsString, -1, ppStmt, null)
+
+       The pzTail argument is ignored in this case because its result
+       is meaningless when a string-type value is passed through
+       (because the string goes through another level of internal
+       conversion for WASM's sake and the result pointer would refer
+       to that conversion's memory, not the passed-in string).
 
        If sql is not a string or Uint8Array, it must be a _pointer_ to
        a string which was allocated via api.wasm.allocateUTF8OnStack()
@@ -331,17 +337,14 @@ Module.postRun.push(function(namespace/*the module object, the target for
        for the C-side sqlite3_prepare_v2(). In case (2), the
        underlying C function is called with:
 
-       (pDb, sql, -1, ppStmt, pzTail)
+       (pDb, sqlAsPointer, -1, ppStmt, pzTail)
 
        It returns its result and compiled statement as documented in
-       the C API. Fetching the output pointer (4th argument) requires using
-       api.wasm.getValue().
+       the C API. Fetching the output pointers (4th and 5th
+       parameters) requires using api.wasm.getValue().
     */
     api.sqlite3_prepare_v2 = function(pDb, sql, sqlLen, ppStmt, pzTail){
         if(sql instanceof Uint8Array) sql = uint8ToString(sql);
-        /* ^^^ TODO: confirm whether this conversion is really
-           necessary or whether passing on the array as-is will work
-           as if it were a string. */
         switch(typeof sql){
             case 'string': return prepareMethods.basic(pDb, sql, -1, ppStmt, null);
             case 'number': return prepareMethods.full(pDb, sql, -1, ppStmt, pzTail);
@@ -349,7 +352,7 @@ Module.postRun.push(function(namespace/*the module object, the target for
         }
     };
 
-    /** Populate api.wasm... */
+    /** Populate api.wasm with several members of the module object... */
     ['getValue','setValue', 'stackSave', 'stackRestore', 'stackAlloc',
      'allocateUTF8OnStack', '_malloc', '_free',
      'addFunction', 'removeFunction'     
diff --git a/manifest b/manifest
index dffd8233a8..6a4922ca36 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C wasm\sbinding:\sconsolidated\sthe\stwo\ssqlite3_prepare_v2()\sbindings\sbehind\sa\ssingle\sdispathcer.\sVarious\sinternal\scleanups\sand\srefactoring.\sBranched\sbecause\strunk\sis\sin\spencils-down\smode\sfor\spending\s3.39\srelease.
-D 2022-06-25T02:37:57.122
+C Minor\swasm\sdoc\stweaks.
+D 2022-06-25T02:54:20.783
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -65,7 +65,7 @@ F ext/fiddle/fiddle-worker.js 88bc2193a6cb6a3f04d8911bed50a4401fe6f277de7a71ba83
 F ext/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
 F ext/fiddle/fiddle.js 812f9954cc7c4b191884ad171f36fcf2d0112d0a7ecfdf6087896833a0c079a8
 F ext/fiddle/index.md d9c1c308d8074341bc3b11d1d39073cd77754cb3ca9aeb949f23fdd8323d81cf
-F ext/fiddle/sqlite3-api.js aff4fe5583d02cb7207cc27a92d2cc708fca8a0eba14339f519059298f6bbc5e
+F ext/fiddle/sqlite3-api.js c54f0ee6a65a59284e6b0184f556376b35f5996b6b82607d7275a95f759a380a
 F ext/fiddle/sqlite3-worker.js a9c2b614beca187dbdd8c053ec2770cc61ec1ac9c0ec6398ceb49a79f705a421
 F ext/fiddle/testing.css 750572dded671d2cf142bbcb27af5542522ac08db128245d0b9fe410aa1d7f2a
 F ext/fiddle/testing1.html ea1f3be727f78e420007f823912c1a03b337ecbb8e79449abc2244ad4fe15d9a
@@ -1978,11 +1978,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 e93fd170ce4ae91d572c46d03f68f55d00091d0188030517455017d90d212587
-R 3edce7228a2d729bf332a89ed3af6305
-T *branch * wasm-cleanups
-T *sym-wasm-cleanups *
-T -sym-trunk * Cancelled\sby\sbranch.
+P ab3e50dab4d71557ab5d179bbd6caf7fb61ab7c51dffc8e4714441c189ce3e5c
+R bbdb5fff926c789b277af363fc1aa00d
 U stephan
-Z e1adc8db1d84e5f34db3da1c68e91f04
+Z 54385a773b385e5557f29a3390198b0f
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index e24c1ef14b..66b7720610 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ab3e50dab4d71557ab5d179bbd6caf7fb61ab7c51dffc8e4714441c189ce3e5c
\ No newline at end of file
+42dc500819bfc1308a9542aa2cae4f6dfd98a29237c59cec82e0e6f9e0bf3779
\ No newline at end of file