fix cppcheck issues in component utils

32 files changed, 35 insertions, 2 deletions

diff --git a/src/components/utils/src/date_time.cc b/src/components/utils/src/date_time.cc
index cea35a977e..2423e73da0 100644
--- a/src/components/utils/src/date_time.cc
+++ b/src/components/utils/src/date_time.cc
@@ -46,6 +46,7 @@ namespace date_time {
 TimeDuration getCurrentTime() {
   return bpt::microsec_clock::local_time() - bpt::from_time_t(0);
 }
+// cppcheck-suppress unusedFunction
 TimeDuration TimeDurationZero() {
   return TimeDuration(0, 0, 0, 0);
 }
@@ -61,10 +62,12 @@ int64_t getuSecs(const TimeDuration& t) {
   return t.total_microseconds();
 }
 
+// cppcheck-suppress unusedFunction
 int64_t get_just_mSecs(const TimeDuration& t) {
   return t.total_milliseconds() % MILLISECONDS_IN_SECOND;
 }
 
+// cppcheck-suppress unusedFunction
 int64_t get_just_uSecs(const TimeDuration& t) {
   return t.total_microseconds() % MICROSECONDS_IN_SECOND;
 }
diff --git a/src/components/utils/src/file_system.cc b/src/components/utils/src/file_system.cc
index 015dc25a22..2e3407eb5c 100644
--- a/src/components/utils/src/file_system.cc
+++ b/src/components/utils/src/file_system.cc
@@ -56,8 +56,8 @@ using boost::system::error_code;
 uint64_t file_system::GetAvailableDiskSpace(const std::string& path) {
   LOG4CXX_AUTO_TRACE(logger_);
   error_code ec;
-  fs::space_info si = {0, 0, 0};
-  si = fs::space(path, ec);
+  // fs::space_info si = {0, 0, 0};
+  fs::space_info si = fs::space(path, ec);
 
   if (ec) {
     // If something went wrong, assume no free space
diff --git a/src/components/utils/src/logger.cc b/src/components/utils/src/logger.cc
index 5a7922afc4..9825fb3f9b 100644
--- a/src/components/utils/src/logger.cc
+++ b/src/components/utils/src/logger.cc
@@ -53,6 +53,7 @@ void deinit_logger() {
   logger::logger_status = logger::LoggerThreadNotCreated;
 }
 
+// cppcheck-suppress unusedFunction
 log4cxx_time_t time_now() {
   return apr_time_now();
 }
diff --git a/src/components/utils/test/async_runner_test.cc b/src/components/utils/test/async_runner_test.cc
index e26f80d954..8ddff546ef 100644
--- a/src/components/utils/test/async_runner_test.cc
+++ b/src/components/utils/test/async_runner_test.cc
@@ -105,6 +105,7 @@ class AsyncRunnerTest : public ::testing::Test {
   }
 };
 
+// cppcheck-suppress syntaxError
 TEST_F(AsyncRunnerTest, ASyncRunManyDelegates_ExpectSuccessfulAllDelegatesRun) {
   // Create Delegates and run
   sync_primitives::ConditionalVariable cond_var;
diff --git a/src/components/utils/test/auto_trace_test.cc b/src/components/utils/test/auto_trace_test.cc
index 41dc90cae4..c18b4783ae 100644
--- a/src/components/utils/test/auto_trace_test.cc
+++ b/src/components/utils/test/auto_trace_test.cc
@@ -130,6 +130,7 @@ bool CheckAutoTraceDebugInFile(const std::string& debug_message) {
   return Compare<bool, EQ, ALL>(true, debug_found, trace_enter, trace_exit);
 }
 // TODO(DTrunov) : Enable after APPLINK-25006 will be resolved
+// cppcheck-suppress syntaxError
 TEST(AutoTraceTest, DISABLED_AutoTrace_WriteToFile_ReadCorrectString) {
   const std::string testlog = "Test trace is working!";
   Preconditions();
diff --git a/src/components/utils/test/back_trace_test.cc b/src/components/utils/test/back_trace_test.cc
index 2c8c61439b..62486d7fb0 100644
--- a/src/components/utils/test/back_trace_test.cc
+++ b/src/components/utils/test/back_trace_test.cc
@@ -39,6 +39,7 @@ namespace utils_test {
 
 using namespace ::utils;
 
+// cppcheck-suppress syntaxError
 TEST(BackTraceTest, CallStackShouldNotBeEmpty) {
   // arrange
   Backtrace newtrace = Backtrace();
diff --git a/src/components/utils/test/bitstream_test.cc b/src/components/utils/test/bitstream_test.cc
index 3d20845dc4..f52dff6ec5 100644
--- a/src/components/utils/test/bitstream_test.cc
+++ b/src/components/utils/test/bitstream_test.cc
@@ -41,6 +41,7 @@ namespace utils_test {
 
 using ::utils::BitStream;
 
+// cppcheck-suppress syntaxError
 TEST(BitstreamTest, CreateBitstream_WithDataWithDatasize_BitStreamIsGood) {
   // arrange
   uint8_t data = 10;
diff --git a/src/components/utils/test/conditional_variable_test.cc b/src/components/utils/test/conditional_variable_test.cc
index 1ef29685e6..d48c787a6e 100644
--- a/src/components/utils/test/conditional_variable_test.cc
+++ b/src/components/utils/test/conditional_variable_test.cc
@@ -90,6 +90,7 @@ void ConditionalVariableTest::task_one() {
   test_value_ = "changed again by thread 1";
 }
 
+// cppcheck-suppress syntaxError
 TEST_F(ConditionalVariableTest,
        CheckNotifyOne_OneThreadNotified_ExpectSuccessful) {
   pthread_t thread1;
diff --git a/src/components/utils/test/custom_string_test.cc b/src/components/utils/test/custom_string_test.cc
index cf03f6099f..e1d0e51a11 100644
--- a/src/components/utils/test/custom_string_test.cc
+++ b/src/components/utils/test/custom_string_test.cc
@@ -82,6 +82,7 @@ size_t CustomStringTest::amount_symbols_mbstring2_ = 0;
 size_t CustomStringTest::amount_bytes_mbstring1_ = 0;
 size_t CustomStringTest::amount_bytes_mbstring2_ = 0;
 
+// cppcheck-suppress syntaxError
 TEST_F(CustomStringTest,
        AddASCIIStringToCustomString_ExpectCorrectSizeAndIsASCIIStringEQTrue) {
   std::string str("Test string");
diff --git a/src/components/utils/test/data_accessor_test.cc b/src/components/utils/test/data_accessor_test.cc
index b9d8f3b4f9..40fa5ce507 100644
--- a/src/components/utils/test/data_accessor_test.cc
+++ b/src/components/utils/test/data_accessor_test.cc
@@ -50,6 +50,7 @@ TEST(DataAccessorTest, CreateDataAccessor) {
   EXPECT_EQ(test_value, data_from_testdata);
 }
 
+// cppcheck-suppress syntaxError
 TEST(DataAccessorTest, CreateDataAccessor_MutexIsLocked_CannotLockItAgain) {
   // arrange
   int test_value = 10;
diff --git a/src/components/utils/test/date_time_test.cc b/src/components/utils/test/date_time_test.cc
index 4cde9a4fc4..c6838035cb 100644
--- a/src/components/utils/test/date_time_test.cc
+++ b/src/components/utils/test/date_time_test.cc
@@ -41,6 +41,7 @@ namespace utils_test {
 using namespace date_time;
 
 namespace bpt = boost::posix_time;
+// cppcheck-suppress syntaxError
 TEST(DateTimeTest, GetCurrentTime) {
   // arrange
   const date_time::TimeDuration time1 = getCurrentTime();
diff --git a/src/components/utils/test/file_system_test.cc b/src/components/utils/test/file_system_test.cc
index 3d518e599f..2d944bc84f 100644
--- a/src/components/utils/test/file_system_test.cc
+++ b/src/components/utils/test/file_system_test.cc
@@ -59,6 +59,7 @@ StringArray MergeStringsToArray(const std::string& first,
 }
 }  // namespace
 
+// cppcheck-suppress syntaxError
 TEST(FileSystemTest, CreateDeleteDirectory) {
   ASSERT_FALSE(DirectoryExists("./Test directory"));
   // Directory creation
diff --git a/src/components/utils/test/generated_code_with_sqlite_test.cc b/src/components/utils/test/generated_code_with_sqlite_test.cc
index b75ec5c58f..fdb7681383 100644
--- a/src/components/utils/test/generated_code_with_sqlite_test.cc
+++ b/src/components/utils/test/generated_code_with_sqlite_test.cc
@@ -87,6 +87,7 @@ const std::string GeneratedCodeTest::kGroupsCreation =
     "application_id VARCHAR(45) NOT NULL COLLATE NOCASE,"
     "group_name VARCHAR(45) NOT NULL )";
 
+// cppcheck-suppress syntaxError
 TEST_F(GeneratedCodeTest,
        FindSectionEndpoints_OpenDBSetDefaultUrl_ExpectDefaultUrl) {
   // arrange
diff --git a/src/components/utils/test/lock_boost_test.cc b/src/components/utils/test/lock_boost_test.cc
index 0da735a990..c209c20dbe 100644
--- a/src/components/utils/test/lock_boost_test.cc
+++ b/src/components/utils/test/lock_boost_test.cc
@@ -40,6 +40,7 @@ namespace utils_test {
 using sync_primitives::Lock;
 using sync_primitives::RecursiveLock;
 
+// cppcheck-suppress syntaxError
 TEST(LockBoostTest, TestNonRecursive) {
   // Create Lock object
   Lock test_mutex;
diff --git a/src/components/utils/test/log_message_loop_thread_test.cc b/src/components/utils/test/log_message_loop_thread_test.cc
index 74b1f5094f..2168d5e69f 100644
--- a/src/components/utils/test/log_message_loop_thread_test.cc
+++ b/src/components/utils/test/log_message_loop_thread_test.cc
@@ -42,6 +42,7 @@ namespace utils_test {
 using namespace ::logger;
 using ::testing::_;
 
+// cppcheck-suppress syntaxError
 TEST(LogMessageLoopThread, DestroyLogMessage_loggerStatusDeletingLogger) {
   logger::logger_status = CreatingLoggerThread;
   LogMessageLoopThread* loop_thread = new LogMessageLoopThread();
diff --git a/src/components/utils/test/message_queue_test.cc b/src/components/utils/test/message_queue_test.cc
index b3c654420a..a1e08231b4 100644
--- a/src/components/utils/test/message_queue_test.cc
+++ b/src/components/utils/test/message_queue_test.cc
@@ -112,6 +112,7 @@ void* MessageQueueTest::ShutDownQueue_helper(void* context) {
   return NULL;
 }
 
+// cppcheck-suppress syntaxError
 TEST_F(MessageQueueTest, DefaultCtorTest_ExpectEmptyQueueCreated) {
   bool test_value = true;
   // Check if the queue is empty
diff --git a/src/components/utils/test/messagemeter_test.cc b/src/components/utils/test/messagemeter_test.cc
index fdfca113a8..66d1aea712 100644
--- a/src/components/utils/test/messagemeter_test.cc
+++ b/src/components/utils/test/messagemeter_test.cc
@@ -81,6 +81,7 @@ class MessageMeterTest : public ::testing::TestWithParam<TimePair> {
   int id1, id2, id3;
 };
 
+// cppcheck-suppress syntaxError
 TEST(MessageMeterTest, DefaultTimeRange) {
   const ::utils::MessageMeter<int> default_meter;
   const date_time::TimeDuration time_second = date_time::seconds(1);
diff --git a/src/components/utils/test/posix_thread_test.cc b/src/components/utils/test/posix_thread_test.cc
index 4bf0c8c092..0633b7d460 100644
--- a/src/components/utils/test/posix_thread_test.cc
+++ b/src/components/utils/test/posix_thread_test.cc
@@ -72,6 +72,7 @@ class TestThreadDelegate : public threads::ThreadDelegate {
   bool check_value_;
 };
 
+// cppcheck-suppress syntaxError
 TEST(PosixThreadTest, CreateThread_ExpectThreadCreated) {
   // Arrange
   threads::Thread* thread = NULL;
diff --git a/src/components/utils/test/prioritized_queue_test.cc b/src/components/utils/test/prioritized_queue_test.cc
index ed22c2db48..a2deaa85cf 100644
--- a/src/components/utils/test/prioritized_queue_test.cc
+++ b/src/components/utils/test/prioritized_queue_test.cc
@@ -71,6 +71,7 @@ class PrioritizedQueueTest : public testing::Test {
   PrioritizedQueue<TestMessage> test_queue;
 };
 
+// cppcheck-suppress syntaxError
 TEST_F(PrioritizedQueueTest, DefaultCtorTest_ExpectEmptyQueueCreated) {
   EXPECT_TRUE(test_queue.empty());
 }
diff --git a/src/components/utils/test/qdb_wrapper/sql_database_test.cc b/src/components/utils/test/qdb_wrapper/sql_database_test.cc
index 33dfe69119..08968dd679 100644
--- a/src/components/utils/test/qdb_wrapper/sql_database_test.cc
+++ b/src/components/utils/test/qdb_wrapper/sql_database_test.cc
@@ -52,6 +52,7 @@ namespace dbms_test {
   }
 }
 
+// cppcheck-suppress syntaxError
 TEST(SQLDatabaseTest, OpenClose) {
   SQLDatabase db("test-database");
   bool ret = db.Open();
diff --git a/src/components/utils/test/qdb_wrapper/sql_query_test.cc b/src/components/utils/test/qdb_wrapper/sql_query_test.cc
index 6279f4d8a1..128493b968 100644
--- a/src/components/utils/test/qdb_wrapper/sql_query_test.cc
+++ b/src/components/utils/test/qdb_wrapper/sql_query_test.cc
@@ -82,6 +82,7 @@ class SQLQueryTest : public ::testing::Test {
 qdb_hdl_t* SQLQueryTest::conn = 0;
 const std::string SQLQueryTest::kDatabaseName = "test-query";
 
+// cppcheck-suppress syntaxError
 TEST_F(SQLQueryTest, Query) {
   const std::string kSelect("SELECT * FROM testTable WHERE integerValue = ?");
 
diff --git a/src/components/utils/test/resource_usage_test.cc b/src/components/utils/test/resource_usage_test.cc
index ac8825c841..62be0abfa3 100644
--- a/src/components/utils/test/resource_usage_test.cc
+++ b/src/components/utils/test/resource_usage_test.cc
@@ -44,6 +44,7 @@ class ResourceUsagePrivateTest : public ::testing::Test {
   Resources res;
 };
 
+// cppcheck-suppress syntaxError
 TEST_F(ResourceUsagePrivateTest, ReadStatFileTest) {
   std::string proc_buf;
   EXPECT_TRUE(res.ReadStatFile(proc_buf));
diff --git a/src/components/utils/test/rwlock_posix_test.cc b/src/components/utils/test/rwlock_posix_test.cc
index 6679219aa8..93e445495f 100644
--- a/src/components/utils/test/rwlock_posix_test.cc
+++ b/src/components/utils/test/rwlock_posix_test.cc
@@ -96,6 +96,7 @@ class RWlockTest : public ::testing::Test {
   pthread_t thread[kNum_threads_];
 };
 
+// cppcheck-suppress syntaxError
 TEST_F(RWlockTest, AcquireForReading_ExpectAccessForReading) {
   // Lock rw lock for reading
   EXPECT_TRUE(test_rwlock.AcquireForReading());
diff --git a/src/components/utils/test/scope_guard_test.cc b/src/components/utils/test/scope_guard_test.cc
index 1f9224effa..cec60aeb71 100644
--- a/src/components/utils/test/scope_guard_test.cc
+++ b/src/components/utils/test/scope_guard_test.cc
@@ -57,6 +57,7 @@ void dealloc(char* ptr) {
 }
 }  // namespace
 
+// cppcheck-suppress syntaxError
 TEST(ScopeGuardTest, CallFreeFunctionWithParam) {
   {
     call_with_param_count = 0;
diff --git a/src/components/utils/test/singleton_test.cc b/src/components/utils/test/singleton_test.cc
index a38f51726c..6de8ecd847 100644
--- a/src/components/utils/test/singleton_test.cc
+++ b/src/components/utils/test/singleton_test.cc
@@ -55,6 +55,7 @@ class SingletonTest : public ::utils::Singleton<SingletonTest> {
   int test_value;
 };
 
+// cppcheck-suppress syntaxError
 TEST(SingletonTest, CreateAndDestroySingleton) {
   // assert
   ASSERT_EQ(SingletonTest::instance(), SingletonTest::instance());
diff --git a/src/components/utils/test/sqlite_wrapper/sql_database_test.cc b/src/components/utils/test/sqlite_wrapper/sql_database_test.cc
index 0195e02121..00b05923a9 100644
--- a/src/components/utils/test/sqlite_wrapper/sql_database_test.cc
+++ b/src/components/utils/test/sqlite_wrapper/sql_database_test.cc
@@ -49,6 +49,7 @@ namespace dbms_test {
   }
 }
 
+// cppcheck-suppress syntaxError
 TEST(SQLDatabaseTest, OpenCloseMemory_OpenAndCloseDB_ActsWithoutError) {
   // arrange
   SQLDatabase db;
diff --git a/src/components/utils/test/sqlite_wrapper/sql_query_test.cc b/src/components/utils/test/sqlite_wrapper/sql_query_test.cc
index b2d3c747cd..4f238a19bb 100644
--- a/src/components/utils/test/sqlite_wrapper/sql_query_test.cc
+++ b/src/components/utils/test/sqlite_wrapper/sql_query_test.cc
@@ -101,6 +101,7 @@ sqlite3* SQLQueryTest::conn = 0;
 // mounting /tmp as tmpfs will descrease utils unit tests runing time
 const std::string SQLQueryTest::kDatabaseName = "/tmp/test-query";
 
+// cppcheck-suppress syntaxError
 TEST_F(SQLQueryTest, Query_CreateQuery_QueryInDBEqualCreated) {
   // arrange
   const std::string kSelect("SELECT * FROM testTable WHERE integerValue = ?");
diff --git a/src/components/utils/test/stl_utils_test.cc b/src/components/utils/test/stl_utils_test.cc
index c2701c1558..70a275f0aa 100644
--- a/src/components/utils/test/stl_utils_test.cc
+++ b/src/components/utils/test/stl_utils_test.cc
@@ -50,6 +50,7 @@ class TestObject {
 typedef std::map<int, TestObject*> TestMap;
 typedef std::vector<TestObject*> TestVector;
 
+// cppcheck-suppress syntaxError
 TEST(StlDeleter, DestructMapWithOneElement) {
   TestMap test_map;
   test_map[1] = new TestObject();
diff --git a/src/components/utils/test/system_test.cc b/src/components/utils/test/system_test.cc
index b9daa575ba..1372eac7ae 100644
--- a/src/components/utils/test/system_test.cc
+++ b/src/components/utils/test/system_test.cc
@@ -39,6 +39,7 @@ namespace utils_test {
 
 using namespace ::utils;
 
+// cppcheck-suppress syntaxError
 TEST(SystemTest, Constructor_WithCommandName_ExpectArgsStored) {
   // Command creation without any arguments
   const std::string test_command("ls");
diff --git a/src/components/utils/test/test_generator/generated_msg_version_test.cc b/src/components/utils/test/test_generator/generated_msg_version_test.cc
index 4d1d70a5d6..0abc87f2b0 100644
--- a/src/components/utils/test/test_generator/generated_msg_version_test.cc
+++ b/src/components/utils/test/test_generator/generated_msg_version_test.cc
@@ -92,6 +92,7 @@ void get_version_from_file(int& first_version,
   }
 }
 
+// cppcheck-suppress syntaxError
 TEST(GeneratorTool, GetCorrectVersion) {
   int first_version = 0;
   int second_version = 0;
diff --git a/src/components/utils/test/thread_validator_test.cc b/src/components/utils/test/thread_validator_test.cc
index a2df1eea5f..b7fbf77cbe 100644
--- a/src/components/utils/test/thread_validator_test.cc
+++ b/src/components/utils/test/thread_validator_test.cc
@@ -42,6 +42,7 @@ namespace utils_test {
 
 using namespace ::threads;
 
+// cppcheck-suppress syntaxError
 TEST(ThreadValidatorTest, CompareID_CurrentThreadAndPthread_AreEqual) {
   SingleThreadSimpleValidator object;
   ASSERT_EQ(object.creation_thread_id(), pthread_self());
diff --git a/src/components/utils/test/timer_test.cc b/src/components/utils/test/timer_test.cc
index d7b196876d..9c04fb23bd 100644
--- a/src/components/utils/test/timer_test.cc
+++ b/src/components/utils/test/timer_test.cc
@@ -104,6 +104,7 @@ class TestTaskWithStop : public TestTask {
 
 // Start - Stop
 
+// cppcheck-suppress syntaxError
 TEST(TimerTest, Start_Stop_NoLoop_NoCall) {
   MockTimerTask* mock_task = new MockTimerTask();
   EXPECT_CALL(*mock_task, run()).Times(0);