Skip to content

src: use C++ nullptr in webstorage #61407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tniessen wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −12
Open

src: use C++ nullptr in webstorage #61407

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions src/node_webstorage.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,14 +170,17 @@ Maybe<void> Storage::Open() {

int r = sqlite3_open(location_.c_str(), &db);
CHECK_ERROR_OR_THROW(env(), r, SQLITE_OK, Nothing<void>());
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<void>());

// 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<void>());
auto stmt = stmt_unique_ptr(s);
CHECK_ERROR_OR_THROW(
Expand All @@ -197,7 +200,8 @@ Maybe<void> 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<void>());
}

Expand Down Expand Up @@ -236,7 +240,7 @@ Maybe<void> 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<void>());
auto stmt = stmt_unique_ptr(s);
Expand All @@ -252,7 +256,7 @@ MaybeLocal<Array> 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<Array>());
auto stmt = stmt_unique_ptr(s);
LocalVector<Value> values(env()->isolate());
Expand Down Expand Up @@ -282,7 +286,7 @@ MaybeLocal<Value> 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<Value>());
auto stmt = stmt_unique_ptr(s);
CHECK_ERROR_OR_THROW(
Expand All @@ -305,7 +309,7 @@ MaybeLocal<Value> Storage::Load(Local<Name> 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<Value>());
auto stmt = stmt_unique_ptr(s);
TwoByteValue utf16key(env()->isolate(), key);
Expand Down Expand Up @@ -338,7 +342,7 @@ MaybeLocal<Value> 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<Value>());
auto stmt = stmt_unique_ptr(s);
r = sqlite3_bind_int(stmt.get(), 1, index);
Expand Down Expand Up @@ -376,7 +380,7 @@ Maybe<void> Storage::Remove(Local<Name> 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<void>());
auto stmt = stmt_unique_ptr(s);
TwoByteValue utf16key(env()->isolate(), key);
Expand Down Expand Up @@ -411,7 +415,7 @@ Maybe<void> Storage::Store(Local<Name> key, Local<Value> 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<void>());
auto stmt = stmt_unique_ptr(s);
auto key_size = utf16key.length() * sizeof(uint16_t);
Expand Down
Loading