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 CCA58C433EF for ; Wed, 3 Nov 2021 23:25:12 +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 F05C66103C for ; Wed, 3 Nov 2021 23:25:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org F05C66103C 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 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) 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=20Beh=C3=BAn?= To: Simon Glass , =?UTF-8?q?Pali=20Roh=C3=A1r?= Cc: u-boot@lists.denx.de, =?UTF-8?q?Marek=20Beh=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 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 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 --- 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); -- 2.32.0