ShellPkg: Tidy for code readability

Use error handling instead of success handling.
Less indented logic is easier to read.

Cc: Zhichao Gao <zhichao.gao@intel.com>
Cc: Ray Ni <ray.ni@intel.com>

Signed-off-by: Daniel Nguyen <daniel.nguyen@arm.com>
Reviewed-by: Zhichao Gao <zhichao.gao@intel.com>

ShellPkg/Library/UefiShellLevel2CommandsLib/Reset.c

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Reset.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Reset.c
index 57ba3c9..361c47e 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Reset.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Reset.c
@@ -79,30 +79,35 @@
                           &DataSize,

                           &OsIndications

                           );

-        if (!EFI_ERROR (Status)) {

-          if ((OsIndications & EFI_OS_INDICATIONS_BOOT_TO_FW_UI) != 0) {

-            DataSize = sizeof (OsIndications);

-            Status   = gRT->GetVariable (

-                              EFI_OS_INDICATIONS_VARIABLE_NAME,

-                              &gEfiGlobalVariableGuid,

-                              &Attr,

-                              &DataSize,

-                              &OsIndications

-                              );

-            if (!EFI_ERROR (Status)) {

-              OsIndications |= EFI_OS_INDICATIONS_BOOT_TO_FW_UI;

-            } else {

-              OsIndications = EFI_OS_INDICATIONS_BOOT_TO_FW_UI;

-            }

 

-            Status = gRT->SetVariable (

+        if (EFI_ERROR (Status)) {

+          ShellStatus = SHELL_UNSUPPORTED;

+          goto Error;

+        }

+

+        if ((OsIndications & EFI_OS_INDICATIONS_BOOT_TO_FW_UI) != 0) {

+          DataSize = sizeof (OsIndications);

+          Status   = gRT->GetVariable (

                             EFI_OS_INDICATIONS_VARIABLE_NAME,

                             &gEfiGlobalVariableGuid,

-                            EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,

-                            sizeof (OsIndications),

+                            &Attr,

+                            &DataSize,

                             &OsIndications

                             );

+

+          if (EFI_ERROR (Status)) {

+            OsIndications = EFI_OS_INDICATIONS_BOOT_TO_FW_UI;

+          } else {

+            OsIndications |= EFI_OS_INDICATIONS_BOOT_TO_FW_UI;

           }

+

+          Status = gRT->SetVariable (

+                          EFI_OS_INDICATIONS_VARIABLE_NAME,

+                          &gEfiGlobalVariableGuid,

+                          EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,

+                          sizeof (OsIndications),

+                          &OsIndications

+                          );

         }

 

         if (EFI_ERROR (Status)) {