diff options
| author | Peter Schiffer <pschiffe@redhat.com> | 2013-04-08 20:25:59 +0200 |
|---|---|---|
| committer | Peter Schiffer <pschiffe@redhat.com> | 2013-04-08 20:25:59 +0200 |
| commit | 699a49933d2b2690888f719a447682d85c9942b0 (patch) | |
| tree | abaf80cecec848db033318cfe84bac08b884dbdc /src/hardware/sysfs.c | |
| parent | 9b77270eebd073ab4060ac84e4b40fc0652dff07 (diff) | |
| download | openlmi-providers-699a49933d2b2690888f719a447682d85c9942b0.tar.gz openlmi-providers-699a49933d2b2690888f719a447682d85c9942b0.tar.xz openlmi-providers-699a49933d2b2690888f719a447682d85c9942b0.zip | |
Hardware: Code clean up
* Got rid of asprintf() where suitable (used static memory instead)
* Removed if conditional before free()
* Replaced more hard coded numbers with LMI constants
Diffstat (limited to 'src/hardware/sysfs.c')
| -rw-r--r-- | src/hardware/sysfs.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/hardware/sysfs.c b/src/hardware/sysfs.c index c2cc1af..d07df71 100644 --- a/src/hardware/sysfs.c +++ b/src/hardware/sysfs.c @@ -148,7 +148,7 @@ short sysfs_get_cpu_caches(SysfsCpuCache **caches, unsigned *caches_nb) { short ret = -1; unsigned i, level; - char *buf, *format_str, path[PATH_MAX]; + char *buf = NULL, *format_str, path[PATH_MAX]; DIR *dir; *caches_nb = 0; @@ -256,9 +256,7 @@ short sysfs_get_cpu_caches(SysfsCpuCache **caches, unsigned *caches_nb) ret = 0; done: - if (buf) { - free(buf); - } + free(buf); buf = NULL; if (ret != 0) { @@ -274,17 +272,11 @@ void sysfs_free_cpu_caches(SysfsCpuCache **caches, unsigned *caches_nb) if (*caches_nb > 0) { for (i = 0; i < *caches_nb; i++) { - if ((*caches)[i].id) { - free((*caches)[i].id); - } + free((*caches)[i].id); (*caches)[i].id = NULL; - if ((*caches)[i].name) { - free((*caches)[i].name); - } + free((*caches)[i].name); (*caches)[i].name = NULL; - if ((*caches)[i].type) { - free((*caches)[i].type); - } + free((*caches)[i].type); (*caches)[i].type = NULL; } free (*caches); |