diff options
author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-11-14 15:54:33 +0000 |
---|---|---|
committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-11-14 15:54:33 +0000 |
commit | 8b3a821222ec9fb5437828f598063a29b8706a36 (patch) | |
tree | 708aaca8476a6f4758bf41bf757c28f3d20b5aa0 /src/libs/zbxsysinfo/freebsd | |
parent | aadd81c310474f516eec3e9f7f3ce0546623510d (diff) | |
download | zabbix-8b3a821222ec9fb5437828f598063a29b8706a36.tar.gz zabbix-8b3a821222ec9fb5437828f598063a29b8706a36.tar.xz zabbix-8b3a821222ec9fb5437828f598063a29b8706a36.zip |
Cleaning server code.
git-svn-id: svn://svn.zabbix.com/trunk@2314 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src/libs/zbxsysinfo/freebsd')
-rw-r--r-- | src/libs/zbxsysinfo/freebsd/cpu.c | 38 | ||||
-rw-r--r-- | src/libs/zbxsysinfo/freebsd/diskio.c | 6 | ||||
-rw-r--r-- | src/libs/zbxsysinfo/freebsd/diskspace.c | 12 | ||||
-rw-r--r-- | src/libs/zbxsysinfo/freebsd/inodes.c | 12 | ||||
-rw-r--r-- | src/libs/zbxsysinfo/freebsd/kernel.c | 6 | ||||
-rw-r--r-- | src/libs/zbxsysinfo/freebsd/memory.c | 38 | ||||
-rw-r--r-- | src/libs/zbxsysinfo/freebsd/net.c | 8 | ||||
-rw-r--r-- | src/libs/zbxsysinfo/freebsd/proc.c | 4 | ||||
-rw-r--r-- | src/libs/zbxsysinfo/freebsd/sensors.c | 8 | ||||
-rw-r--r-- | src/libs/zbxsysinfo/freebsd/swap.c | 16 | ||||
-rw-r--r-- | src/libs/zbxsysinfo/freebsd/uptime.c | 8 |
11 files changed, 78 insertions, 78 deletions
diff --git a/src/libs/zbxsysinfo/freebsd/cpu.c b/src/libs/zbxsysinfo/freebsd/cpu.c index f45b39db..157ab650 100644 --- a/src/libs/zbxsysinfo/freebsd/cpu.c +++ b/src/libs/zbxsysinfo/freebsd/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; } @@ -561,7 +561,7 @@ int SYSTEM_CPU_INTR(const char *cmd, const char *param, unsigned flags, AGEN { assert(result); - clean_result(result); + init_result(result); return SYSINFO_RET_FAIL; } diff --git a/src/libs/zbxsysinfo/freebsd/diskio.c b/src/libs/zbxsysinfo/freebsd/diskio.c index 23d0c450..333b177a 100644 --- a/src/libs/zbxsysinfo/freebsd/diskio.c +++ b/src/libs/zbxsysinfo/freebsd/diskio.c @@ -159,7 +159,7 @@ DEV_FNCLIST assert(result); - clean_result(result); + init_result(result); if(num_param(param) > 3) { @@ -235,7 +235,7 @@ DEV_FNCLIST assert(result); - clean_result(result); + init_result(result); if(num_param(param) > 3) { @@ -334,7 +334,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/freebsd/diskspace.c b/src/libs/zbxsysinfo/freebsd/diskspace.c index e2120ac6..81fd7e8e 100644 --- a/src/libs/zbxsysinfo/freebsd/diskspace.c +++ b/src/libs/zbxsysinfo/freebsd/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/freebsd/inodes.c b/src/libs/zbxsysinfo/freebsd/inodes.c index b1283d4c..c17c58e7 100644 --- a/src/libs/zbxsysinfo/freebsd/inodes.c +++ b/src/libs/zbxsysinfo/freebsd/inodes.c @@ -52,7 +52,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; @@ -76,7 +76,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; @@ -100,7 +100,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; @@ -127,7 +127,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; @@ -152,7 +152,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; @@ -195,7 +195,7 @@ FS_FNCLIST assert(result); - clean_result(result); + init_result(result); if(num_param(param) > 2) { diff --git a/src/libs/zbxsysinfo/freebsd/kernel.c b/src/libs/zbxsysinfo/freebsd/kernel.c index 14157f22..84c5067b 100644 --- a/src/libs/zbxsysinfo/freebsd/kernel.c +++ b/src/libs/zbxsysinfo/freebsd/kernel.c @@ -30,7 +30,7 @@ int KERNEL_MAXFILES(const char *cmd, const char *param, unsigned flags, AGENT_RE assert(result); - clean_result(result); + init_result(result); mib[0]=CTL_KERN; mib[1]=KERN_MAXFILES; @@ -58,7 +58,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; @@ -86,7 +86,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/freebsd/memory.c b/src/libs/zbxsysinfo/freebsd/memory.c index 7dc0fcbe..2feba4e8 100644 --- a/src/libs/zbxsysinfo/freebsd/memory.c +++ b/src/libs/zbxsysinfo/freebsd/memory.c @@ -36,7 +36,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) @@ -61,7 +61,7 @@ static int VM_MEMORY_CACHED(const char *cmd, const char *param, unsigned flags, #else assert(result); - clean_result(result); + init_result(result); return SYSINFO_RET_FAIL; #endif @@ -74,7 +74,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)) { @@ -93,7 +93,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 @@ -106,7 +106,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)) { @@ -128,7 +128,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; @@ -150,7 +150,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); @@ -161,7 +161,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) { @@ -181,7 +181,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)) { @@ -203,7 +203,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; @@ -222,7 +222,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(memory); @@ -240,7 +240,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 @@ -252,7 +252,7 @@ static int VM_MEMORY_FREE(const char *cmd, const char *param, unsigned flags, AG #ifdef HAVE_UNISTD_SYSCONF assert(result); - clean_result(result); + init_result(result); result->type |= AR_DOUBLE; result->dbl=(double)sysconf(_SC_AVPHYS_PAGES)*sysconf(_SC_PAGESIZE); @@ -264,7 +264,7 @@ static int VM_MEMORY_FREE(const char *cmd, const char *param, unsigned flags, AG assert(result); - clean_result(result); + init_result(result); if(pstat_getstatic(&pst, sizeof(pst), (size_t)1, 0) == -1) { @@ -304,7 +304,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)) { @@ -326,7 +326,7 @@ static int VM_MEMORY_FREE(const char *cmd, const char *param, unsigned flags, AG assert(result); - clean_result(result); + init_result(result); len=sizeof(struct vmtotal); mib[0]=CTL_VM; @@ -347,7 +347,7 @@ static int VM_MEMORY_FREE(const char *cmd, const char *param, unsigned flags, AG assert(result); - clean_result(result); + init_result(result); pagesize = 0; kret = host_page_size (mach_host_self(), &pagesize); @@ -378,7 +378,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 @@ -407,7 +407,7 @@ MEM_FNCLIST assert(result); - clean_result(result); + init_result(result); if(num_param(param) > 1) { diff --git a/src/libs/zbxsysinfo/freebsd/net.c b/src/libs/zbxsysinfo/freebsd/net.c index 54c81126..851be786 100644 --- a/src/libs/zbxsysinfo/freebsd/net.c +++ b/src/libs/zbxsysinfo/freebsd/net.c @@ -27,7 +27,7 @@ int NET_IF_IN(const char *cmd, const char *param, unsigned flags, AGENT_RESULT * assert(result); - clean_result(result); + init_result(result); return SYSINFO_RET_FAIL; } @@ -37,7 +37,7 @@ int NET_IF_OUT(const char *cmd, const char *param, unsigned flags, AGENT_RESULT assert(result); - clean_result(result); + init_result(result); return SYSINFO_RET_FAIL; } @@ -46,7 +46,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; } @@ -55,7 +55,7 @@ int NET_IF_COLLISIONS(const char *cmd, const char *param, unsigned flags, AG { assert(result); - clean_result(result); + init_result(result); return SYSINFO_RET_FAIL; } diff --git a/src/libs/zbxsysinfo/freebsd/proc.c b/src/libs/zbxsysinfo/freebsd/proc.c index 5153605c..0bcd31dc 100644 --- a/src/libs/zbxsysinfo/freebsd/proc.c +++ b/src/libs/zbxsysinfo/freebsd/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) { @@ -313,7 +313,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/freebsd/sensors.c b/src/libs/zbxsysinfo/freebsd/sensors.c index 956ca3d1..4ef03c39 100644 --- a/src/libs/zbxsysinfo/freebsd/sensors.c +++ b/src/libs/zbxsysinfo/freebsd/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/freebsd/swap.c b/src/libs/zbxsysinfo/freebsd/swap.c index 85e0979c..ac899d88 100644 --- a/src/libs/zbxsysinfo/freebsd/swap.c +++ b/src/libs/zbxsysinfo/freebsd/swap.c @@ -98,7 +98,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)) { @@ -121,7 +121,7 @@ static int SYSTEM_SWAP_FREE(const char *cmd, const char *param, unsigned flags, assert(result); - clean_result(result); + init_result(result); get_swapinfo(&swaptotal,&swapfree); @@ -131,7 +131,7 @@ static int SYSTEM_SWAP_FREE(const char *cmd, const char *param, unsigned flags, #else assert(result); - clean_result(result); + init_result(result); return SYSINFO_RET_FAIL; #endif @@ -145,7 +145,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)) { @@ -168,7 +168,7 @@ static int SYSTEM_SWAP_TOTAL(const char *cmd, const char *param, unsigned flags, assert(result); - clean_result(result); + init_result(result); get_swapinfo(&swaptotal,&swapfree); @@ -178,7 +178,7 @@ static int SYSTEM_SWAP_TOTAL(const char *cmd, const char *param, unsigned flags, #else assert(result); - clean_result(result); + init_result(result); return SYSINFO_RET_FAIL; #endif @@ -208,7 +208,7 @@ SWP_FNCLIST assert(result); - clean_result(result); + init_result(result); if(num_param(param) > 2) { @@ -260,7 +260,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/freebsd/uptime.c b/src/libs/zbxsysinfo/freebsd/uptime.c index a38b2bd7..f05c6ab7 100644 --- a/src/libs/zbxsysinfo/freebsd/uptime.c +++ b/src/libs/zbxsysinfo/freebsd/uptime.c @@ -29,7 +29,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)) { @@ -49,7 +49,7 @@ int SYSTEM_UPTIME(const char *cmd, const char *param, unsigned flags, AGENT_RESU assert(result); - clean_result(result); + init_result(result); mib[0]=CTL_KERN; mib[1]=KERN_BOOTTIME; @@ -78,7 +78,7 @@ int SYSTEM_UPTIME(const char *cmd, const char *param, unsigned flags, AGENT_RESU assert(result); - clean_result(result); + init_result(result); hz = sysconf(_SC_CLK_TCK); @@ -113,7 +113,7 @@ int SYSTEM_UPTIME(const char *cmd, const char *param, unsigned flags, AGENT_RESU #else assert(result); - clean_result(result); + init_result(result); return SYSINFO_RET_FAIL; #endif |