Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com>2020-04-23 15:20:50 +0300
committerArtjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com>2020-04-23 15:20:50 +0300
commit754a06bcf9ab65c02aed1cb0dbb18b4ac7e7a002 (patch)
treeb32c1d86105dd3cbd361b895d7bfd108531d9755 /include/zbxserver.h
parentc3a59774f488db4bc97bd0e903ede89206563294 (diff)
........S. [ZBXNEXT-702] remove redundant code
Diffstat (limited to 'include/zbxserver.h')
-rw-r--r--include/zbxserver.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/zbxserver.h b/include/zbxserver.h
index 4fa19aa297d..4b0a2259930 100644
--- a/include/zbxserver.h
+++ b/include/zbxserver.h
@@ -32,7 +32,6 @@
#define MACRO_TYPE_TRIGGER_DESCRIPTION 0x00000010 /* name */
#define MACRO_TYPE_TRIGGER_COMMENTS 0x00000020 /* description */
#define MACRO_TYPE_ITEM_KEY 0x00000040
-#define MACRO_TYPE_ITEM_EXPRESSION 0x00000080
#define MACRO_TYPE_INTERFACE_ADDR 0x00000100
#define MACRO_TYPE_COMMON 0x00000400
#define MACRO_TYPE_PARAMS_FIELD 0x00000800
@@ -55,8 +54,7 @@
#define STR_CONTAINS_MACROS(str) (NULL != strchr(str, '{'))
-char *zbx_dc_expand_user_macros_for_triggers_and_calc_items(const char *text, zbx_uint64_t *hostids,
- int hostids_num);
+char *zbx_dc_expand_user_macros_in_expression(const char *text, zbx_uint64_t *hostids, int hostids_num);
int get_N_functionid(const char *expression, int N_functionid, zbx_uint64_t *functionid, const char **end);
void get_functionids(zbx_vector_uint64_t *functionids, const char *expression);