diff options
| author | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-11-13 23:53:37 +0000 |
|---|---|---|
| committer | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-11-13 23:53:37 +0000 |
| commit | cd07fb09470d2ec5e286ef988db5500c5a3c522e (patch) | |
| tree | c894c54229c71157e518773f38c698e0464633aa /src/libs/zbxsysinfo/netbsd | |
| parent | 3c4d85925af84b10a9cdb70b91589c70fdd97519 (diff) | |
| download | zabbix-cd07fb09470d2ec5e286ef988db5500c5a3c522e.tar.gz zabbix-cd07fb09470d2ec5e286ef988db5500c5a3c522e.tar.xz zabbix-cd07fb09470d2ec5e286ef988db5500c5a3c522e.zip | |
- [ZBX-154] fixed processing of comma in zbx.fs.size[] (Alexei)
[svn merge -r5018:5020 svn://svn.zabbix.com/branches/1.4]
git-svn-id: svn://svn.zabbix.com/trunk@5021 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src/libs/zbxsysinfo/netbsd')
| -rw-r--r-- | src/libs/zbxsysinfo/netbsd/diskspace.c | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/libs/zbxsysinfo/netbsd/diskspace.c b/src/libs/zbxsysinfo/netbsd/diskspace.c index e9dfd0a5..3eda44e1 100644 --- a/src/libs/zbxsysinfo/netbsd/diskspace.c +++ b/src/libs/zbxsysinfo/netbsd/diskspace.c @@ -58,22 +58,22 @@ int get_fs_size_stat(char *fs, double *total, double *free, double *usage) return SYSINFO_RET_OK; } -static int VFS_FS_USED(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) +static int VFS_FS_USED(const char *cmd, char *param, unsigned flags, AGENT_RESULT *result) { - char mountPoint[MAX_STRING_LEN]; +/* char mountPoint[MAX_STRING_LEN];*/ double value = 0; assert(result); init_result(result); - if(num_param(param) > 1) +/* if(num_param(param) > 1) return SYSINFO_RET_FAIL; if(get_param(param, 1, mountPoint, MAX_STRING_LEN) != 0) - return SYSINFO_RET_FAIL; + return SYSINFO_RET_FAIL;*/ - if(get_fs_size_stat(mountPoint, NULL, NULL, &value) != SYSINFO_RET_OK) + if(get_fs_size_stat(param, NULL, NULL, &value) != SYSINFO_RET_OK) return SYSINFO_RET_FAIL; SET_UI64_RESULT(result, value); @@ -81,22 +81,22 @@ static int VFS_FS_USED(const char *cmd, const char *param, unsigned flags, AGENT return SYSINFO_RET_OK; } -static int VFS_FS_FREE(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) +static int VFS_FS_FREE(const char *cmd, char *param, unsigned flags, AGENT_RESULT *result) { - char mountPoint[MAX_STRING_LEN]; +/* char mountPoint[MAX_STRING_LEN];*/ double value = 0; assert(result); init_result(result); - if(num_param(param) > 1) +/* if(num_param(param) > 1) return SYSINFO_RET_FAIL; if(get_param(param, 1, mountPoint, MAX_STRING_LEN) != 0) - return SYSINFO_RET_FAIL; + return SYSINFO_RET_FAIL;*/ - if(get_fs_size_stat(mountPoint, NULL, &value, NULL) != SYSINFO_RET_OK) + if(get_fs_size_stat(param, NULL, &value, NULL) != SYSINFO_RET_OK) return SYSINFO_RET_FAIL; SET_UI64_RESULT(result, value); @@ -104,24 +104,24 @@ static int VFS_FS_FREE(const char *cmd, const char *param, unsigned flags, AGENT return SYSINFO_RET_OK; } -static int VFS_FS_TOTAL(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) +static int VFS_FS_TOTAL(const char *cmd, char *param, unsigned flags, AGENT_RESULT *result) { - char mountPoint[MAX_STRING_LEN]; +/* char mountPoint[MAX_STRING_LEN];*/ double value = 0; assert(result); init_result(result); - if(num_param(param) > 1) +/* if(num_param(param) > 1) return SYSINFO_RET_FAIL; if(get_param(param, 1, mountPoint, MAX_STRING_LEN) != 0) { return SYSINFO_RET_FAIL; - } + }*/ - if(get_fs_size_stat(mountPoint, &value, NULL, NULL) != SYSINFO_RET_OK) + if(get_fs_size_stat(param, &value, NULL, NULL) != SYSINFO_RET_OK) return SYSINFO_RET_FAIL; SET_UI64_RESULT(result, value); @@ -130,9 +130,9 @@ static int VFS_FS_TOTAL(const char *cmd, const char *param, unsigned flags, AGEN } -static int VFS_FS_PFREE(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) +static int VFS_FS_PFREE(const char *cmd, char *param, unsigned flags, AGENT_RESULT *result) { - char mountPoint[MAX_STRING_LEN]; +/* char mountPoint[MAX_STRING_LEN];*/ double tot_val = 0; double free_val = 0; @@ -140,13 +140,13 @@ static int VFS_FS_PFREE(const char *cmd, const char *param, unsigned flags, AGEN init_result(result); - if(num_param(param) > 1) +/* if(num_param(param) > 1) return SYSINFO_RET_FAIL; if(get_param(param, 1, mountPoint, MAX_STRING_LEN) != 0) - return SYSINFO_RET_FAIL; + return SYSINFO_RET_FAIL;*/ - if(get_fs_size_stat(mountPoint, &tot_val, &free_val, NULL) != SYSINFO_RET_OK) + if(get_fs_size_stat(param, &tot_val, &free_val, NULL) != SYSINFO_RET_OK) return SYSINFO_RET_FAIL; SET_DBL_RESULT(result, (100.0 * free_val) / tot_val); @@ -154,9 +154,9 @@ static int VFS_FS_PFREE(const char *cmd, const char *param, unsigned flags, AGEN return SYSINFO_RET_OK; } -static int VFS_FS_PUSED(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) +static int VFS_FS_PUSED(const char *cmd, char *param, unsigned flags, AGENT_RESULT *result) { - char mountPoint[MAX_STRING_LEN]; +/* char mountPoint[MAX_STRING_LEN];*/ double tot_val = 0; double usg_val = 0; @@ -164,13 +164,13 @@ static int VFS_FS_PUSED(const char *cmd, const char *param, unsigned flags, AGEN init_result(result); - if(num_param(param) > 1) +/* if(num_param(param) > 1) return SYSINFO_RET_FAIL; if(get_param(param, 1, mountPoint, MAX_STRING_LEN) != 0) - return SYSINFO_RET_FAIL; + return SYSINFO_RET_FAIL;*/ - if(get_fs_size_stat(mountPoint, &tot_val, NULL, &usg_val) != SYSINFO_RET_OK) + if(get_fs_size_stat(param, &tot_val, NULL, &usg_val) != SYSINFO_RET_OK) return SYSINFO_RET_FAIL; SET_DBL_RESULT(result, (100.0 * usg_val) / tot_val); |