Use memset to clear structs

Several places manually zero'd out each member of a struct. This makes it possible to
forget to zero out members, especially as structs change over time. Using memset
prevents that possibility.

diff --git a/loader/loader.c b/loader/loader.c
index 56705e5f51b204d6a3c9c4794831eeaf90d59705..87d62806d944be62bea56d3e3615bdccc0cc9354 100644 (file)
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -325,10 +325,8 @@ void free_string_list(const struct loader_instance *inst, struct loader_string_l
             string_list->list[i] = NULL;
         }
         loader_instance_heap_free(inst, string_list->list);
-        string_list->list = NULL;
     }
-    string_list->count = 0;
-    string_list->allocated_count = 0;
+    memset(string_list, 0, sizeof(struct loader_string_list));
 }
 
 // Given string of three part form "maj.min.pat" convert to a vulkan version number.
@@ -503,6 +501,7 @@ void loader_delete_layer_list_and_properties(const struct loader_instance *inst,
         layer_list->capacity = 0;
         loader_instance_heap_free(inst, layer_list->list);
     }
+    memset(layer_list, 0, sizeof(struct loader_layer_list));
 }
 
 void loader_remove_layer_in_list(const struct loader_instance *inst, struct loader_layer_list *layer_list,
@@ -715,9 +714,7 @@ VkResult loader_init_generic_list(const struct loader_instance *inst, struct loa
 
 void loader_destroy_generic_list(const struct loader_instance *inst, struct loader_generic_list *list) {
     loader_instance_heap_free(inst, list->list);
-    list->count = 0;
-    list->capacity = 0;
-    list->list = NULL;
+    memset(list, 0, sizeof(struct loader_generic_list));
 }
 
 // Append non-duplicate extension properties defined in props to the given ext_list.
@@ -837,9 +834,7 @@ bool loader_names_array_has_layer_property(const VkLayerProperties *vk_layer_pro
 
 void loader_destroy_pointer_layer_list(const struct loader_instance *inst, struct loader_pointer_layer_list *layer_list) {
     loader_instance_heap_free(inst, layer_list->list);
-    layer_list->count = 0;
-    layer_list->capacity = 0;
-    layer_list->list = NULL;
+    memset(layer_list, 0, sizeof(struct loader_pointer_layer_list));
 }
 
 // Append layer properties defined in prop_list to the given layer_info list
@@ -1349,16 +1344,9 @@ void loader_unload_scanned_icd(struct loader_instance *inst, struct loader_scann
     }
     if (scanned_icd->handle) {
         loader_platform_close_library(scanned_icd->handle);
-        scanned_icd->handle = NULL;
     }
     loader_instance_heap_free(inst, scanned_icd->lib_name);
-    scanned_icd->lib_name = NULL;
-    scanned_icd->CreateInstance = NULL;
-    scanned_icd->EnumerateInstanceExtensionProperties = NULL;
-    scanned_icd->GetInstanceProcAddr = NULL;
-    scanned_icd->GetPhysicalDeviceProcAddr = NULL;
-    scanned_icd->api_version = 0;
-    scanned_icd->interface_version = 0;
+    memset(scanned_icd, 0, sizeof(struct loader_scanned_icd));
 }
 
 // Determine the ICD interface version to use.
@@ -1406,9 +1394,7 @@ void loader_clear_scanned_icd_list(const struct loader_instance *inst, struct lo
         }
         loader_instance_heap_free(inst, icd_tramp_list->scanned_list);
     }
-    icd_tramp_list->capacity = 0;
-    icd_tramp_list->count = 0;
-    icd_tramp_list->scanned_list = NULL;
+    memset(icd_tramp_list, 0, sizeof(struct loader_icd_tramp_list));
 }
 
 VkResult loader_init_scanned_icd_list(const struct loader_instance *inst, struct loader_icd_tramp_list *icd_tramp_list) {

diff --git a/loader/settings.c b/loader/settings.c
index 145e5b2c1c6237128a2ef0239237baa8d54de6c9..828937a0df7a0c64319a76635ffbf5be367f16c8 100644 (file)
--- a/loader/settings.c
+++ b/loader/settings.c
@@ -37,9 +37,8 @@ loader_settings global_loader_settings;
 
 void free_layer_configuration(const struct loader_instance* inst, loader_settings_layer_configuration* layer_configuration) {
     loader_instance_heap_free(inst, layer_configuration->name);
-    layer_configuration->name = NULL;
     loader_instance_heap_free(inst, layer_configuration->path);
-    layer_configuration->path = NULL;
+    memset(layer_configuration, 0, sizeof(loader_settings_layer_configuration));
 }
 
 void free_loader_settings(const struct loader_instance* inst, loader_settings* settings) {
@@ -50,7 +49,6 @@ void free_loader_settings(const struct loader_instance* inst, loader_settings* s
     }
     loader_instance_heap_free(inst, settings->layer_configurations);
     loader_instance_heap_free(inst, settings->settings_file_path);
-    settings->layer_configurations = NULL;
     memset(settings, 0, sizeof(loader_settings));
 }