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

(PS3) Build fixes

This commit is contained in:
twinaphex 2014-08-09 03:25:11 +02:00
parent 2333d87a6b
commit 91bad2b25d
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/frontend.c
View File

@ -280,7 +280,7 @@ bool main_load_content(int argc, char **argv, args_type() args, environment_get_
char **rarch_argv_ptr; char **rarch_argv_ptr;
struct rarch_main_wrap *wrap_args; struct rarch_main_wrap *wrap_args;
bool retval = true; bool retval = true;
int i, ret, rarch_argc = 0; int i, ret = 0, rarch_argc = 0;
char *rarch_argv[MAX_ARGS] = {NULL}; char *rarch_argv[MAX_ARGS] = {NULL};
char *argv_copy [MAX_ARGS] = {NULL}; char *argv_copy [MAX_ARGS] = {NULL};
@ -289,6 +289,7 @@ bool main_load_content(int argc, char **argv, args_type() args, environment_get_
(void)rarch_argc_ptr; (void)rarch_argc_ptr;
(void)rarch_argv_ptr; (void)rarch_argv_ptr;
(void)ret;
wrap_args = (struct rarch_main_wrap*)calloc(1, sizeof(*wrap_args)); wrap_args = (struct rarch_main_wrap*)calloc(1, sizeof(*wrap_args));
rarch_assert(wrap_args); rarch_assert(wrap_args);

2
frontend/menu/backend/menu_common_backend.c
View File

@ -1998,7 +1998,7 @@ static int menu_custom_bind_iterate(void *data, unsigned action)
if (driver.video_data && driver.menu_ctx && driver.menu_ctx->render_messagebox) if (driver.video_data && driver.menu_ctx && driver.menu_ctx->render_messagebox)
driver.menu_ctx->render_messagebox(msg); driver.menu_ctx->render_messagebox(msg);
struct menu_bind_state binds = (struct menu_bind_state)menu->binds; struct menu_bind_state binds = menu->binds;
menu_poll_bind_state(&binds); menu_poll_bind_state(&binds);
if ((binds.skip && !menu->binds.skip) || menu_poll_find_trigger(&menu->binds, &binds)) if ((binds.skip && !menu->binds.skip) || menu_poll_find_trigger(&menu->binds, &binds))

2
frontend/menu/disp/rmenu.c
View File

@ -366,7 +366,7 @@ static void rmenu_render(void)
if (type == MENU_FILE_PLAIN) if (type == MENU_FILE_PLAIN)
{ {
strlcpy(type_str, "(CORE)", sizeof(type_str)); strlcpy(type_str, "(CORE)", sizeof(type_str));
file_list_get_alt_at_offset(menu->selection_buf, i, &path, setting); file_list_get_alt_at_offset(menu->selection_buf, i, &path);
w = 6; w = 6;
} }
else else

23
settings_data.c
View File

@ -277,31 +277,32 @@ bool setting_data_save_config(const rarch_setting_t* settings, config_file_t* co
rarch_setting_t* setting_data_find_setting(rarch_setting_t* settings, const char* name) rarch_setting_t* setting_data_find_setting(rarch_setting_t* settings, const char* name)
{ {
bool found = false;
rarch_setting_t *setting = NULL; rarch_setting_t *setting = NULL;
if (!name) if (!name)
goto notfound; return NULL;
for (setting = settings; setting->type != ST_NONE; setting++) for (setting = settings; setting->type != ST_NONE; setting++)
{ {
if (setting->type <= ST_GROUP && strcmp(setting->name, name) == 0) if (setting->type <= ST_GROUP && strcmp(setting->name, name) == 0)
{ {
goto found; found = true;
break; break;
} }
} }
goto notfound; if (found)
found: {
if (setting->short_description && setting->short_description[0] == '\0') if (setting->short_description && setting->short_description[0] == '\0')
goto notfound; return NULL;
if (setting->read_handler)
setting->read_handler(setting);
return setting; if (setting->read_handler)
setting->read_handler(setting);
return setting;
}
notfound:
return NULL; return NULL;
} }