UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

vt: use modern types in do_con_write 

Use bools for rescan and inverse. And true/false accordingly.

Use u8 for width instead of uint8_t.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20200615074910.19267-11-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby 2020-06-15 09:48:43 +02:00 committed by Greg Kroah-Hartman
parent a018180cc3
commit da823b2dc0
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/tty/vt/vt.c
View File

@ -2581,10 +2581,10 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co
struct vc_data *vc;
unsigned char vc_attr;
struct vt_notifier_param param;
uint8_t rescan;
uint8_t inverse;
uint8_t width;
u16 himask, charmask;
u8 width;
bool rescan;
bool inverse;
if (in_interrupt())
return count;
@ -2620,8 +2620,8 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co
buf++;
n++;
count--;
rescan = 0;
inverse = 0;
rescan = false;
inverse = false;
width = 1;
/* Do no translation at all in control states */
@ -2660,7 +2660,7 @@ rescan_last_byte:
/* Single ASCII byte or first byte of a sequence received */
if (vc->vc_utf_count) {
/* Continuation byte expected */
rescan = 1;
rescan = true;
vc->vc_utf_count = 0;
c = 0xfffd;
} else if (c > 0x7f) {
@ -2746,7 +2746,7 @@ rescan_last_byte:
/* Display U+FFFD. If it's not found, display an inverse question mark. */
tc = conv_uni_to_pc(vc, 0xfffd);
if (tc < 0) {
inverse = 1;
inverse = true;
tc = conv_uni_to_pc(vc, '?');
if (tc < 0) tc = '?';
}
@ -2807,8 +2807,8 @@ rescan_last_byte:
con_flush(vc, draw_from, draw_to, &draw_x);
if (rescan) {
rescan = 0;
inverse = 0;
rescan = false;
inverse = false;
width = 1;
c = orig;
goto rescan_last_byte;