diff options
| author | Andris Zeila <andris.zeila@zabbix.com> | 2021-10-22 21:14:07 +0300 |
|---|---|---|
| committer | Andris Zeila <andris.zeila@zabbix.com> | 2021-10-22 21:14:07 +0300 |
| commit | d3d5d26ea0a3e2011c91068f324322921c73bb43 (patch) | |
| tree | 39559897ba7819dc01ccc73f2ddfd572012732e1 /include/common.h | |
| parent | da59768e37bed3bb6f3aaf4b10a21f8b1155e165 (diff) | |
| parent | c7eaf7b34526ac2c1f4a32fa199b38a4d6bd8374 (diff) | |
.......... [ZBXNEXT-6923] merged branch 'master' of ssh://git.zabbix.lan:7999/zbx/zabbix into feature/ZBXNEXT-6923-5.5
Diffstat (limited to 'include/common.h')
| -rw-r--r-- | include/common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/common.h b/include/common.h index 120d7de5198..f75c41eac27 100644 --- a/include/common.h +++ b/include/common.h @@ -1486,7 +1486,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 @@ -1725,6 +1724,7 @@ zbx_function_type_t; zbx_function_type_t zbx_get_function_type(const char *func); int zbx_query_xpath(zbx_variant_t *value, const char *params, char **errmsg); +int zbx_xmlnode_to_json(void *xml_node, char **jstr); int zbx_xml_to_json(char *xml_data, char **jstr, char **errmsg); int zbx_json_to_xml(char *json_data, char **xstr, char **errmsg); #ifdef HAVE_LIBXML2 |