diff options
| author | Andrejs Verza <andrejs.verza@zabbix.com> | 2021-08-26 10:38:53 +0300 |
|---|---|---|
| committer | Andrejs Verza <andrejs.verza@zabbix.com> | 2021-08-26 10:38:53 +0300 |
| commit | be758bee36aa62b15791ed18adff3fcbf96e2a3b (patch) | |
| tree | 8054a035f04b150ec627640e9c8094d35a1b18df /include/common.h | |
| parent | 32cd9e5335990f45b67a34051ad96b578a1c60ff (diff) | |
| parent | a91ee32d0303b87be43706fe3dce0a9c3aa19b76 (diff) | |
.......... [ZBXNEXT-6787] updated to the latest master branch (simple conflicts resolved)
Diffstat (limited to 'include/common.h')
| -rw-r--r-- | include/common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/common.h b/include/common.h index a9e078b2717..fa7de039e24 100644 --- a/include/common.h +++ b/include/common.h @@ -1345,7 +1345,7 @@ typedef struct } zbx_file_time_t; -int zbx_get_file_time(const char *path, zbx_file_time_t *time); +int zbx_get_file_time(const char *path, int sym, zbx_file_time_t *time); void find_cr_lf_szbyte(const char *encoding, const char **cr, const char **lf, size_t *szbyte); int zbx_read(int fd, char *buf, size_t count, const char *encoding); int zbx_is_regular_file(const char *path); @@ -1400,7 +1400,7 @@ int zbx_user_macro_parse(const char *macro, int *macro_r, int *context_l, int *c int zbx_user_macro_parse_dyn(const char *macro, char **name, char **context, int *length, unsigned char *context_op); char *zbx_user_macro_unquote_context_dyn(const char *context, int len); -char *zbx_user_macro_quote_context_dyn(const char *context, int force_quote); +char *zbx_user_macro_quote_context_dyn(const char *context, int force_quote, char **error); #define ZBX_SESSION_ACTIVE 0 #define ZBX_SESSION_PASSIVE 1 |