[PATCH 22/36] tty/vt: consolemap: saner variable names in con_insert_unipair()

Jiri Slaby
2022-06-07T10:52:50Z

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.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
drivers/tty/vt/consolemap.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c
index 374b1ba20635..2454a4395722 100644
--- a/drivers/tty/vt/consolemap.c
+++ b/drivers/tty/vt/consolemap.c
@@ -499,31 +499,31 @@ static int con_unify_unimap(struct vc_data *conp, struct uni_pagedict *p)
static int
con_insert_unipair(struct uni_pagedict *p, u_short unicode, u_short fontpos)
{
- int n;
- u16 **p1, *p2;
+ u16 **dir, *row;
+ unsigned int n;

n = UNI_DIR(unicode);
- p1 = p->uni_pgdir[n];
- if (!p1) {
- p1 = p->uni_pgdir[n] = kcalloc(UNI_DIR_ROWS, sizeof(*p1),
+ dir = p->uni_pgdir[n];
+ if (!dir) {
+ dir = p->uni_pgdir[n] = kcalloc(UNI_DIR_ROWS, sizeof(*dir),
GFP_KERNEL);
- if (!p1)
+ if (!dir)
return -ENOMEM;
}

n = UNI_ROW(unicode);
- p2 = p1[n];
- if (!p2) {
- p2 = p1[n] = kmalloc_array(UNI_ROW_GLYPHS, sizeof(*p2),
+ row = dir[n];
+ if (!row) {
+ row = dir[n] = kmalloc_array(UNI_ROW_GLYPHS, sizeof(*row),
GFP_KERNEL);
- if (!p2)
+ if (!row)
return -ENOMEM;
/* No glyphs for the characters (yet) */
- memset(p2, 0xff, UNI_ROW_GLYPHS * sizeof(*p2));
+ memset(row, 0xff, UNI_ROW_GLYPHS * sizeof(*row));
}

- p2[UNI_GLYPH(unicode)] = fontpos;
-
+ row[UNI_GLYPH(unicode)] = fontpos;
+
p->sum += (fontpos << 20U) + unicode;

return 0;
--
2.36.1