Skip to content

Commit 3208d4b

Browse files
JJLovesLifecharles-lunarg
authored andcommitted
fix: format code, fix build warning, fix memory leak
1 parent e30b49a commit 3208d4b

2 files changed

Lines changed: 5 additions & 6 deletions

File tree

loader/loader.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2835,8 +2835,7 @@ VkResult loader_read_layer_json(const struct loader_instance *inst, struct loade
28352835

28362836
// Parse description
28372837

2838-
result =
2839-
loader_parse_json_string_to_existing_str(layer_node, "description", VK_MAX_DESCRIPTION_SIZE, props.info.description);
2838+
result = loader_parse_json_string_to_existing_str(layer_node, "description", VK_MAX_DESCRIPTION_SIZE, props.info.description);
28402839
if (VK_ERROR_INITIALIZATION_FAILED == result) {
28412840
loader_log(
28422841
inst, VULKAN_LOADER_WARN_BIT, 0,

loader/settings.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -883,7 +883,7 @@ TEST_FUNCTION_EXPORT VkResult update_global_loader_settings(void) {
883883
if (!check_if_settings_are_equal(&settings, &global_loader_settings)) {
884884
log_settings(NULL, &settings);
885885
}
886-
886+
free_loader_settings(NULL, &global_loader_settings);
887887
memcpy(&global_loader_settings, &settings, sizeof(loader_settings));
888888
if (global_loader_settings.settings_active && global_loader_settings.debug_level > 0) {
889889
loader_set_global_debug_level(global_loader_settings.debug_level);
@@ -991,7 +991,7 @@ TEST_FUNCTION_EXPORT VkResult get_settings_layers(const struct loader_instance*
991991
}
992992

993993
// Makes it possible to know if a new layer was added or not, since the only return value is VkResult
994-
size_t count_before_adding = settings_layers->count;
994+
uint32_t count_before_adding = settings_layers->count;
995995

996996
local_res =
997997
loader_add_layer_properties(inst, settings_layers, json, layer_config->treat_as_implicit_manifest, layer_config->path);
@@ -1019,8 +1019,8 @@ TEST_FUNCTION_EXPORT VkResult get_settings_layers(const struct loader_instance*
10191019
bool should_remove = false;
10201020
// Make sure the layer isn't already in the list
10211021
for (uint32_t k = 0; k < j; k++) {
1022-
if (0 ==
1023-
strncmp(settings_layers->list[k].info.layerName, newly_added_layer->info.layerName, VK_MAX_EXTENSION_NAME_SIZE)) {
1022+
if (0 == strncmp(settings_layers->list[k].info.layerName, newly_added_layer->info.layerName,
1023+
VK_MAX_EXTENSION_NAME_SIZE)) {
10241024
if (0 == (newly_added_layer->type_flags & VK_LAYER_TYPE_FLAG_META_LAYER) &&
10251025
settings_layers->list[k].lib_name != NULL && newly_added_layer->lib_name != NULL &&
10261026
strcmp(settings_layers->list[k].lib_name, newly_added_layer->lib_name) == 0) {

0 commit comments

Comments
 (0)