diff options
| author | RichardHitt <rbh00@netcom.com> | 2013-01-10 02:14:02 -0800 |
|---|---|---|
| committer | RichardHitt <rbh00@netcom.com> | 2013-01-10 02:14:02 -0800 |
| commit | bf673072e8457b60a5a8c8d0adf53fa3ccb71ea6 (patch) | |
| tree | 4a4d78d292998d449f04237c779d6d90e38b44ec /plugins/sysinfo | |
| parent | efdfa50f1e711e5bdd3ec98a3dedea422b3da362 (diff) | |
| parent | 475eb9fcaab1d846a3617f587f22bd77cdeddd5e (diff) | |
Merge branch 'master' into pull350
Diffstat (limited to 'plugins/sysinfo')
| -rw-r--r-- | plugins/sysinfo/match.c | 3 | ||||
| -rw-r--r-- | plugins/sysinfo/parse.c | 9 |
2 files changed, 6 insertions, 6 deletions
diff --git a/plugins/sysinfo/match.c b/plugins/sysinfo/match.c index e40ac428..7d719738 100644 --- a/plugins/sysinfo/match.c +++ b/plugins/sysinfo/match.c @@ -37,7 +37,6 @@ char *pretty_freespace(const char *desc, unsigned long long *free_k, unsigned lo free_space = *free_k; total_space = *total_k; result = malloc(bsize * sizeof(char)); - bytesize = malloc(3 * sizeof(char)); const char *quantities = "KB\0MB\0GB\0TB\0PB\0EB\0ZB\0YB\0"; int i=0; if (total_space == 0) @@ -45,6 +44,7 @@ char *pretty_freespace(const char *desc, unsigned long long *free_k, unsigned lo snprintf(result, bsize, "%s: none", desc); return result; } + bytesize = malloc(3 * sizeof(char)); while (total_space > 1023 && i <= 14) { i=i+3; @@ -61,6 +61,7 @@ char *pretty_freespace(const char *desc, unsigned long long *free_k, unsigned lo else snprintf(result, bsize, "%s: %.1f%s/%.1f%s free", desc, free_space, bytesize, total_space, bytesize); + free (bytesize); return result; } diff --git a/plugins/sysinfo/parse.c b/plugins/sysinfo/parse.c index fbca6213..c1b478f8 100644 --- a/plugins/sysinfo/parse.c +++ b/plugins/sysinfo/parse.c @@ -394,6 +394,7 @@ int xs_parse_distro(char *name) char keywords[bsize]; while(fgets(buffer, bsize, fp) != NULL) find_match_char(buffer, "ACCEPT_KEYWORDS", keywords); + /* cppcheck-suppress uninitvar */ if (strstr(keywords, "\"") == NULL) snprintf(buffer, bsize, "Gentoo Linux (stable)"); else @@ -440,16 +441,14 @@ int xs_parse_hwmon_chip(char *chip) int xs_parse_hwmon_temp(char *temp, unsigned int *sensor) { - unsigned int *value; + unsigned int value; float celsius; - value = malloc(sizeof(int)); if (!hwmon_chip_present()) return 1; else - get_hwmon_temp(value, sensor); - celsius = (float)*value; + get_hwmon_temp(&value, sensor); + celsius = (float)value; snprintf(temp, bsize, "%.1fC", celsius/1000.0); - free(value); return 0; } |