diff options
| author | Aleksejs Sestakovs <aleksejs.sestakovs@zabbix.com> | 2021-10-20 15:27:37 +0300 |
|---|---|---|
| committer | Aleksejs Sestakovs <aleksejs.sestakovs@zabbix.com> | 2021-10-20 15:50:02 +0300 |
| commit | 6aa4df9e51a13c36c4ba619eec308173fe9a478b (patch) | |
| tree | f81481aedc238c611cf5f87be40edf90ae808da9 /include | |
| parent | e9c86cf25370401804ca3f87772f4285b9ebe14c (diff) | |
........S. [ZBX-19872] removed redundant escaping in XML data of HTTP agent POST request
* commit '930a7de065dcd5f2f38e6a299f5b24a8e911a736':
........S. [ZBX-19872] fixed cmocka tests
........S. [ZBX-19872] removed redundant escaping in XML data of HTTP agent POST request
(cherry picked from commit c5d168915c6188a47d65d7da227c1473e2e01502)
(cherry picked from commit 4261738b47f5acf5826899f72b4b72adcf029fb9)
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 1 | ||||
| -rw-r--r-- | include/zbxserver.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/include/common.h b/include/common.h index a45da89d9cf..d988fe61e5c 100644 --- a/include/common.h +++ b/include/common.h @@ -1471,7 +1471,6 @@ int zbx_strcmp_natural(const char *s1, const char *s2); /* additional token flags */ #define ZBX_TOKEN_JSON 0x0010000 -#define ZBX_TOKEN_XML 0x0020000 #define ZBX_TOKEN_REGEXP 0x0040000 #define ZBX_TOKEN_XPATH 0x0080000 #define ZBX_TOKEN_REGEXP_OUTPUT 0x0100000 diff --git a/include/zbxserver.h b/include/zbxserver.h index d3062c796ea..5693840d619 100644 --- a/include/zbxserver.h +++ b/include/zbxserver.h @@ -122,7 +122,6 @@ int zbx_expression_eval_execute(zbx_expression_eval_t *eval, const zbx_timespec_ /* lld macro context */ #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_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, |