Commit a4236348 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

vc: move translation out of do_con_write 



Now that we reordered the code and the label, we can eliminate the
translation into a separate function. We call it vc_translate here.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20200615074910.19267-16-jslaby@suse.cz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0d1ffef5

drivers/tty/vt/vt.c

+16 −10
Original line number Diff line number Diff line
@@ -2658,6 +2658,19 @@ need_more_bytes: 
	return -1;

}



static int vc_translate(struct vc_data *vc, int *c, bool *rescan)

{

	/* Do no translation at all in control states */

	if (vc->vc_state != ESnormal)

		return *c;



	if (vc->vc_utf && !vc->vc_disp_ctrl)

		return *c = vc_translate_unicode(vc, *c, rescan);



	/* no utf or alternate charset mode */

	return vc_translate_ascii(vc, *c);

}



static inline unsigned char vc_invert_attr(const struct vc_data *vc)

{

	if (!vc->vc_can_do_color)
@@ -2726,16 +2739,9 @@ rescan_last_byte: 
		inverse = false;

		width = 1;



		/* Do no translation at all in control states */

		if (vc->vc_state != ESnormal) {

			tc = c;

		} else if (vc->vc_utf && !vc->vc_disp_ctrl) {

			tc = c = vc_translate_unicode(vc, c, &rescan);

		tc = vc_translate(vc, &c, &rescan);

		if (tc == -1)

			continue;

		} else {	/* no utf or alternate charset mode */

			tc = vc_translate_ascii(vc, c);

		}



		param.c = tc;

		if (atomic_notifier_call_chain(&vt_notifier_list, VT_PREWRITE,

CRA Git | Maintained and supported by SUSTech CRA and CCSE