diff mbox series

[18/22] tty: vt: add new helper for reseting vc parameters

Message ID	20240202065608.14019-19-jirislaby@kernel.org
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel+bounces-49334-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; From: "Jiri Slaby (SUSE)" <jirislaby@kernel.org> To: gregkh@linuxfoundation.org Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" <jirislaby@kernel.org> Subject: [PATCH 18/22] tty: vt: add new helper for reseting vc parameters Date: Fri, 2 Feb 2024 07:56:04 +0100 Message-ID: <20240202065608.14019-19-jirislaby@kernel.org> In-Reply-To: <20240202065608.14019-1-jirislaby@kernel.org> References: <20240202065608.14019-1-jirislaby@kernel.org> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-getmail-retrieved-from-mailbox: INBOX
Series	tty: vt: cleanup ESC sequences handling \| [00/22] tty: vt: cleanup ESC sequences handling [01/22] tty: vt: make rgb_from_256() slighly more comprehensible [02/22] tty: vt: define enums for CSI+h/l codes [03/22] tty: vt: rename set_mode() to csi_hl() [04/22] tty: vt: split DEC CSI+h/l handling into csi_DEC_hl() [05/22] tty: vt: remove unneeded assignment of EPecma to vc_priv [06/22] tty: vt: move CSI+n handling along to other ECMA CSIs [07/22] tty: vt: define an enum for CSI+] codes [08/22] tty: vt: rename setterm_command() to csi_RSB() [09/22] tty: vt: put cases on separate lines [10/22] tty: vt: accept u8 in do_con_trol() and vc_setGx() [11/22] tty: vt: extract ascii handling to handle_ascii() [12/22] tty: vt: separate ESesc state handling into handle_esc() [13/22] tty: vt: move CSI DEC handling to a separate function [14/22] tty: vt: move CSI ECMA handling to a separate function [15/22] tty: vt: name, reflow and document enum vc_ctl_state [16/22] tty: vt: simplify ansi_control_string() [17/22] tty: vt: handle CSI+[ inside preexisting switch-case [18/22] tty: vt: add new helper for reseting vc parameters [19/22] tty: vt: use switch+case in the ESnonstd case [20/22] tty: vt: use switch+case in the ESgetpars case [21/22] tty: vt: use ASCII enum constants in vt_console_print() [22/22] tty: vt: decrypt magic constants in vc_is_control()

Commit Message

Jiri Slaby Feb. 2, 2024, 6:56 a.m. UTC

  The code to reset the vc parameter parsing is repeated on two locations.
Create a helper vc_reset_params() and use it on both of them.

And instead of a 'for' loop to clear the array of parameters, use
simpler memset().

Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
---
 drivers/tty/vt/vt.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff mbox series

Patch

diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 4d020a9967a2..b0f691d79bf2 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -2548,6 +2548,12 @@  static void csi_ECMA(struct tty_struct *tty, struct vc_data *vc, u8 c)
 
 }
 
+static void vc_reset_params(struct vc_data *vc)
+{
+	memset(vc->vc_par, 0, sizeof(vc->vc_par));
+	vc->vc_npar = 0;
+}
+
 /* console_lock is held */
 static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, u8 c)
 {
@@ -2568,9 +2574,7 @@  static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, u8 c)
 		return;
 	case ESnonstd:	/* ESC ] aka OSC */
 		if (c=='P') {   /* palette escape sequence */
-			for (vc->vc_npar = 0; vc->vc_npar < NPAR; vc->vc_npar++)
-				vc->vc_par[vc->vc_npar] = 0;
-			vc->vc_npar = 0;
+			vc_reset_params(vc);
 			vc->vc_state = ESpalette;
 			return;
 		} else if (c=='R') {   /* reset palette */
@@ -2599,9 +2603,8 @@  static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, u8 c)
 			vc->vc_state = ESnormal;
 		return;
 	case ESsquare:	/* ESC [ aka CSI, parameters or modifiers expected */
-		for (vc->vc_npar = 0; vc->vc_npar < NPAR; vc->vc_npar++)
-			vc->vc_par[vc->vc_npar] = 0;
-		vc->vc_npar = 0;
+		vc_reset_params(vc);
+
 		vc->vc_state = ESgetpars;
 		switch (c) {
 		case '[': /* Function key */