wdvi

commit 2f3759840bd62835f068e736ad5c9d6d67144b55
parent 8c1e448e2e998d81d9e1bb1c44b6b13ea6694a85
Author: Kyle Milz <krwmilz@gmail.com>
Date:   Sun, 12 Mar 2023 01:35:36 +0000

remove one layer of control flow from complicated loop

Diffstat:
M
dvi-init.c
 | 
31
+++++++++++++++++--------------

1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/dvi-init.c b/dvi-init.c
@@ -85,23 +85,26 @@ reset_fonts(void)
 	struct font *f;
 	struct glyph *g;
 
-	for (f = font_head; f != NULL; f = f->next)
-	    if ((f->flags & FONT_LOADED) && !(f->flags & FONT_VIRTUAL))
+	for (f = font_head; f != NULL; f = f->next) {
+		if (!(f->flags & FONT_LOADED) || (f->flags & FONT_VIRTUAL))
+			continue;
+
 		for (g = f->glyph; g <= f->glyph + f->maxchar; ++g) {
-		    if (g->bitmap2.bits) {
-			free(g->bitmap2.bits);
-			g->bitmap2.bits = NULL;
-		    }
-		    if (g->pixmap2) {
-			XDestroyImage(g->image2);
-			g->pixmap2 = NULL;
-			if (g->pixmap2_t != NULL) {
-			    free(g->pixmap2_t);
-			    g->pixmap2_t = NULL;
+			if (g->bitmap2.bits) {
+				free(g->bitmap2.bits);
+				g->bitmap2.bits = NULL;
+		    	}
+			if (g->pixmap2) {
+				XDestroyImage(g->image2);
+				g->pixmap2 = NULL;
+				if (g->pixmap2_t != NULL) {
+					free(g->pixmap2_t);
+					g->pixmap2_t = NULL;
+				}
 			}
-		    }
-		    g->fg = NULL;
+			g->fg = NULL;
 		}
+	}
 }