github
/
Magisk
mirror of https://github.com/topjohnwu/Magisk
1
Fork 0
Code Releases Activity

Initialize local variables 

Fix #5542
This commit is contained in:
topjohnwu 2022-03-09 20:43:34 -08:00
parent 24505cd111
commit 563a587882
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
native/jni/core/db.cpp
View File

@ -144,9 +144,9 @@ static char *open_and_init_db(sqlite3 *&db) {
SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_FULLMUTEX, nullptr);
if (ret)
return strdup(sqlite3_errmsg(db));
int ver;
int ver = 0;
bool upgrade = false;
char *err;
char *err = nullptr;
sqlite3_exec(db, "PRAGMA user_version", ver_cb, &ver, &err);
err_ret(err);
if (ver > DB_VERSION) {
@ -250,7 +250,7 @@ static char *open_and_init_db(sqlite3 *&db) {
}
char *db_exec(const char *sql) {
char *err;
char *err = nullptr;
if (mDB == nullptr) {
err = open_and_init_db(mDB);
db_err_cmd(err,
@ -276,7 +276,7 @@ static int sqlite_db_row_callback(void *cb, int col_num, char **data, char **col
}
char *db_exec(const char *sql, const db_row_cb &fn) {
char *err;
char *err = nullptr;
if (mDB == nullptr) {
err = open_and_init_db(mDB);
db_err_cmd(err,
@ -294,7 +294,7 @@ char *db_exec(const char *sql, const db_row_cb &fn) {
}
int get_db_settings(db_settings &cfg, int key) {
char *err;
char *err = nullptr;
auto settings_cb = [&](db_row &row) -> bool {
cfg[row["key"]] = parse_int(row["value"]);
DBLOGV("query %s=[%s]\n", row["key"].data(), row["value"].data());
@ -312,7 +312,7 @@ int get_db_settings(db_settings &cfg, int key) {
}
int get_db_strings(db_strings &str, int key) {
char *err;
char *err = nullptr;
auto string_cb = [&](db_row &row) -> bool {
str[row["key"]] = row["value"];
DBLOGV("query %s=[%s]\n", row["key"].data(), row["value"].data());