lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/36] tty/vt: consolemap: decrypt inverse_translate()
    Date
    Fix invalid indentation and demystify the code by removing superfluous
    "else"s. The "else"s are unneeded as they always follow an "if"-true
    branch containing a "return". The code is now way more readable.

    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/tty/vt/consolemap.c | 31 ++++++++++++++++---------------
    1 file changed, 16 insertions(+), 15 deletions(-)

    diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c
    index 15aa10ff87ad..fb61158f4dc6 100644
    --- a/drivers/tty/vt/consolemap.c
    +++ b/drivers/tty/vt/consolemap.c
    @@ -285,25 +285,26 @@ u16 inverse_translate(const struct vc_data *conp, int glyph, int use_unicode)
    {
    struct uni_pagedict *p;
    int m;
    +
    if (glyph < 0 || glyph >= MAX_GLYPH)
    return 0;
    - else {
    - p = *conp->vc_uni_pagedir_loc;
    - if (!p)
    +
    + p = *conp->vc_uni_pagedir_loc;
    + if (!p)
    + return glyph;
    +
    + if (use_unicode) {
    + if (!p->inverse_trans_unicode)
    return glyph;
    - else if (use_unicode) {
    - if (!p->inverse_trans_unicode)
    - return glyph;
    - else
    - return p->inverse_trans_unicode[glyph];
    - } else {
    - m = inv_translate[conp->vc_num];
    - if (!p->inverse_translations[m])
    - return glyph;
    - else
    - return p->inverse_translations[m][glyph];
    - }
    +
    + return p->inverse_trans_unicode[glyph];
    }
    +
    + m = inv_translate[conp->vc_num];
    + if (!p->inverse_translations[m])
    + return glyph;
    +
    + return p->inverse_translations[m][glyph];
    }
    EXPORT_SYMBOL_GPL(inverse_translate);

    --
    2.36.1
    \
     
     \ /
      Last update: 2022-06-07 12:52    [W:4.041 / U:0.748 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site