diff options
| author | Artjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com> | 2022-11-04 13:55:57 +0300 |
|---|---|---|
| committer | Artjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com> | 2022-11-04 13:55:57 +0300 |
| commit | 8ed725a9cbafa0bd5708816dcab2268805076400 (patch) | |
| tree | 9288a4e3bec7a40e873742a94978e8dd60839d07 /src | |
| parent | 121c3a309856cc8f3b30ec6fcde1850b334004bb (diff) | |
| parent | 92597a03e91ff2b7abe767d43f0d27c5ccaf894e (diff) | |
.......... [DEV-2176] fixed cppcheck warnings
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/zbxsysinfo/sysinfo.h | 8 | ||||
| -rw-r--r-- | src/libs/zbxsysinfo/win32/services.c | 13 | ||||
| -rw-r--r-- | src/libs/zbxsysinfo/win32/win32.c | 8 |
3 files changed, 15 insertions, 14 deletions
diff --git a/src/libs/zbxsysinfo/sysinfo.h b/src/libs/zbxsysinfo/sysinfo.h index ba6474293a9..384fbe09c93 100644 --- a/src/libs/zbxsysinfo/sysinfo.h +++ b/src/libs/zbxsysinfo/sysinfo.h @@ -176,10 +176,10 @@ int perf_counter(AGENT_REQUEST *request, AGENT_RESULT *result); int perf_counter_en(AGENT_REQUEST *request, AGENT_RESULT *result); int perf_instance_discovery(AGENT_REQUEST *request, AGENT_RESULT *result); int perf_instance_discovery_en(AGENT_REQUEST *request, AGENT_RESULT *result); -int service_discovery(AGENT_REQUEST *request, AGENT_RESULT *result); -int service_info(AGENT_REQUEST *request, AGENT_RESULT *result); -int service_state(AGENT_REQUEST *request, AGENT_RESULT *result); -int services(AGENT_REQUEST *request, AGENT_RESULT *result); +int discover_services(AGENT_REQUEST *request, AGENT_RESULT *result); +int get_service_info(AGENT_REQUEST *request, AGENT_RESULT *result); +int get_service_state(AGENT_REQUEST *request, AGENT_RESULT *result); +int get_list_of_services(AGENT_REQUEST *request, AGENT_RESULT *result); int proc_info(AGENT_REQUEST *request, AGENT_RESULT *result); int net_if_list(AGENT_REQUEST *request, AGENT_RESULT *result); int wmi_get(AGENT_REQUEST *request, AGENT_RESULT *result); diff --git a/src/libs/zbxsysinfo/win32/services.c b/src/libs/zbxsysinfo/win32/services.c index 05ed85f0ea4..c3a24fd0ec2 100644 --- a/src/libs/zbxsysinfo/win32/services.c +++ b/src/libs/zbxsysinfo/win32/services.c @@ -254,7 +254,7 @@ static zbx_startup_type_t get_service_startup_type(SC_HANDLE h_srv, QUERY_SERVIC } } -int service_discovery(AGENT_REQUEST *request, AGENT_RESULT *result) +int discover_services(AGENT_REQUEST *request, AGENT_RESULT *result) { ENUM_SERVICE_STATUS_PROCESS *ssp = NULL; SC_HANDLE h_mgr; @@ -391,7 +391,7 @@ next: return SYSINFO_RET_OK; } -int service_info(AGENT_REQUEST *request, AGENT_RESULT *result) +int get_service_info(AGENT_REQUEST *request, AGENT_RESULT *result) { #define ZBX_SRV_PARAM_STATE 0x01 #define ZBX_SRV_PARAM_DISPLAYNAME 0x02 @@ -550,7 +550,7 @@ int service_info(AGENT_REQUEST *request, AGENT_RESULT *result) #undef ZBX_NON_EXISTING_SRV } -int service_state(AGENT_REQUEST *request, AGENT_RESULT *result) +int get_service_state(AGENT_REQUEST *request, AGENT_RESULT *result) { SC_HANDLE mgr, service; char *name; @@ -657,7 +657,8 @@ static int check_service_starttype(SC_HANDLE h_srv, int start_type) */ #define ZBX_SRV_STATE_ALL 0x007f /* ZBX_SRV_STATE_STOPPED | ZBX_SRV_STATE_STARTED */ -static int check_service_state(SC_HANDLE h_srv, int service_state) + +static int get_service_state_local(SC_HANDLE h_srv, int service_state) { SERVICE_STATUS status; @@ -699,7 +700,7 @@ static int check_service_state(SC_HANDLE h_srv, int service_state) return FAIL; } -int services(AGENT_REQUEST *request, AGENT_RESULT *result) +int get_list_of_services(AGENT_REQUEST *request, AGENT_RESULT *result) { int start_type, service_state; char *type, *state, *exclude, *buf = NULL, *utf8; @@ -776,7 +777,7 @@ int services(AGENT_REQUEST *request, AGENT_RESULT *result) if (SUCCEED == check_service_starttype(h_srv, start_type)) { - if (SUCCEED == check_service_state(h_srv, service_state)) + if (SUCCEED == get_service_state_local(h_srv, service_state)) { utf8 = zbx_unicode_to_utf8(ssp[i].lpServiceName); diff --git a/src/libs/zbxsysinfo/win32/win32.c b/src/libs/zbxsysinfo/win32/win32.c index 3357f46d566..65ec0854913 100644 --- a/src/libs/zbxsysinfo/win32/win32.c +++ b/src/libs/zbxsysinfo/win32/win32.c @@ -56,10 +56,10 @@ ZBX_METRIC parameters_specific[] = {"system.uname", 0, system_uname, NULL}, - {"service.discovery", 0, service_discovery, NULL}, - {"service.info", CF_HAVEPARAMS, service_info, ZABBIX_SERVICE_NAME}, - {"service_state", CF_HAVEPARAMS, service_state, ZABBIX_SERVICE_NAME}, - {"services", CF_HAVEPARAMS, services, NULL}, + {"service.discovery", 0, discover_services, NULL}, + {"service.info", CF_HAVEPARAMS, get_service_info, ZABBIX_SERVICE_NAME}, + {"service_state", CF_HAVEPARAMS, get_service_state, ZABBIX_SERVICE_NAME}, + {"services", CF_HAVEPARAMS, get_list_of_services, NULL}, {"perf_counter", CF_HAVEPARAMS, perf_counter, "\\System\\Processes"}, {"perf_counter_en", CF_HAVEPARAMS, perf_counter_en, "\\System\\Processes"}, {"perf_instance.discovery", CF_HAVEPARAMS, perf_instance_discovery, "Processor"}, |