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

1 files changed, 19 insertions, 51 deletions

diff --git a/src/hardware/dmidecode.c b/src/hardware/dmidecode.c
index a50aa8a..04988a9 100644
--- a/src/hardware/dmidecode.c
+++ b/src/hardware/dmidecode.c
@@ -359,56 +359,36 @@ void dmi_free_processors(DmiProcessor **cpus, unsigned *cpus_nb)
 
     if (*cpus_nb > 0) {
         for (i = 0; i < *cpus_nb; i++) {
-            if ((*cpus)[i].id) {
-                free((*cpus)[i].id);
-            }
+            free((*cpus)[i].id);
             (*cpus)[i].id = NULL;
-            if ((*cpus)[i].family) {
-                free((*cpus)[i].family);
-            }
+            free((*cpus)[i].family);
             (*cpus)[i].family = NULL;
-            if ((*cpus)[i].status) {
-                free((*cpus)[i].status);
-            }
+            free((*cpus)[i].status);
             (*cpus)[i].status = NULL;
-            if ((*cpus)[i].name) {
-                free((*cpus)[i].name);
-            }
+            free((*cpus)[i].name);
             (*cpus)[i].name = NULL;
-            if ((*cpus)[i].type) {
-                free((*cpus)[i].type);
-            }
+            free((*cpus)[i].type);
             (*cpus)[i].type = NULL;
-            if ((*cpus)[i].stepping) {
-                free((*cpus)[i].stepping);
-            }
+            free((*cpus)[i].stepping);
             (*cpus)[i].stepping = NULL;
-            if ((*cpus)[i].upgrade) {
-                free((*cpus)[i].upgrade);
-            }
+            free((*cpus)[i].upgrade);
             (*cpus)[i].upgrade = NULL;
+
             if ((*cpus)[i].charact_nb > 0) {
                 for (j = 0; j < (*cpus)[i].charact_nb; j++) {
-                    if ((*cpus)[i].characteristics[j]) {
-                        free((*cpus)[i].characteristics[j]);
-                    }
+                    free((*cpus)[i].characteristics[j]);
                     (*cpus)[i].characteristics[j] = NULL;
                 }
                 free((*cpus)[i].characteristics);
             }
             (*cpus)[i].charact_nb = 0;
             (*cpus)[i].characteristics = NULL;
-            if ((*cpus)[i].l1_cache_handle) {
-                free((*cpus)[i].l1_cache_handle);
-            }
+
+            free((*cpus)[i].l1_cache_handle);
             (*cpus)[i].l1_cache_handle = NULL;
-            if ((*cpus)[i].l2_cache_handle) {
-                free((*cpus)[i].l2_cache_handle);
-            }
+            free((*cpus)[i].l2_cache_handle);
             (*cpus)[i].l2_cache_handle = NULL;
-            if ((*cpus)[i].l3_cache_handle) {
-                free((*cpus)[i].l3_cache_handle);
-            }
+            free((*cpus)[i].l3_cache_handle);
             (*cpus)[i].l3_cache_handle = NULL;
         }
         free (*cpus);
@@ -645,29 +625,17 @@ void dmi_free_cpu_caches(DmiCpuCache **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].status) {
-                free((*caches)[i].status);
-            }
+            free((*caches)[i].status);
             (*caches)[i].status = NULL;
-            if ((*caches)[i].op_mode) {
-                free((*caches)[i].op_mode);
-            }
+            free((*caches)[i].op_mode);
             (*caches)[i].op_mode = NULL;
-            if ((*caches)[i].type) {
-                free((*caches)[i].type);
-            }
+            free((*caches)[i].type);
             (*caches)[i].type = NULL;
-            if ((*caches)[i].associativity) {
-                free((*caches)[i].associativity);
-            }
+            free((*caches)[i].associativity);
             (*caches)[i].associativity = NULL;
         }
         free (*caches);