Get rid of some static code analysis warnings

This commit is contained in:
twinaphex 2020-10-12 00:00:54 +02:00
parent 009220bc3f
commit a6eaac2a84
2 changed files with 5 additions and 10 deletions

View File

@ -2070,8 +2070,7 @@ static void ozone_draw_header(ozone_handle_t *ozone,
menu_ticker_type = (enum gfx_animation_ticker_type)settings->uints.menu_ticker_type;
gfx_display_t *p_disp = disp_get_ptr();
gfx_display_ctx_driver_t *dispctx = p_disp->dispctx;
float *col = ozone->theme->entries_icon
? ozone->theme->entries_icon : ozone->pure_white;
float *col = ozone->theme->entries_icon;
/* Initial ticker configuration */
if (use_smooth_ticker)
@ -2330,8 +2329,7 @@ static void ozone_draw_footer(ozone_handle_t *ozone,
ozone->footer_labels.metadata_toggle.width - icon_size - (2.0f * icon_padding);
gfx_display_t *p_disp = disp_get_ptr();
gfx_display_ctx_driver_t *dispctx = p_disp->dispctx;
float *col = ozone->theme_dynamic.entries_icon
? ozone->theme_dynamic.entries_icon : ozone->pure_white;
float *col = ozone->theme_dynamic.entries_icon;
/* Separator */
gfx_display_draw_quad(

View File

@ -67,8 +67,7 @@ static void ozone_draw_entry_value(
/* check icon */
if (entry->checked)
{
float *col = ozone->theme_dynamic.entries_checkmark
? ozone->theme_dynamic.entries_checkmark : ozone->pure_white;
float *col = ozone->theme_dynamic.entries_checkmark;
if (dispctx && dispctx->blend_begin)
dispctx->blend_begin(userdata);
ozone_draw_icon(
@ -184,8 +183,7 @@ static void ozone_draw_no_thumbnail_available(ozone_handle_t *ozone,
unsigned icon_size = (unsigned)((float)ozone->dimensions.sidebar_entry_icon_size * 1.5f);
gfx_display_t *p_disp = disp_get_ptr();
gfx_display_ctx_driver_t *dispctx = p_disp->dispctx;
float *col = ozone->theme->entries_icon
? ozone->theme->entries_icon : ozone->pure_white;
float *col = ozone->theme->entries_icon;
if (dispctx && dispctx->blend_begin)
dispctx->blend_begin(userdata);
@ -1318,8 +1316,7 @@ void ozone_draw_thumbnail_bar(ozone_handle_t *ozone,
* is available */
if (metadata_override_enabled)
{
float *col = ozone->theme_dynamic.entries_icon
? ozone->theme_dynamic.entries_icon : ozone->pure_white;
float *col = ozone->theme_dynamic.entries_icon;
/* Icon should be small and unobtrusive
* > Make it 80% of the normal entry icon size */
unsigned icon_size = (unsigned)((float)ozone->dimensions.sidebar_entry_icon_size * 0.8f);