diff --git a/src/node_webstorage.cc b/src/node_webstorage.cc index 0b301a310fa397..224f49e8596cf1 100644 --- a/src/node_webstorage.cc +++ b/src/node_webstorage.cc @@ -170,14 +170,17 @@ Maybe Storage::Open() { int r = sqlite3_open(location_.c_str(), &db); CHECK_ERROR_OR_THROW(env(), r, SQLITE_OK, Nothing()); - r = sqlite3_exec(db, init_sql_v0.data(), 0, 0, nullptr); + r = sqlite3_exec(db, init_sql_v0.data(), nullptr, nullptr, nullptr); CHECK_ERROR_OR_THROW(env(), r, SQLITE_OK, Nothing()); // Get the current schema version, used to determine schema migrations. sqlite3_stmt* s = nullptr; - r = sqlite3_prepare_v2( - db, get_schema_version_sql.data(), get_schema_version_sql.size(), &s, 0); - r = sqlite3_exec(db, init_sql_v0.data(), 0, 0, nullptr); + r = sqlite3_prepare_v2(db, + get_schema_version_sql.data(), + get_schema_version_sql.size(), + &s, + nullptr); + r = sqlite3_exec(db, init_sql_v0.data(), nullptr, nullptr, nullptr); CHECK_ERROR_OR_THROW(env(), r, SQLITE_OK, Nothing()); auto stmt = stmt_unique_ptr(s); CHECK_ERROR_OR_THROW( @@ -197,7 +200,8 @@ Maybe Storage::Open() { std::string set_user_version_sql = "UPDATE nodejs_webstorage_state SET schema_version = " + std::to_string(kCurrentSchemaVersion) + ";"; - r = sqlite3_exec(db, set_user_version_sql.c_str(), 0, 0, nullptr); + r = sqlite3_exec( + db, set_user_version_sql.c_str(), nullptr, nullptr, nullptr); CHECK_ERROR_OR_THROW(env(), r, SQLITE_OK, Nothing()); } @@ -236,7 +240,7 @@ Maybe Storage::Clear() { sqlite3_stmt* s = nullptr; CHECK_ERROR_OR_THROW( env(), - sqlite3_prepare_v2(db_.get(), sql.data(), sql.size(), &s, 0), + sqlite3_prepare_v2(db_.get(), sql.data(), sql.size(), &s, nullptr), SQLITE_OK, Nothing()); auto stmt = stmt_unique_ptr(s); @@ -252,7 +256,7 @@ MaybeLocal Storage::Enumerate() { static constexpr std::string_view sql = "SELECT key FROM nodejs_webstorage"; sqlite3_stmt* s = nullptr; - int r = sqlite3_prepare_v2(db_.get(), sql.data(), sql.size(), &s, 0); + int r = sqlite3_prepare_v2(db_.get(), sql.data(), sql.size(), &s, nullptr); CHECK_ERROR_OR_THROW(env(), r, SQLITE_OK, Local()); auto stmt = stmt_unique_ptr(s); LocalVector values(env()->isolate()); @@ -282,7 +286,7 @@ MaybeLocal Storage::Length() { static constexpr std::string_view sql = "SELECT count(*) FROM nodejs_webstorage"; sqlite3_stmt* s = nullptr; - int r = sqlite3_prepare_v2(db_.get(), sql.data(), sql.size(), &s, 0); + int r = sqlite3_prepare_v2(db_.get(), sql.data(), sql.size(), &s, nullptr); CHECK_ERROR_OR_THROW(env(), r, SQLITE_OK, Local()); auto stmt = stmt_unique_ptr(s); CHECK_ERROR_OR_THROW( @@ -305,7 +309,7 @@ MaybeLocal Storage::Load(Local key) { static constexpr std::string_view sql = "SELECT value FROM nodejs_webstorage WHERE key = ? LIMIT 1"; sqlite3_stmt* s = nullptr; - int r = sqlite3_prepare_v2(db_.get(), sql.data(), sql.size(), &s, 0); + int r = sqlite3_prepare_v2(db_.get(), sql.data(), sql.size(), &s, nullptr); CHECK_ERROR_OR_THROW(env(), r, SQLITE_OK, Local()); auto stmt = stmt_unique_ptr(s); TwoByteValue utf16key(env()->isolate(), key); @@ -338,7 +342,7 @@ MaybeLocal Storage::LoadKey(const int index) { static constexpr std::string_view sql = "SELECT key FROM nodejs_webstorage LIMIT 1 OFFSET ?"; sqlite3_stmt* s = nullptr; - int r = sqlite3_prepare_v2(db_.get(), sql.data(), sql.size(), &s, 0); + int r = sqlite3_prepare_v2(db_.get(), sql.data(), sql.size(), &s, nullptr); CHECK_ERROR_OR_THROW(env(), r, SQLITE_OK, Local()); auto stmt = stmt_unique_ptr(s); r = sqlite3_bind_int(stmt.get(), 1, index); @@ -376,7 +380,7 @@ Maybe Storage::Remove(Local key) { static constexpr std::string_view sql = "DELETE FROM nodejs_webstorage WHERE key = ?"; sqlite3_stmt* s = nullptr; - int r = sqlite3_prepare_v2(db_.get(), sql.data(), sql.size(), &s, 0); + int r = sqlite3_prepare_v2(db_.get(), sql.data(), sql.size(), &s, nullptr); CHECK_ERROR_OR_THROW(env(), r, SQLITE_OK, Nothing()); auto stmt = stmt_unique_ptr(s); TwoByteValue utf16key(env()->isolate(), key); @@ -411,7 +415,7 @@ Maybe Storage::Store(Local key, Local value) { sqlite3_stmt* s = nullptr; TwoByteValue utf16key(env()->isolate(), key); TwoByteValue utf16val(env()->isolate(), val); - int r = sqlite3_prepare_v2(db_.get(), sql.data(), sql.size(), &s, 0); + int r = sqlite3_prepare_v2(db_.get(), sql.data(), sql.size(), &s, nullptr); CHECK_ERROR_OR_THROW(env(), r, SQLITE_OK, Nothing()); auto stmt = stmt_unique_ptr(s); auto key_size = utf16key.length() * sizeof(uint16_t);