diff options
| author | Artjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com> | 2022-11-02 12:18:11 +0300 |
|---|---|---|
| committer | Artjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com> | 2022-11-02 12:18:11 +0300 |
| commit | e29e63fae29f83fea4b1fb217fb1625f1df68e3d (patch) | |
| tree | c95243e77df891aff71cdec28eaa7789f0790225 /src | |
| parent | 81c7f39595754a5d01edfac5017ac8a129737417 (diff) | |
.......... [DEV-2134] fixed compilation
Diffstat (limited to 'src')
| -rw-r--r-- | src/zabbix_agent/zabbix_agentd.c | 2 | ||||
| -rw-r--r-- | src/zabbix_js/zabbix_js.c | 2 | ||||
| -rw-r--r-- | src/zabbix_proxy/proxy.c | 2 | ||||
| -rw-r--r-- | src/zabbix_sender/zabbix_sender.c | 1 | ||||
| -rw-r--r-- | src/zabbix_server/server.c | 4 |
5 files changed, 7 insertions, 4 deletions
diff --git a/src/zabbix_agent/zabbix_agentd.c b/src/zabbix_agent/zabbix_agentd.c index 1880fcc035f..c28c512c62c 100644 --- a/src/zabbix_agent/zabbix_agentd.c +++ b/src/zabbix_agent/zabbix_agentd.c @@ -1496,7 +1496,7 @@ int main(int argc, char **argv) service_start(t.flags); #elif defined(ZABBIX_DAEMON) zbx_daemon_start(config_allow_root, CONFIG_USER, t.flags, get_pid_file_path, zbx_on_exit, - log_file_cfg->log_type, log_file_cfg->log_file_name); + log_file_cfg.log_type, log_file_cfg.log_file_name); #endif exit(EXIT_SUCCESS); } diff --git a/src/zabbix_js/zabbix_js.c b/src/zabbix_js/zabbix_js.c index 4164ef753ba..217dd2f4704 100644 --- a/src/zabbix_js/zabbix_js.c +++ b/src/zabbix_js/zabbix_js.c @@ -123,6 +123,8 @@ int main(int argc, char **argv) char *script_file = NULL, *input_file = NULL, *param = NULL, ch, *script = NULL, *error = NULL, *result = NULL, script_error[MAX_STRING_LEN]; + zbx_config_log_t log_file_cfg = {NULL, NULL, LOG_TYPE_UNDEFINED, 0}; + /* see description of 'optarg' in 'man 3 getopt' */ char *zbx_optarg = NULL; diff --git a/src/zabbix_proxy/proxy.c b/src/zabbix_proxy/proxy.c index 32c7a38343f..d93346eab23 100644 --- a/src/zabbix_proxy/proxy.c +++ b/src/zabbix_proxy/proxy.c @@ -1121,7 +1121,7 @@ int main(int argc, char **argv) } return zbx_daemon_start(config_allow_root, CONFIG_USER, t.flags, get_pid_file_path, zbx_on_exit, - log_file_cfg->log_type, log_file_cfg->log_file_name); + log_file_cfg.log_type, log_file_cfg.log_file_name); } static void zbx_check_db(void) diff --git a/src/zabbix_sender/zabbix_sender.c b/src/zabbix_sender/zabbix_sender.c index 6480c1cda10..269a940f95a 100644 --- a/src/zabbix_sender/zabbix_sender.c +++ b/src/zabbix_sender/zabbix_sender.c @@ -1497,6 +1497,7 @@ int main(int argc, char **argv) char *error = NULL; int total_count = 0, succeed_count = 0, ret = FAIL, timestamp, ns; zbx_thread_sendval_args *sendval_args = NULL; + zbx_config_log_t log_file_cfg = {NULL, NULL, LOG_TYPE_UNDEFINED, 0}; zbx_config_tls = zbx_config_tls_new(); diff --git a/src/zabbix_server/server.c b/src/zabbix_server/server.c index e173cff6e9e..a445f79c0a2 100644 --- a/src/zabbix_server/server.c +++ b/src/zabbix_server/server.c @@ -338,7 +338,7 @@ int CONFIG_SERVICEMAN_SYNC_FREQUENCY = 60; static char *config_file = NULL; static int config_allow_root = 0; -static zbx_config_log_t log_file_cfg = {NULL, NULL, LOG_TYPE_UNDEFINED, 1} +static zbx_config_log_t log_file_cfg = {NULL, NULL, LOG_TYPE_UNDEFINED, 1}; struct zbx_db_version_info_t db_version_info; @@ -1179,7 +1179,7 @@ int main(int argc, char **argv) } return zbx_daemon_start(config_allow_root, CONFIG_USER, t.flags, get_pid_file_path, zbx_on_exit, - log_file_cfg->log_type, log_file_cfg->log_file_name); + log_file_cfg.log_type, log_file_cfg.log_file_name); } static void zbx_check_db(void) |