From b8028f338922bcd574aa1e0ff195899da4faecd8 Mon Sep 17 00:00:00 2001 From: Andris Zeila Date: Tue, 16 Mar 2021 00:11:17 +0200 Subject: ........S. [ZBXNEXT-6451] changed parser logic to try parsing negative constants rather than unary minus and positive constant. This was done so $N could refer to negative constants. Removed unused functions, moved test case. --- include/zbxserver.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'include/zbxserver.h') diff --git a/include/zbxserver.h b/include/zbxserver.h index 01106df4d78..4cd35535b11 100644 --- a/include/zbxserver.h +++ b/include/zbxserver.h @@ -58,8 +58,6 @@ #define STR_CONTAINS_MACROS(str) (NULL != strchr(str, '{')) -int get_N_functionid(const char *expression, int N_functionid, zbx_uint64_t *functionid, const char **end); - int evaluate_function(char **value, DC_ITEM *item, const char *function, const char *parameter, const zbx_timespec_t *ts, char **error); int evaluate_function2(zbx_variant_t *value, DC_ITEM *item, const char *function, const char *parameter, @@ -84,9 +82,6 @@ void zbx_format_value(char *value, size_t max_len, zbx_uint64_t valuemapid, void zbx_determine_items_in_expressions(zbx_vector_ptr_t *trigger_order, const zbx_uint64_t *itemids, int item_num); -void get_trigger_expression_constant(const char *expression, const zbx_token_reference_t *reference, - char **constant); - /* lld macro context */ #define ZBX_MACRO_ANY (ZBX_TOKEN_LLD_MACRO | ZBX_TOKEN_LLD_FUNC_MACRO | ZBX_TOKEN_USER_MACRO) #define ZBX_MACRO_NUMERIC (ZBX_MACRO_ANY | ZBX_TOKEN_NUMERIC) -- cgit v1.2.3