diff options
| author | Aleksejs Sestakovs <aleksejs.sestakovs@zabbix.com> | 2021-08-20 09:28:09 +0300 |
|---|---|---|
| committer | Aleksejs Sestakovs <aleksejs.sestakovs@zabbix.com> | 2021-08-20 09:28:09 +0300 |
| commit | 5b9ea3efc9efe8cc4a9030ab29217f24883664ff (patch) | |
| tree | 2c27b794bea1bf8fcbe0cb68363667c85f5a9ea4 /include/common.h | |
| parent | 0821b8040dab7859590c52fa024e829f5e7bbb7a (diff) | |
........S. [ZBXNEXT-6824,ZBXNEXT-6825] replaced simple macros with expression macros at server
Diffstat (limited to 'include/common.h')
| -rw-r--r-- | include/common.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/common.h b/include/common.h index 99123a9fa45..b18a13049da 100644 --- a/include/common.h +++ b/include/common.h @@ -1574,6 +1574,7 @@ zbx_token_t; #define ZBX_TOKEN_SEARCH_REFERENCES 0x01 #define ZBX_TOKEN_SEARCH_EXPRESSION_MACRO 0x02 #define ZBX_TOKEN_SEARCH_FUNCTIONID 0x04 +#define ZBX_TOKEN_SEARCH_SIMPLE_MACRO 0x08 /* used by the upgrade patches only */ typedef int zbx_token_search_t; @@ -1583,7 +1584,8 @@ int zbx_token_parse_user_macro(const char *expression, const char *macro, zbx_to int zbx_token_parse_macro(const char *expression, const char *macro, zbx_token_t *token); int zbx_token_parse_objectid(const char *expression, const char *macro, zbx_token_t *token); int zbx_token_parse_lld_macro(const char *expression, const char *macro, zbx_token_t *token); -int zbx_token_parse_nested_macro(const char *expression, const char *macro, zbx_token_t *token); +int zbx_token_parse_nested_macro(const char *expression, const char *macro, int simple_macro_find, + zbx_token_t *token); int zbx_strmatch_condition(const char *value, const char *pattern, unsigned char op); |