From a747af268701d526a2cdc28d1d363b29244ad5b3 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 5 Dec 2015 11:38:18 +0100
Subject: [PATCH] Nothing was done with first param of
 menu_display_font_bind_block

---
 menu/drivers/materialui.c | 2 +-
 menu/drivers/xmb.c        | 2 +-
 menu/drivers/zarch.c      | 5 +----
 menu/menu_display.c       | 6 ++----
 menu/menu_display.h       | 2 +-
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index 48b1cadb9a..be142fde83 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -813,7 +813,7 @@ static void mui_frame(void)
          width, height,
          &lightblue_bg[0]);
 
-   menu_display_font_bind_block(menu, driver->font_osd_driver, &mui->list_block);
+   menu_display_font_bind_block(driver->font_osd_driver, &mui->list_block);
 
    mui_render_menu_list(mui, width, height, menu, normal_color, hover_color, &pure_white[0]);
 
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index db5fe04407..a2f2369aa9 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -1699,7 +1699,7 @@ static void xmb_frame(void)
 
    video_driver_get_size(&width, &height);
 
-   menu_display_font_bind_block(menu, font_driver, &xmb->raster_block);
+   menu_display_font_bind_block(font_driver, &xmb->raster_block);
 
    xmb->raster_block.carr.coords.vertices = 0;
 
diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c
index 502f29af86..6bd14c1679 100644
--- a/menu/drivers/zarch.c
+++ b/menu/drivers/zarch.c
@@ -968,7 +968,6 @@ static void zarch_frame(void)
    float coord_color[16];
    float coord_color2[16];
    zui_t *zui           = NULL;
-   const struct font_renderer *font_driver = NULL;
    driver_t *driver     = driver_get_ptr();
    settings_t *settings = config_get_ptr();
    menu_handle_t *menu  = menu_driver_get_ptr();
@@ -1010,9 +1009,7 @@ static void zarch_frame(void)
 
    zui->tmp_block.carr.coords.vertices = 0;
 
-   font_driver = driver->font_osd_driver;
-
-   menu_display_font_bind_block(zui->menu, font_driver, &zui->tmp_block);
+   menu_display_font_bind_block(driver->font_osd_driver, &zui->tmp_block);
 
    zarch_zui_push_quad(zui->width, zui->height, ZUI_BG_SCREEN, &zui->ca, 0, 0, zui->width, zui->height);
    zarch_zui_snow(zui, &zui->ca, zui->width, zui->height);
diff --git a/menu/menu_display.c b/menu/menu_display.c
index b40c94bd72..4211d05f46 100644
--- a/menu/menu_display.c
+++ b/menu/menu_display.c
@@ -143,7 +143,7 @@ static bool menu_display_font_init_first(void **font_handle,
          font_path, font_size);
 }
 
-bool menu_display_font_bind_block(void *data, const void *font_data, void *userdata)
+bool menu_display_font_bind_block(const void *font_data, void *userdata)
 {
    const struct font_renderer *font_driver = 
       (const struct font_renderer*)font_data;
@@ -160,15 +160,13 @@ bool menu_display_font_flush_block(void *data, const void *font_data)
 {
    const struct font_renderer *font_driver = 
       (const struct font_renderer*)font_data;
-   menu_handle_t *menu = (menu_handle_t*)data;
    menu_display_t *disp = menu_display_get_ptr();
    if (!font_driver || !font_driver->flush || !disp || !disp->font.buf)
       return false;
 
    font_driver->flush(disp->font.buf);
 
-   return menu_display_font_bind_block(menu,
-         font_driver, NULL);
+   return menu_display_font_bind_block(font_driver, NULL);
 }
 
 void menu_display_free_main_font(void)
diff --git a/menu/menu_display.h b/menu/menu_display.h
index 62bef77f4e..3f07f2fad7 100644
--- a/menu/menu_display.h
+++ b/menu/menu_display.h
@@ -118,7 +118,7 @@ void menu_display_free(void);
 
 bool menu_display_init(void);
 
-bool menu_display_font_bind_block(void *data, const void *font_data, void *userdata);
+bool menu_display_font_bind_block(const void *font_data, void *userdata);
 
 bool menu_display_font_flush_block(void *data, const void *font_data);