vt: synchronize types and use min in csi_X (e8548296) · Commits · 戴 / test

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> Link: https://lore.kernel.org/r/20200615074910.19267-23-jslaby@suse.cz Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/tty/vt/vt.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -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);

Admin message