diff options
| author | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2014-07-16 16:28:13 +0400 |
|---|---|---|
| committer | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2014-07-16 16:28:13 +0400 |
| commit | e4692015cf70f17d82d6ec1b2284c539fc9e348e (patch) | |
| tree | f689aa307622c1d13b7068bc91e4f66c41cf8d49 /include | |
| parent | 30ea8044ae13b5aed4a1f652412698689f9680c9 (diff) | |
.......PS. [ZBXNEXT-1848] zabbix[host,,maintenance] and zabbix[proxy,<name>,lastaccess] will be processed by server only
Diffstat (limited to 'include')
| -rw-r--r-- | include/dbcache.h | 1 | ||||
| -rw-r--r-- | include/module.h | 2 | ||||
| -rw-r--r-- | include/sysinfo.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/include/dbcache.h b/include/dbcache.h index d5d680c5242..b5f841ebfb8 100644 --- a/include/dbcache.h +++ b/include/dbcache.h @@ -257,6 +257,7 @@ typedef struct } zbx_host_availability_t; +int is_item_processed_by_server(unsigned char type, const char *key); int in_maintenance_without_data_collection(unsigned char maintenance_status, unsigned char maintenance_type, unsigned char type); void dc_add_history(zbx_uint64_t itemid, unsigned char value_type, unsigned char flags, AGENT_RESULT *value, diff --git a/include/module.h b/include/module.h index 654c35cd556..f70fe5c2f81 100644 --- a/include/module.h +++ b/include/module.h @@ -27,7 +27,7 @@ #define ZBX_MODULE_API_VERSION_ONE 1 -#define get_rparam(request, num) (request->nparam > num ? request->params[num] : NULL) +#define get_rparam(request, num) ((request)->nparam > num ? (request)->params[num] : NULL) /* flags for command */ #define CF_HAVEPARAMS 0x01 /* item accepts either optional or mandatory parameters */ diff --git a/include/sysinfo.h b/include/sysinfo.h index dbd19db123a..b74a7d0d21f 100644 --- a/include/sysinfo.h +++ b/include/sysinfo.h @@ -189,7 +189,7 @@ void free_result(AGENT_RESULT *result); void init_request(AGENT_REQUEST *request); void free_request(AGENT_REQUEST *request); -int parse_item_key(char *cmd, AGENT_REQUEST *request); +int parse_item_key(const char *itemkey, AGENT_REQUEST *request); zbx_log_t *add_log_result(AGENT_RESULT *result, const char *value); void set_log_result_empty(AGENT_RESULT *result); |