diff options
| author | Jurijs Klopovskis <jurijs.klopovskis@zabbix.com> | 2018-07-31 14:13:56 +0300 |
|---|---|---|
| committer | Jurijs Klopovskis <jurijs.klopovskis@zabbix.com> | 2018-07-31 14:13:56 +0300 |
| commit | 7c0e09be564e8f0eae83474c675ef621da2a4821 (patch) | |
| tree | 7c09009388e43a1eb3707dda50b4a38fb03efbe0 /include/zbxregexp.h | |
| parent | ae883a1f6a9841667defa7f31f9f22a6ebcd4fd8 (diff) | |
| parent | 2c6d871cc3c0b44ee635dbb5475d8000a5fd3744 (diff) | |
.......... [ZBX-13730] merged latest upstream changes from trunk, resolved conflicts
Changed zbx_regexp_compile function to allow "regexp" parameter be NULL and
fixed its invocation in lld_item.c
Diffstat (limited to 'include/zbxregexp.h')
| -rw-r--r-- | include/zbxregexp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/zbxregexp.h b/include/zbxregexp.h index 1b342cc222c..13f7e18d04f 100644 --- a/include/zbxregexp.h +++ b/include/zbxregexp.h @@ -53,5 +53,6 @@ int regexp_match_ex(const zbx_vector_ptr_t *regexps, const char *string, const c int regexp_sub_ex(const zbx_vector_ptr_t *regexps, const char *string, const char *pattern, int case_sensitive, const char *output_template, char **output); int zbx_global_regexp_exists(const char *name, const zbx_vector_ptr_t *regexps); +void zbx_regexp_escape(char **string); #endif /* ZABBIX_ZBXREGEXP_H */ |