From ab2040a100d436d50911aa489a10e2dc53ef4ede Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Tue, 1 Apr 2014 17:42:00 +0200
Subject: [PATCH] Avoid some confusing opaqueness.

First argument of menu_ctx_init_first must always be const menu_ctx_driver_t**.
---
 driver.c                    | 5 ++---
 driver.h                    | 2 +-
 frontend/menu/menu_common.c | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/driver.c b/driver.c
index b43188ebb6..748bff2159 100644
--- a/driver.c
+++ b/driver.c
@@ -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);
 }
 
-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;
-   const menu_ctx_driver_t **driver = (const menu_ctx_driver_t**)driver_data;
 
    if (!menu_ctx_drivers[0])
       return false;
@@ -1724,7 +1723,7 @@ bool menu_ctx_init_first(const void **driver_data, void **data)
       if (h)
       {
          *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));
          return true;
       }
diff --git a/driver.h b/driver.h
index 9ce2cd7ae6..b007a2fae7 100644
--- a/driver.h
+++ b/driver.h
@@ -661,7 +661,7 @@ void driver_location_set_interval(unsigned interval_msecs, unsigned interval_dis
 
 #ifdef HAVE_MENU
 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_next_menu_driver(void);
 #endif
diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c
index f72af8dcd7..334892b498 100644
--- a/frontend/menu/menu_common.c
+++ b/frontend/menu/menu_common.c
@@ -432,8 +432,7 @@ bool load_menu_game(void)
 
 void menu_init(void)
 {
-   const void **menuctx = (const void**)&driver.menu_ctx;
-   if (!menu_ctx_init_first(menuctx, (void**)&rgui))
+   if (!menu_ctx_init_first(&driver.menu_ctx, (void**)&rgui))
    {
       RARCH_ERR("Could not initialize menu.\n");
       rarch_fail(1, "menu_init()");