Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-06 05:06:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tty: vt: simplify ansi_control_string()

Browse Source 
Given all the ANSI control states are sequential in the vc_ctl_state
enum, we can define first/last constants and use them in
ansi_control_string(). It makes the test simple and allows for removal
of the 'if' (which was unnecessary at all -- the 'return' should have
returned the 'if' content directly anyway).

And remove the useless comment -- it's clear from the function
prototype.

Signed-off-by: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20240202065608.14019-17-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby (SUSE) 2024-02-02 07:56:02 +01:00 committed by Greg Kroah-Hartman
parent 22795b3c47
commit fd5b40251a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2107,9 +2107,11 @@ static void restore_cur(struct vc_data *vc)
* @ESnonstd: OSC parsed
* @ESpalette: OSC P parsed
* @ESosc: OSC [0-9] parsed
* @ESANSI_first: first state for ignoring ansi control sequences
* @ESapc: ESC _ parsed
* @ESpm: ESC ^ parsed
* @ESdcs: ESC P parsed
* @ESANSI_last: last state for ignoring ansi control sequences
*/
enum vc_ctl_state {
ESnormal,
@ -2125,9 +2127,11 @@ enum vc_ctl_state {
ESnonstd,
ESpalette,
ESosc,
ESANSI_first = ESosc,
ESapc,
ESpm,
ESdcs,
ESANSI_last = ESdcs,
};
/* console_lock is held (except via vc_init()) */
@ -2202,12 +2206,9 @@ static void vc_setGx(struct vc_data *vc, unsigned int which, u8 c)
vc->vc_translate = set_translate(*charset, vc);
}
/* is this state an ANSI control string? */
static bool ansi_control_string(unsigned int state)
static bool ansi_control_string(enum vc_ctl_state state)
{
if (state == ESosc || state == ESapc || state == ESpm || state == ESdcs)
return true;
return false;
return state >= ESANSI_first && state <= ESANSI_last;
}
enum {