........S. [ZBX-21145] removed unused functions, fixed function parameter naming

4 files changed, 1 insertions, 28 deletions

diff --git a/include/db.h b/include/db.h
index 82af4018dcd..2fb25853699 100644
--- a/include/db.h
+++ b/include/db.h
@@ -898,8 +898,6 @@ ZBX_PTR_VECTOR_DECL(db_tag_ptr, zbx_db_tag_t *)
 
 zbx_db_tag_t	*zbx_db_tag_create(const char *tag_tag, const char *tag_value);
 void		zbx_db_tag_free(zbx_db_tag_t *tag);
-int		zbx_db_tag_compare_func(const void *d1, const void *d2);
-int		zbx_db_tag_compare_func_template(const void *d1, const void *d2);
 
 int	zbx_merge_tags(zbx_vector_db_tag_ptr_t *dst, zbx_vector_db_tag_ptr_t *src, const char *owner, char **error);
 
diff --git a/src/libs/zbxaudit/audit_trigger.h b/src/libs/zbxaudit/audit_trigger.h
index aadb3ceee84..b479d9fc4a1 100644
--- a/src/libs/zbxaudit/audit_trigger.h
+++ b/src/libs/zbxaudit/audit_trigger.h
@@ -63,7 +63,7 @@ void	zbx_audit_trigger_update_json_add_tags_and_values(zbx_uint64_t triggerid, i
 		const char *tag, const char *value);
 void	zbx_audit_trigger_update_json_delete_tags(zbx_uint64_t triggerid, int flags, zbx_uint64_t triggertagid);
 void	zbx_audit_trigger_update_json_update_trigger_tag_create_entry(zbx_uint64_t trigger, int trigger_flags,
-		zbx_uint64_t tagid);
+		zbx_uint64_t triggertagid);
 
 #define PREPARE_AUDIT_TRIGGER_UPDATE_TAG_H(resource, type1)							\
 void	zbx_audit_trigger_update_json_update_tag_##resource(zbx_uint64_t triggerid, int trigger_flags, 		\
diff --git a/src/libs/zbxdbhigh/tag.c b/src/libs/zbxdbhigh/tag.c
index 2f948b34c43..e30775c3a58 100644
--- a/src/libs/zbxdbhigh/tag.c
+++ b/src/libs/zbxdbhigh/tag.c
@@ -52,28 +52,6 @@ void	zbx_db_tag_free(zbx_db_tag_t *tag)
 	zbx_free(tag);
 }
 
-int	zbx_db_tag_compare_func(const void *d1, const void *d2)
-{
-	const zbx_db_tag_t	* const tag1 = *(const zbx_db_tag_t * const *)d1;
-	const zbx_db_tag_t	* const tag2 = *(const zbx_db_tag_t * const *)d2;
-	int			ret;
-
-	if (0 != (ret = strcmp(tag1->tag, tag2->tag)))
-		return ret;
-
-	return strcmp(tag1->value, tag2->value);
-}
-
-int	zbx_db_tag_compare_func_template(const void *d1, const void *d2)
-{
-	const zbx_db_tag_t	* const it1 = *(const zbx_db_tag_t * const *)d1;
-	const zbx_db_tag_t	* const it2 = *(const zbx_db_tag_t * const *)d2;
-
-	ZBX_RETURN_IF_NOT_EQUAL(it1->tag, it2->tag);
-
-	return 0;
-}
-
 /******************************************************************************
  *                                                                            *
  * Purpose: roll back tag updates done during merge process                   *
diff --git a/src/zabbix_server/lld/lld_host.c b/src/zabbix_server/lld/lld_host.c
index fbec72bd1d3..50d079e10ee 100644
--- a/src/zabbix_server/lld/lld_host.c
+++ b/src/zabbix_server/lld/lld_host.c
@@ -386,10 +386,7 @@ static void	lld_hosts_get_tags(zbx_vector_ptr_t *hosts)
 	}
 out:
 	for (i = 0; i < hosts->values_num; i++)
-	{
 		host = (zbx_lld_host_t *)hosts->values[i];
-		zbx_vector_db_tag_ptr_sort(&host->tags, zbx_db_tag_compare_func);
-	}
 
 	DBfree_result(result);
 	zbx_free(sql);