ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(menu_displaylist.c) Cleanups

This commit is contained in:
twinaphex 2015-06-12 16:36:15 +02:00
parent 3abf8ec982
commit 2b9d70a672
1 changed files with 74 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
menu/menu_displaylist.c
View File

@ -42,7 +42,8 @@ static void print_buf_lines(file_list_t *list, char *buf, int buf_size,
unsigned type) unsigned type)
{ {
int i; int i;
char c, *line_start = buf; char c;
char *line_start = buf;
for (i = 0; i < buf_size; i++) for (i = 0; i < buf_size; i++)
{ {
@ -201,7 +202,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
if (core_info && core_info->data) if (core_info && core_info->data)
{ {
char tmp[PATH_MAX_LENGTH]; char tmp[PATH_MAX_LENGTH] = {0};
snprintf(tmp, sizeof(tmp), "Core name: %s", snprintf(tmp, sizeof(tmp), "Core name: %s",
core_info->core_name ? core_info->core_name : ""); core_info->core_name ? core_info->core_name : "");
@ -329,8 +330,8 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info) static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
{ {
{ {
char tmp[PATH_MAX_LENGTH]; char tmp[PATH_MAX_LENGTH] = {0};
char tmp2[PATH_MAX_LENGTH]; char tmp2[PATH_MAX_LENGTH] = {0};
const char *tmp_string = NULL; const char *tmp_string = NULL;
const frontend_ctx_driver_t *frontend = frontend_get_ptr(); const frontend_ctx_driver_t *frontend = frontend_get_ptr();
@ -350,7 +351,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
menu_list_push(info->list, tmp, "", MENU_SETTINGS_CORE_INFO_NONE, 0, 0); menu_list_push(info->list, tmp, "", MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
{ {
char cpu_str[PATH_MAX_LENGTH]; char cpu_str[PATH_MAX_LENGTH] = {0};
snprintf(cpu_str, sizeof(cpu_str), "CPU Features: "); snprintf(cpu_str, sizeof(cpu_str), "CPU Features: ");
@ -465,7 +466,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
} }
{ {
char feat_str[PATH_MAX_LENGTH]; char feat_str[PATH_MAX_LENGTH] = {0};
snprintf(feat_str, sizeof(feat_str), snprintf(feat_str, sizeof(feat_str),
"LibretroDB support: %s", _libretrodb_supp ? "true" : "false"); "LibretroDB support: %s", _libretrodb_supp ? "true" : "false");
@ -713,8 +714,8 @@ static int menu_displaylist_parse_playlist(menu_displaylist_info_t *info,
for (i = 0; i < list_size; i++) for (i = 0; i < list_size; i++)
{ {
char fill_buf[PATH_MAX_LENGTH]; char fill_buf[PATH_MAX_LENGTH] = {0};
char path_copy[PATH_MAX_LENGTH]; char path_copy[PATH_MAX_LENGTH] = {0};
bool core_detected = false; bool core_detected = false;
const char *core_name = NULL; const char *core_name = NULL;
const char *db_name = NULL; const char *db_name = NULL;
@ -732,7 +733,7 @@ static int menu_displaylist_parse_playlist(menu_displaylist_info_t *info,
if (path) if (path)
{ {
char path_short[PATH_MAX_LENGTH]; char path_short[PATH_MAX_LENGTH] = {0};
fill_short_pathname_representation(path_short, path, fill_short_pathname_representation(path_short, path,
sizeof(path_short)); sizeof(path_short));
@ -743,7 +744,7 @@ static int menu_displaylist_parse_playlist(menu_displaylist_info_t *info,
{ {
if (strcmp(core_name, "DETECT") != 0) if (strcmp(core_name, "DETECT") != 0)
{ {
char tmp[PATH_MAX_LENGTH]; char tmp[PATH_MAX_LENGTH] = {0};
snprintf(tmp, sizeof(tmp), " (%s)", core_name); snprintf(tmp, sizeof(tmp), " (%s)", core_name);
strlcat(fill_buf, tmp, sizeof(fill_buf)); strlcat(fill_buf, tmp, sizeof(fill_buf));
core_detected = true; core_detected = true;
@ -753,7 +754,7 @@ static int menu_displaylist_parse_playlist(menu_displaylist_info_t *info,
if (!is_history && core_detected && db_name[0] != '\0') if (!is_history && core_detected && db_name[0] != '\0')
{ {
char db_path[PATH_MAX_LENGTH]; char db_path[PATH_MAX_LENGTH] = {0};
fill_pathname_join(db_path, settings->content_database, fill_pathname_join(db_path, settings->content_database,
db_name, sizeof(db_path)); db_name, sizeof(db_path));
@ -800,7 +801,7 @@ static int menu_displaylist_parse_shader_options(menu_displaylist_info_t *info)
for (i = 0; i < shader->passes; i++) for (i = 0; i < shader->passes; i++)
{ {
char buf[64]; char buf[64] = {0};
snprintf(buf, sizeof(buf), "Shader #%u", i); snprintf(buf, sizeof(buf), "Shader #%u", i);
menu_list_push(info->list, buf, "video_shader_pass", menu_list_push(info->list, buf, "video_shader_pass",
@ -822,8 +823,8 @@ static int menu_displaylist_parse_shader_options(menu_displaylist_info_t *info)
static int create_string_list_rdb_entry_string(const char *desc, const char *label, static int create_string_list_rdb_entry_string(const char *desc, const char *label,
const char *actual_string, const char *path, file_list_t *list) const char *actual_string, const char *path, file_list_t *list)
{ {
char tmp[PATH_MAX_LENGTH];
union string_list_elem_attr attr; union string_list_elem_attr attr;
char tmp[PATH_MAX_LENGTH] = {0};
char *output_label = NULL; char *output_label = NULL;
int str_len = 0; int str_len = 0;
struct string_list *str_list = string_list_new(); struct string_list *str_list = string_list_new();
@ -866,9 +867,9 @@ static int create_string_list_rdb_entry_string(const char *desc, const char *lab
static int create_string_list_rdb_entry_int(const char *desc, const char *label, static int create_string_list_rdb_entry_int(const char *desc, const char *label,
int actual_int, const char *path, file_list_t *list) int actual_int, const char *path, file_list_t *list)
{ {
char tmp[PATH_MAX_LENGTH];
union string_list_elem_attr attr; union string_list_elem_attr attr;
char str[PATH_MAX_LENGTH]; char tmp[PATH_MAX_LENGTH] = {0};
char str[PATH_MAX_LENGTH] = {0};
char *output_label = NULL; char *output_label = NULL;
int str_len = 0; int str_len = 0;
struct string_list *str_list = string_list_new(); struct string_list *str_list = string_list_new();
@ -914,11 +915,12 @@ static int create_string_list_rdb_entry_int(const char *desc, const char *label,
static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info) static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info)
{ {
#ifdef HAVE_LIBRETRODB #ifdef HAVE_LIBRETRODB
char query[PATH_MAX_LENGTH]; unsigned i, j, k;
content_playlist_t *playlist = NULL; content_playlist_t *playlist = NULL;
database_info_list_t *db_info = NULL; database_info_list_t *db_info = NULL;
char path_playlist[PATH_MAX_LENGTH], path_base[PATH_MAX_LENGTH]; char path_playlist[PATH_MAX_LENGTH] = {0};
unsigned i, j, k; char path_base[PATH_MAX_LENGTH] = {0};
char query[PATH_MAX_LENGTH] = {0};
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
if (!menu) if (!menu)
@ -944,7 +946,7 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info)
for (i = 0; i < db_info->count; i++) for (i = 0; i < db_info->count; i++)
{ {
char tmp[PATH_MAX_LENGTH]; char tmp[PATH_MAX_LENGTH] = {0};
char crc_str[20] = {0}; char crc_str[20] = {0};
database_info_t *db_info_entry = &db_info->list[i]; database_info_t *db_info_entry = &db_info->list[i];
@ -957,7 +959,8 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info)
{ {
for (j = 0; j < playlist->size; j++) for (j = 0; j < playlist->size; j++)
{ {
char elem0[PATH_MAX_LENGTH], elem1[PATH_MAX_LENGTH]; char elem0[PATH_MAX_LENGTH] = {0};
char elem1[PATH_MAX_LENGTH] = {0};
bool match_found = false; bool match_found = false;
struct string_list *tmp_str_list = string_split( struct string_list *tmp_str_list = string_split(
playlist->entries[j].crc32, "|"); playlist->entries[j].crc32, "|");
@ -1274,7 +1277,8 @@ static int menu_displaylist_parse_settings(menu_handle_t *menu,
static int menu_displaylist_parse_settings_in_subgroup(menu_displaylist_info_t *info) static int menu_displaylist_parse_settings_in_subgroup(menu_displaylist_info_t *info)
{ {
char elem0[PATH_MAX_LENGTH], elem1[PATH_MAX_LENGTH]; char elem0[PATH_MAX_LENGTH] = {0};
char elem1[PATH_MAX_LENGTH] = {0};
struct string_list *str_list = NULL; struct string_list *str_list = NULL;
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
@ -1367,9 +1371,8 @@ static int menu_displaylist_sort_playlist(const content_playlist_entry_t *a,
static int menu_displaylist_parse_horizontal_list(menu_displaylist_info_t *info) static int menu_displaylist_parse_horizontal_list(menu_displaylist_info_t *info)
{ {
char db_path[PATH_MAX_LENGTH]; char path_playlist[PATH_MAX_LENGTH] = {0};
char path_playlist[PATH_MAX_LENGTH]; char lpl_basename[PATH_MAX_LENGTH] = {0};
char lpl_basename[PATH_MAX_LENGTH];
content_playlist_t *playlist = NULL; content_playlist_t *playlist = NULL;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
@ -1379,23 +1382,9 @@ static int menu_displaylist_parse_horizontal_list(menu_displaylist_info_t *info)
if (!item) if (!item)
return -1; return -1;
(void)db_path;
strlcpy(lpl_basename, item->path, sizeof(lpl_basename)); strlcpy(lpl_basename, item->path, sizeof(lpl_basename));
path_remove_extension(lpl_basename); path_remove_extension(lpl_basename);
#ifdef HAVE_LIBRETRODB
#if 0
fill_pathname_join(db_path, settings->content_database,
lpl_basename, sizeof(db_path));
strlcat(db_path, ".rdb", sizeof(db_path));
if (path_file_exists(db_path))
menu_list_push(info->list, path_basename(db_path), "core_database",
MENU_FILE_RDB, 0, 0);
#endif
#endif
if (menu->playlist) if (menu->playlist)
content_playlist_free(menu->playlist); content_playlist_free(menu->playlist);
@ -1492,7 +1481,8 @@ static int menu_displaylist_parse_options_cheats(menu_displaylist_info_t *info)
for (i = 0; i < cheat->size; i++) for (i = 0; i < cheat->size; i++)
{ {
char cheat_label[64]; char cheat_label[64] = {0};
snprintf(cheat_label, sizeof(cheat_label), "Cheat #%u: ", i); snprintf(cheat_label, sizeof(cheat_label), "Cheat #%u: ", i);
if (cheat->cheats[i].desc) if (cheat->cheats[i].desc)
strlcat(cheat_label, cheat->cheats[i].desc, sizeof(cheat_label)); strlcat(cheat_label, cheat->cheats[i].desc, sizeof(cheat_label));
@ -1532,14 +1522,15 @@ static int menu_displaylist_parse_options_remappings(menu_displaylist_info_t *in
{ {
for (retro_id = 0; retro_id < RARCH_FIRST_CUSTOM_BIND + 4; retro_id++) for (retro_id = 0; retro_id < RARCH_FIRST_CUSTOM_BIND + 4; retro_id++)
{ {
char desc_label[64]; char desc_label[64] = {0};
unsigned user = p + 1; unsigned user = p + 1;
unsigned desc_offset = retro_id; unsigned desc_offset = retro_id;
const char *description = NULL;
if (desc_offset >= RARCH_FIRST_CUSTOM_BIND) if (desc_offset >= RARCH_FIRST_CUSTOM_BIND)
desc_offset = RARCH_FIRST_CUSTOM_BIND + (desc_offset - RARCH_FIRST_CUSTOM_BIND) * 2; desc_offset = RARCH_FIRST_CUSTOM_BIND + (desc_offset - RARCH_FIRST_CUSTOM_BIND) * 2;
const char *description = global->system.input_desc_btn[p][desc_offset]; description = global->system.input_desc_btn[p][desc_offset];
if (!description) if (!description)
continue; continue;
@ -1558,8 +1549,8 @@ static int menu_displaylist_parse_options_remappings(menu_displaylist_info_t *in
static int menu_displaylist_parse_generic(menu_displaylist_info_t *info, bool *need_sort) static int menu_displaylist_parse_generic(menu_displaylist_info_t *info, bool *need_sort)
{ {
bool path_is_compressed, push_dir; bool path_is_compressed, push_dir;
struct string_list *str_list = NULL;
size_t i, list_size; size_t i, list_size;
struct string_list *str_list = NULL;
int device = 0; int device = 0;
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
@ -1709,13 +1700,16 @@ static int menu_displaylist_parse_generic(menu_displaylist_info_t *info, bool *n
case MENU_LABEL_CORE_LIST: case MENU_LABEL_CORE_LIST:
{ {
const char *dir = NULL; const char *dir = NULL;
menu_list_get_last_stack(menu->menu_list, &dir, NULL, NULL, NULL); menu_list_get_last_stack(menu->menu_list, &dir, NULL, NULL, NULL);
list_size = file_list_get_size(info->list); list_size = file_list_get_size(info->list);
for (i = 0; i < list_size; i++) for (i = 0; i < list_size; i++)
{ {
unsigned type = 0; unsigned type = 0;
char core_path[PATH_MAX_LENGTH], display_name[PATH_MAX_LENGTH]; char core_path[PATH_MAX_LENGTH] = {0};
char display_name[PATH_MAX_LENGTH] = {0};
const char *path = NULL; const char *path = NULL;
menu_list_get_at_offset(info->list, i, &path, NULL, &type, NULL); menu_list_get_at_offset(info->list, i, &path, NULL, &type, NULL);
@ -1926,14 +1920,16 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
{ {
for (; setting->type != ST_NONE; setting++) for (; setting->type != ST_NONE; setting++)
{ {
char group_label[PATH_MAX_LENGTH]; char group_label[PATH_MAX_LENGTH] = {0};
char subgroup_label[PATH_MAX_LENGTH]; char subgroup_label[PATH_MAX_LENGTH] = {0};
if (setting->type == ST_GROUP) if (setting->type == ST_GROUP)
strlcpy(group_label, setting->name, sizeof(group_label)); strlcpy(group_label, setting->name, sizeof(group_label));
else if (setting->type == ST_SUB_GROUP) else if (setting->type == ST_SUB_GROUP)
{ {
char new_label[PATH_MAX_LENGTH], new_path[PATH_MAX_LENGTH]; char new_label[PATH_MAX_LENGTH] = {0};
char new_path[PATH_MAX_LENGTH] = {0};
strlcpy(subgroup_label, setting->name, sizeof(group_label)); strlcpy(subgroup_label, setting->name, sizeof(group_label));
strlcpy(new_label, group_label, sizeof(new_label)); strlcpy(new_label, group_label, sizeof(new_label));
strlcat(new_label, "|", sizeof(new_label)); strlcat(new_label, "|", sizeof(new_label));
@ -1954,7 +1950,7 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
case DISPLAYLIST_PLAYLIST_COLLECTION: case DISPLAYLIST_PLAYLIST_COLLECTION:
menu_list_clear(info->list); menu_list_clear(info->list);
{ {
char path_playlist[PATH_MAX_LENGTH]; char path_playlist[PATH_MAX_LENGTH] = {0};
content_playlist_t *playlist = NULL; content_playlist_t *playlist = NULL;
if (menu->playlist) if (menu->playlist)
@ -1982,8 +1978,9 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
case DISPLAYLIST_HISTORY: case DISPLAYLIST_HISTORY:
menu_list_clear(info->list); menu_list_clear(info->list);
{ {
char path_playlist[PATH_MAX_LENGTH]; char path_playlist[PATH_MAX_LENGTH] = {0};
content_playlist_t *playlist = g_defaults.history; content_playlist_t *playlist = g_defaults.history;
strlcpy(path_playlist, "history", sizeof(path_playlist)); strlcpy(path_playlist, "history", sizeof(path_playlist));
ret = menu_displaylist_parse_playlist(info, playlist, path_playlist, true); ret = menu_displaylist_parse_playlist(info, playlist, path_playlist, true);