diff options
Diffstat (limited to 'ext/wasm/api')
-rw-r--r-- | ext/wasm/api/sqlite3-api-oo1.js | 11 | ||||
-rw-r--r-- | ext/wasm/api/sqlite3-api-prologue.js | 4 | ||||
-rw-r--r-- | ext/wasm/api/sqlite3-wasm.c | 10 |
3 files changed, 12 insertions, 13 deletions
diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js index 6a8c22939..368986933 100644 --- a/ext/wasm/api/sqlite3-api-oo1.js +++ b/ext/wasm/api/sqlite3-api-oo1.js @@ -1383,12 +1383,11 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){ return this.reset(); }, /** - Functions like step() except that - it finalizes this statement immediately after stepping unless - the step cannot be performed because the statement is - locked. Throws on error, but any error other than the - statement-is-locked case will also trigger finalization of this - statement. + Functions like step() except that it finalizes this statement + immediately after stepping unless the step cannot be performed + because the statement is locked. Throws on error, but any error + other than the statement-is-locked case will also trigger + finalization of this statement. On success, it returns true if the step indicated that a row of data was available, else it returns false. diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js index 1c22e9ea2..3d6d4c92b 100644 --- a/ext/wasm/api/sqlite3-api-prologue.js +++ b/ext/wasm/api/sqlite3-api-prologue.js @@ -720,7 +720,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap( } try{ if(pdir && 0===capi.wasm.xCallWrapped( - 'sqlite3_wasm_init_opfs', 'i32', ['string'], pdir + 'sqlite3_wasm_init_wasmfs', 'i32', ['string'], pdir )){ /** OPFS does not support locking and will trigger errors if we try to lock. We don't _really_ want to @@ -739,7 +739,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap( return __persistentDir = ""; } }catch(e){ - // sqlite3_wasm_init_opfs() is not available + // sqlite3_wasm_init_wasmfs() is not available return __persistentDir = ""; } }; diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c index c072e8c9d..eb8f58b40 100644 --- a/ext/wasm/api/sqlite3-wasm.c +++ b/ext/wasm/api/sqlite3-wasm.c @@ -510,7 +510,7 @@ int sqlite3_wasm_vfs_unlink(const char * zName){ return rc; } -#if defined(__EMSCRIPTEN__) && defined(SQLITE_WASM_OPFS) +#if defined(__EMSCRIPTEN__) && defined(SQLITE_WASM_WASMFS) #include <emscripten/wasmfs.h> #include <emscripten/console.h> @@ -532,11 +532,11 @@ int sqlite3_wasm_vfs_unlink(const char * zName){ ** ** Returns 0 on success, SQLITE_NOMEM if instantiation of the backend ** object fails, SQLITE_IOERR if mkdir() of the zMountPoint dir in -** the virtual FS fails. In builds compiled without SQLITE_WASM_OPFS +** the virtual FS fails. In builds compiled without SQLITE_WASM_WASMFS ** defined, SQLITE_NOTFOUND is returned without side effects. */ WASM_KEEP -int sqlite3_wasm_init_opfs(const char *zMountPoint){ +int sqlite3_wasm_init_wasmfs(const char *zMountPoint){ static backend_t pOpfs = 0; if( !zMountPoint || !*zMountPoint ) zMountPoint = "/persistent"; if( !pOpfs ){ @@ -562,10 +562,10 @@ int sqlite3_wasm_init_opfs(const char *zMountPoint){ } #else WASM_KEEP -int sqlite3_wasm_init_opfs(void){ +int sqlite3_wasm_init_wasmfs(void){ return SQLITE_NOTFOUND; } -#endif /* __EMSCRIPTEN__ && SQLITE_WASM_OPFS */ +#endif /* __EMSCRIPTEN__ && SQLITE_WASM_WASMFS */ #undef WASM_KEEP |