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

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

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: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20220607104946.18710-20-jslaby@suse.czSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dca14191
...@@ -244,33 +244,33 @@ static void set_inverse_transl(struct vc_data *conp, struct uni_pagedict *p, ...@@ -244,33 +244,33 @@ static void set_inverse_transl(struct vc_data *conp, struct uni_pagedict *p,
static void set_inverse_trans_unicode(struct vc_data *conp, static void set_inverse_trans_unicode(struct vc_data *conp,
struct uni_pagedict *p) struct uni_pagedict *p)
{ {
int i, j, k; unsigned int d, r, g;
u16 **p1, *p2; u16 *inv;
u16 *q;
if (!p) if (!p)
return; return;
q = p->inverse_trans_unicode;
if (!q) { inv = p->inverse_trans_unicode;
q = p->inverse_trans_unicode = kmalloc_array(MAX_GLYPH, if (!inv) {
sizeof(*q), GFP_KERNEL); inv = p->inverse_trans_unicode = kmalloc_array(MAX_GLYPH,
if (!q) sizeof(*inv), GFP_KERNEL);
if (!inv)
return; return;
} }
memset(q, 0, MAX_GLYPH * sizeof(*q)); memset(inv, 0, MAX_GLYPH * sizeof(*inv));
for (i = 0; i < UNI_DIRS; i++) { for (d = 0; d < UNI_DIRS; d++) {
p1 = p->uni_pgdir[i]; u16 **dir = p->uni_pgdir[d];
if (!p1) if (!dir)
continue; continue;
for (j = 0; j < UNI_DIR_ROWS; j++) { for (r = 0; r < UNI_DIR_ROWS; r++) {
p2 = p1[j]; u16 *row = dir[r];
if (!p2) if (!row)
continue; continue;
for (k = 0; k < UNI_ROW_GLYPHS; k++) { for (g = 0; g < UNI_ROW_GLYPHS; g++) {
u16 glyph = p2[k]; u16 glyph = row[g];
if (glyph < MAX_GLYPH && q[glyph] < 32) if (glyph < MAX_GLYPH && inv[glyph] < 32)
q[glyph] = UNI(i, j, k); inv[glyph] = UNI(d, r, g);
} }
} }
} }
......
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