diff options
| author | Andris Zeila <andris.zeila@zabbix.com> | 2021-02-23 12:31:09 +0300 |
|---|---|---|
| committer | Andris Zeila <andris.zeila@zabbix.com> | 2021-02-23 12:31:09 +0300 |
| commit | 06cb23e58a1ff75959c63ad46a94543e68e098fd (patch) | |
| tree | 94e30093a5c2bb967d40523cb9b23529231cf556 /include | |
| parent | 4d2912f5a68534767fbe5f9276c4acd59b328585 (diff) | |
........S. [ZBXNEXT-6451] changed trigger function evaluation to return variant values
Diffstat (limited to 'include')
| -rw-r--r-- | include/zbxhistory.h | 3 | ||||
| -rw-r--r-- | include/zbxserver.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/zbxhistory.h b/include/zbxhistory.h index 2fe5f779d70..788864aa1e5 100644 --- a/include/zbxhistory.h +++ b/include/zbxhistory.h @@ -20,6 +20,8 @@ #ifndef ZABBIX_ZBXHISTORY_H #define ZABBIX_ZBXHISTORY_H +#include "zbxvariant.h" + /* the item history value */ typedef struct { @@ -40,6 +42,7 @@ int zbx_history_record_compare_desc_func(const zbx_history_record_t *d1, const z void zbx_history_value2str(char *buffer, size_t size, const history_value_t *value, int value_type); char *zbx_history_value2str_dyn(const history_value_t *value, int value_type); void zbx_history_value_print(char *buffer, size_t size, const history_value_t *value, int value_type); +void zbx_history_value2variant(const history_value_t *value, unsigned char value_type, zbx_variant_t *var); /* In most cases zbx_history_record_vector_destroy() function should be used to free the */ /* value vector filled by zbx_vc_get_value* functions. This define simply better */ diff --git a/include/zbxserver.h b/include/zbxserver.h index 8076dddfa67..033a7a95cd8 100644 --- a/include/zbxserver.h +++ b/include/zbxserver.h @@ -62,7 +62,7 @@ void get_functionids(zbx_vector_uint64_t *functionids, const char *expression); int evaluate_function(char **value, DC_ITEM *item, const char *function, const char *parameter, const zbx_timespec_t *ts, char **error); -int evaluate_function2(char **value, DC_ITEM *item, const char *function, const char *parameter, +int evaluate_function2(zbx_variant_t *value, DC_ITEM *item, const char *function, const char *parameter, const zbx_timespec_t *ts, char **error); |