- [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

11 files changed, 250 insertions, 250 deletions

diff --git a/src/libs/zbxsysinfo/aix/diskspace.c b/src/libs/zbxsysinfo/aix/diskspace.c
index 29afcef5..6f31f687 100644
--- a/src/libs/zbxsysinfo/aix/diskspace.c
+++ b/src/libs/zbxsysinfo/aix/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);
diff --git a/src/libs/zbxsysinfo/common/file.c b/src/libs/zbxsysinfo/common/file.c
index 56e050a5..657ad9ad 100644
--- a/src/libs/zbxsysinfo/common/file.c
+++ b/src/libs/zbxsysinfo/common/file.c
@@ -42,7 +42,7 @@ int	VFS_FILE_SIZE(const char *cmd, const char *param, unsigned flags, AGENT_RESU
         {
                 return SYSINFO_RET_FAIL;
         }
-	
+
 	if(stat(filename,&buf) == 0)
 	{
 		SET_UI64_RESULT(result, buf.st_size);
diff --git a/src/libs/zbxsysinfo/freebsd/diskspace.c b/src/libs/zbxsysinfo/freebsd/diskspace.c
index be01023b..6d0afd00 100644
--- a/src/libs/zbxsysinfo/freebsd/diskspace.c
+++ b/src/libs/zbxsysinfo/freebsd/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);
diff --git a/src/libs/zbxsysinfo/hpux/diskspace.c b/src/libs/zbxsysinfo/hpux/diskspace.c
index be01023b..6d0afd00 100644
--- a/src/libs/zbxsysinfo/hpux/diskspace.c
+++ b/src/libs/zbxsysinfo/hpux/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);
diff --git a/src/libs/zbxsysinfo/linux/diskspace.c b/src/libs/zbxsysinfo/linux/diskspace.c
index ddc998df..5d470daf 100644
--- a/src/libs/zbxsysinfo/linux/diskspace.c
+++ b/src/libs/zbxsysinfo/linux/diskspace.c
@@ -58,22 +58,22 @@ int	get_fs_size_stat(char *fs, zbx_uint64_t *total, zbx_uint64_t *free, zbx_uint
         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];*/
         zbx_uint64_t  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];*/
         zbx_uint64_t  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];*/
         zbx_uint64_t  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];*/
         zbx_uint64_t  tot_val = 0;
         zbx_uint64_t  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 * (double)free_val) / (double)tot_val);
@@ -156,7 +156,7 @@ static int	VFS_FS_PFREE(const char *cmd, const char *param, unsigned flags, AGEN
 
 static int	VFS_FS_PUSED(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
 {
-        char    mountPoint[MAX_STRING_LEN];
+/*        char    mountPoint[MAX_STRING_LEN];*/
         zbx_uint64_t  tot_val = 0;
         zbx_uint64_t  usg_val = 0;
 
@@ -164,14 +164,14 @@ 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;
 
         if(get_fs_size_stat(mountPoint, &tot_val, NULL, &usg_val) != SYSINFO_RET_OK)
-                return  SYSINFO_RET_FAIL;
+                return  SYSINFO_RET_FAIL;*/
 
 	SET_DBL_RESULT(result, (100.0 * (double)usg_val) / (double)tot_val);
 
@@ -205,7 +205,7 @@ FS_FNCLIST
         assert(result);
 
         init_result(result);
-	
+
         if(num_param(param) > 2)
         {
                 return SYSINFO_RET_FAIL;
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);
diff --git a/src/libs/zbxsysinfo/openbsd/diskspace.c b/src/libs/zbxsysinfo/openbsd/diskspace.c
index be01023b..6d0afd00 100644
--- a/src/libs/zbxsysinfo/openbsd/diskspace.c
+++ b/src/libs/zbxsysinfo/openbsd/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);
diff --git a/src/libs/zbxsysinfo/osf/diskspace.c b/src/libs/zbxsysinfo/osf/diskspace.c
index be01023b..6d0afd00 100644
--- a/src/libs/zbxsysinfo/osf/diskspace.c
+++ b/src/libs/zbxsysinfo/osf/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);
diff --git a/src/libs/zbxsysinfo/osx/diskspace.c b/src/libs/zbxsysinfo/osx/diskspace.c
index be01023b..6d0afd00 100644
--- a/src/libs/zbxsysinfo/osx/diskspace.c
+++ b/src/libs/zbxsysinfo/osx/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);
diff --git a/src/libs/zbxsysinfo/solaris/diskspace.c b/src/libs/zbxsysinfo/solaris/diskspace.c
index 1f8e2ca6..8acbdbea 100644
--- a/src/libs/zbxsysinfo/solaris/diskspace.c
+++ b/src/libs/zbxsysinfo/solaris/diskspace.c
@@ -42,22 +42,22 @@ int	get_fs_size_stat(char *fs, double *total, double *free, double *usage)
 	return SYSINFO_RET_OK;
 }
 
-int	VFS_FS_USED(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
+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);
@@ -65,22 +65,22 @@ int	VFS_FS_USED(const char *cmd, const char *param, unsigned flags, AGENT_RESULT
         return SYSINFO_RET_OK;
 }
 
-int	VFS_FS_FREE(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
+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);
@@ -88,24 +88,24 @@ int	VFS_FS_FREE(const char *cmd, const char *param, unsigned flags, AGENT_RESULT
         return SYSINFO_RET_OK;
 }
 
-int	VFS_FS_TOTAL(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
+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);
@@ -114,9 +114,9 @@ int	VFS_FS_TOTAL(const char *cmd, const char *param, unsigned flags, AGENT_RESUL
 
 }
 
-int	VFS_FS_PFREE(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
+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;
 
@@ -124,13 +124,13 @@ int	VFS_FS_PFREE(const char *cmd, const char *param, unsigned flags, AGENT_RESUL
 
         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);
@@ -138,9 +138,9 @@ int	VFS_FS_PFREE(const char *cmd, const char *param, unsigned flags, AGENT_RESUL
         return SYSINFO_RET_OK;
 }
 
-int	VFS_FS_PUSED(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
+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;
 
@@ -148,13 +148,13 @@ int	VFS_FS_PUSED(const char *cmd, const char *param, unsigned flags, AGENT_RESUL
 
         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);
diff --git a/src/libs/zbxsysinfo/unknown/diskspace.c b/src/libs/zbxsysinfo/unknown/diskspace.c
index be01023b..6d0afd00 100644
--- a/src/libs/zbxsysinfo/unknown/diskspace.c
+++ b/src/libs/zbxsysinfo/unknown/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);