tty/vt: consolemap: remove glyph < 0 check from set_inverse_trans_unicode()
authorJiri Slaby <jslaby@suse.cz>
Tue, 7 Jun 2022 10:49:28 +0000 (12:49 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Jun 2022 11:37:02 +0000 (13:37 +0200)
glyph is now an int casted from u16. It can never be negative. So remove
the check and type glyph as u16 properly in set_inverse_trans_unicode().

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20220607104946.18710-18-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/vt/consolemap.c

index 80536687acefea59549a29d8eb19e90165475ed2..733795a3dc68e0b195453d0f4e1198b16e351677 100644 (file)
@@ -244,7 +244,7 @@ static void set_inverse_transl(struct vc_data *conp, struct uni_pagedict *p,
 static void set_inverse_trans_unicode(struct vc_data *conp,
                                      struct uni_pagedict *p)
 {
-       int i, j, k, glyph;
+       int i, j, k;
        u16 **p1, *p2;
        u16 *q;
 
@@ -268,9 +268,8 @@ static void set_inverse_trans_unicode(struct vc_data *conp,
                        if (!p2)
                                continue;
                        for (k = 0; k < UNI_ROW_GLYPHS; k++) {
-                               glyph = p2[k];
-                               if (glyph >= 0 && glyph < MAX_GLYPH
-                                              && q[glyph] < 32)
+                               u16 glyph = p2[k];
+                               if (glyph < MAX_GLYPH && q[glyph] < 32)
                                        q[glyph] = UNI(i, j, k);
                        }
                }