From patchwork Tue Jun 6 10:31:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiang W X-Patchwork-Id: 1791087 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=A17v8JSF; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=126.com header.i=@126.com header.a=rsa-sha256 header.s=s110527 header.b=YU5q7a42; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Qb6d11zXRz20WK for ; Tue, 6 Jun 2023 20:47:49 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=dkMbknnOwpWN4LkQxnxnxvRfTuZv6B496m0JZlRZcsA=; b=A17v8JSFC9sgyw 5hv5+QG4ly+Qt4z6DnZWhA9yXoNnnj1QxkhAFnvD+27/jNv4e8ZWB5giECS1OSIz+YXzl+d8b3z4o G5rmunv7tqGEtpqeqe1QPJ8cZRhMaDUYLUFHPMGpBKfAyjUuH58zB0Mk/WksId862KKtzdo1ll6tO EJ/HdWvWfJR9V9N2s5qStxv6p3UwL9ZHOGs74zBaiDisTWwSScoC8DorWjcU5jHtdXAnODYxMfh4Q 5rweAAYKxnoC1otvw/FILrmkBQmkFrvQHlRNOV8l+ky/44SMRsASVKuAUaT48+d972Kw8gmwLHETG N2eUQYY8mkT17MfC9o6w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q6UDx-001Kfk-0t; Tue, 06 Jun 2023 10:47:37 +0000 Received: from m126.mail.126.com ([220.181.12.28]) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q6UDu-001Kck-03 for opensbi@lists.infradead.org; Tue, 06 Jun 2023 10:47:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=FvZNE Y/Hl9kWwTyVHa+sWc2WQCeXkXhgLiIIfoEaJjc=; b=YU5q7a42o4gOw8iXh2go9 hgncHVAsFPsQirsJjFqfJ1UrDJjdxOiBwj5jtDAZyljqj6aoaPI3fL+nHfNU8qem X3xoBENbq78hGhySo3t/bb7Du/AuvUrt2ecil3srymnvrktItcW10tjqGJyRUvm6 LBx6gTUUtl+5yqn2XCR6tY= Received: from x390.lan (unknown [58.247.180.116]) by zwqz-smtp-mta-g2-0 (Coremail) with SMTP id _____wBHCJbxCn9kkU0YAw--.48285S4; Tue, 06 Jun 2023 18:31:16 +0800 (CST) From: Xiang W To: opensbi@lists.infradead.org Cc: Xiang W , 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> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230606103112.1218382-1-wxjstz@126.com> References: <20230606103112.1218382-1-wxjstz@126.com> MIME-Version: 1.0 X-CM-TRANSID: _____wBHCJbxCn9kkU0YAw--.48285S4 X-Coremail-Antispam: 1Uf129KBjvJXoW7Aw13Cry3tw4DuFWrKFWxJFb_yoW8XF4rpF n5CF9xtF1Fyrn3G3y3Jw4xCFWFy395Gr1jvrZxJw4rWFy5CryFkrykXFyFyrZrGry7Ar15 t3WrJF1jqFWjq3DanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UIJPiUUUUU= X-Originating-IP: [58.247.180.116] X-CM-SenderInfo: pz0m23b26rjloofrz/1tbi1xeGOl53bWDBrQAAs0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230606_034734_399787_3E3A035B X-CRM114-Status: UNSURE ( 8.32 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content 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 X-BeenThere: opensbi@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "opensbi" Errors-To: opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org 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(-) 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';