[v2,02/12] lib: sbi: Fix how print gets flags

Message ID	20230606103112.1218382-3-wxjstz@126.com
State	Superseded
Headers	show Return-Path: <opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> From: Xiang W <wxjstz@126.com> To: opensbi@lists.infradead.org Cc: Xiang W <wxjstz@126.com>, anup@brainfault.org, jrtc27@jrtc27.com Subject: [PATCH v2 02/12] lib: sbi: Fix how print gets flags Date: Tue, 6 Jun 2023 18:31:02 +0800 Message-Id: <20230606103112.1218382-3-wxjstz@126.com> In-Reply-To: <20230606103112.1218382-1-wxjstz@126.com> References: <20230606103112.1218382-1-wxjstz@126.com> MIME-Version: 1.0 preview: The flags for print should be able to appear in any order. The previous code required the order to be fixed. Signed-off-by: Xiang W --- lib/sbi/sbi_console.c \| 33 +++++++++++++++++++++ 1 file changed, 21 insertions(+), 12 deletions(-) Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [wxjstz[at]126.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "opensbi" <opensbi-bounces@lists.infradead.org> Errors-To: opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org
Series	Improve sbi_console \| expand [v2,00/12] Improve sbi_console [v2,01/12] lib: sbi: Fix missing contine in print [v2,02/12] lib: sbi: Fix how print gets flags [v2,03/12] lib: sbi: print not fill '0' when left-aligned [v2,04/12] lib: sbi: Add '+' flags for print [v2,05/12] lib: sbi: Add ' ' '\'' flags for print [v2,06/12] lib: sbi: implifying the parameters of printi [v2,07/12] lib: sbi: print add 'o' type [v2,08/12] lib: sbi: Fix printi [v2,09/12] lib: sbi: Simplify prints [v2,10/12] lib: sbi: sbi_console.c code re-layout [v2,11/12] lib: sbi: Add print_info for sbi_console.c [v2,12/12] lib: sbi: Fix timing of clearing tbuf

Message ID

20230606103112.1218382-3-wxjstz@126.com

State

Superseded

Headers

From: Xiang W <wxjstz@126.com>
To: opensbi@lists.infradead.org
Cc: Xiang W <wxjstz@126.com>,
	anup@brainfault.org,
	jrtc27@jrtc27.com
Subject: [PATCH v2 02/12] lib: sbi: Fix how print gets flags
Date: Tue,  6 Jun 2023 18:31:02 +0800
Message-Id: <20230606103112.1218382-3-wxjstz@126.com>
In-Reply-To: <20230606103112.1218382-1-wxjstz@126.com>
References: <20230606103112.1218382-1-wxjstz@126.com>
MIME-Version: 1.0
Precedence: list
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: "opensbi" <opensbi-bounces@lists.infradead.org>
Errors-To: opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org

Series

Improve sbi_console | expand

Commit Message

Xiang W June 6, 2023, 10:31 a.m. UTC

The flags for print should be able to appear in any order. The
previous code required the order to be fixed.

Signed-off-by: Xiang W <wxjstz@126.com>
---
 lib/sbi/sbi_console.c | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/lib/sbi/sbi_console.c b/lib/sbi/sbi_console.c
index 1f0727c..97ee328 100644
--- a/lib/sbi/sbi_console.c
+++ b/lib/sbi/sbi_console.c
@@ -236,6 +236,7 @@  static int printi(char **out, u32 *out_len, long long i, int b, int sg,
 
 static int print(char **out, u32 *out_len, const char *format, va_list args)
 {
+	bool flags_done;
 	int width, flags, pc = 0;
 	char scr[2], *tout;
 	bool use_tbuf = (!out) ? true : false;
@@ -262,25 +263,33 @@  static int print(char **out, u32 *out_len, const char *format, va_list args)
 
 		if (*format == '%') {
 			++format;
-			width = flags = 0;
 			if (*format == '\0')
 				break;
 			if (*format == '%')
 				goto literal;
 			/* Get flags */
-			if (*format == '-') {
-				++format;
-				flags = PAD_RIGHT;
-			}
-			if (*format == '#') {
-				++format;
-				flags |= PAD_ALTERNATE;
-			}
-			while (*format == '0') {
-				++format;
-				flags |= PAD_ZERO;
+			flags = 0;
+			flags_done = false;
+			while (!flags_done) {
+				switch (*format) {
+				case '-':
+					flags |= PAD_RIGHT;
+					break;
+				case '#':
+					flags |= PAD_ALTERNATE;
+					break;
+				case '0':
+					flags |= PAD_ZERO;
+					break;
+				default:
+					flags_done = true;
+					break;
+				}
+				if (!flags_done)
+					++format;
 			}
 			/* Get width */
+			width = 0;
 			for (; *format >= '0' && *format <= '9'; ++format) {
 				width *= 10;
 				width += *format - '0';

[v2,02/12] lib: sbi: Fix how print gets flags

Commit Message

Patch