diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-11-01 16:36:03 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-11-01 16:36:03 +0000 |
| commit | 8bbda1139ac3e396a1af764a3d3ca5d6fa4f7040 (patch) | |
| tree | 4d9cc6a8da28057b21a5260dcabd724606b1d453 /src | |
| parent | dab00a8bf5bba7034ad8bb4c27d2b9349bda8287 (diff) | |
| download | zabbix-8bbda1139ac3e396a1af764a3d3ca5d6fa4f7040.tar.gz zabbix-8bbda1139ac3e396a1af764a3d3ca5d6fa4f7040.tar.xz zabbix-8bbda1139ac3e396a1af764a3d3ca5d6fa4f7040.zip | |
Minor changes.
git-svn-id: svn://svn.zabbix.com/trunk@2240 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/zbxsysinfo/freebsd/inodes.c | 19 | ||||
| -rw-r--r-- | src/libs/zbxsysinfo/freebsd/proc.c | 2 |
2 files changed, 3 insertions, 18 deletions
diff --git a/src/libs/zbxsysinfo/freebsd/inodes.c b/src/libs/zbxsysinfo/freebsd/inodes.c index c8109f28..b1283d4c 100644 --- a/src/libs/zbxsysinfo/freebsd/inodes.c +++ b/src/libs/zbxsysinfo/freebsd/inodes.c @@ -26,36 +26,22 @@ static int get_fs_inodes_stat(char *fs, double *total, double *free, double *usage) { -#ifdef HAVE_SYS_STATVFS_H - struct statvfs s; -#else struct statfs s; -#endif assert(fs); -#ifdef HAVE_SYS_STATVFS_H - if ( statvfs( fs, &s) != 0 ) -#else if ( statfs( fs, &s) != 0 ) -#endif { return SYSINFO_RET_FAIL; } if(total) (*total) = (double)(s.f_files); -#ifdef HAVE_SYS_STATVFS_H if(free) - (*free) = (double)(s.f_favail); - if(usage) - (*usage) = (double)(s.f_files - s.f_favail); -#else - if(free) - (*free) = (double)(s.ffree); + (*free) = (double)(s.f_ffree); if(usage) (*usage) = (double)(s.f_files - s.f_ffree); -#endif + return SYSINFO_RET_OK; } @@ -241,4 +227,3 @@ FS_FNCLIST return SYSINFO_RET_FAIL; } - diff --git a/src/libs/zbxsysinfo/freebsd/proc.c b/src/libs/zbxsysinfo/freebsd/proc.c index d80dac13..4d6ee05a 100644 --- a/src/libs/zbxsysinfo/freebsd/proc.c +++ b/src/libs/zbxsysinfo/freebsd/proc.c @@ -309,12 +309,12 @@ int PROC_NUM(const char *cmd, const char *param, unsigned flags, AGENT_RESUL long int lvalue = 0; FILE *f; + int proccount = 0; assert(result); clean_result(result); - int proccount = 0; if(num_param(param) > 3) { |