From nobody Mon May 13 11:26:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+111856+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+111856+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1701282562; cv=none; d=zohomail.com; s=zohoarc; b=ENN1wPXIK1RAwogNTXybeXnZVxAYFPWplrrifDJWkyIVoFXqi0G85KjGufiPzgDbWsfvRX9OBchCcY+5tMfeRs4wYSvfnR7KxCdV/Oc1nfroBqlutaCmffoAe6mLxcIWJ9A/h4BENrIke2teWpRfwT64+5ZRNAxYKNOuxEZqlc8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1701282562; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=tyqJcFJNlFPul0i2LK/8QXwvEo2BtwoTpbjQTSqVJws=; b=iszwSblaQ1oGAwtA8qjvjWWLbF03DxaZXnoinK5M1oTkQ733nRip3YmOS39VH0r0N2mRzwnLfG32HkvTXlkOJHcUEPP0eMF0sb/hcCAzxuIDqgSjW/abNPxQKvlDl2WonVTeBHkQmnsi2EzwBErYlTXrzX/+gYC4DzmQz01g11Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+111856+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1701282562533335.00736166977356; Wed, 29 Nov 2023 10:29:22 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=m6QSNH5ohGxkjnDy/I/vVI2OMnzjE1iS/99ClK8D0yw=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20140610; t=1701282561; v=1; b=Q2RUvMyxxsXewpPkpnjxQ0CZFiaZpy1Rz1C8Y+BoiwBznJHl95lzoBi0Xz7UAwSZeM39D907 vgQzpHHq33oke9mhR4AWj9QExm6wM+9IQbYpSHn5vtA8LcieOaoA2+cawdYs82ApRySaaMRi7c0 9gTVU/1zKJgU+cw9WI5U2ecA= X-Received: by 127.0.0.2 with SMTP id FGT5YY1788612xdOO59PIDG4; Wed, 29 Nov 2023 10:29:21 -0800 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.46009.1701282561033008677 for ; Wed, 29 Nov 2023 10:29:21 -0800 X-Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C720EC15; Wed, 29 Nov 2023 10:30:07 -0800 (PST) X-Received: from u102865.austin.arm.com (u102865.arm.com [10.118.16.53]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id A9D3F3F5A1; Wed, 29 Nov 2023 10:29:20 -0800 (PST) From: "Daniel Nguyen" To: devel@edk2.groups.io Cc: nd@arm.com, Daniel Nguyen , Zhichao Gao , Ray Ni Subject: [edk2-devel] [PATCH v2 1/1] ShellPkg: Tidy for code readability Date: Wed, 29 Nov 2023 12:28:40 -0600 Message-Id: <20231129182840.2333098-2-daniel.nguyen@arm.com> In-Reply-To: <20231129182840.2333098-1-daniel.nguyen@arm.com> References: <20231129182840.2333098-1-daniel.nguyen@arm.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,daniel.nguyen@arm.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: 9edTjgqodPr2Kk5WQDck7yAEx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1701282564105000003 Content-Type: text/plain; charset="utf-8" Use error handling instead of success handling. Less indented logic is easier to read. Cc: Zhichao Gao Cc: Ray Ni Signed-off-by: Daniel Nguyen --- ShellPkg/Library/UefiShellLevel2CommandsLib/Reset.c | 41 +++++++++++------= --- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Reset.c b/ShellPkg= /Library/UefiShellLevel2CommandsLib/Reset.c index 57ba3c90f373..361c47e43059 100644 --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Reset.c +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Reset.c @@ -79,30 +79,35 @@ ShellCommandRunReset ( &DataSize, &OsIndications ); - if (!EFI_ERROR (Status)) { - if ((OsIndications & EFI_OS_INDICATIONS_BOOT_TO_FW_UI) !=3D 0) { - DataSize =3D sizeof (OsIndications); - Status =3D gRT->GetVariable ( - EFI_OS_INDICATIONS_VARIABLE_NAME, - &gEfiGlobalVariableGuid, - &Attr, - &DataSize, - &OsIndications - ); - if (!EFI_ERROR (Status)) { - OsIndications |=3D EFI_OS_INDICATIONS_BOOT_TO_FW_UI; - } else { - OsIndications =3D EFI_OS_INDICATIONS_BOOT_TO_FW_UI; - } =20 - Status =3D gRT->SetVariable ( + if (EFI_ERROR (Status)) { + ShellStatus =3D SHELL_UNSUPPORTED; + goto Error; + } + + if ((OsIndications & EFI_OS_INDICATIONS_BOOT_TO_FW_UI) !=3D 0) { + DataSize =3D sizeof (OsIndications); + Status =3D gRT->GetVariable ( EFI_OS_INDICATIONS_VARIABLE_NAME, &gEfiGlobalVariableGuid, - EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTS= ERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS, - sizeof (OsIndications), + &Attr, + &DataSize, &OsIndications ); + + if (EFI_ERROR (Status)) { + OsIndications =3D EFI_OS_INDICATIONS_BOOT_TO_FW_UI; + } else { + OsIndications |=3D EFI_OS_INDICATIONS_BOOT_TO_FW_UI; } + + Status =3D gRT->SetVariable ( + EFI_OS_INDICATIONS_VARIABLE_NAME, + &gEfiGlobalVariableGuid, + EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSER= VICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS, + sizeof (OsIndications), + &OsIndications + ); } =20 if (EFI_ERROR (Status)) { --=20 2.25.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111856): https://edk2.groups.io/g/devel/message/111856 Mute This Topic: https://groups.io/mt/102877864/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-