diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-07-12 09:14:46 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-07-12 09:14:46 +0000 |
| commit | 8a9f232945f6ec241470513933baf6d72d256a06 (patch) | |
| tree | 01c03798a9850c55f88a3e34db706a8786040482 /src/libs/zbxsysinfo/linux/diskio.c | |
| parent | 62918b434f4f3c809505715d1d92c402110ab230 (diff) | |
| download | zabbix-8a9f232945f6ec241470513933baf6d72d256a06.tar.gz zabbix-8a9f232945f6ec241470513933baf6d72d256a06.tar.xz zabbix-8a9f232945f6ec241470513933baf6d72d256a06.zip | |
zabbix-1.2_dev integration
git-svn-id: svn://svn.zabbix.com/trunk@3038 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src/libs/zbxsysinfo/linux/diskio.c')
| -rw-r--r-- | src/libs/zbxsysinfo/linux/diskio.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/libs/zbxsysinfo/linux/diskio.c b/src/libs/zbxsysinfo/linux/diskio.c index 02de011e..03837ba3 100644 --- a/src/libs/zbxsysinfo/linux/diskio.c +++ b/src/libs/zbxsysinfo/linux/diskio.c @@ -97,8 +97,7 @@ static int get_disk_stat(const char *interface, struct disk_stat_s *result) assert(result); - f=fopen(INFO_FILE_NAME,"r"); - if(f) + if(NULL != (f = fopen(INFO_FILE_NAME,"r") )) { while(fgets(line,MAX_STRING_LEN,f) != NULL) { @@ -110,7 +109,7 @@ static int get_disk_stat(const char *interface, struct disk_stat_s *result) break; } } - fclose(f); + zbx_fclose(f); } if(ret != SYSINFO_RET_OK) @@ -137,12 +136,12 @@ int VFS_DEV_WRITE(const char *cmd, const char *param, unsigned flags, AGENT_RESU return SYSINFO_RET_FAIL; } - if(get_param(param, 1, devname, MAX_STRING_LEN) != 0) + if(get_param(param, 1, devname, sizeof(devname)) != 0) { return SYSINFO_RET_FAIL; } - if(get_param(param, 2, mode, MAX_STRING_LEN) != 0) + if(get_param(param, 2, mode, sizeof(mode)) != 0) { mode[0] = '\0'; } @@ -150,7 +149,7 @@ int VFS_DEV_WRITE(const char *cmd, const char *param, unsigned flags, AGENT_RESU if(mode[0] == '\0') { /* default parameter */ - sprintf(mode, "sectors"); + zbx_snprintf(mode, sizeof(mode), "sectors"); } ret = get_disk_stat(devname, &ds); @@ -192,12 +191,12 @@ int VFS_DEV_READ(const char *cmd, const char *param, unsigned flags, AGENT_RESUL return SYSINFO_RET_FAIL; } - if(get_param(param, 1, devname, MAX_STRING_LEN) != 0) + if(get_param(param, 1, devname, sizeof(devname)) != 0) { return SYSINFO_RET_FAIL; } - if(get_param(param, 2, mode, MAX_STRING_LEN) != 0) + if(get_param(param, 2, mode, sizeof(mode)) != 0) { mode[0] = '\0'; } @@ -205,7 +204,7 @@ int VFS_DEV_READ(const char *cmd, const char *param, unsigned flags, AGENT_RESUL if(mode[0] == '\0') { /* default parameter */ - sprintf(mode, "sectors"); + zbx_snprintf(mode, sizeof(mode), "sectors"); } ret = get_disk_stat(devname, &ds); |