From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AEE70C433EF for ; Tue, 12 Oct 2021 11:07:00 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 203F560F3A for ; Tue, 12 Oct 2021 11:07:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 203F560F3A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 379FC83756; Tue, 12 Oct 2021 13:06:20 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="JIiWNXT4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 155B283715; Tue, 12 Oct 2021 13:05:26 +0200 (CEST) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7174483746 for ; Tue, 12 Oct 2021 13:05:17 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=kabel@kernel.org Received: by mail.kernel.org (Postfix) with ESMTPSA id 0B68460F3A; Tue, 12 Oct 2021 11:05:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1634036716; bh=tC3T3SdDB8WFOqEcrGHRoeeK/9OG+JugQr3sfDO0M1o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JIiWNXT48TMDTdr/a8xKDhfBcOHwawL4MgbDrCVOxZjwL9Nhg8+sOwklA3aVji6jD yXWA8iWOFXmHWPQryc6eiwp+SUZi1XH9QMAMjECU1QbC+JNHGAa11bW7k3gFPpbf+N yzhbVJDEKVty5smo3lzr4nIw1DExJO7y/N36AqqCEBeFGP7ojAnxNbtBFu8zAiBkOH DY6/ckKiz8Dxm7Y2iaWqBDKbs1W0iUeFCKUWbhv12YrgIKEOiQoD32WfAAHP7Y/2/+ w0bZRf0IXJILLq9dQpot6cc5JHXkag89e0LzBZ/BNlfkfbuYFvFhjCp0v5XYnzFIY6 zT+VMzBd5B1DQ== From: =?UTF-8?q?Marek=20Beh=C3=BAn?= To: Simon Glass , Tom Rini Cc: U-Boot Mailing List , =?UTF-8?q?Marek=20Beh=C3=BAn?= Subject: [PATCH 09/10] env: Use string pointer instead of indexes in env_get_f() Date: Tue, 12 Oct 2021 13:05:00 +0200 Message-Id: <20211012110501.6118-10-kabel@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211012110501.6118-1-kabel@kernel.org> References: <20211012110501.6118-1-kabel@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean From: Marek Behún Since we no longer use env_get_char() to access n-th character of linearized environment data, but rather access the arrays themselves, we can convert the iteration to use string pointers instead of position indexes. Signed-off-by: Marek Behún --- cmd/nvedit.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 51b9e4ffa4..455783dccc 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -706,16 +706,16 @@ char *from_env(const char *envvar) return ret; } -static int env_match(const char *env, const char *s1, int i2) +static const char *matching_name_get_value(const char *p, const char *name) { - while (*s1 != '\0' && *s1 == env[i2++]) - if (*s1++ == '=') - return i2; + while (*name != '\0' && *name == *p++) + if (*name++ == '=') + return p; - if (*s1 == '\0' && env[i2-1] == '=') - return i2; + if (*name == '\0' && p[-1] == '=') + return p; - return -1; + return NULL; } /* @@ -723,8 +723,7 @@ static int env_match(const char *env, const char *s1, int i2) */ int env_get_f(const char *name, char *buf, unsigned len) { - const char *env; - int i, nxt; + const char *env, *p, *nxt; if (name == NULL || *name == '\0') return -1; @@ -734,26 +733,26 @@ int env_get_f(const char *name, char *buf, unsigned len) else env = (const char *)gd->env_addr; - for (i = 0; env[i] != '\0'; i = nxt + 1) { - int val, n; + for (p = env; *p != '\0'; p = nxt + 1) { + const char *value; + unsigned copied; - for (nxt = i; env[nxt] != '\0'; ++nxt) - if (nxt >= CONFIG_ENV_SIZE) + for (nxt = p; *nxt != '\0'; ++nxt) + if (p - env >= CONFIG_ENV_SIZE) return -1; - val = env_match(env, name, i); - if (val < 0) + value = matching_name_get_value(p, name); + if (value == NULL) continue; - /* found; copy out */ - n = strncpy(buf, &env[val], len) - buf; - if (len && n == len) { + copied = strncpy(buf, value, len) - buf; + if (len && copied == len) { buf[len - 1] = '\0'; printf("env_buf [%u bytes] too small for value of \"%s\"\n", len, name); } - return n; + return copied; } return -1; -- 2.32.0