FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

src: use C++ nullptr in webstorage · nodejs/node@344cc62 · GitHub

/ node Public

Commit 344cc62

Browse files
tniessen
authored and
aduh95
committed
src: use C++ nullptr in webstorage
Using the C-style constant `0` to represent a null pointer is less type safe than the C++-style constant `nullptr`, so we should always be using `nullptr` instead of `0`. PR-URL: #61407 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: René <contact.9a5d6388@renegade334.me.uk>
1 parent 6a32a68 commit 344cc62

1 file changed

Lines changed: 16 additions & 12 deletions

File tree

‎src/node_webstorage.cc‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -170,14 +170,17 @@ Maybe<void> Storage::Open() {
170170

171171
int r = sqlite3_open(location_.c_str(), &db);
172172
CHECK_ERROR_OR_THROW(env(), r, SQLITE_OK, Nothing<void>());
173-
r = sqlite3_exec(db, init_sql_v0.data(), 0, 0, nullptr);
173+
r = sqlite3_exec(db, init_sql_v0.data(), nullptr, nullptr, nullptr);
174174
CHECK_ERROR_OR_THROW(env(), r, SQLITE_OK, Nothing<void>());
175175

176176
// Get the current schema version, used to determine schema migrations.
177177
sqlite3_stmt* s = nullptr;
178-
r = sqlite3_prepare_v2(
179-
db, get_schema_version_sql.data(), get_schema_version_sql.size(), &s, 0);
180-
r = sqlite3_exec(db, init_sql_v0.data(), 0, 0, nullptr);
178+
r = sqlite3_prepare_v2(db,
179+
get_schema_version_sql.data(),
180+
get_schema_version_sql.size(),
181+
&s,
182+
nullptr);
183+
r = sqlite3_exec(db, init_sql_v0.data(), nullptr, nullptr, nullptr);
181184
CHECK_ERROR_OR_THROW(env(), r, SQLITE_OK, Nothing<void>());
182185
auto stmt = stmt_unique_ptr(s);
183186
CHECK_ERROR_OR_THROW(
@@ -197,7 +200,8 @@ Maybe<void> Storage::Open() {
197200
std::string set_user_version_sql =
198201
"UPDATE nodejs_webstorage_state SET schema_version = " +
199202
std::to_string(kCurrentSchemaVersion) + ";";
200-
r = sqlite3_exec(db, set_user_version_sql.c_str(), 0, 0, nullptr);
203+
r = sqlite3_exec(
204+
db, set_user_version_sql.c_str(), nullptr, nullptr, nullptr);
201205
CHECK_ERROR_OR_THROW(env(), r, SQLITE_OK, Nothing<void>());
202206
}
203207

@@ -236,7 +240,7 @@ Maybe<void> Storage::Clear() {
236240
sqlite3_stmt* s = nullptr;
237241
CHECK_ERROR_OR_THROW(
238242
env(),
239-
sqlite3_prepare_v2(db_.get(), sql.data(), sql.size(), &s, 0),
243+
sqlite3_prepare_v2(db_.get(), sql.data(), sql.size(), &s, nullptr),
240244
SQLITE_OK,
241245
Nothing<void>());
242246
auto stmt = stmt_unique_ptr(s);
@@ -252,7 +256,7 @@ MaybeLocal<Array> Storage::Enumerate() {
252256

253257
static constexpr std::string_view sql = "SELECT key FROM nodejs_webstorage";
254258
sqlite3_stmt* s = nullptr;
255-
int r = sqlite3_prepare_v2(db_.get(), sql.data(), sql.size(), &s, 0);
259+
int r = sqlite3_prepare_v2(db_.get(), sql.data(), sql.size(), &s, nullptr);
256260
CHECK_ERROR_OR_THROW(env(), r, SQLITE_OK, Local<Array>());
257261
auto stmt = stmt_unique_ptr(s);
258262
LocalVector<Value> values(env()->isolate());
@@ -282,7 +286,7 @@ MaybeLocal<Value> Storage::Length() {
282286
static constexpr std::string_view sql =
283287
"SELECT count(*) FROM nodejs_webstorage";
284288
sqlite3_stmt* s = nullptr;
285-
int r = sqlite3_prepare_v2(db_.get(), sql.data(), sql.size(), &s, 0);
289+
int r = sqlite3_prepare_v2(db_.get(), sql.data(), sql.size(), &s, nullptr);
286290
CHECK_ERROR_OR_THROW(env(), r, SQLITE_OK, Local<Value>());
287291
auto stmt = stmt_unique_ptr(s);
288292
CHECK_ERROR_OR_THROW(
@@ -305,7 +309,7 @@ MaybeLocal<Value> Storage::Load(Local<Name> key) {
305309
static constexpr std::string_view sql =
306310
"SELECT value FROM nodejs_webstorage WHERE key = ? LIMIT 1";
307311
sqlite3_stmt* s = nullptr;
308-
int r = sqlite3_prepare_v2(db_.get(), sql.data(), sql.size(), &s, 0);
312+
int r = sqlite3_prepare_v2(db_.get(), sql.data(), sql.size(), &s, nullptr);
309313
CHECK_ERROR_OR_THROW(env(), r, SQLITE_OK, Local<Value>());
310314
auto stmt = stmt_unique_ptr(s);
311315
TwoByteValue utf16key(env()->isolate(), key);
@@ -338,7 +342,7 @@ MaybeLocal<Value> Storage::LoadKey(const int index) {
338342
static constexpr std::string_view sql =
339343
"SELECT key FROM nodejs_webstorage LIMIT 1 OFFSET ?";
340344
sqlite3_stmt* s = nullptr;
341-
int r = sqlite3_prepare_v2(db_.get(), sql.data(), sql.size(), &s, 0);
345+
int r = sqlite3_prepare_v2(db_.get(), sql.data(), sql.size(), &s, nullptr);
342346
CHECK_ERROR_OR_THROW(env(), r, SQLITE_OK, Local<Value>());
343347
auto stmt = stmt_unique_ptr(s);
344348
r = sqlite3_bind_int(stmt.get(), 1, index);
@@ -376,7 +380,7 @@ Maybe<void> Storage::Remove(Local<Name> key) {
376380
static constexpr std::string_view sql =
377381
"DELETE FROM nodejs_webstorage WHERE key = ?";
378382
sqlite3_stmt* s = nullptr;
379-
int r = sqlite3_prepare_v2(db_.get(), sql.data(), sql.size(), &s, 0);
383+
int r = sqlite3_prepare_v2(db_.get(), sql.data(), sql.size(), &s, nullptr);
380384
CHECK_ERROR_OR_THROW(env(), r, SQLITE_OK, Nothing<void>());
381385
auto stmt = stmt_unique_ptr(s);
382386
TwoByteValue utf16key(env()->isolate(), key);
@@ -411,7 +415,7 @@ Maybe<void> Storage::Store(Local<Name> key, Local<Value> value) {
411415
sqlite3_stmt* s = nullptr;
412416
TwoByteValue utf16key(env()->isolate(), key);
413417
TwoByteValue utf16val(env()->isolate(), val);
414-
int r = sqlite3_prepare_v2(db_.get(), sql.data(), sql.size(), &s, 0);
418+
int r = sqlite3_prepare_v2(db_.get(), sql.data(), sql.size(), &s, nullptr);
415419
CHECK_ERROR_OR_THROW(env(), r, SQLITE_OK, Nothing<void>());
416420
auto stmt = stmt_unique_ptr(s);
417421
auto key_size = utf16key.length() * sizeof(uint16_t);

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL