Get rid of unused variables

This commit is contained in:
twinaphex 2015-12-05 12:50:56 +01:00
parent f9353c41cb
commit c8d8176c0c
7 changed files with 10 additions and 27 deletions

View file

@ -44,7 +44,6 @@
**/
void main_exit(void *args)
{
driver_t *driver = driver_get_ptr();
settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr();
@ -53,6 +52,7 @@ void main_exit(void *args)
if (global->inited.main)
{
#ifdef HAVE_MENU
driver_t *driver = driver_get_ptr();
/* Do not want menu context to live any more. */
driver->menu_data_own = false;
#endif

View file

@ -459,10 +459,9 @@ bool win32_set_video_mode(void *data,
float refresh_mod;
unsigned refresh;
bool windowed_full;
RECT rect = {0};
HMONITOR hm_to_use = NULL;
driver_t *driver = driver_get_ptr();
settings_t *settings = config_get_ptr();
RECT rect = {0};
HMONITOR hm_to_use = NULL;
settings_t *settings = config_get_ptr();
win32_monitor_info(&current_mon, &hm_to_use, &mon_id);

View file

@ -358,7 +358,6 @@ static bool d3d_initialize(d3d_video_t *d3d, const video_info_t *info)
unsigned width, height;
bool ret = true;
settings_t *settings = config_get_ptr();
driver_t *driver = driver_get_ptr();
if (!d3d)
return false;
@ -536,7 +535,6 @@ static bool d3d_construct(d3d_video_t *d3d,
void **input_data)
{
unsigned full_x, full_y;
driver_t *driver = driver_get_ptr();
settings_t *settings = config_get_ptr();
d3d->should_resize = false;
@ -1430,7 +1428,6 @@ static bool d3d_frame(void *data, const void *frame,
unsigned i = 0;
d3d_video_t *d3d = (d3d_video_t*)data;
LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)d3d->dev;
driver_t *driver = driver_get_ptr();
settings_t *settings = config_get_ptr();
HWND window = win32_get_window();

View file

@ -80,8 +80,7 @@ typedef struct vita_video
static void *vita2d_gfx_init(const video_info_t *video,
const input_driver_t **input, void **input_data)
{
vita_video_t *vita = (vita_video_t *)calloc(1, sizeof(vita_video_t));
driver_t *driver = driver_get_ptr();
vita_video_t *vita = (vita_video_t *)calloc(1, sizeof(vita_video_t));
settings_t *settings = config_get_ptr();
if (!vita)

View file

@ -424,7 +424,6 @@ static void rgui_render(void)
uint16_t *fb_data = NULL;
rgui_t *rgui = NULL;
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();
settings_t *settings = config_get_ptr();
video_driver_ctl(RARCH_DISPLAY_CTL_GET_FRAME_COUNT, &frame_count);
@ -435,8 +434,6 @@ static void rgui_render(void)
title_msg[0] = '\0';
timedate[0] = '\0';
(void)driver;
if (!menu || !menu->userdata)
return;

View file

@ -274,9 +274,7 @@ static void* rmenu_xui_init(void)
video_info_t video_info = {0};
TypefaceDescriptor typeface = {0};
settings_t *settings = config_get_ptr();
driver_t *driver = driver_get_ptr();
menu_handle_t *menu = (menu_handle_t*)
calloc(1, sizeof(*menu));
menu_handle_t *menu = (menu_handle_t*)calloc(1, sizeof(*menu));
if (!menu)
return NULL;
@ -368,8 +366,7 @@ static void xui_render_message(const char *msg)
size_t i = 0;
size_t j = 0;
struct string_list *list = NULL;
driver_t *driver = driver_get_ptr();
d3d_video_t *d3d = (d3d_video_t*)video_driver_get_ptr(false);
d3d_video_t *d3d = (d3d_video_t*)video_driver_get_ptr(false);
if (!d3d)
return;
@ -408,10 +405,9 @@ static void rmenu_xui_frame(void)
D3DXMATRIX matOrigView;
LPDIRECT3DDEVICE d3dr;
const char *message;
D3DVIEWPORT vp_full = {0};
d3d_video_t *d3d = NULL;
D3DVIEWPORT vp_full = {0};
d3d_video_t *d3d = NULL;
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();
if (!menu)
return;

View file

@ -967,15 +967,12 @@ static void zarch_frame(void)
float coord_color[16];
float coord_color2[16];
zui_t *zui = NULL;
driver_t *driver = driver_get_ptr();
settings_t *settings = config_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
(void)driver;
zui = (zui_t*)menu->userdata;
zui->menu = menu;
@ -1125,7 +1122,6 @@ error:
static void zarch_free(void *data)
{
menu_handle_t *menu = (menu_handle_t*)data;
driver_t *driver = driver_get_ptr();
zui_t *zui = (zui_t*)menu->userdata;
if (!zui || !menu)
@ -1150,10 +1146,9 @@ static void zarch_context_bg_destroy(zui_t *zui)
static void zarch_context_destroy(void)
{
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();
zui_t *zui = menu ? (zui_t*)menu->userdata : NULL;
if (!menu || !zui || !driver)
if (!menu || !zui)
return;
menu_display_free_main_font();