mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-02 14:54:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid some confusing opaqueness.

Browse Source 
First argument of menu_ctx_init_first must always be const menu_ctx_driver_t**.
This commit is contained in:
Themaister 2014-04-01 17:42:00 +02:00
parent 68593e39ea
commit ab2040a100
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
driver.c
View File

@ -1709,10 +1709,9 @@ void find_next_menu_driver(void)
RARCH_WARN("Couldn't find any next menu driver (current one: \"%s\").\n", g_settings.menu.driver); RARCH_WARN("Couldn't find any next menu driver (current one: \"%s\").\n", g_settings.menu.driver);
} }
bool menu_ctx_init_first(const void **driver_data, void **data) bool menu_ctx_init_first(const menu_ctx_driver_t **driver, void **data)
{ {
unsigned i; unsigned i;
const menu_ctx_driver_t **driver = (const menu_ctx_driver_t**)driver_data;
if (!menu_ctx_drivers[0]) if (!menu_ctx_drivers[0])
return false; return false;
@ -1724,7 +1723,7 @@ bool menu_ctx_init_first(const void **driver_data, void **data)
if (h) if (h)
{ {
*driver = menu_ctx_drivers[i]; *driver = menu_ctx_drivers[i];
*data = (void*)h; *data = h;
strlcpy(g_settings.menu.driver, menu_ctx_drivers[i]->ident, sizeof(g_settings.menu.driver)); strlcpy(g_settings.menu.driver, menu_ctx_drivers[i]->ident, sizeof(g_settings.menu.driver));
return true; return true;
} }

2
driver.h
View File

@ -661,7 +661,7 @@ void driver_location_set_interval(unsigned interval_msecs, unsigned interval_dis
#ifdef HAVE_MENU #ifdef HAVE_MENU
const void *menu_ctx_find_driver(const char *ident); // Finds driver with ident. Does not initialize. const void *menu_ctx_find_driver(const char *ident); // Finds driver with ident. Does not initialize.
bool menu_ctx_init_first(const void **driver, void **handle); // Finds first suitable driver and initializes. bool menu_ctx_init_first(const menu_ctx_driver_t **driver, void **handle); // Finds first suitable driver and initializes.
void find_prev_menu_driver(void); void find_prev_menu_driver(void);
void find_next_menu_driver(void); void find_next_menu_driver(void);
#endif #endif

3
frontend/menu/menu_common.c
View File

@ -432,8 +432,7 @@ bool load_menu_game(void)
void menu_init(void) void menu_init(void)
{ {
const void **menuctx = (const void**)&driver.menu_ctx; if (!menu_ctx_init_first(&driver.menu_ctx, (void**)&rgui))
if (!menu_ctx_init_first(menuctx, (void**)&rgui))
{ {
RARCH_ERR("Could not initialize menu.\n"); RARCH_ERR("Could not initialize menu.\n");
rarch_fail(1, "menu_init()"); rarch_fail(1, "menu_init()");