From patchwork Fri Jun 9 03:34:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiang W X-Patchwork-Id: 1792752 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=Qzci2zwG; 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=k1goUviF; 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 4QcmtR6p5sz20fT for ; Fri, 9 Jun 2023 13:35:11 +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=TLwHrwomJQbvbXZm4guXLSo8Q7eQS39KZ4j7fgSSqlE=; b=Qzci2zwG2xb0eV 6HznGufoyviADGrUOR7Lht8QURmx5j8K3kVy0CuDxdfeU9JsHm/lU7qhjFRuWaQOtJdrFh8vpvhiq GutGY2XughM/XrghyUlk1iP10eeRki5DC6s70ouZmeBtEx3pGhfWn0Y2/YrIjo51yvtupvX0EeXtQ xCcwDsK6ck6z/qiJhizjApQU+RK5N0czUmYigP8hDCkDitsOGC9mEDSKkBXaAXd/+lh4uy3qaNgGa WmNWsFdtvqjVR1EXJEsPvOv+nqt3u7bhYOcdfJJTnpGj+rj5s6nM97ppJzTejDHB/UHquDDcsCJXU IhqB0dVeF9EhuQfylYDQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q7Stu-00BTHX-0M; Fri, 09 Jun 2023 03:34:58 +0000 Received: from m126.mail.126.com ([220.181.12.29]) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q7Stm-00BTD1-2m for opensbi@lists.infradead.org; Fri, 09 Jun 2023 03:34:54 +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=bytJR T2WrSH+LyziQSe+3ieIWMGZhVrdgWrQFYv4ip8=; b=k1goUviFYU3or/Ao0g5tp INS+S0DClReT/6+J3AiximvAIIqjOLszXhox/nSUm4QHwGLulg93jqP3nl/qlDcs /kiF7i/KsCXYofOtFKLdlgHxtS4lvpGV6BjNQkoLlMKP35lSFKvX/lqYSWGCBkgJ i2uyeoILrby1nd9PMLUrCY= Received: from x390.lan (unknown [58.247.180.222]) by zwqz-smtp-mta-g0-1 (Coremail) with SMTP id _____wB3omDKnYJkJuYMAA--.4380S11; Fri, 09 Jun 2023 11:34:38 +0800 (CST) From: Xiang W To: opensbi@lists.infradead.org Cc: Xiang W , anup@brainfault.org, jrtc27@jrtc27.com Subject: [PATCH v5 09/14] lib: sbi: Simplify prints Date: Fri, 9 Jun 2023 11:34:25 +0800 Message-Id: <20230609033430.84471-10-wxjstz@126.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230609033430.84471-1-wxjstz@126.com> References: <20230609033430.84471-1-wxjstz@126.com> MIME-Version: 1.0 X-CM-TRANSID: _____wB3omDKnYJkJuYMAA--.4380S11 X-Coremail-Antispam: 1Uf129KBjvJXoW7WF4UCF4xZr4UJFWktFW5Jrb_yoW8Jw1Upa n3K3ZrJw4Fyas5Ary8twnFgF1Yy3WDCFW2yr9rXr18ZFWDZ3y8Jr4fJF1Fya47Jay8ZFy5 u3Z5uF4rXa1j9r7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zt2NixUUUUU= X-Originating-IP: [58.247.180.222] X-CM-SenderInfo: pz0m23b26rjloofrz/1tbi5BOJOlpEGBEafAAAs1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230608_203451_238687_C38C2895 X-CRM114-Status: UNSURE ( 9.62 ) 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: When doing width = width - strlen(string) in prints there is no need to consider the case that witdh may be less than 0. This is because the code to do filling needs to be executed under the condition [...] 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 When doing width = width - strlen(string) in prints there is no need to consider the case that witdh may be less than 0. This is because the code to do filling needs to be executed under the condition that width > 0. Signed-off-by: Xiang W --- lib/sbi/sbi_console.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/lib/sbi/sbi_console.c b/lib/sbi/sbi_console.c index 6f714f0..824ff6e 100644 --- a/lib/sbi/sbi_console.c +++ b/lib/sbi/sbi_console.c @@ -151,24 +151,11 @@ static void printc(char **out, u32 *out_len, char ch) static int prints(char **out, u32 *out_len, const char *string, int width, int flags) { - int pc = 0; - char padchar = ' '; - - if (width > 0) { - int len = 0; - const char *ptr; - for (ptr = string; *ptr; ++ptr) - ++len; - if (len >= width) - width = 0; - else - width -= len; - if (flags & PAD_ZERO) - padchar = '0'; - } + int pc = 0; + width -= sbi_strlen(string); if (!(flags & PAD_RIGHT)) { for (; width > 0; --width) { - printc(out, out_len, padchar); + printc(out, out_len, flags & PAD_ZERO ? '0' : ' '); ++pc; } } @@ -177,7 +164,7 @@ static int prints(char **out, u32 *out_len, const char *string, int width, ++pc; } for (; width > 0; --width) { - printc(out, out_len, padchar); + printc(out, out_len, ' '); ++pc; }