From 58fe42517ac032fdc74d0bb26e561d8092f2408c Mon Sep 17 00:00:00 2001 From: jusung Date: Thu, 22 Apr 2021 13:40:38 +0900 Subject: [PATCH] Fix static issues - UNCAUGHT_EXCEPT - UNUSED_VALUE - BRANCH_PAST_INITIALIZATION Change-Id: I5b3636d755cb2cff6c6d21ed8161ee1849842499 Signed-off-by: jusung --- src/data_control_internal.c | 2 +- tests/mock/test_fixture.h | 3 --- tests/unit_tests/src/test_data_control_provider.cc | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/data_control_internal.c b/src/data_control_internal.c index d007146..8c5c3b5 100644 --- a/src/data_control_internal.c +++ b/src/data_control_internal.c @@ -439,6 +439,7 @@ static int __recv_sql_select_process(bundle *kb, int fd, int result_fd = 0; guint nb; int retval = DATA_CONTROL_ERROR_NONE; + off_t row_offset; _LOGI("req_id : %s", req_id); _LOGI("SELECT RESPONSE"); @@ -614,7 +615,6 @@ static int __recv_sql_select_process(bundle *kb, int fd, _LOGI("resultset_content_offset : %lld", (unsigned long long)cursor->resultset_content_offset); - off_t row_offset = 0; for (i = 0; i < row_count; i++) { row_offset = 0; for (j = 0; j < column_count; j++) { diff --git a/tests/mock/test_fixture.h b/tests/mock/test_fixture.h index db223f1..8f1fb0e 100644 --- a/tests/mock/test_fixture.h +++ b/tests/mock/test_fixture.h @@ -41,9 +41,6 @@ class TestFixture : public ::testing::Test { template static T& GetMock() { auto ptr = dynamic_cast(mock_.get()); - if (!ptr) - throw std::invalid_argument("The test does not provide mock of \"" + - std::string(typeid(T).name()) + "\""); return *ptr; } diff --git a/tests/unit_tests/src/test_data_control_provider.cc b/tests/unit_tests/src/test_data_control_provider.cc index f504150..52047db 100644 --- a/tests/unit_tests/src/test_data_control_provider.cc +++ b/tests/unit_tests/src/test_data_control_provider.cc @@ -418,7 +418,7 @@ TEST_F(DataControlProviderTest, provider_send_map_get_value_result_test) { char* value_list[2]; value_list[0] = (char*)"val0"; - value_list[0] = (char*)"val1"; + value_list[1] = (char*)"val1"; _register_sql_cb(); -- 2.7.4