Hi tech@,

Here is a diff to merge the two if blocks checking if the font in use
contains a given character in rasops_mapchar().

Comments? OK?

Index: sys/dev/rasops/rasops.c
===================================================================
RCS file: /cvs/src/sys/dev/rasops/rasops.c,v
retrieving revision 1.63
diff -u -p -r1.63 rasops.c
--- sys/dev/rasops/rasops.c     11 Jul 2020 15:02:52 -0000      1.63
+++ sys/dev/rasops/rasops.c     16 Jul 2020 14:18:58 -0000
@@ -532,13 +532,8 @@ rasops_mapchar(void *cookie, int c, u_in
                }
        }
 
-
-       if (c < ri->ri_font->firstchar) {
-               *cp = '?';
-               return (0);
-       }
-
-       if (c - ri->ri_font->firstchar >= ri->ri_font->numchars) {
+       if (c < ri->ri_font->firstchar ||
+           c - ri->ri_font->firstchar >= ri->ri_font->numchars) {
                *cp = '?';
                return (0);
        }

Reply via email to