@@ -171,14 +171,17 @@ Maybe<void> Storage::Open() {
171171
172172 int r = sqlite3_open (location_.c_str (), &db);
173173 CHECK_ERROR_OR_THROW (env (), r, SQLITE_OK, Nothing<void >());
174- r = sqlite3_exec (db, init_sql_v0.data (), 0 , 0 , nullptr );
174+ r = sqlite3_exec (db, init_sql_v0.data (), nullptr , nullptr , nullptr );
175175 CHECK_ERROR_OR_THROW (env (), r, SQLITE_OK, Nothing<void >());
176176
177177 // Get the current schema version, used to determine schema migrations.
178178 sqlite3_stmt* s = nullptr ;
179- r = sqlite3_prepare_v2 (
180- db, get_schema_version_sql.data (), get_schema_version_sql.size (), &s, 0 );
181- r = sqlite3_exec (db, init_sql_v0.data (), 0 , 0 , nullptr );
179+ r = sqlite3_prepare_v2 (db,
180+ get_schema_version_sql.data (),
181+ get_schema_version_sql.size (),
182+ &s,
183+ nullptr );
184+ r = sqlite3_exec (db, init_sql_v0.data (), nullptr , nullptr , nullptr );
182185 CHECK_ERROR_OR_THROW (env (), r, SQLITE_OK, Nothing<void >());
183186 auto stmt = stmt_unique_ptr (s);
184187 CHECK_ERROR_OR_THROW (
@@ -198,7 +201,8 @@ Maybe<void> Storage::Open() {
198201 std::string set_user_version_sql =
199202 " UPDATE nodejs_webstorage_state SET schema_version = " +
200203 std::to_string (kCurrentSchemaVersion ) + " ;" ;
201- r = sqlite3_exec (db, set_user_version_sql.c_str (), 0 , 0 , nullptr );
204+ r = sqlite3_exec (
205+ db, set_user_version_sql.c_str (), nullptr , nullptr , nullptr );
202206 CHECK_ERROR_OR_THROW (env (), r, SQLITE_OK, Nothing<void >());
203207 }
204208
@@ -237,7 +241,7 @@ Maybe<void> Storage::Clear() {
237241 sqlite3_stmt* s = nullptr ;
238242 CHECK_ERROR_OR_THROW (
239243 env (),
240- sqlite3_prepare_v2 (db_.get (), sql.data (), sql.size (), &s, 0 ),
244+ sqlite3_prepare_v2 (db_.get (), sql.data (), sql.size (), &s, nullptr ),
241245 SQLITE_OK,
242246 Nothing<void >());
243247 auto stmt = stmt_unique_ptr (s);
@@ -253,7 +257,7 @@ MaybeLocal<Array> Storage::Enumerate() {
253257
254258 static constexpr std::string_view sql = " SELECT key FROM nodejs_webstorage" ;
255259 sqlite3_stmt* s = nullptr ;
256- int r = sqlite3_prepare_v2 (db_.get (), sql.data (), sql.size (), &s, 0 );
260+ int r = sqlite3_prepare_v2 (db_.get (), sql.data (), sql.size (), &s, nullptr );
257261 CHECK_ERROR_OR_THROW (env (), r, SQLITE_OK, Local<Array>());
258262 auto stmt = stmt_unique_ptr (s);
259263 LocalVector<Value> values (env ()->isolate ());
@@ -283,7 +287,7 @@ MaybeLocal<Value> Storage::Length() {
283287 static constexpr std::string_view sql =
284288 " SELECT count(*) FROM nodejs_webstorage" ;
285289 sqlite3_stmt* s = nullptr ;
286- int r = sqlite3_prepare_v2 (db_.get (), sql.data (), sql.size (), &s, 0 );
290+ int r = sqlite3_prepare_v2 (db_.get (), sql.data (), sql.size (), &s, nullptr );
287291 CHECK_ERROR_OR_THROW (env (), r, SQLITE_OK, Local<Value>());
288292 auto stmt = stmt_unique_ptr (s);
289293 CHECK_ERROR_OR_THROW (
@@ -306,7 +310,7 @@ MaybeLocal<Value> Storage::Load(Local<Name> key) {
306310 static constexpr std::string_view sql =
307311 " SELECT value FROM nodejs_webstorage WHERE key = ? LIMIT 1" ;
308312 sqlite3_stmt* s = nullptr ;
309- int r = sqlite3_prepare_v2 (db_.get (), sql.data (), sql.size (), &s, 0 );
313+ int r = sqlite3_prepare_v2 (db_.get (), sql.data (), sql.size (), &s, nullptr );
310314 CHECK_ERROR_OR_THROW (env (), r, SQLITE_OK, Local<Value>());
311315 auto stmt = stmt_unique_ptr (s);
312316 TwoByteValue utf16key (env ()->isolate (), key);
@@ -339,7 +343,7 @@ MaybeLocal<Value> Storage::LoadKey(const int index) {
339343 static constexpr std::string_view sql =
340344 " SELECT key FROM nodejs_webstorage LIMIT 1 OFFSET ?" ;
341345 sqlite3_stmt* s = nullptr ;
342- int r = sqlite3_prepare_v2 (db_.get (), sql.data (), sql.size (), &s, 0 );
346+ int r = sqlite3_prepare_v2 (db_.get (), sql.data (), sql.size (), &s, nullptr );
343347 CHECK_ERROR_OR_THROW (env (), r, SQLITE_OK, Local<Value>());
344348 auto stmt = stmt_unique_ptr (s);
345349 r = sqlite3_bind_int (stmt.get (), 1 , index);
@@ -377,7 +381,7 @@ Maybe<void> Storage::Remove(Local<Name> key) {
377381 static constexpr std::string_view sql =
378382 " DELETE FROM nodejs_webstorage WHERE key = ?" ;
379383 sqlite3_stmt* s = nullptr ;
380- int r = sqlite3_prepare_v2 (db_.get (), sql.data (), sql.size (), &s, 0 );
384+ int r = sqlite3_prepare_v2 (db_.get (), sql.data (), sql.size (), &s, nullptr );
381385 CHECK_ERROR_OR_THROW (env (), r, SQLITE_OK, Nothing<void >());
382386 auto stmt = stmt_unique_ptr (s);
383387 TwoByteValue utf16key (env ()->isolate (), key);
@@ -412,7 +416,7 @@ Maybe<void> Storage::Store(Local<Name> key, Local<Value> value) {
412416 sqlite3_stmt* s = nullptr ;
413417 TwoByteValue utf16key (env ()->isolate (), key);
414418 TwoByteValue utf16val (env ()->isolate (), val);
415- int r = sqlite3_prepare_v2 (db_.get (), sql.data (), sql.size (), &s, 0 );
419+ int r = sqlite3_prepare_v2 (db_.get (), sql.data (), sql.size (), &s, nullptr );
416420 CHECK_ERROR_OR_THROW (env (), r, SQLITE_OK, Nothing<void >());
417421 auto stmt = stmt_unique_ptr (s);
418422 auto key_size = utf16key.length () * sizeof (uint16_t );
0 commit comments