lkml.org 
[lkml]   [2020]   [Jun]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 23/38] vt: synchronize types and use min in csi_X
    Date
    All the types are unsinged ints -- even the vpar passed to the function.
    So unify them and use min() to compute count instead of explicit
    comparison.

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

    diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
    index 4686f8b9251d..b1fdbf119755 100644
    --- a/drivers/tty/vt/vt.c
    +++ b/drivers/tty/vt/vt.c
    @@ -1582,13 +1582,15 @@ static void csi_K(struct vc_data *vc, int vpar)
    do_update_region(vc, (unsigned long)(start + offset), count);
    }

    -static void csi_X(struct vc_data *vc, int vpar) /* erase the following vpar positions */
    +/* erase the following vpar positions */
    +static void csi_X(struct vc_data *vc, unsigned int vpar)
    { /* not vt100? */
    - int count;
    + unsigned int count;

    if (!vpar)
    vpar++;
    - count = (vpar > vc->vc_cols - vc->state.x) ? (vc->vc_cols - vc->state.x) : vpar;
    +
    + count = min(vpar, vc->vc_cols - vc->state.x);

    vc_uniscr_clear_line(vc, vc->state.x, count);
    scr_memsetw((unsigned short *)vc->vc_pos, vc->vc_video_erase_char, 2 * count);
    --
    2.27.0
    \
     
     \ /
      Last update: 2020-06-15 09:50    [W:4.011 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site