From 66553fd7a7bcf7c260b45f2e7ad54e98d33f8080 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Sat, 5 Aug 2017 19:28:38 +0200 Subject: Simplify deallocations. free (NULL) is a nop, therefore it is not necessary to check that first. Simplify the code accordingly. This commit is the result of the following semantic patch: @@ identifier X; @@ -if (X) free (X); +free (X); * console-client/console.c: Simplify accordingly. * console-client/driver.c: Likewise. * console-client/vga.c: Likewise. * ftpfs/dir.c: Likewise. * libftpconn/unix.c: Likewise. * libps/fmt.c: Likewise. * libps/proclist.c: Likewise. * libstore/mvol.c: Likewise. * nfs/ops.c: Likewise. * proc/host.c: Likewise. * sutils/fstab.c: Likewise. --- console-client/vga.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'console-client/vga.c') diff --git a/console-client/vga.c b/console-client/vga.c index 9d751a7f..e954013d 100644 --- a/console-client/vga.c +++ b/console-client/vga.c @@ -385,14 +385,10 @@ vga_display_fini (void *handle, int force) free (disp); dynacolor_fini (); vga_fini (); - if (vga_display_font) - free (vga_display_font); - if (vga_display_font_italic) - free (vga_display_font_italic); - if (vga_display_font_bold) - free (vga_display_font_bold); - if (vga_display_font_bold_italic) - free (vga_display_font_bold_italic); + free (vga_display_font); + free (vga_display_font_italic); + free (vga_display_font_bold); + free (vga_display_font_bold_italic); return 0; } -- cgit v1.2.3