From f59135359e44068cc08c20569cbb04a1ea97f60f Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 2 Apr 2015 11:18:08 -0400 Subject: [PATCH] font: Remove unnecessary null checks These conditions are checked at the top of the function. --- gfx/drivers_font/d3d_w32_font.cpp | 4 ++-- gfx/drivers_font/xdk360_fonts.cpp | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gfx/drivers_font/d3d_w32_font.cpp b/gfx/drivers_font/d3d_w32_font.cpp index 7b3ac11d14..c5a8bfaaf0 100644 --- a/gfx/drivers_font/d3d_w32_font.cpp +++ b/gfx/drivers_font/d3d_w32_font.cpp @@ -73,8 +73,8 @@ static void d3dfonts_w32_free_font(void *data) if (d3dfonts->font) d3dfonts->font->Release(); d3dfonts->font = NULL; - if (d3dfonts) - free(d3dfonts); + + free(d3dfonts); d3dfonts = NULL; } diff --git a/gfx/drivers_font/xdk360_fonts.cpp b/gfx/drivers_font/xdk360_fonts.cpp index b1cb244498..b272be24c5 100644 --- a/gfx/drivers_font/xdk360_fonts.cpp +++ b/gfx/drivers_font/xdk360_fonts.cpp @@ -276,8 +276,7 @@ static void xdk360_free_font(void *data) if (m_xprResource.Initialized()) m_xprResource.Destroy(); - if (font) - free(font); + free(font); font = NULL; }