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

Cleanups

This commit is contained in:
twinaphex 2015-09-04 00:31:46 +02:00
parent ad103d11cb
commit 45e90d9e6b
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
menu/cbs/menu_cbs_ok.c
View File

@ -1149,11 +1149,17 @@ static int action_ok_rdb_entry_submenu(const char *path,
str_list = string_split(label, "|"); str_list = string_split(label, "|");
if (!str_list) if (!str_list)
goto error; {
ret = -1;
goto end;
}
str_list2 = string_list_new(); str_list2 = string_list_new();
if (!str_list2) if (!str_list2)
goto error; {
ret = -1;
goto end;
}
/* element 0 : label /* element 0 : label
* element 1 : value * element 1 : value
@ -1171,7 +1177,10 @@ static int action_ok_rdb_entry_submenu(const char *path,
rdb = (char*)calloc(len, sizeof(char)); rdb = (char*)calloc(len, sizeof(char));
if (!rdb) if (!rdb)
goto error; {
ret = -1;
goto end;
}
string_list_join_concat(rdb, len, str_list2, "|"); string_list_join_concat(rdb, len, str_list2, "|");
@ -1188,17 +1197,13 @@ static int action_ok_rdb_entry_submenu(const char *path,
ret = menu_displaylist_push_list(&info, DISPLAYLIST_GENERIC); ret = menu_displaylist_push_list(&info, DISPLAYLIST_GENERIC);
string_list_free(str_list); end:
string_list_free(str_list2);
return ret;
error:
if (str_list) if (str_list)
string_list_free(str_list); string_list_free(str_list);
if (str_list2) if (str_list2)
string_list_free(str_list2); string_list_free(str_list2);
return -1;
return ret;
} }
enum enum