github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 17:13:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

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

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

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20220607104946.18710-21-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby 2022-06-07 12:49:31 +02:00 committed by Greg Kroah-Hartman
parent 50c92a1b2d
commit 61fe4a6bb1
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/tty/vt/consolemap.c
View File

@ -852,10 +852,9 @@ int conv_uni_to_8bit(u32 uni)
int
conv_uni_to_pc(struct vc_data *conp, long ucs)
{
int h;
u16 **p1, *p2;
struct uni_pagedict *p;
struct uni_pagedict *dict;
u16 **dir, *row, glyph;
/* Only 16-bit codes supported at this time */
if (ucs > 0xffff)
return -4; /* Not found */
@ -874,11 +873,11 @@ conv_uni_to_pc(struct vc_data *conp, long ucs)
if (!*conp->vc_uni_pagedir_loc)
return -3;
p = *conp->vc_uni_pagedir_loc;
if ((p1 = p->uni_pgdir[UNI_DIR(ucs)]) &&
(p2 = p1[UNI_ROW(ucs)]) &&
(h = p2[UNI_GLYPH(ucs)]) < MAX_GLYPH)
return h;
dict = *conp->vc_uni_pagedir_loc;
if ((dir = dict->uni_pgdir[UNI_DIR(ucs)]) &&
(row = dir[UNI_ROW(ucs)]) &&
(glyph = row[UNI_GLYPH(ucs)]) < MAX_GLYPH)
return glyph;
return -4; /* not found */
}