From e330f03124d50bfa8e7a7496b2ac86d3348ee871 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= <jean.andre.santoni@gmail.com>
Date: Tue, 10 Feb 2015 15:02:38 +0100
Subject: [PATCH] (Menu) init_lists was not used either

---
 menu/drivers/glui.c        |  1 -
 menu/drivers/ios.c         |  1 -
 menu/drivers/rgui.c        |  1 -
 menu/drivers/rmenu.c       |  1 -
 menu/drivers/rmenu_xui.cpp |  1 -
 menu/drivers/xmb.c         |  1 -
 menu/menu.c                | 26 --------------------------
 menu/menu.h                | 11 -----------
 menu/menu_driver.c         |  3 ++-
 menu/menu_driver.h         |  1 -
 10 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c
index 47913ab853..20bbc65b1a 100644
--- a/menu/drivers/glui.c
+++ b/menu/drivers/glui.c
@@ -631,7 +631,6 @@ menu_ctx_driver_t menu_ctx_glui = {
    NULL,
    glui_frame,
    glui_init,
-   NULL,
    glui_free,
    glui_context_reset,
    NULL,
diff --git a/menu/drivers/ios.c b/menu/drivers/ios.c
index e240b7fb5c..ca32d04817 100644
--- a/menu/drivers/ios.c
+++ b/menu/drivers/ios.c
@@ -95,7 +95,6 @@ menu_ctx_driver_t menu_ctx_ios = {
   NULL, // render
   NULL, // frame
   ios_init, // init
-  NULL, // init_lists
   ios_free, // free
   NULL, // context_reset
   NULL, // context_destroy
diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c
index 7c91350bf2..e9ab569f77 100644
--- a/menu/drivers/rgui.c
+++ b/menu/drivers/rgui.c
@@ -660,7 +660,6 @@ menu_ctx_driver_t menu_ctx_rgui = {
    rgui_render,
    NULL,
    rgui_init,
-   NULL,
    rgui_free,
    NULL,
    NULL,
diff --git a/menu/drivers/rmenu.c b/menu/drivers/rmenu.c
index 9fd52bdcc8..d0b8101577 100644
--- a/menu/drivers/rmenu.c
+++ b/menu/drivers/rmenu.c
@@ -373,7 +373,6 @@ menu_ctx_driver_t menu_ctx_rmenu = {
    rmenu_render,
    NULL,
    rmenu_init,
-   NULL,
    rmenu_free,
    rmenu_context_reset,
    rmenu_context_destroy,
diff --git a/menu/drivers/rmenu_xui.cpp b/menu/drivers/rmenu_xui.cpp
index d75c03d52c..6fc658a1bf 100644
--- a/menu/drivers/rmenu_xui.cpp
+++ b/menu/drivers/rmenu_xui.cpp
@@ -694,7 +694,6 @@ menu_ctx_driver_t menu_ctx_rmenu_xui = {
    rmenu_xui_render,
    rmenu_xui_frame,
    rmenu_xui_init,
-   NULL,
    rmenu_xui_free,
    NULL,
    NULL,
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index a24ca6d46a..88b7f1da73 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -1698,7 +1698,6 @@ menu_ctx_driver_t menu_ctx_xmb = {
    NULL,
    xmb_frame,
    xmb_init,
-   NULL,
    xmb_free,
    xmb_context_reset,
    xmb_context_destroy,
diff --git a/menu/menu.c b/menu/menu.c
index 85c8ee43c1..9c420663aa 100644
--- a/menu/menu.c
+++ b/menu/menu.c
@@ -215,32 +215,6 @@ void menu_free_list(void *data)
    menu->list_settings = NULL;
 }
 
-/**
- * menu_init_list:
- * @data                     : Menu handle.
- *
- * Initialize menu lists.
- * Will be performed after menu_init().
- *
- * Returns: true (1) if successful, otherwise false (0).
- **/
-bool menu_init_list(void *data)
-{
-   menu_handle_t *menu = (menu_handle_t*)data;
-
-   if (!menu)
-      return false;
-
-   if (!menu_entries_init(menu))
-      return false;
-
-   if (driver.menu_ctx && driver.menu_ctx->init_lists)
-      if (!(driver.menu_ctx->init_lists(menu)))
-            return false;
-
-   return true;
-}
-
 /**
  * menu_free:
  * @info                     : Menu handle.
diff --git a/menu/menu.h b/menu/menu.h
index 0fe35c86b8..56eaae055b 100644
--- a/menu/menu.h
+++ b/menu/menu.h
@@ -155,17 +155,6 @@ void *menu_init(const void *data);
  **/
 void menu_free_list(void *data);
 
-/**
- * menu_init_list:
- * @data                     : Menu handle.
- *
- * Initialize menu lists.
- * Will be performed after menu_init().
- *
- * Returns: true (1) if successful, otherwise false (0).
- **/
-bool menu_init_list(void *data);
-
 /**
  * menu_iterate:
  * @input                    : input sample for this frame
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index 99e6f28cd5..04502c23d5 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -18,6 +18,7 @@
 #include <string/string_list.h>
 #include "menu_driver.h"
 #include "menu.h"
+#include "menu_entries.h"
 #include "../driver.h"
 #include "../general.h"
 
@@ -153,7 +154,7 @@ void init_menu(void)
       rarch_fail(1, "init_menu()");
    }
 
-   if (!(menu_init_list(driver.menu)))
+   if (!(menu_entries_init(driver.menu)))
    {
       RARCH_ERR("Cannot initialize menu lists.\n");
       rarch_fail(1, "init_menu()");
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index 9001c2a436..3e43f3f96e 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -180,7 +180,6 @@ typedef struct menu_ctx_driver
    void  (*render)(void);
    void  (*frame)(void);
    void* (*init)(void);
-   bool  (*init_lists)(void*);
    void  (*free)(void*);
    void  (*context_reset)(void*);
    void  (*context_destroy)(void*);