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 27033C433F5 for ; Sun, 17 Oct 2021 15:38:50 +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 9B32960FE3 for ; Sun, 17 Oct 2021 15:38:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 9B32960FE3 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 9D264834F1; Sun, 17 Oct 2021 17:37:56 +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="fQyWtqaV"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EA6AF833D8; Sun, 17 Oct 2021 17:37:05 +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 BA26C83406 for ; Sun, 17 Oct 2021 17:36:52 +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 90BED610E5; Sun, 17 Oct 2021 15:36:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1634485011; bh=Z9Sg/nb328JfJqnpbzDK/2P6xuzipFBjmR/Zk9Ihq7U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fQyWtqaV6NmiqxrWEsLXP9cQIsCRyWOYQxRd96dvnj4YyURUF5Hnis4Hea8bqPQ92 7f8sA0sCj9pGMCZuguhy2ExNAap7gRHeo4SBq5HtbRpIvoJ3eJJ94Kmwb60Fra7CYn SyvzPAthO91zcjijilU99nG8GQRyeELow/51tJFowK4Moxo4Wmw7qrZgKKeG7N4geG fbzWPClYJcM/s20c+laUIMC24uycEjKrMaKqn1XuvnSvBg8X6Teg0I0gR6AE07AKZu 0rA3QSoGBB3AE/2PzKhCtGuE2wAa+xP4O6rLcKEkJBJEiMgwj1krtD/uJxq0yejNdg Vw6HWJJQeSYiw== 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 v3 07/13] env: Use better name for variable in env_get_f() Date: Sun, 17 Oct 2021 17:36:32 +0200 Message-Id: <20211017153638.29870-8-kabel@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211017153638.29870-1-kabel@kernel.org> References: <20211017153638.29870-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 The `nxt` variable actually points to the terminating null-byte of the current env var, and the next env var is at `nxt + 1`, not `nxt`. So a better name for this variable is `end`. Signed-off-by: Marek Behún Reviewed-by: Simon Glass --- cmd/nvedit.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/nvedit.c b/cmd/nvedit.c index f395d2893a..5b1d4c2448 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -726,19 +726,19 @@ static const char *env_match(const char *p, const char *s1) */ int env_get_f(const char *name, char *buf, unsigned len) { - const char *env, *p, *nxt; + const char *env, *p, *end; if (gd->env_valid == ENV_INVALID) env = (const char *)default_environment; else env = (const char *)gd->env_addr; - for (p = env; *p != '\0'; p = nxt + 1) { + for (p = env; *p != '\0'; p = end + 1) { const char *value; int n; - for (nxt = p; *nxt != '\0'; ++nxt) - if (nxt - env >= CONFIG_ENV_SIZE) + for (end = p; *end != '\0'; ++end) + if (end - env >= CONFIG_ENV_SIZE) return -1; value = env_match(p, name); -- 2.32.0