From 9b8713aebd39a2c9d6eb56c94edad0281d11e26f Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 24 Mar 2018 11:59:01 +0100 Subject: [PATCH] Fix Coverity defects --- gfx/drivers/ctr_gfx.c | 4 ++-- gfx/drivers/d3d11.c | 4 ++-- gfx/drivers/d3d12.c | 4 ++-- gfx/drivers/d3d8.c | 4 ++-- gfx/drivers/d3d9.c | 4 ++-- gfx/drivers/gl.c | 4 ++-- gfx/drivers/gx2_gfx.c | 4 ++-- gfx/drivers/switch_gfx.c | 4 ++-- gfx/drivers/vita2d_gfx.c | 4 ++-- gfx/drivers/vulkan.c | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/gfx/drivers/ctr_gfx.c b/gfx/drivers/ctr_gfx.c index 0872643fb9..bdb3a69596 100644 --- a/gfx/drivers/ctr_gfx.c +++ b/gfx/drivers/ctr_gfx.c @@ -773,8 +773,8 @@ static bool ctr_frame(void* data, const void* frame, } else if (video_info->statistics_show) { - struct font_params *osd_params = video_info ? - (struct font_params*)&video_info->osd_stat_params : NULL; + struct font_params *osd_params = (struct font_params*) + &video_info->osd_stat_params; if (osd_params) { diff --git a/gfx/drivers/d3d11.c b/gfx/drivers/d3d11.c index ebca67461b..fb8077f1cc 100644 --- a/gfx/drivers/d3d11.c +++ b/gfx/drivers/d3d11.c @@ -1270,8 +1270,8 @@ static bool d3d11_gfx_frame( } else if (video_info->statistics_show) { - struct font_params *osd_params = video_info ? - (struct font_params*)&video_info->osd_stat_params : NULL; + struct font_params *osd_params = (struct font_params*) + &video_info->osd_stat_params; if (osd_params) { diff --git a/gfx/drivers/d3d12.c b/gfx/drivers/d3d12.c index d0926b7e41..2b942fc868 100644 --- a/gfx/drivers/d3d12.c +++ b/gfx/drivers/d3d12.c @@ -1456,8 +1456,8 @@ static bool d3d12_gfx_frame( } else if (video_info->statistics_show) { - struct font_params *osd_params = video_info ? - (struct font_params*)&video_info->osd_stat_params : NULL; + struct font_params *osd_params = (struct font_params*) + &video_info->osd_stat_params; if (osd_params) { diff --git a/gfx/drivers/d3d8.c b/gfx/drivers/d3d8.c index c7a4c3e2e1..dcb0f51676 100644 --- a/gfx/drivers/d3d8.c +++ b/gfx/drivers/d3d8.c @@ -1626,8 +1626,8 @@ static bool d3d8_frame(void *data, const void *frame, } else if (video_info->statistics_show) { - struct font_params *osd_params = video_info ? - (struct font_params*)&video_info->osd_stat_params : NULL; + struct font_params *osd_params = (struct font_params*) + &video_info->osd_stat_params; if (osd_params) { diff --git a/gfx/drivers/d3d9.c b/gfx/drivers/d3d9.c index 785fcca299..b9a5afcab1 100644 --- a/gfx/drivers/d3d9.c +++ b/gfx/drivers/d3d9.c @@ -1603,8 +1603,8 @@ static bool d3d9_frame(void *data, const void *frame, } else if (video_info->statistics_show) { - struct font_params *osd_params = video_info ? - (struct font_params*)&video_info->osd_stat_params : NULL; + struct font_params *osd_params = (struct font_params*) + &video_info->osd_stat_params; if (osd_params) { diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index 0c729d23c9..940e663dcb 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -1146,8 +1146,8 @@ static bool gl_frame(void *data, const void *frame, } else if (video_info->statistics_show) { - struct font_params *osd_params = video_info ? - (struct font_params*)&video_info->osd_stat_params : NULL; + struct font_params *osd_params = (struct font_params*) + &video_info->osd_stat_params; if (osd_params) { diff --git a/gfx/drivers/gx2_gfx.c b/gfx/drivers/gx2_gfx.c index b1d6634ca5..9e8c4e16c2 100644 --- a/gfx/drivers/gx2_gfx.c +++ b/gfx/drivers/gx2_gfx.c @@ -1344,8 +1344,8 @@ static bool wiiu_gfx_frame(void *data, const void *frame, menu_driver_frame(video_info); else if (video_info->statistics_show) { - struct font_params *osd_params = video_info ? - (struct font_params*)&video_info->osd_stat_params : NULL; + struct font_params *osd_params = (struct font_params*) + &video_info->osd_stat_params; if (osd_params) { diff --git a/gfx/drivers/switch_gfx.c b/gfx/drivers/switch_gfx.c index 5e6d4c9c18..83d22dddb0 100644 --- a/gfx/drivers/switch_gfx.c +++ b/gfx/drivers/switch_gfx.c @@ -209,8 +209,8 @@ static bool switch_frame(void *data, const void *frame, } else if (video_info->statistics_show) { - struct font_params *osd_params = video_info ? - (struct font_params*)&video_info->osd_stat_params : NULL; + struct font_params *osd_params = (struct font_params*) + &video_info->osd_stat_params; if (osd_params) { diff --git a/gfx/drivers/vita2d_gfx.c b/gfx/drivers/vita2d_gfx.c index 57cdcb6c59..50692b62e5 100644 --- a/gfx/drivers/vita2d_gfx.c +++ b/gfx/drivers/vita2d_gfx.c @@ -252,8 +252,8 @@ static bool vita2d_gfx_frame(void *data, const void *frame, } else if (video_info->statistics_show) { - struct font_params *osd_params = video_info ? - (struct font_params*)&video_info->osd_stat_params : NULL; + struct font_params *osd_params = (struct font_params*) + &video_info->osd_stat_params; if (osd_params) { diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c index 7395d2ba0c..722f45a176 100644 --- a/gfx/drivers/vulkan.c +++ b/gfx/drivers/vulkan.c @@ -1843,8 +1843,8 @@ static bool vulkan_frame(void *data, const void *frame, } else if (video_info->statistics_show) { - struct font_params *osd_params = video_info ? - (struct font_params*)&video_info->osd_stat_params : NULL; + struct font_params *osd_params = (struct font_params*) + &video_info->osd_stat_params; if (osd_params) {