diff options
author | Changgyu Choi <changyu.choi@samsung.com> | 2020-12-01 11:52:32 +0900 |
---|---|---|
committer | Changgyu Choi <changyu.choi@samsung.com> | 2020-12-01 12:16:18 +0900 |
commit | ab0b57a067803784b39322ea547b22351900c500 (patch) | |
tree | aa9c84b5ed4c0ff61d2c12e8d63276b59d68022a | |
parent | 5934c39af54f352d8022d07357d48a11e4aa515c (diff) | |
download | widget-service-ab0b57a067803784b39322ea547b22351900c500.tar.gz widget-service-ab0b57a067803784b39322ea547b22351900c500.tar.bz2 widget-service-ab0b57a067803784b39322ea547b22351900c500.zip |
Fix static analysis issues
Change-Id: I8c4e4c51da5e5ea86dea49b292a93862cf65f33a
Signed-off-by: Changgyu Choi <changyu.choi@samsung.com>
-rw-r--r-- | mock/db_mock.cc | 66 |
1 files changed, 43 insertions, 23 deletions
diff --git a/mock/db_mock.cc b/mock/db_mock.cc index 6fbf5a2..ca3943a 100644 --- a/mock/db_mock.cc +++ b/mock/db_mock.cc @@ -73,13 +73,13 @@ int create_db() { ret = sqlite3_open_v2(get_db_path(), &db, SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE, - NULL); + nullptr); if (ret != SQLITE_OK) { printf("error 1\n"); goto out; } - ret = sqlite3_exec(db, CREATE_WIDGET_TABLE, NULL, NULL, NULL); + ret = sqlite3_exec(db, CREATE_WIDGET_TABLE, nullptr, nullptr, nullptr); if (ret != SQLITE_OK) { printf("error 2\n"); goto out; @@ -94,8 +94,8 @@ out: int insert_widget_class(sqlite3 *db) { int ret; - char *query = NULL; - sqlite3_stmt *stmt = NULL; + char *query = nullptr; + sqlite3_stmt *stmt = nullptr; query = sqlite3_mprintf("INSERT INTO widget_class " "(classid, setup_appid, appid, pkgid, prime, nodisplay, max_instance) " @@ -103,16 +103,21 @@ int insert_widget_class(sqlite3 *db) { "org.tizen.test_widget", "org.tizen.setup_appid", "org.tizen.test_appid", "org.tizen.test_pkgid", 1, 2, 3); - ret = sqlite3_prepare_v2(db, query, strlen(query), &stmt, NULL); - if (ret != SQLITE_OK) { + if (query == nullptr) { printf("widget class error 1\n"); + return SQLITE_ERROR; + } + + ret = sqlite3_prepare_v2(db, query, strlen(query), &stmt, nullptr); + if (ret != SQLITE_OK) { + printf("widget class error 2\n"); goto out; } ret = sqlite3_step(stmt); if (ret != SQLITE_DONE) { - printf("widget class error 2\n"); + printf("widget class error 3\n"); goto out; } @@ -127,24 +132,29 @@ out: int insert_support_size(sqlite3 *db) { int ret; - char *query = NULL; - sqlite3_stmt *stmt = NULL; + char *query = nullptr; + sqlite3_stmt *stmt = nullptr; query = sqlite3_mprintf("INSERT INTO support_size " "(classid, preview, width, height) " "VALUES (%Q, %Q, %d, %d)", "org.tizen.test_widget", "/unittest/preview.png", 4, 2); - ret = sqlite3_prepare_v2(db, query, strlen(query), &stmt, NULL); - if (ret != SQLITE_OK) { + if (query == nullptr) { printf("support size error 1\n"); + return SQLITE_ERROR; + } + + ret = sqlite3_prepare_v2(db, query, strlen(query), &stmt, nullptr); + if (ret != SQLITE_OK) { + printf("support size error 2\n"); goto out; } ret = sqlite3_step(stmt); if (ret != SQLITE_DONE) { - printf("support size error 2\n"); + printf("support size error 3\n"); goto out; } @@ -159,24 +169,29 @@ out: int insert_label(sqlite3 *db) { int ret; - char *query = NULL; - sqlite3_stmt *stmt = NULL; + char *query = nullptr; + sqlite3_stmt *stmt = nullptr; query = sqlite3_mprintf("INSERT INTO label " "(classid, locale, label) " "VALUES (%Q, %Q, %Q)", "org.tizen.test_widget", "en-us", "TestWidget"); - ret = sqlite3_prepare_v2(db, query, strlen(query), &stmt, NULL); - if (ret != SQLITE_OK) { + if (query == nullptr) { printf("label error 1\n"); + return SQLITE_ERROR; + } + + ret = sqlite3_prepare_v2(db, query, strlen(query), &stmt, nullptr); + if (ret != SQLITE_OK) { + printf("label error 2\n"); goto out; } ret = sqlite3_step(stmt); if (ret != SQLITE_DONE) { - printf("label error 2\n"); + printf("label error 3\n"); goto out; } @@ -191,24 +206,29 @@ out: int insert_icon(sqlite3 *db) { int ret; - char *query = NULL; - sqlite3_stmt *stmt = NULL; + char *query = nullptr; + sqlite3_stmt *stmt = nullptr; query = sqlite3_mprintf("INSERT INTO icon " "(classid, locale, icon) " "VALUES (%Q, %Q, %Q)", "org.tizen.test_widget", "en-us", "/unittest/icon.png"); - ret = sqlite3_prepare_v2(db, query, strlen(query), &stmt, NULL); - if (ret != SQLITE_OK) { + if (query == nullptr) { printf("icon error 1\n"); + return SQLITE_ERROR; + } + + ret = sqlite3_prepare_v2(db, query, strlen(query), &stmt, nullptr); + if (ret != SQLITE_OK) { + printf("icon error 2\n"); goto out; } ret = sqlite3_step(stmt); if (ret != SQLITE_DONE) { - printf("icon error 2\n"); + printf("icon error 3\n"); goto out; } @@ -225,7 +245,7 @@ int insert_default_data() { int ret; sqlite3 *db; - ret = sqlite3_open_v2(get_db_path(), &db, SQLITE_OPEN_READWRITE, NULL); + ret = sqlite3_open_v2(get_db_path(), &db, SQLITE_OPEN_READWRITE, nullptr); if (ret != SQLITE_OK) { printf("insert_default_data error 1\n"); goto out; |