diff mbox series

ui/gtk: Remove NULL checks in gd_switch

Message ID 20210308140713.17901-1-akihiko.odaki@gmail.com
State New
Headers show
Series ui/gtk: Remove NULL checks in gd_switch | expand

Commit Message

Akihiko Odaki March 8, 2021, 2:07 p.m. UTC 
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 <akihiko.odaki@gmail.com>
---
 ui/gtk.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Gerd Hoffmann March 9, 2021, 9:51 a.m. UTC | #1 
On Mon, Mar 08, 2021 at 11:07:13PM +0900, Akihiko Odaki wrote:
> 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 <akihiko.odaki@gmail.com>

Added to UI queue.

thanks,
  Gerd
diff mbox series

Patch

diff --git a/ui/gtk.c b/ui/gtk.c
index 3edaf041def..eb1c9658e24 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;