From e251b5876383cac918b2cd03be034a5d24310b87 Mon Sep 17 00:00:00 2001 From: Akihiko Odaki Date: Mon, 8 Mar 2021 23:07:13 +0900 Subject: [PATCH] ui/gtk: Remove NULL checks in gd_switch c821a58ee7 ("ui/console: Pass placeholder surface to display") eliminated the possibility that NULL is passed as surface to dpy_gfx_switch and removed some NULL checks from gd_switch, but the removal was not thoroughly. Remaining NULL checks were confusing for Coverity and probably also for humans. This change removes those NULL checks. Reported-by: Coverity (CID 1448421) Signed-off-by: Akihiko Odaki Reviewed-by: Peter Maydell Message-Id: <20210308140713.17901-1-akihiko.odaki@gmail.com> Signed-off-by: Gerd Hoffmann --- ui/gtk.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ui/gtk.c b/ui/gtk.c index 3edaf041de..eb1c9658e2 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -547,9 +547,7 @@ static void gd_switch(DisplayChangeListener *dcl, VirtualConsole *vc = container_of(dcl, VirtualConsole, gfx.dcl); bool resized = true; - trace_gd_switch(vc->label, - surface ? surface_width(surface) : 0, - surface ? surface_height(surface) : 0); + trace_gd_switch(vc->label, surface_width(surface), surface_height(surface)); if (vc->gfx.surface) { cairo_surface_destroy(vc->gfx.surface); @@ -560,7 +558,7 @@ static void gd_switch(DisplayChangeListener *dcl, vc->gfx.convert = NULL; } - if (vc->gfx.ds && surface && + if (vc->gfx.ds && surface_width(vc->gfx.ds) == surface_width(surface) && surface_height(vc->gfx.ds) == surface_height(surface)) { resized = false;