summaryrefslogtreecommitdiffstats
path: root/src/hardware/utils.c
diff options
context:
space:
mode:
authorPeter Schiffer <pschiffe@redhat.com>2013-04-08 20:25:59 +0200
committerPeter Schiffer <pschiffe@redhat.com>2013-04-08 20:25:59 +0200
commit699a49933d2b2690888f719a447682d85c9942b0 (patch)
treeabaf80cecec848db033318cfe84bac08b884dbdc /src/hardware/utils.c
parent9b77270eebd073ab4060ac84e4b40fc0652dff07 (diff)
downloadopenlmi-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/utils.c')
-rw-r--r--src/hardware/utils.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/hardware/utils.c b/src/hardware/utils.c
index da7bbfa..8c1b63e 100644
--- a/src/hardware/utils.c
+++ b/src/hardware/utils.c
@@ -103,9 +103,7 @@ short read_fp_to_2d_buffer(FILE *fp, char ***buffer, unsigned *buffer_size)
ret = 0;
done:
- if (line) {
- free(line);
- }
+ free(line);
line = NULL;
if (ret != 0) {
@@ -122,9 +120,7 @@ void free_2d_buffer(char ***buffer, unsigned *buffer_size)
if (tmp_buffer_lines > 0) {
for (i = 0; i < tmp_buffer_lines; i++) {
- if (tmp_buffer[i]) {
- free(tmp_buffer[i]);
- }
+ free(tmp_buffer[i]);
tmp_buffer[i] = NULL;
}
free(tmp_buffer);
@@ -369,9 +365,7 @@ short explode(const char *str, const char *delims, char ***buffer, unsigned *buf
ret = 0;
done:
- if (trimmed_str) {
- free(trimmed_str);
- }
+ free(trimmed_str);
trimmed_str = NULL;
if (ret != 0) {