Commit d4a2245b authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman

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

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: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20220607104946.18710-22-jslaby@suse.czSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 61fe4a6b
...@@ -499,31 +499,31 @@ static int con_unify_unimap(struct vc_data *conp, struct uni_pagedict *p) ...@@ -499,31 +499,31 @@ static int con_unify_unimap(struct vc_data *conp, struct uni_pagedict *p)
static int static int
con_insert_unipair(struct uni_pagedict *p, u_short unicode, u_short fontpos) con_insert_unipair(struct uni_pagedict *p, u_short unicode, u_short fontpos)
{ {
int n; u16 **dir, *row;
u16 **p1, *p2; unsigned int n;
n = UNI_DIR(unicode); n = UNI_DIR(unicode);
p1 = p->uni_pgdir[n]; dir = p->uni_pgdir[n];
if (!p1) { if (!dir) {
p1 = p->uni_pgdir[n] = kcalloc(UNI_DIR_ROWS, sizeof(*p1), dir = p->uni_pgdir[n] = kcalloc(UNI_DIR_ROWS, sizeof(*dir),
GFP_KERNEL); GFP_KERNEL);
if (!p1) if (!dir)
return -ENOMEM; return -ENOMEM;
} }
n = UNI_ROW(unicode); n = UNI_ROW(unicode);
p2 = p1[n]; row = dir[n];
if (!p2) { if (!row) {
p2 = p1[n] = kmalloc_array(UNI_ROW_GLYPHS, sizeof(*p2), row = dir[n] = kmalloc_array(UNI_ROW_GLYPHS, sizeof(*row),
GFP_KERNEL); GFP_KERNEL);
if (!p2) if (!row)
return -ENOMEM; return -ENOMEM;
/* No glyphs for the characters (yet) */ /* 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; p->sum += (fontpos << 20U) + unicode;
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment