summaryrefslogtreecommitdiffstats
path: root/src/libs/zbxsysinfo/linux
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/zbxsysinfo/linux')
-rw-r--r--src/libs/zbxsysinfo/linux/cpu.c38
-rw-r--r--src/libs/zbxsysinfo/linux/diskio.c6
-rw-r--r--src/libs/zbxsysinfo/linux/diskspace.c12
-rw-r--r--src/libs/zbxsysinfo/linux/inodes.c12
-rw-r--r--src/libs/zbxsysinfo/linux/kernel.c6
-rw-r--r--src/libs/zbxsysinfo/linux/memory.c26
-rw-r--r--src/libs/zbxsysinfo/linux/net.c8
-rw-r--r--src/libs/zbxsysinfo/linux/proc.c4
-rw-r--r--src/libs/zbxsysinfo/linux/sensors.c8
-rw-r--r--src/libs/zbxsysinfo/linux/swap.c8
-rw-r--r--src/libs/zbxsysinfo/linux/uptime.c2
11 files changed, 65 insertions, 65 deletions
diff --git a/src/libs/zbxsysinfo/linux/cpu.c b/src/libs/zbxsysinfo/linux/cpu.c
index 213e7f03..34a2e261 100644
--- a/src/libs/zbxsysinfo/linux/cpu.c
+++ b/src/libs/zbxsysinfo/linux/cpu.c
@@ -121,7 +121,7 @@ CPU_FNCLIST
assert(result);
- clean_result(result);
+ init_result(result);
if(num_param(param) > 3)
{
@@ -217,7 +217,7 @@ int SYSTEM_CPU_LOAD1(const char *cmd, const char *param, unsigned flags, AGENT_R
assert(result);
- clean_result(result);
+ init_result(result);
if(getloadavg(load, 3))
{
@@ -235,7 +235,7 @@ int SYSTEM_CPU_LOAD1(const char *cmd, const char *param, unsigned flags, AGENT_R
assert(result);
- clean_result(result);
+ init_result(result);
if (pstat_getdynamic(&dyn, sizeof(dyn), 1, 0) == -1)
{
@@ -258,7 +258,7 @@ int SYSTEM_CPU_LOAD1(const char *cmd, const char *param, unsigned flags, AGENT_R
assert(result);
- clean_result(result);
+ init_result(result);
if (!kc && !(kc = kstat_open()))
{
@@ -279,7 +279,7 @@ int SYSTEM_CPU_LOAD1(const char *cmd, const char *param, unsigned flags, AGENT_R
assert(result);
- clean_result(result);
+ init_result(result);
if(getloadavg_kmem(loadavg,3) == FAIL)
{
@@ -292,7 +292,7 @@ int SYSTEM_CPU_LOAD1(const char *cmd, const char *param, unsigned flags, AGENT_R
#else
assert(result);
- clean_result(result);
+ init_result(result);
return SYSINFO_RET_FAIL;
#endif
#endif
@@ -308,7 +308,7 @@ int SYSTEM_CPU_LOAD5(const char *cmd, const char *param, unsigned flags, AGENT_R
assert(result);
- clean_result(result);
+ init_result(result);
if(getloadavg(load, 3))
{
@@ -326,7 +326,7 @@ int SYSTEM_CPU_LOAD5(const char *cmd, const char *param, unsigned flags, AGENT_R
assert(result);
- clean_result(result);
+ init_result(result);
if (pstat_getdynamic(&dyn, sizeof(dyn), 1, 0) == -1)
{
@@ -349,7 +349,7 @@ int SYSTEM_CPU_LOAD5(const char *cmd, const char *param, unsigned flags, AGENT_R
assert(result);
- clean_result(result);
+ init_result(result);
if (!kc && !(kc = kstat_open()))
{
@@ -370,7 +370,7 @@ int SYSTEM_CPU_LOAD5(const char *cmd, const char *param, unsigned flags, AGENT_R
assert(result);
- clean_result(result);
+ init_result(result);
if(getloadavg_kmem(loadavg,3) == FAIL)
{
@@ -383,7 +383,7 @@ int SYSTEM_CPU_LOAD5(const char *cmd, const char *param, unsigned flags, AGENT_R
#else
assert(result);
- clean_result(result);
+ init_result(result);
return SYSINFO_RET_FAIL;
#endif
#endif
@@ -399,7 +399,7 @@ int SYSTEM_CPU_LOAD15(const char *cmd, const char *param, unsigned flags, AGENT_
assert(result);
- clean_result(result);
+ init_result(result);
if(getloadavg(load, 3))
{
@@ -417,7 +417,7 @@ int SYSTEM_CPU_LOAD15(const char *cmd, const char *param, unsigned flags, AGENT_
assert(result);
- clean_result(result);
+ init_result(result);
if (pstat_getdynamic(&dyn, sizeof(dyn), 1, 0) == -1)
{
@@ -440,7 +440,7 @@ int SYSTEM_CPU_LOAD15(const char *cmd, const char *param, unsigned flags, AGENT_
assert(result);
- clean_result(result);
+ init_result(result);
if (!kc && !(kc = kstat_open()))
{
@@ -461,7 +461,7 @@ int SYSTEM_CPU_LOAD15(const char *cmd, const char *param, unsigned flags, AGENT_
assert(result);
- clean_result(result);
+ init_result(result);
if(getloadavg_kmem(loadavg,3) == FAIL)
{
@@ -474,7 +474,7 @@ int SYSTEM_CPU_LOAD15(const char *cmd, const char *param, unsigned flags, AGENT_
#else
assert(result);
- clean_result(result);
+ init_result(result);
return SYSINFO_RET_FAIL;
#endif
#endif
@@ -507,7 +507,7 @@ CPU_FNCLIST
assert(result);
- clean_result(result);
+ init_result(result);
if(num_param(param) > 2)
{
@@ -552,7 +552,7 @@ int SYSTEM_CPU_SWITCHES(const char *cmd, const char *param, unsigned flags,
{
assert(result);
- clean_result(result);
+ init_result(result);
return SYSINFO_RET_FAIL;
}
@@ -569,7 +569,7 @@ int SYSTEM_CPU_INTR(const char *cmd, const char *param, unsigned flags, AGEN
assert(result);
- clean_result(result);
+ init_result(result);
f=fopen("/proc/stat","r");
if(f)
diff --git a/src/libs/zbxsysinfo/linux/diskio.c b/src/libs/zbxsysinfo/linux/diskio.c
index 3b8aed74..ffa65063 100644
--- a/src/libs/zbxsysinfo/linux/diskio.c
+++ b/src/libs/zbxsysinfo/linux/diskio.c
@@ -130,7 +130,7 @@ int VFS_DEV_WRITE(const char *cmd, const char *param, unsigned flags, AGENT_RESU
assert(result);
- clean_result(result);
+ init_result(result);
if(num_param(param) > 2)
{
@@ -187,7 +187,7 @@ int VFS_DEV_READ(const char *cmd, const char *param, unsigned flags, AGENT_RESUL
assert(result);
- clean_result(result);
+ init_result(result);
if(num_param(param) > 2)
{
@@ -287,7 +287,7 @@ int OLD_IO(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *res
assert(result);
- clean_result(result);
+ init_result(result);
if(num_param(param) > 1)
{
diff --git a/src/libs/zbxsysinfo/linux/diskspace.c b/src/libs/zbxsysinfo/linux/diskspace.c
index ce308cf9..a062e283 100644
--- a/src/libs/zbxsysinfo/linux/diskspace.c
+++ b/src/libs/zbxsysinfo/linux/diskspace.c
@@ -66,7 +66,7 @@ static int VFS_FS_USED(const char *cmd, const char *param, unsigned flags, AGENT
assert(result);
- clean_result(result);
+ init_result(result);
if(num_param(param) > 1)
return SYSINFO_RET_FAIL;
@@ -90,7 +90,7 @@ static int VFS_FS_FREE(const char *cmd, const char *param, unsigned flags, AGENT
assert(result);
- clean_result(result);
+ init_result(result);
if(num_param(param) > 1)
return SYSINFO_RET_FAIL;
@@ -114,7 +114,7 @@ static int VFS_FS_TOTAL(const char *cmd, const char *param, unsigned flags, AGEN
assert(result);
- clean_result(result);
+ init_result(result);
if(num_param(param) > 1)
return SYSINFO_RET_FAIL;
@@ -142,7 +142,7 @@ static int VFS_FS_PFREE(const char *cmd, const char *param, unsigned flags, AGEN
assert(result);
- clean_result(result);
+ init_result(result);
if(num_param(param) > 1)
return SYSINFO_RET_FAIL;
@@ -167,7 +167,7 @@ static int VFS_FS_PUSED(const char *cmd, const char *param, unsigned flags, AGEN
assert(result);
- clean_result(result);
+ init_result(result);
if(num_param(param) > 1)
return SYSINFO_RET_FAIL;
@@ -210,7 +210,7 @@ FS_FNCLIST
assert(result);
- clean_result(result);
+ init_result(result);
if(num_param(param) > 2)
{
diff --git a/src/libs/zbxsysinfo/linux/inodes.c b/src/libs/zbxsysinfo/linux/inodes.c
index 277d573d..455ad4f5 100644
--- a/src/libs/zbxsysinfo/linux/inodes.c
+++ b/src/libs/zbxsysinfo/linux/inodes.c
@@ -66,7 +66,7 @@ static int VFS_FS_INODE_USED(const char *cmd, const char *param, unsigned flags,
assert(result);
- clean_result(result);
+ init_result(result);
if(num_param(param) > 1)
return SYSINFO_RET_FAIL;
@@ -90,7 +90,7 @@ static int VFS_FS_INODE_FREE(const char *cmd, const char *param, unsigned flags,
assert(result);
- clean_result(result);
+ init_result(result);
if(num_param(param) > 1)
return SYSINFO_RET_FAIL;
@@ -114,7 +114,7 @@ static int VFS_FS_INODE_TOTAL(const char *cmd, const char *param, unsigned flags
assert(result);
- clean_result(result);
+ init_result(result);
if(num_param(param) > 1)
return SYSINFO_RET_FAIL;
@@ -141,7 +141,7 @@ static int VFS_FS_INODE_PFREE(const char *cmd, const char *param, unsigned flags
assert(result);
- clean_result(result);
+ init_result(result);
if(num_param(param) > 1)
return SYSINFO_RET_FAIL;
@@ -166,7 +166,7 @@ static int VFS_FS_INODE_PUSED(const char *cmd, const char *param, unsigned flags
assert(result);
- clean_result(result);
+ init_result(result);
if(num_param(param) > 1)
return SYSINFO_RET_FAIL;
@@ -209,7 +209,7 @@ FS_FNCLIST
assert(result);
- clean_result(result);
+ init_result(result);
if(num_param(param) > 2)
{
diff --git a/src/libs/zbxsysinfo/linux/kernel.c b/src/libs/zbxsysinfo/linux/kernel.c
index c6dc6f00..9f08a74f 100644
--- a/src/libs/zbxsysinfo/linux/kernel.c
+++ b/src/libs/zbxsysinfo/linux/kernel.c
@@ -33,7 +33,7 @@ int KERNEL_MAXFILES(const char *cmd, const char *param, unsigned flags, AGENT_RE
assert(result);
- clean_result(result);
+ init_result(result);
f=fopen("/proc/sys/fs/file-max","r");
if(f)
@@ -61,7 +61,7 @@ int KERNEL_MAXPROC(const char *cmd, const char *param, unsigned flags, AGENT_RES
assert(result);
- clean_result(result);
+ init_result(result);
mib[0]=CTL_KERN;
mib[1]=KERN_MAXPROC;
@@ -89,7 +89,7 @@ int OLD_KERNEL(const char *cmd, const char *param, unsigned flags, AGENT_RES
assert(result);
- clean_result(result);
+ init_result(result);
if(num_param(param) > 1)
{
diff --git a/src/libs/zbxsysinfo/linux/memory.c b/src/libs/zbxsysinfo/linux/memory.c
index aa9cb8a5..8513c09b 100644
--- a/src/libs/zbxsysinfo/linux/memory.c
+++ b/src/libs/zbxsysinfo/linux/memory.c
@@ -35,7 +35,7 @@ static int VM_MEMORY_CACHED(const char *cmd, const char *param, unsigned flags,
assert(result);
- clean_result(result);
+ init_result(result);
f=fopen("/proc/meminfo","r");
if(NULL == f)
@@ -66,7 +66,7 @@ static int VM_MEMORY_BUFFERS(const char *cmd, const char *param, unsigned flags,
assert(result);
- clean_result(result);
+ init_result(result);
if( 0 == sysinfo(&info))
{
@@ -85,7 +85,7 @@ static int VM_MEMORY_BUFFERS(const char *cmd, const char *param, unsigned flags,
#else
assert(result);
- clean_result(result);
+ init_result(result);
return SYSINFO_RET_FAIL;
#endif
@@ -98,7 +98,7 @@ static int VM_MEMORY_SHARED(const char *cmd, const char *param, unsigned flags,
assert(result);
- clean_result(result);
+ init_result(result);
if( 0 == sysinfo(&info))
{
@@ -120,7 +120,7 @@ static int VM_MEMORY_SHARED(const char *cmd, const char *param, unsigned flags,
assert(result);
- clean_result(result);
+ init_result(result);
len=sizeof(struct vmtotal);
mib[0]=CTL_VM;
@@ -142,7 +142,7 @@ static int VM_MEMORY_TOTAL(const char *cmd, const char *param, unsigned flags, A
#ifdef HAVE_UNISTD_SYSCONF
assert(result);
- clean_result(result);
+ init_result(result);
result->type |= AR_DOUBLE;
result->dbl=(double)sysconf(_SC_PHYS_PAGES)*sysconf(_SC_PAGESIZE);
@@ -153,7 +153,7 @@ static int VM_MEMORY_TOTAL(const char *cmd, const char *param, unsigned flags, A
assert(result);
- clean_result(result);
+ init_result(result);
if(pstat_getstatic(&pst, sizeof(pst), (size_t)1, 0) == -1)
{
@@ -173,7 +173,7 @@ static int VM_MEMORY_TOTAL(const char *cmd, const char *param, unsigned flags, A
assert(result);
- clean_result(result);
+ init_result(result);
if( 0 == sysinfo(&info))
{
@@ -195,7 +195,7 @@ static int VM_MEMORY_TOTAL(const char *cmd, const char *param, unsigned flags, A
assert(result);
- clean_result(result);
+ init_result(result);
len=sizeof(struct vmtotal);
mib[0]=CTL_VM;
@@ -209,7 +209,7 @@ static int VM_MEMORY_TOTAL(const char *cmd, const char *param, unsigned flags, A
#else
assert(result);
- clean_result(result);
+ init_result(result);
return SYSINFO_RET_FAIL;
#endif
@@ -222,7 +222,7 @@ static int VM_MEMORY_FREE(const char *cmd, const char *param, unsigned flags, AG
assert(result);
- clean_result(result);
+ init_result(result);
if( 0 == sysinfo(&info))
{
@@ -241,7 +241,7 @@ static int VM_MEMORY_FREE(const char *cmd, const char *param, unsigned flags, AG
#else
assert(result);
- clean_result(result);
+ init_result(result);
return SYSINFO_RET_FAIL;
#endif
@@ -270,7 +270,7 @@ MEM_FNCLIST
assert(result);
- clean_result(result);
+ init_result(result);
if(num_param(param) > 1)
{
diff --git a/src/libs/zbxsysinfo/linux/net.c b/src/libs/zbxsysinfo/linux/net.c
index 26b343bb..6946a892 100644
--- a/src/libs/zbxsysinfo/linux/net.c
+++ b/src/libs/zbxsysinfo/linux/net.c
@@ -107,7 +107,7 @@ int NET_IF_IN(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *
assert(result);
- clean_result(result);
+ init_result(result);
if(num_param(param) > 2)
{
@@ -174,7 +174,7 @@ int NET_IF_OUT(const char *cmd, const char *param, unsigned flags, AGENT_RESULT
assert(result);
- clean_result(result);
+ init_result(result);
if(num_param(param) > 2)
{
@@ -234,7 +234,7 @@ int NET_TCP_LISTEN(const char *cmd, const char *param, unsigned flags, AGENT
{
assert(result);
- clean_result(result);
+ init_result(result);
return SYSINFO_RET_FAIL;
}
@@ -249,7 +249,7 @@ int NET_IF_COLLISIONS(const char *cmd, const char *param, unsigned flags, AG
assert(result);
- clean_result(result);
+ init_result(result);
if(num_param(param) > 1)
{
diff --git a/src/libs/zbxsysinfo/linux/proc.c b/src/libs/zbxsysinfo/linux/proc.c
index 89c4c107..6129f1c5 100644
--- a/src/libs/zbxsysinfo/linux/proc.c
+++ b/src/libs/zbxsysinfo/linux/proc.c
@@ -59,7 +59,7 @@ int PROC_MEMORY(const char *cmd, const char *param, unsigned flags, AGENT_RE
assert(result);
- clean_result(result);
+ init_result(result);
if(num_param(param) > 3)
{
@@ -317,7 +317,7 @@ int PROC_NUM(const char *cmd, const char *param, unsigned flags, AGENT_RESUL
assert(result);
- clean_result(result);
+ init_result(result);
if(num_param(param) > 3)
diff --git a/src/libs/zbxsysinfo/linux/sensors.c b/src/libs/zbxsysinfo/linux/sensors.c
index 956ca3d1..4ef03c39 100644
--- a/src/libs/zbxsysinfo/linux/sensors.c
+++ b/src/libs/zbxsysinfo/linux/sensors.c
@@ -37,7 +37,7 @@ static int SENSOR_TEMP1(const char *cmd, const char *param, unsigned flags, AGEN
assert(result);
- clean_result(result);
+ init_result(result);
dir=opendir("/proc/sys/dev/sensors");
if(NULL == dir)
@@ -92,7 +92,7 @@ static int SENSOR_TEMP2(const char *cmd, const char *param, unsigned flags, AGEN
assert(result);
- clean_result(result);
+ init_result(result);
dir=opendir("/proc/sys/dev/sensors");
if(NULL == dir)
@@ -147,7 +147,7 @@ static int SENSOR_TEMP3(const char *cmd, const char *param, unsigned flags, AGEN
assert(result);
- clean_result(result);
+ init_result(result);
dir=opendir("/proc/sys/dev/sensors");
if(NULL == dir)
@@ -196,7 +196,7 @@ int OLD_SENSOR(const char *cmd, const char *param, unsigned flags, AGENT_RES
assert(result);
- clean_result(result);
+ init_result(result);
if(num_param(param) > 1)
{
diff --git a/src/libs/zbxsysinfo/linux/swap.c b/src/libs/zbxsysinfo/linux/swap.c
index 6d8d5458..5a7f8a70 100644
--- a/src/libs/zbxsysinfo/linux/swap.c
+++ b/src/libs/zbxsysinfo/linux/swap.c
@@ -30,7 +30,7 @@ static int SYSTEM_SWAP_FREE(const char *cmd, const char *param, unsigned flags,
assert(result);
- clean_result(result);
+ init_result(result);
if( 0 == sysinfo(&info))
{
@@ -54,7 +54,7 @@ static int SYSTEM_SWAP_TOTAL(const char *cmd, const char *param, unsigned flags,
assert(result);
- clean_result(result);
+ init_result(result);
if( 0 == sysinfo(&info))
{
@@ -95,7 +95,7 @@ SWP_FNCLIST
assert(result);
- clean_result(result);
+ init_result(result);
if(num_param(param) > 2)
{
@@ -147,7 +147,7 @@ int OLD_SWAP(const char *cmd, const char *param, unsigned flags, AGENT_RESUL
assert(result);
- clean_result(result);
+ init_result(result);
if(num_param(param) > 1)
{
diff --git a/src/libs/zbxsysinfo/linux/uptime.c b/src/libs/zbxsysinfo/linux/uptime.c
index e748f906..d4710d0c 100644
--- a/src/libs/zbxsysinfo/linux/uptime.c
+++ b/src/libs/zbxsysinfo/linux/uptime.c
@@ -28,7 +28,7 @@ int SYSTEM_UPTIME(const char *cmd, const char *param, unsigned flags, AGENT_RESU
assert(result);
- clean_result(result);
+ init_result(result);
if( 0 == sysinfo(&info))
{
generated by cgit (git 2.34.1) at 2024-09-30 00:27:55 +0000