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

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...

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20220607104946.18710-28-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 dcbeb38a3a0ae9d38569f12c3878872b1974cba1..b8f2acb6e388a1a5925a909ebe0ca0c058a2e725 100644 (file)
--- a/drivers/tty/vt/consolemap.c
+++ b/drivers/tty/vt/consolemap.c
@@ -773,11 +773,11 @@ EXPORT_SYMBOL(con_copy_unimap);
 int con_get_unimap(struct vc_data *vc, ushort ct, ushort __user *uct,
                struct unipair __user *list)
 {
-       int i, j, k, ret = 0;
        ushort ect;
-       u16 **p1, *p2;
-       struct uni_pagedict *p;
+       struct uni_pagedict *dict;
        struct unipair *unilist;
+       unsigned int d, r, g;
+       int ret = 0;
 
        unilist = kvmalloc_array(ct, sizeof(*unilist), GFP_KERNEL);
        if (!unilist)
@@ -786,26 +786,26 @@ int con_get_unimap(struct vc_data *vc, ushort ct, ushort __user *uct,
        console_lock();
 
        ect = 0;
-       p = *vc->vc_uni_pagedir_loc;
-       if (!p)
+       dict = *vc->vc_uni_pagedir_loc;
+       if (!dict)
                goto unlock;
 
-       for (i = 0; i < UNI_DIRS; i++) {
-               p1 = p->uni_pgdir[i];
-               if (!p1)
+       for (d = 0; d < UNI_DIRS; d++) {
+               u16 **dir = dict->uni_pgdir[d];
+               if (!dir)
                        continue;
 
-               for (j = 0; j < UNI_DIR_ROWS; j++, p1++) {
-                       p2 = *p1;
-                       if (!p2)
+               for (r = 0; r < UNI_DIR_ROWS; r++) {
+                       u16 *row = dir[r];
+                       if (!row)
                                continue;
 
-                       for (k = 0; k < UNI_ROW_GLYPHS; k++, p2++) {
-                               if (*p2 >= MAX_GLYPH)
+                       for (g = 0; g < UNI_ROW_GLYPHS; g++, row++) {
+                               if (*row >= MAX_GLYPH)
                                        continue;
                                if (ect < ct) {
-                                       unilist[ect].unicode = UNI(i, j, k);
-                                       unilist[ect].fontpos = *p2;
+                                       unilist[ect].unicode = UNI(d, r, g);
+                                       unilist[ect].fontpos = *row;
                                }
                                ect++;
                        }