From patchwork Wed Nov 3 23:23:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 1550636 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=OcKXH7O9; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hl2tf2nRSz9sRN for ; Thu, 4 Nov 2021 10:25:14 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A09E48367E; Thu, 4 Nov 2021 00:24:23 +0100 (CET) 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="OcKXH7O9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id ED9B883666; Thu, 4 Nov 2021 00:23:54 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 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 C479D83224 for ; Thu, 4 Nov 2021 00:23:48 +0100 (CET) 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 9EA01608FB; Wed, 3 Nov 2021 23:23:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1635981827; bh=Xa6z/pKt2Z1IKp0N5YOodeu/x2nU67lw1Nu+jM3R4KM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OcKXH7O9oVmZ4b2eZcYsKJQ1emlSKAIkpO3l0X0eHbxSFIAnHQ90+yfPzHqUk4UWR 3XO8ovEEeTeFrM9s/tp4ED4TGaeGWsiO3HSmKxaW5tBTi1YNncfi4+LwhRjo60Hl2I GUwCTFKhRkxZn5vTZPelifzVmKeSupNy8D3/wdHhBlvr6PWYKMALy0iq8y9M9mnJEq Jm4pSRlDrkBG+rGYfbpX7HDDlzNtB1s9Ukeh7z/Jv7ngVFeAr27ulsbvPbEqyz9PzW E2vfj8PVSQFhMJnO4+6LtrDtLostjotIYegjoRUaYFZbUsjDHzK3QtDTtOtQzBtILt uYOH5e+Bp47MQ== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Simon Glass , =?utf-8?q?Pali_Roh=C3=A1r?= Cc: u-boot@lists.denx.de, =?utf-8?q?Marek_Beh=C3=BAn?= Subject: [PATCH v2 09/12] env: Change return behaviour of env_set_default_vars() Date: Thu, 4 Nov 2021 00:23:29 +0100 Message-Id: <20211103232332.2737-10-kabel@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211103232332.2737-1-kabel@kernel.org> References: <20211103232332.2737-1-kabel@kernel.org> MIME-Version: 1.0 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 env_set_default_vars() function does not document return value and behaves differently from other env_* functions. Change the return value to return 0 on success and -ve on error. Signed-off-by: Marek Behún Reviewed-by: Simon Glass --- env/common.c | 9 ++++++--- include/env.h | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/env/common.c b/env/common.c index 208e2adaa0..cefe58561b 100644 --- a/env/common.c +++ b/env/common.c @@ -283,9 +283,12 @@ int env_set_default_vars(int nvars, char * const vars[], int flags) * (and use \0 as a separator) */ flags |= H_NOCLEAR | H_DEFAULT; - return himport_r(&env_htab, default_environment, - sizeof(default_environment), '\0', - flags, 0, nvars, vars); + if (!himport_r(&env_htab, default_environment, + sizeof(default_environment), '\0', flags, 0, nvars, + vars)) + return -errno; + + return 0; } /* diff --git a/include/env.h b/include/env.h index ee5e30d036..d0b95a498d 100644 --- a/include/env.h +++ b/include/env.h @@ -245,6 +245,7 @@ void env_fix_drivers(void); * @nvars: Number of variables to set/reset * @vars: List of variables to set/reset * @flags: Flags controlling matching (H_... - see search.h) + * @return 0 if OK, -ve on error */ int env_set_default_vars(int nvars, char *const vars[], int flags);