Fixup style.

This commit is contained in:
Themaister 2014-03-03 10:11:07 +01:00
parent 7a19c34ead
commit 344ebb77e9
3 changed files with 60 additions and 68 deletions

View File

@ -58,7 +58,6 @@ static void core_info_list_resolve_all_firmware(core_info_list_t *core_info_list
size_t i;
unsigned c;
for (i = 0; i < core_info_list->count; i++)
{
core_info_t *info = &core_info_list->list[i];
@ -74,7 +73,6 @@ static void core_info_list_resolve_all_firmware(core_info_list_t *core_info_list
if (!info->firmware)
continue;
for (c = 0; c < count; c++)
{
char path_key[64], desc_key[64];
@ -84,7 +82,6 @@ static void core_info_list_resolve_all_firmware(core_info_list_t *core_info_list
config_get_string(info->data, path_key, &info->firmware[c].path);
config_get_string(info->data, desc_key, &info->firmware[c].desc);
}
}
}
@ -375,7 +372,6 @@ void core_info_list_update_missing_firmware(core_info_list_t *core_info_list,
info->firmware[i].missing = !path_file_exists(path);
}
}
}
void core_info_list_get_missing_firmware(core_info_list_t *core_info_list,

View File

@ -1926,12 +1926,9 @@ void menu_populate_entries(void *data, unsigned menu_type)
file_list_push(rgui->selection_buf, "No options available.", RGUI_SETTINGS_CORE_OPTION_NONE, 0);
break;
case RGUI_SETTINGS_CORE_INFO:
file_list_clear(rgui->selection_buf);
if (rgui->core_info_current.data)
{
file_list_clear(rgui->selection_buf);
snprintf(tmp, sizeof(tmp), "Core name: %s", rgui->core_info_current.display_name ? rgui->core_info_current.display_name : "");
file_list_push(rgui->selection_buf, tmp, RGUI_SETTINGS_CORE_INFO_NONE, 0);
snprintf(tmp, sizeof(tmp), "Authors: %s", rgui->core_info_current.authors ? rgui->core_info_current.authors : "");
@ -1943,7 +1940,6 @@ void menu_populate_entries(void *data, unsigned menu_type)
if (rgui->core_info_current.firmware_count > 0)
{
core_info_list_update_missing_firmware(rgui->core_info, rgui->core_info_current.path, g_settings.system_directory);
file_list_push(rgui->selection_buf, "Required firmware:", RGUI_SETTINGS_CORE_INFO_NONE, 0);
@ -1951,11 +1947,14 @@ void menu_populate_entries(void *data, unsigned menu_type)
{
if (rgui->core_info_current.firmware[i].desc)
{
snprintf(tmp, sizeof(tmp), " Name: %s, %s", rgui->core_info_current.firmware[i].desc ? rgui->core_info_current.firmware[i].desc : "",rgui->core_info_current.firmware[i].missing ? "missing" : "present");
snprintf(tmp, sizeof(tmp), " Name: %s, %s",
rgui->core_info_current.firmware[i].desc ? rgui->core_info_current.firmware[i].desc : "",
rgui->core_info_current.firmware[i].missing ? "missing" : "present");
file_list_push(rgui->selection_buf, tmp, RGUI_SETTINGS_CORE_INFO_NONE, 0);
}
}
}
if (rgui->core_info_current.notes)
{
snprintf(tmp, sizeof(tmp), "Core notes: ");
@ -1967,13 +1966,9 @@ void menu_populate_entries(void *data, unsigned menu_type)
file_list_push(rgui->selection_buf, tmp, RGUI_SETTINGS_CORE_INFO_NONE, 0);
}
}
}
else
{
file_list_clear(rgui->selection_buf);
file_list_push(rgui->selection_buf, "No information available.", RGUI_SETTINGS_CORE_OPTION_NONE, 0);
}
break;
case RGUI_SETTINGS_OPTIONS:
file_list_clear(rgui->selection_buf);

View File

@ -2066,6 +2066,7 @@ void menu_set_settings_label(char *type_str, size_t type_str_size, unsigned *w,
case RGUI_SETTINGS_OPEN_FILEBROWSER_DEFERRED_CORE:
case RGUI_SETTINGS_OPEN_HISTORY:
case RGUI_SETTINGS_CORE_OPTIONS:
case RGUI_SETTINGS_CORE_INFO:
case RGUI_SETTINGS_CUSTOM_VIEWPORT:
case RGUI_SETTINGS_TOGGLE_FULLSCREEN:
case RGUI_SETTINGS_VIDEO_OPTIONS: