mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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/20220607104946.18710-20-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby 2022-06-07 12:49:30 +02:00 committed by Greg Kroah-Hartman
parent dca1419173
commit 50c92a1b2d
1 changed files with 19 additions and 19 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

38
drivers/tty/vt/consolemap.c
View file

@ -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,
struct uni_pagedict *p)
{
int i, j, k;
u16 **p1, *p2;
u16 *q;
unsigned int d, r, g;
u16 *inv;
if (!p)
return;
q = p->inverse_trans_unicode;
if (!q) {
q = p->inverse_trans_unicode = kmalloc_array(MAX_GLYPH,
sizeof(*q), GFP_KERNEL);
if (!q)
inv = p->inverse_trans_unicode;
if (!inv) {
inv = p->inverse_trans_unicode = kmalloc_array(MAX_GLYPH,
sizeof(*inv), GFP_KERNEL);
if (!inv)
return;
}
memset(q, 0, MAX_GLYPH * sizeof(*q));
memset(inv, 0, MAX_GLYPH * sizeof(*inv));
for (i = 0; i < UNI_DIRS; i++) {
p1 = p->uni_pgdir[i];
if (!p1)
for (d = 0; d < UNI_DIRS; d++) {
u16 **dir = p->uni_pgdir[d];
if (!dir)
continue;
for (j = 0; j < UNI_DIR_ROWS; j++) {
p2 = p1[j];
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++) {
u16 glyph = p2[k];
if (glyph < MAX_GLYPH && q[glyph] < 32)
q[glyph] = UNI(i, j, k);
for (g = 0; g < UNI_ROW_GLYPHS; g++) {
u16 glyph = row[g];
if (glyph < MAX_GLYPH && inv[glyph] < 32)
inv[glyph] = UNI(d, r, g);
}
}
}