From 90c8b5b2890a227088b5a67a21bdc24028b156d5 Mon Sep 17 00:00:00 2001 From: Phong Tran Date: Thu, 29 Mar 2018 13:51:29 +0700 Subject: minor compiler warning gcc 7.x (#30) * Fix -Wpointer-compare of compare with null char Signed-off-by: Phong Tran * dlt_common: fix -Wformat-truncation of snprintf Avoid snprintf output truncation by handling return value Signed-off-by: Phong Tran * dlt_offline_trace: Fix Wformat-truncation of snprintf Compile with Gcc 7.x has the warning of snprintf buffer length size. Check return value of snprintf() for avoiding the warning. Signed-off-by: Phong Tran * dlt_common_test: Fix memleak t_dlt_message_read some resources were not free after using. Detected by running valgrind --leak-check=full ./gtest_dlt_common Signed-off-by: Phong Tran --- tests/gtest_dlt_common.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/gtest_dlt_common.cpp b/tests/gtest_dlt_common.cpp index df3b6d2..d7c6d9c 100644 --- a/tests/gtest_dlt_common.cpp +++ b/tests/gtest_dlt_common.cpp @@ -261,7 +261,7 @@ TEST(t_dlt_buffer_reset, normal) // Normal Use-Case. expect 0 EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); EXPECT_LE(0, dlt_buffer_reset(&buf)); - + EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); } TEST(t_dlt_buffer_reset, abnormal) { @@ -1238,6 +1238,7 @@ TEST(t_dlt_buffer_info, normal) // Normal Use-Case EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); EXPECT_NO_THROW(dlt_buffer_info(&buf)); + EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); } TEST(t_dlt_buffer_info, abnormal) { @@ -1262,6 +1263,7 @@ TEST(t_dlt_buffer_status, normal) // Normal Use-Case EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); EXPECT_NO_THROW(dlt_buffer_status(&buf)); + EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); } TEST(t_dlt_buffer_status, abnormal) { @@ -3092,7 +3094,8 @@ TEST(t_dlt_message_read, normal) EXPECT_LE(DLT_RETURN_ERROR, dlt_message_read(&file.msg,(unsigned char*) buffer,255,0,1)); } EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); - + EXPECT_LE(DLT_RETURN_OK, dlt_file_close(&file, 0)); + EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0)); EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0)); EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0)); @@ -3103,6 +3106,8 @@ TEST(t_dlt_message_read, normal) EXPECT_LE(DLT_RETURN_ERROR, dlt_message_read(&file.msg,(unsigned char *) buffer,255,1,1)); } EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); + EXPECT_LE(DLT_RETURN_OK, dlt_file_close(&file, 0)); + EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0)); } TEST(t_dlt_message_read, abnormal) { @@ -3335,11 +3340,16 @@ TEST(t_dlt_log_init, normal) // Normal Use-Case, exptect 0-3 EXPECT_NO_THROW(dlt_log_init(DLT_LOG_TO_CONSOLE)); + EXPECT_NO_THROW(dlt_log_free()); EXPECT_NO_THROW(dlt_log_init(DLT_LOG_TO_SYSLOG)); + EXPECT_NO_THROW(dlt_log_free()); EXPECT_NO_THROW(dlt_log_set_filename("/tmp/dlt.log")); EXPECT_NO_THROW(dlt_log_init(DLT_LOG_TO_FILE)); + EXPECT_NO_THROW(dlt_log_free()); EXPECT_NO_THROW(dlt_log_init(DLT_LOG_TO_FILE)); + EXPECT_NO_THROW(dlt_log_free()); EXPECT_NO_THROW(dlt_log_init(DLT_LOG_DROPPED)); + EXPECT_NO_THROW(dlt_log_free()); } TEST(t_dlt_log_init, abnormal) { @@ -3367,8 +3377,11 @@ TEST(t_dlt_log_free, normal) // Normal Use-Case, expected 0 EXPECT_NO_THROW(dlt_log_init(DLT_LOG_TO_CONSOLE)); + EXPECT_NO_THROW(dlt_log_free()); EXPECT_NO_THROW(dlt_log_init(DLT_LOG_TO_SYSLOG)); + EXPECT_NO_THROW(dlt_log_free()); EXPECT_NO_THROW(dlt_log_init(DLT_LOG_DROPPED)); + EXPECT_NO_THROW(dlt_log_free()); } TEST(t_dlt_log_free, abnormal) { -- cgit v1.2.1