diff options
| -rw-r--r-- | include/zbxserver.h | 1 | ||||
| -rw-r--r-- | src/libs/zbxserver/expression.c | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/include/zbxserver.h b/include/zbxserver.h index ecf4f577f16..b6eccd8d0d2 100644 --- a/include/zbxserver.h +++ b/include/zbxserver.h @@ -125,7 +125,6 @@ int zbx_expression_eval_execute(zbx_expression_eval_t *eval, const zbx_timespec_ #define ZBX_MACRO_ANY (ZBX_TOKEN_LLD_MACRO | ZBX_TOKEN_LLD_FUNC_MACRO | ZBX_TOKEN_USER_MACRO) #define ZBX_MACRO_JSON (ZBX_MACRO_ANY | ZBX_TOKEN_JSON) #define ZBX_MACRO_XML (ZBX_MACRO_ANY | ZBX_TOKEN_XML) -#define ZBX_MACRO_SIMPLE (ZBX_MACRO_ANY | ZBX_TOKEN_SIMPLE_MACRO) #define ZBX_MACRO_FUNC (ZBX_MACRO_ANY | ZBX_TOKEN_FUNC_MACRO) int substitute_lld_macros(char **data, const struct zbx_json_parse *jp_row, const zbx_vector_ptr_t *lld_macro_paths, diff --git a/src/libs/zbxserver/expression.c b/src/libs/zbxserver/expression.c index 2013942426e..b850e512cba 100644 --- a/src/libs/zbxserver/expression.c +++ b/src/libs/zbxserver/expression.c @@ -6086,11 +6086,6 @@ static int substitute_func_macro(char **data, zbx_token_t *token, const struct z * without validation of the value type * * ZBX_MACRO_NUMERIC - values for LLD macros should * * be numeric * - * ZBX_MACRO_SIMPLE - LLD macros, located in the * - * item key parameters in simple macros will be * - * resolved considering quotes. * - * Flag ZBX_MACRO_NUMERIC doesn't affect these * - * macros. * * ZBX_MACRO_FUNC - function macros will be * * skipped (lld macros inside function macros will * * be ignored) for macros specified in func_macros * |