.......... [DEV-2062] fixed review comments

5 files changed, 23 insertions, 23 deletions

diff --git a/tests/libs/zbxdbcache/zbx_vc_add_values.c b/tests/libs/zbxdbcache/zbx_vc_add_values.c
index cc4e1a4f48d..f1b33972ece 100644
--- a/tests/libs/zbxdbcache/zbx_vc_add_values.c
+++ b/tests/libs/zbxdbcache/zbx_vc_add_values.c
@@ -54,5 +54,5 @@ void	zbx_vc_test_add_values_setup(zbx_mock_handle_t *handle, zbx_vector_ptr_t *h
 
 void	zbx_mock_test_entry(void **state)
 {
-	zbx_vc_common_test_func(state, zbx_vc_test_add_values_setup, NULL, NULL, NULL);
+	zbx_vc_common_test_func(state, zbx_vc_test_add_values_setup, NULL, NULL, 0);
 }
diff --git a/tests/libs/zbxdbcache/zbx_vc_common.c b/tests/libs/zbxdbcache/zbx_vc_common.c
index 18aad21e219..2486c4a43e9 100644
--- a/tests/libs/zbxdbcache/zbx_vc_common.c
+++ b/tests/libs/zbxdbcache/zbx_vc_common.c
@@ -31,36 +31,34 @@
 
 extern zbx_uint64_t	CONFIG_VALUE_CACHE_SIZE;
 
-void	zbx_vc_test_check_result(zbx_uint64_t *cache_hits, zbx_uint64_t *cache_misses)
+static void	zbx_vc_test_check_result(zbx_uint64_t cache_hits, zbx_uint64_t cache_misses)
 {
 	zbx_uint64_t	expected_hits, expected_misses;
 
 	if (FAIL == is_uint64(zbx_mock_get_parameter_string("out.cache.hits"), &expected_hits))
 		fail_msg("Invalid out.cache.hits value");
-	zbx_mock_assert_uint64_eq("cache.hits", expected_hits, *cache_hits);
+	zbx_mock_assert_uint64_eq("cache.hits", expected_hits, cache_hits);
 
 	if (FAIL == is_uint64(zbx_mock_get_parameter_string("out.cache.misses"), &expected_misses))
 		fail_msg("Invalid out.cache.misses value");
-	zbx_mock_assert_uint64_eq("cache.misses", expected_misses, *cache_misses);
+	zbx_mock_assert_uint64_eq("cache.misses", expected_misses, cache_misses);
 }
 
 void	zbx_vc_common_test_func(
 		void **state,
 		zbx_vc_test_add_values_setup_cb add_values_cb,
 		zbx_vc_test_get_value_setup_cb get_value_cb,
-		zbx_vc_test_check_result_cb check_result_cb,
-		zbx_vc_test_get_values_setup_cb get_values_cb)
+		zbx_vc_test_get_values_setup_cb get_values_cb,
+		int test_check_result)
 {
-	int				err, seconds, count, item_status, item_active_range, item_db_cached_from,
-					item_values_total, cache_mode, ret_flush;
+	int				err, seconds, count, cache_mode;
 	zbx_vector_history_record_t	expected, returned;
 	const char			*data;
 	char				*error;
-	zbx_mock_handle_t		handle, hitem, hitems, hstatus;
+	zbx_mock_handle_t		handle, hitem, hitems;
 	zbx_mock_error_t		mock_err;
 	zbx_uint64_t			itemid, cache_hits, cache_misses;
 	unsigned char			value_type;
-	zbx_vector_ptr_t		history;
 	zbx_timespec_t			ts;
 
 	ZBX_UNUSED(state);
@@ -96,6 +94,9 @@ void	zbx_vc_common_test_func(
 
 	if (NULL != add_values_cb)
 	{
+		int			ret_flush;
+		zbx_vector_ptr_t	history;
+
 		add_values_cb(&handle, &history, &err, &data, &ret_flush);
 	}
 	else if (NULL != get_value_cb)
@@ -112,6 +113,9 @@ void	zbx_vc_common_test_func(
 
 	while (ZBX_MOCK_END_OF_VECTOR != (mock_err = (zbx_mock_vector_element(hitems, &hitem))))
 	{
+		int			item_status, item_active_range, item_db_cached_from, item_values_total;
+		zbx_mock_handle_t	hstatus;
+
 		if (ZBX_MOCK_NOT_A_VECTOR == mock_err)
 			fail_msg("out.cache.items parameter is not a vector");
 
@@ -120,7 +124,7 @@ void	zbx_vc_common_test_func(
 			fail_msg("Invalid itemid \"%s\"", data);
 
 		err = zbx_vc_get_item_state(itemid, &item_status, &item_active_range, &item_values_total,
-						&item_db_cached_from);
+				&item_db_cached_from);
 
 		mock_err = zbx_mock_object_member(hitem, "status", &hstatus);
 
@@ -168,8 +172,8 @@ void	zbx_vc_common_test_func(
 	zbx_mock_assert_int_eq("cache.mode",
 			zbx_vcmock_str_to_cache_mode(zbx_mock_get_parameter_string("out.cache.mode")), cache_mode);
 
-	if (NULL != check_result_cb)
-		check_result_cb(&cache_hits, &cache_misses);
+	if (1 == test_check_result)
+		zbx_vc_test_check_result(cache_hits, cache_misses);
 
 	/* cleanup */
 
diff --git a/tests/libs/zbxdbcache/zbx_vc_common.h b/tests/libs/zbxdbcache/zbx_vc_common.h
index a350eb9b61f..796b72d8a02 100644
--- a/tests/libs/zbxdbcache/zbx_vc_common.h
+++ b/tests/libs/zbxdbcache/zbx_vc_common.h
@@ -17,15 +17,14 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-#ifndef VC_COMMON_H
-#define VC_COMMON_H
+#ifndef ZBX_VC_COMMON_H
+#define ZBX_VC_COMMON_H
 
 typedef void	(*zbx_vc_test_add_values_setup_cb)(zbx_mock_handle_t *handle, zbx_vector_ptr_t *history, int *err,
 		const char **data, int *ret_flush);
 typedef void	(*zbx_vc_test_get_value_setup_cb)(zbx_mock_handle_t *handle, zbx_uint64_t *itemid,
 		unsigned char *value_type, zbx_timespec_t *ts, int *err, zbx_vector_history_record_t *expected,
 		zbx_vector_history_record_t *returned);
-typedef void	(*zbx_vc_test_check_result_cb)(zbx_uint64_t *cache_hits, zbx_uint64_t *cache_misses);
 typedef void	(*zbx_vc_test_get_values_setup_cb)(zbx_mock_handle_t *handle, zbx_uint64_t *itemid,
 		unsigned char *value_type, zbx_timespec_t *ts, int *err, zbx_vector_history_record_t *expected,
 		zbx_vector_history_record_t *returned, int *seconds, int *count);
@@ -35,7 +34,6 @@ void	zbx_vc_test_add_values_setup(zbx_mock_handle_t *handle, zbx_vector_ptr_t *h
 void	zbx_vc_test_get_value_setup(zbx_mock_handle_t *handle, zbx_uint64_t *itemid, unsigned char *value_type,
 		zbx_timespec_t *ts, int *err, zbx_vector_history_record_t *expected,
 		zbx_vector_history_record_t *returned);
-void	zbx_vc_test_check_result(zbx_uint64_t *cache_hits, zbx_uint64_t *cache_misses);
 void	zbx_vc_test_get_values_setup(zbx_mock_handle_t *handle, zbx_uint64_t *itemid, unsigned char *value_type,
 		zbx_timespec_t *ts, int *err, zbx_vector_history_record_t *expected,
 				zbx_vector_history_record_t *returned, int *seconds, int *count);
@@ -44,6 +42,6 @@ void	zbx_vc_common_test_func(
 		void **state,
 		zbx_vc_test_add_values_setup_cb add_values_cb,
 		zbx_vc_test_get_value_setup_cb get_value_cb,
-		zbx_vc_test_check_result_cb check_result_cb,
-		zbx_vc_test_get_values_setup_cb get_values_cb);
+		zbx_vc_test_get_values_setup_cb get_values_cb,
+		int test_check_result);
 #endif
diff --git a/tests/libs/zbxdbcache/zbx_vc_get_value.c b/tests/libs/zbxdbcache/zbx_vc_get_value.c
index a66ecf39cc1..90544bc9dde 100644
--- a/tests/libs/zbxdbcache/zbx_vc_get_value.c
+++ b/tests/libs/zbxdbcache/zbx_vc_get_value.c
@@ -64,6 +64,5 @@ void	zbx_vc_test_get_value_setup(zbx_mock_handle_t *handle, zbx_uint64_t *itemid
 
 void	zbx_mock_test_entry(void **state)
 {
-	zbx_vc_common_test_func(state, NULL, zbx_vc_test_get_value_setup, zbx_vc_test_check_result, NULL);
+	zbx_vc_common_test_func(state, NULL, zbx_vc_test_get_value_setup, NULL, 1);
 }
-
diff --git a/tests/libs/zbxdbcache/zbx_vc_get_values.c b/tests/libs/zbxdbcache/zbx_vc_get_values.c
index c1304dfdb1a..aae57dae753 100644
--- a/tests/libs/zbxdbcache/zbx_vc_get_values.c
+++ b/tests/libs/zbxdbcache/zbx_vc_get_values.c
@@ -57,6 +57,5 @@ void	zbx_vc_test_get_values_setup(zbx_mock_handle_t *handle, zbx_uint64_t *itemi
 
 void	zbx_mock_test_entry(void **state)
 {
-	zbx_vc_common_test_func(state, NULL, NULL, zbx_vc_test_check_result, zbx_vc_test_get_values_setup);
+	zbx_vc_common_test_func(state, NULL, NULL, zbx_vc_test_get_values_setup, 1);
 }
-