tty/vt: consolemap: saner variable names in set_inverse_transl()

The function uses too vague variable names like i, j, k for iterators, p,
q, p1, p2 for pointers etc.

Rename all these, so that it is clear what is going on:
- dict: for dictionaries.
- d, r, g: for dir, row, glyph iterators -- these are unsigned now.
- dir, row: for directory and row pointers.
- glyph: for the glyph.
- and so on...

This is a lot of shuffling, but the result pays off, IMO.

Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20220614090537.15557-4-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c
index 55fb466361c17a5582465d02ff5edbc1ec564d38..3d0e10dac6d940bdb7c4bb2eef7bf0449c27f6be 100644 (file)
--- a/drivers/tty/vt/consolemap.c
+++ b/drivers/tty/vt/consolemap.c
@@ -214,29 +214,29 @@ struct uni_pagedict {
 
 static struct uni_pagedict *dflt;
 
-static void set_inverse_transl(struct vc_data *conp, struct uni_pagedict *p,
+static void set_inverse_transl(struct vc_data *conp, struct uni_pagedict *dict,
               enum translation_map m)
 {
-       int j, glyph;
        unsigned short *t = translations[m];
-       unsigned char *q;
+       unsigned char *inv;
 
-       if (!p)
+       if (!dict)
                return;
-       q = p->inverse_translations[m];
+       inv = dict->inverse_translations[m];
 
-       if (!q) {
-               q = p->inverse_translations[m] = kmalloc(MAX_GLYPH, GFP_KERNEL);
-               if (!q)
+       if (!inv) {
+               inv = dict->inverse_translations[m] = kmalloc(MAX_GLYPH,
+                               GFP_KERNEL);
+               if (!inv)
                        return;
        }
-       memset(q, 0, MAX_GLYPH);
+       memset(inv, 0, MAX_GLYPH);
 
-       for (j = 0; j < ARRAY_SIZE(translations[m]); j++) {
-               glyph = conv_uni_to_pc(conp, t[j]);
-               if (glyph >= 0 && glyph < MAX_GLYPH && q[glyph] < 32) {
+       for (unsigned int ch = 0; ch < ARRAY_SIZE(translations[m]); ch++) {
+               int glyph = conv_uni_to_pc(conp, t[ch]);
+               if (glyph >= 0 && glyph < MAX_GLYPH && inv[glyph] < 32) {
                        /* prefer '-' above SHY etc. */
-                       q[glyph] = j;
+                       inv[glyph] = ch;
                }
        }
 }