diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2022-06-07 12:49:31 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-06-10 13:37:02 +0200 |
| commit | 61fe4a6bb16fd411ba9c779413006a503649f862 (patch) | |
| tree | eff41da316766cb401b4d0ab9c4e2f909acb6de5 /drivers/tty/vt | |
| parent | 50c92a1b2d50611d49a8027027536c7a5003d049 (diff) | |
tty/vt: consolemap: saner variable names in conv_uni_to_pc()
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>
Diffstat (limited to 'drivers/tty/vt')
| -rw-r--r-- | drivers/tty/vt/consolemap.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c index 3763a73706b2..374b1ba20635 100644 --- a/drivers/tty/vt/consolemap.c +++ b/drivers/tty/vt/consolemap.c @@ -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 */ } |