diff options
| -rw-r--r-- | include/common.h | 2 | ||||
| -rw-r--r-- | src/zabbix_agent/zabbix_agentd.c | 6 | ||||
| -rw-r--r-- | src/zabbix_proxy/proxy.c | 6 | ||||
| -rw-r--r-- | src/zabbix_server/rtc.c | 12 | ||||
| -rw-r--r-- | src/zabbix_server/server.c | 4 |
5 files changed, 15 insertions, 15 deletions
diff --git a/include/common.h b/include/common.h index 3bf3a0b181e..120d7de5198 100644 --- a/include/common.h +++ b/include/common.h @@ -1006,7 +1006,7 @@ zbx_httptest_auth_t; typedef struct { zbx_task_t task; - int flags; + unsigned int flags; int data; } ZBX_TASK_EX; diff --git a/src/zabbix_agent/zabbix_agentd.c b/src/zabbix_agent/zabbix_agentd.c index 7837b39d516..42600c59208 100644 --- a/src/zabbix_agent/zabbix_agentd.c +++ b/src/zabbix_agent/zabbix_agentd.c @@ -746,7 +746,7 @@ static int add_serveractive_host_cb(const zbx_vector_ptr_t *addrs, zbx_vector_st forks = CONFIG_ACTIVE_FORKS; CONFIG_ACTIVE_FORKS += new_forks; CONFIG_ACTIVE_ARGS = (ZBX_THREAD_ACTIVECHK_ARGS *)zbx_realloc(CONFIG_ACTIVE_ARGS, - sizeof(ZBX_THREAD_ACTIVECHK_ARGS) * CONFIG_ACTIVE_FORKS); + sizeof(ZBX_THREAD_ACTIVECHK_ARGS) * (size_t)CONFIG_ACTIVE_FORKS); for (i = 0; i < new_forks; i++, forks++) { @@ -1176,8 +1176,8 @@ int MAIN_ZABBIX_ENTRY(int flags) exit(EXIT_FAILURE); } #endif - threads = (ZBX_THREAD_HANDLE *)zbx_calloc(threads, threads_num, sizeof(ZBX_THREAD_HANDLE)); - threads_flags = (int *)zbx_calloc(threads_flags, threads_num, sizeof(int)); + threads = (ZBX_THREAD_HANDLE *)zbx_calloc(threads, (size_t)threads_num, sizeof(ZBX_THREAD_HANDLE)); + threads_flags = (int *)zbx_calloc(threads_flags, (size_t)threads_num, sizeof(int)); zabbix_log(LOG_LEVEL_INFORMATION, "agent #0 started [main process]"); diff --git a/src/zabbix_proxy/proxy.c b/src/zabbix_proxy/proxy.c index 5c2d2b58b3f..69b8ee71a5c 100644 --- a/src/zabbix_proxy/proxy.c +++ b/src/zabbix_proxy/proxy.c @@ -1286,8 +1286,8 @@ int MAIN_ZABBIX_ENTRY(int flags) + CONFIG_PREPROCMAN_FORKS + CONFIG_PREPROCESSOR_FORKS + CONFIG_HISTORYPOLLER_FORKS + CONFIG_AVAILMAN_FORKS; - threads = (pid_t *)zbx_calloc(threads, threads_num, sizeof(pid_t)); - threads_flags = (int *)zbx_calloc(threads_flags, threads_num, sizeof(int)); + threads = (pid_t *)zbx_calloc(threads, (size_t)threads_num, sizeof(pid_t)); + threads_flags = (int *)zbx_calloc(threads_flags, (size_t)threads_num, sizeof(int)); if (0 != CONFIG_TRAPPER_FORKS) { @@ -1419,7 +1419,7 @@ int MAIN_ZABBIX_ENTRY(int flags) /* check if the wait was interrupted because of diaginfo remote command */ if (ZBX_DIAGINFO_UNDEFINED != zbx_diaginfo_scope) { - zbx_diag_log_info(zbx_diaginfo_scope); + zbx_diag_log_info((unsigned int)zbx_diaginfo_scope); zbx_diaginfo_scope = ZBX_DIAGINFO_UNDEFINED; } } diff --git a/src/zabbix_server/rtc.c b/src/zabbix_server/rtc.c index 0e33e65db6a..c39437db34a 100644 --- a/src/zabbix_server/rtc.c +++ b/src/zabbix_server/rtc.c @@ -60,7 +60,7 @@ static void rtc_ha_status(void) if (SUCCEED != zbx_ha_get_nodes(&nodes, &error)) { - zabbix_log(LOG_LEVEL_WARNING, "cannot get HA node information: %s", error); + zabbix_log(LOG_LEVEL_ERR, "cannot get HA node information: %s", error); zbx_free(error); return; } @@ -143,7 +143,7 @@ static void rtc_remove_node(int index) if (SUCCEED != zbx_ha_remove_node(index, &error)) { - zabbix_log(LOG_LEVEL_WARNING, "cannot remove HA node: %s", error); + zabbix_log(LOG_LEVEL_ERR, "cannot remove HA node: %s", error); zbx_free(error); } } @@ -161,7 +161,7 @@ static void rtc_ha_failover_delay(int delay) if (SUCCEED != zbx_ha_set_failover_delay(delay, &error)) { - zabbix_log(LOG_LEVEL_WARNING, "cannot set HA failover delay: %s", error); + zabbix_log(LOG_LEVEL_ERR, "cannot set HA failover delay: %s", error); zbx_free(error); } } @@ -173,7 +173,7 @@ static void rtc_ha_failover_delay(int delay) * Purpose: change log level of main process * * * ******************************************************************************/ -static void rtc_change_loglevel_main(unsigned int command) +static void rtc_change_loglevel_main(int command) { if (ZBX_RTC_LOG_LEVEL_INCREASE == command) { @@ -210,7 +210,7 @@ static void rtc_change_loglevel_main(unsigned int command) * Purpose: change log level of HA manager * * * ******************************************************************************/ -static void rtc_change_loglevel_ha(unsigned int command) +static void rtc_change_loglevel_ha(int command) { int direction; char *error = NULL; @@ -231,7 +231,7 @@ static void rtc_change_loglevel_ha(unsigned int command) * Purpose: process log level changes affecting main/ha manager processes * * * ******************************************************************************/ -static void rtc_change_loglevel(unsigned int command, unsigned int scope, unsigned int data) +static void rtc_change_loglevel(int command, int scope, int data) { if ((ZBX_RTC_LOG_SCOPE_FLAG | ZBX_RTC_LOG_SCOPE_PID) == scope) { diff --git a/src/zabbix_server/server.c b/src/zabbix_server/server.c index 26604c84b38..db8653f71bc 100644 --- a/src/zabbix_server/server.c +++ b/src/zabbix_server/server.c @@ -1264,8 +1264,8 @@ static int server_startup(zbx_socket_t *listen_sock) + CONFIG_LLDMANAGER_FORKS + CONFIG_LLDWORKER_FORKS + CONFIG_ALERTDB_FORKS + CONFIG_HISTORYPOLLER_FORKS + CONFIG_AVAILMAN_FORKS + CONFIG_REPORTMANAGER_FORKS + CONFIG_REPORTWRITER_FORKS + CONFIG_SERVICEMAN_FORKS + CONFIG_PROBLEMHOUSEKEEPER_FORKS; - threads = (pid_t *)zbx_calloc(threads, threads_num, sizeof(pid_t)); - threads_flags = (int *)zbx_calloc(threads_flags, threads_num, sizeof(int)); + threads = (pid_t *)zbx_calloc(threads, (size_t)threads_num, sizeof(pid_t)); + threads_flags = (int *)zbx_calloc(threads_flags, (size_t)threads_num, sizeof(int)); zabbix_log(LOG_LEVEL_INFORMATION, "server #0 started [main process]"); |