]> git.proxmox.com Git - mirror_edk2.git/blobdiff - ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
ShellPkg: Apply uncrustify changes
[mirror_edk2.git] / ShellPkg / Library / UefiShellDebug1CommandsLib / HexEdit / MainHexEditor.c
index 9f72da11939e32ef5b4fcfe630c1c73116c1c4c3..0eb917acf73e8aa4d6dc3b7a8bbed087e6b1edbe 100644 (file)
 #include "EditStatusBar.h"\r
 #include "EditInputBar.h"\r
 \r
-HEFI_EDITOR_COLOR_ATTRIBUTES    HOriginalColors;\r
-INTN                            HOriginalMode;\r
+HEFI_EDITOR_COLOR_ATTRIBUTES  HOriginalColors;\r
+INTN                          HOriginalMode;\r
 \r
 //\r
 // the first time editor launch\r
 //\r
-BOOLEAN                         HEditorFirst;\r
+BOOLEAN  HEditorFirst;\r
 \r
 //\r
 // it's time editor should exit\r
 //\r
-BOOLEAN                         HEditorExit;\r
+BOOLEAN  HEditorExit;\r
 \r
-BOOLEAN                         HEditorMouseAction;\r
+BOOLEAN  HEditorMouseAction;\r
 \r
-extern HEFI_EDITOR_BUFFER_IMAGE HBufferImage;\r
-extern HEFI_EDITOR_BUFFER_IMAGE HBufferImageBackupVar;\r
+extern HEFI_EDITOR_BUFFER_IMAGE  HBufferImage;\r
+extern HEFI_EDITOR_BUFFER_IMAGE  HBufferImageBackupVar;\r
 \r
-extern BOOLEAN                  HBufferImageMouseNeedRefresh;\r
-extern BOOLEAN                  HBufferImageNeedRefresh;\r
-extern BOOLEAN                  HBufferImageOnlyLineNeedRefresh;\r
+extern BOOLEAN  HBufferImageMouseNeedRefresh;\r
+extern BOOLEAN  HBufferImageNeedRefresh;\r
+extern BOOLEAN  HBufferImageOnlyLineNeedRefresh;\r
 \r
-HEFI_EDITOR_GLOBAL_EDITOR       HMainEditor;\r
-HEFI_EDITOR_GLOBAL_EDITOR       HMainEditorBackupVar;\r
+HEFI_EDITOR_GLOBAL_EDITOR  HMainEditor;\r
+HEFI_EDITOR_GLOBAL_EDITOR  HMainEditorBackupVar;\r
 \r
 //\r
 // basic initialization for MainEditor\r
 //\r
-HEFI_EDITOR_GLOBAL_EDITOR       HMainEditorConst = {\r
+HEFI_EDITOR_GLOBAL_EDITOR  HMainEditorConst = {\r
   &HBufferImage,\r
   {\r
-    {0, 0}\r
+    { 0,        0}\r
   },\r
   {\r
     0,\r
@@ -63,33 +63,32 @@ HEFI_EDITOR_GLOBAL_EDITOR       HMainEditorConst = {
   Help info that will be displayed.\r
 **/\r
 EFI_STRING_ID  HexMainMenuHelpInfo[] = {\r
-  STRING_TOKEN(STR_HEXEDIT_HELP_TITLE),\r
-  STRING_TOKEN(STR_HEXEDIT_HELP_BLANK),\r
-  STRING_TOKEN(STR_HEXEDIT_HELP_LIST_TITLE),\r
-  STRING_TOKEN(STR_HEXEDIT_HELP_DIV),\r
-  STRING_TOKEN(STR_HEXEDIT_HELP_GO_TO_OFFSET),\r
-  STRING_TOKEN(STR_HEXEDIT_HELP_SAVE_BUFFER),\r
-  STRING_TOKEN(STR_HEXEDIT_HELP_EXIT),\r
-  STRING_TOKEN(STR_HEXEDIT_HELP_SELECT_START),\r
-  STRING_TOKEN(STR_HEXEDIT_HELP_SELECT_END),\r
-  STRING_TOKEN(STR_HEXEDIT_HELP_CUT),\r
-  STRING_TOKEN(STR_HEXEDIT_HELP_PASTE),\r
-  STRING_TOKEN(STR_HEXEDIT_HELP_OPEN_FILE),\r
-  STRING_TOKEN(STR_HEXEDIT_HELP_OPEN_DISK),\r
-  STRING_TOKEN(STR_HEXEDIT_HELP_OPEN_MEMORY),\r
-  STRING_TOKEN(STR_HEXEDIT_HELP_BLANK),\r
-  STRING_TOKEN(STR_HEXEDIT_HELP_EXIT_HELP),\r
-  STRING_TOKEN(STR_HEXEDIT_HELP_BLANK),\r
-  STRING_TOKEN(STR_HEXEDIT_HELP_BLANK),\r
-  STRING_TOKEN(STR_HEXEDIT_HELP_BLANK),\r
-  STRING_TOKEN(STR_HEXEDIT_HELP_BLANK),\r
-  STRING_TOKEN(STR_HEXEDIT_HELP_BLANK),\r
-  STRING_TOKEN(STR_HEXEDIT_HELP_BLANK),\r
-  STRING_TOKEN(STR_HEXEDIT_HELP_DIV),\r
+  STRING_TOKEN (STR_HEXEDIT_HELP_TITLE),\r
+  STRING_TOKEN (STR_HEXEDIT_HELP_BLANK),\r
+  STRING_TOKEN (STR_HEXEDIT_HELP_LIST_TITLE),\r
+  STRING_TOKEN (STR_HEXEDIT_HELP_DIV),\r
+  STRING_TOKEN (STR_HEXEDIT_HELP_GO_TO_OFFSET),\r
+  STRING_TOKEN (STR_HEXEDIT_HELP_SAVE_BUFFER),\r
+  STRING_TOKEN (STR_HEXEDIT_HELP_EXIT),\r
+  STRING_TOKEN (STR_HEXEDIT_HELP_SELECT_START),\r
+  STRING_TOKEN (STR_HEXEDIT_HELP_SELECT_END),\r
+  STRING_TOKEN (STR_HEXEDIT_HELP_CUT),\r
+  STRING_TOKEN (STR_HEXEDIT_HELP_PASTE),\r
+  STRING_TOKEN (STR_HEXEDIT_HELP_OPEN_FILE),\r
+  STRING_TOKEN (STR_HEXEDIT_HELP_OPEN_DISK),\r
+  STRING_TOKEN (STR_HEXEDIT_HELP_OPEN_MEMORY),\r
+  STRING_TOKEN (STR_HEXEDIT_HELP_BLANK),\r
+  STRING_TOKEN (STR_HEXEDIT_HELP_EXIT_HELP),\r
+  STRING_TOKEN (STR_HEXEDIT_HELP_BLANK),\r
+  STRING_TOKEN (STR_HEXEDIT_HELP_BLANK),\r
+  STRING_TOKEN (STR_HEXEDIT_HELP_BLANK),\r
+  STRING_TOKEN (STR_HEXEDIT_HELP_BLANK),\r
+  STRING_TOKEN (STR_HEXEDIT_HELP_BLANK),\r
+  STRING_TOKEN (STR_HEXEDIT_HELP_BLANK),\r
+  STRING_TOKEN (STR_HEXEDIT_HELP_DIV),\r
   0\r
 };\r
 \r
-\r
 /**\r
   show help menu.\r
 \r
@@ -100,19 +99,23 @@ HMainCommandDisplayHelp (
   VOID\r
   )\r
 {\r
-  INT32           CurrentLine;\r
-  CHAR16          *InfoString;\r
-  EFI_KEY_DATA    KeyData;\r
-  EFI_STATUS      Status;\r
-  UINTN           EventIndex;\r
+  INT32         CurrentLine;\r
+  CHAR16        *InfoString;\r
+  EFI_KEY_DATA  KeyData;\r
+  EFI_STATUS    Status;\r
+  UINTN         EventIndex;\r
 \r
   //\r
   // print helpInfo\r
   //\r
   for (CurrentLine = 0; 0 != HexMainMenuHelpInfo[CurrentLine]; CurrentLine++) {\r
-    InfoString = HiiGetString(gShellDebug1HiiHandle, HexMainMenuHelpInfo[CurrentLine]\r
-, NULL);\r
-    ShellPrintEx (0,CurrentLine+1,L"%E%s%N",InfoString);\r
+    InfoString = HiiGetString (\r
+                   gShellDebug1HiiHandle,\r
+                   HexMainMenuHelpInfo[CurrentLine]\r
+                              ,\r
+                   NULL\r
+                   );\r
+    ShellPrintEx (0, CurrentLine+1, L"%E%s%N", InfoString);\r
   }\r
 \r
   //\r
@@ -123,13 +126,15 @@ HMainCommandDisplayHelp (
     if (EFI_ERROR (Status) || (EventIndex != 0)) {\r
       continue;\r
     }\r
+\r
     Status = HMainEditor.TextInputEx->ReadKeyStrokeEx (HMainEditor.TextInputEx, &KeyData);\r
     if (EFI_ERROR (Status)) {\r
       continue;\r
     }\r
 \r
     if (((KeyData.KeyState.KeyShiftState & EFI_SHIFT_STATE_VALID) == 0) ||\r
-        (KeyData.KeyState.KeyShiftState == EFI_SHIFT_STATE_VALID)) {\r
+        (KeyData.KeyState.KeyShiftState == EFI_SHIFT_STATE_VALID))\r
+    {\r
       //\r
       // For consoles that don't support/report shift state,\r
       // CTRL+W is translated to L'W' - L'A' + 1.\r
@@ -139,7 +144,8 @@ HMainCommandDisplayHelp (
       }\r
     } else if (((KeyData.KeyState.KeyShiftState & EFI_SHIFT_STATE_VALID) != 0) &&\r
                ((KeyData.KeyState.KeyShiftState & (EFI_LEFT_CONTROL_PRESSED | EFI_RIGHT_CONTROL_PRESSED)) != 0) &&\r
-               ((KeyData.KeyState.KeyShiftState & ~(EFI_SHIFT_STATE_VALID | EFI_LEFT_CONTROL_PRESSED | EFI_RIGHT_CONTROL_PRESSED)) == 0)) {\r
+               ((KeyData.KeyState.KeyShiftState & ~(EFI_SHIFT_STATE_VALID | EFI_LEFT_CONTROL_PRESSED | EFI_RIGHT_CONTROL_PRESSED)) == 0))\r
+    {\r
       //\r
       // For consoles that supports/reports shift state,\r
       // make sure that only CONTROL shift key is pressed.\r
@@ -151,7 +157,7 @@ HMainCommandDisplayHelp (
   }\r
 \r
   // update screen with buffer's info\r
-  HBufferImageNeedRefresh = TRUE;\r
+  HBufferImageNeedRefresh         = TRUE;\r
   HBufferImageOnlyLineNeedRefresh = FALSE;\r
   HBufferImageRefresh ();\r
 \r
@@ -177,10 +183,10 @@ HMainCommandGoToOffset (
   //\r
   // variable initialization\r
   //\r
-  Size    = 0;\r
-  Offset  = 0;\r
-  FRow    = 0;\r
-  FCol    = 0;\r
+  Size   = 0;\r
+  Offset = 0;\r
+  FRow   = 0;\r
+  FCol   = 0;\r
 \r
   //\r
   // get offset\r
@@ -202,14 +208,14 @@ HMainCommandGoToOffset (
     // ESC pressed\r
     //\r
     if (Status == EFI_NOT_READY) {\r
-\r
       return EFI_SUCCESS;\r
     }\r
+\r
     //\r
     // THE input string length should > 0\r
     //\r
-    if (StrLen (InputBarGetString()) > 0) {\r
-      Status = ShellConvertStringToUint64 (InputBarGetString(), &Offset, TRUE, FALSE);\r
+    if (StrLen (InputBarGetString ()) > 0) {\r
+      Status = ShellConvertStringToUint64 (InputBarGetString (), &Offset, TRUE, FALSE);\r
       if (EFI_ERROR (Status)) {\r
         StatusBarSetStatusString (L"Invalid Offset");\r
         return EFI_SUCCESS;\r
@@ -225,8 +231,8 @@ HMainCommandGoToOffset (
     return EFI_SUCCESS;\r
   }\r
 \r
-  FRow  = (UINTN)DivU64x32(Offset , 0x10) + 1;\r
-  FCol  = (UINTN)ModU64x32(Offset , 0x10) + 1;\r
+  FRow = (UINTN)DivU64x32 (Offset, 0x10) + 1;\r
+  FCol = (UINTN)ModU64x32 (Offset, 0x10) + 1;\r
 \r
   HBufferImageMovePosition (FRow, FCol, TRUE);\r
 \r
@@ -251,13 +257,13 @@ HMainCommandSaveBuffer (
   VOID\r
   )\r
 {\r
-  EFI_STATUS          Status;\r
-  BOOLEAN             Done;\r
-  CHAR16              *FileName;\r
-  BOOLEAN             OldFile;\r
-  CHAR16              *Str;\r
-  EFI_FILE_INFO       *Info;\r
-  SHELL_FILE_HANDLE   ShellFileHandle;\r
+  EFI_STATUS         Status;\r
+  BOOLEAN            Done;\r
+  CHAR16             *FileName;\r
+  BOOLEAN            OldFile;\r
+  CHAR16             *Str;\r
+  EFI_FILE_INFO      *Info;\r
+  SHELL_FILE_HANDLE  ShellFileHandle;\r
 \r
   if (HMainEditor.BufferImage->BufferType != FileTypeFileBuffer) {\r
     if (!HMainEditor.BufferImage->Modified) {\r
@@ -268,6 +274,7 @@ HMainCommandSaveBuffer (
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
+\r
     //\r
     // the answer is just one character\r
     //\r
@@ -275,6 +282,7 @@ HMainCommandSaveBuffer (
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
+\r
     //\r
     // loop for user's answer\r
     // valid answer is just 'y' 'Y', 'n' 'N', 'c' 'C'\r
@@ -289,48 +297,51 @@ HMainCommandSaveBuffer (
         return EFI_SUCCESS;\r
       }\r
 \r
-      switch (InputBarGetString()[0]) {\r
-      case L'y':\r
-      case L'Y':\r
-        //\r
-        // want to save this buffer first\r
-        //\r
-        Status = HBufferImageSave (\r
-                  NULL,\r
-                  HMainEditor.BufferImage->DiskImage->Name,\r
-                  HMainEditor.BufferImage->DiskImage->Offset,\r
-                  HMainEditor.BufferImage->DiskImage->Size,\r
-                  HMainEditor.BufferImage->MemImage->Offset,\r
-                  HMainEditor.BufferImage->MemImage->Size,\r
-                  HMainEditor.BufferImage->BufferType\r
-                  );\r
-\r
-        if (EFI_ERROR (Status)) {\r
-          StatusBarSetStatusString (L"BufferSave: Problems Writing");\r
-          return Status;\r
-        }\r
+      switch (InputBarGetString ()[0]) {\r
+        case L'y':\r
+        case L'Y':\r
+          //\r
+          // want to save this buffer first\r
+          //\r
+          Status = HBufferImageSave (\r
+                     NULL,\r
+                     HMainEditor.BufferImage->DiskImage->Name,\r
+                     HMainEditor.BufferImage->DiskImage->Offset,\r
+                     HMainEditor.BufferImage->DiskImage->Size,\r
+                     HMainEditor.BufferImage->MemImage->Offset,\r
+                     HMainEditor.BufferImage->MemImage->Size,\r
+                     HMainEditor.BufferImage->BufferType\r
+                     );\r
+\r
+          if (EFI_ERROR (Status)) {\r
+            StatusBarSetStatusString (L"BufferSave: Problems Writing");\r
+            return Status;\r
+          }\r
 \r
-        return EFI_SUCCESS;\r
+          return EFI_SUCCESS;\r
 \r
-      case L'n':\r
-      case L'N':\r
-        //\r
-        // the file won't be saved\r
-        //\r
-        return EFI_SUCCESS;\r
+        case L'n':\r
+        case L'N':\r
+          //\r
+          // the file won't be saved\r
+          //\r
+          return EFI_SUCCESS;\r
 \r
-      case L'c':\r
-      case L'C':\r
-        return EFI_SUCCESS;\r
+        case L'c':\r
+        case L'C':\r
+          return EFI_SUCCESS;\r
       }\r
+\r
       //\r
       // end of switch\r
       //\r
     }\r
+\r
     //\r
     // ENDOF WHILE\r
     //\r
   }\r
+\r
   //\r
   // ENDOF != FILEBUFFER\r
   //\r
@@ -369,7 +380,8 @@ HMainCommandSaveBuffer (
   // 7. Update File Name field in Title Bar to B\r
   //       and remove the Modified flag in Title Bar.\r
   //\r
-  Str = CatSPrint(NULL,\r
+  Str = CatSPrint (\r
+          NULL,\r
           L"File to Save: [%s]",\r
           HMainEditor.BufferImage->FileImage->FileName\r
           );\r
@@ -397,6 +409,7 @@ HMainCommandSaveBuffer (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   //\r
   // get new file name\r
   //\r
@@ -415,13 +428,14 @@ HMainCommandSaveBuffer (
   //\r
   // if just enter pressed, so think save to current file name\r
   //\r
-  if (StrLen (InputBarGetString()) == 0) {\r
-    FileName = CatSPrint(NULL,\r
-                L"%s",\r
-                HMainEditor.BufferImage->FileImage->FileName\r
-                );\r
+  if (StrLen (InputBarGetString ()) == 0) {\r
+    FileName = CatSPrint (\r
+                 NULL,\r
+                 L"%s",\r
+                 HMainEditor.BufferImage->FileImage->FileName\r
+                 );\r
   } else {\r
-    FileName = CatSPrint(NULL, L"%s", InputBarGetString());\r
+    FileName = CatSPrint (NULL, L"%s", InputBarGetString ());\r
   }\r
 \r
   if (FileName == NULL) {\r
@@ -442,7 +456,8 @@ HMainCommandSaveBuffer (
   if (StringNoCaseCompare (\r
         &FileName,\r
         &HMainEditor.BufferImage->FileImage->FileName\r
-        ) == 0) {\r
+        ) == 0)\r
+  {\r
     OldFile = TRUE;\r
   }\r
 \r
@@ -459,10 +474,9 @@ HMainCommandSaveBuffer (
     Status = ShellOpenFileByName (FileName, &ShellFileHandle, EFI_FILE_MODE_READ, 0);\r
 \r
     if (!EFI_ERROR (Status)) {\r
+      Info = ShellGetFileInfo (ShellFileHandle);\r
 \r
-      Info = ShellGetFileInfo(ShellFileHandle);\r
-\r
-      ShellCloseFile(&ShellFileHandle);\r
+      ShellCloseFile (&ShellFileHandle);\r
       //\r
       // check if read only\r
       //\r
@@ -472,7 +486,7 @@ HMainCommandSaveBuffer (
         return EFI_SUCCESS;\r
       }\r
 \r
-      SHELL_FREE_NON_NULL(Info);\r
+      SHELL_FREE_NON_NULL (Info);\r
       //\r
       // ask user whether to overwrite this file\r
       //\r
@@ -497,19 +511,19 @@ HMainCommandSaveBuffer (
           return EFI_SUCCESS;\r
         }\r
 \r
-        switch (InputBarGetString()[0]) {\r
-        case L'y':\r
-        case L'Y':\r
-          Done = TRUE;\r
-          break;\r
-        case L'n':\r
-        case L'N':\r
-          SHELL_FREE_NON_NULL (FileName);\r
-          return EFI_SUCCESS;\r
-        case L'c':\r
-        case L'C':\r
-          SHELL_FREE_NON_NULL (FileName);\r
-          return EFI_SUCCESS;\r
+        switch (InputBarGetString ()[0]) {\r
+          case L'y':\r
+          case L'Y':\r
+            Done = TRUE;\r
+            break;\r
+          case L'n':\r
+          case L'N':\r
+            SHELL_FREE_NON_NULL (FileName);\r
+            return EFI_SUCCESS;\r
+          case L'c':\r
+          case L'C':\r
+            SHELL_FREE_NON_NULL (FileName);\r
+            return EFI_SUCCESS;\r
         } // switch\r
       } // while\r
     } // if opened existing file\r
@@ -519,14 +533,14 @@ HMainCommandSaveBuffer (
   // save file back to disk\r
   //\r
   Status = HBufferImageSave (\r
-            FileName,\r
-            HMainEditor.BufferImage->DiskImage->Name,\r
-            HMainEditor.BufferImage->DiskImage->Offset,\r
-            HMainEditor.BufferImage->DiskImage->Size,\r
-            HMainEditor.BufferImage->MemImage->Offset,\r
-            HMainEditor.BufferImage->MemImage->Size,\r
-            FileTypeFileBuffer\r
-            );\r
+             FileName,\r
+             HMainEditor.BufferImage->DiskImage->Name,\r
+             HMainEditor.BufferImage->DiskImage->Offset,\r
+             HMainEditor.BufferImage->DiskImage->Size,\r
+             HMainEditor.BufferImage->MemImage->Offset,\r
+             HMainEditor.BufferImage->MemImage->Size,\r
+             FileTypeFileBuffer\r
+             );\r
   SHELL_FREE_NON_NULL (FileName);\r
 \r
   if (EFI_ERROR (Status)) {\r
@@ -548,7 +562,7 @@ HMainCommandSelectStart (
   VOID\r
   )\r
 {\r
-  UINTN Start;\r
+  UINTN  Start;\r
 \r
   Start = (HMainEditor.BufferImage->BufferPosition.Row - 1) * 0x10 + HMainEditor.BufferImage->BufferPosition.Column;\r
 \r
@@ -562,7 +576,7 @@ HMainCommandSelectStart (
     }\r
   }\r
 \r
-  if (HMainEditor.SelectEnd != 0 && Start > HMainEditor.SelectEnd) {\r
+  if ((HMainEditor.SelectEnd != 0) && (Start > HMainEditor.SelectEnd)) {\r
     StatusBarSetStatusString (L"Invalid Block Start");\r
     return EFI_LOAD_ERROR;\r
   }\r
@@ -586,7 +600,7 @@ HMainCommandSelectEnd (
   VOID\r
   )\r
 {\r
-  UINTN End;\r
+  UINTN  End;\r
 \r
   End = (HMainEditor.BufferImage->BufferPosition.Row - 1) * 0x10 + HMainEditor.BufferImage->BufferPosition.Column;\r
 \r
@@ -600,12 +614,12 @@ HMainCommandSelectEnd (
     }\r
   }\r
 \r
-  if (HMainEditor.SelectStart != 0 && End < HMainEditor.SelectStart) {\r
+  if ((HMainEditor.SelectStart != 0) && (End < HMainEditor.SelectStart)) {\r
     StatusBarSetStatusString (L"Invalid Block End");\r
     return EFI_SUCCESS;\r
   }\r
 \r
-  HMainEditor.SelectEnd   = End;\r
+  HMainEditor.SelectEnd = End;\r
 \r
   HBufferImageNeedRefresh = TRUE;\r
 \r
@@ -624,10 +638,10 @@ HMainCommandCut (
   VOID\r
   )\r
 {\r
-  UINTN             Index;\r
-  LIST_ENTRY    *Link;\r
-  UINT8             *Buffer;\r
-  UINTN             Count;\r
+  UINTN       Index;\r
+  LIST_ENTRY  *Link;\r
+  UINT8       *Buffer;\r
+  UINTN       Count;\r
 \r
   //\r
   // not select, so not allowed to cut\r
@@ -636,6 +650,7 @@ HMainCommandCut (
     StatusBarSetStatusString (L"No Block is Selected");\r
     return EFI_SUCCESS;\r
   }\r
+\r
   //\r
   // not select, so not allowed to cut\r
   //\r
@@ -649,11 +664,12 @@ HMainCommandCut (
     Link = Link->ForwardLink;\r
   }\r
 \r
-  Count   = HMainEditor.SelectEnd - HMainEditor.SelectStart + 1;\r
-  Buffer  = AllocateZeroPool (Count);\r
+  Count  = HMainEditor.SelectEnd - HMainEditor.SelectStart + 1;\r
+  Buffer = AllocateZeroPool (Count);\r
   if (Buffer == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   //\r
   // cut the selected area\r
   //\r
@@ -696,7 +712,6 @@ HMainCommandPaste (
   VOID\r
   )\r
 {\r
-\r
   BOOLEAN           OnlyLineRefresh;\r
   HEFI_EDITOR_LINE  *Line;\r
   UINT8             *Buffer;\r
@@ -704,15 +719,15 @@ HMainCommandPaste (
   UINTN             FPos;\r
 \r
   Count = HClipBoardGet (&Buffer);\r
-  if (Count == 0 || Buffer == NULL) {\r
+  if ((Count == 0) || (Buffer == NULL)) {\r
     StatusBarSetStatusString (L"Nothing to Paste");\r
     return EFI_SUCCESS;\r
   }\r
 \r
-  Line            = HMainEditor.BufferImage->CurrentLine;\r
+  Line = HMainEditor.BufferImage->CurrentLine;\r
 \r
   OnlyLineRefresh = FALSE;\r
-  if (Line->Link.ForwardLink == HMainEditor.BufferImage->ListHead && Line->Size + Count < 0x10) {\r
+  if ((Line->Link.ForwardLink == HMainEditor.BufferImage->ListHead) && (Line->Size + Count < 0x10)) {\r
     //\r
     // is at last line, and after paste will not exceed\r
     // so only this line need to be refreshed\r
@@ -721,7 +736,6 @@ HMainCommandPaste (
     // so the whole page will need be refreshed\r
     //\r
     OnlyLineRefresh = TRUE;\r
-\r
   }\r
 \r
   FPos = 0x10 * (HMainEditor.BufferImage->BufferPosition.Row - 1) + HMainEditor.BufferImage->BufferPosition.Column - 1;\r
@@ -741,7 +755,6 @@ HMainCommandPaste (
   }\r
 \r
   return EFI_SUCCESS;\r
-\r
 }\r
 \r
 /**\r
@@ -777,7 +790,6 @@ HMainCommandExit (
   //       whether to save the changes\r
   //\r
   if (HMainEditor.BufferImage->Modified) {\r
-\r
     Status = InputBarSetPrompt (L"Buffer modified. Save (Yes/No/Cancel) ? ");\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
@@ -798,43 +810,41 @@ HMainCommandExit (
         return EFI_SUCCESS;\r
       }\r
 \r
-      switch (InputBarGetString()[0]) {\r
-      case L'y':\r
-      case L'Y':\r
-        //\r
-        // write file back to disk\r
-        //\r
-        Status = HBufferImageSave (\r
-                  HMainEditor.BufferImage->FileImage->FileName,\r
-                  HMainEditor.BufferImage->DiskImage->Name,\r
-                  HMainEditor.BufferImage->DiskImage->Offset,\r
-                  HMainEditor.BufferImage->DiskImage->Size,\r
-                  HMainEditor.BufferImage->MemImage->Offset,\r
-                  HMainEditor.BufferImage->MemImage->Size,\r
-                  HMainEditor.BufferImage->BufferType\r
-                  );\r
-        if (!EFI_ERROR (Status)) {\r
-          HEditorExit = TRUE;\r
-        }\r
-\r
-        return Status;\r
+      switch (InputBarGetString ()[0]) {\r
+        case L'y':\r
+        case L'Y':\r
+          //\r
+          // write file back to disk\r
+          //\r
+          Status = HBufferImageSave (\r
+                     HMainEditor.BufferImage->FileImage->FileName,\r
+                     HMainEditor.BufferImage->DiskImage->Name,\r
+                     HMainEditor.BufferImage->DiskImage->Offset,\r
+                     HMainEditor.BufferImage->DiskImage->Size,\r
+                     HMainEditor.BufferImage->MemImage->Offset,\r
+                     HMainEditor.BufferImage->MemImage->Size,\r
+                     HMainEditor.BufferImage->BufferType\r
+                     );\r
+          if (!EFI_ERROR (Status)) {\r
+            HEditorExit = TRUE;\r
+          }\r
 \r
-      case L'n':\r
-      case L'N':\r
-        HEditorExit = TRUE;\r
-        return EFI_SUCCESS;\r
+          return Status;\r
 \r
-      case L'c':\r
-      case L'C':\r
-        return EFI_SUCCESS;\r
+        case L'n':\r
+        case L'N':\r
+          HEditorExit = TRUE;\r
+          return EFI_SUCCESS;\r
 \r
+        case L'c':\r
+        case L'C':\r
+          return EFI_SUCCESS;\r
       }\r
     }\r
   }\r
 \r
   HEditorExit = TRUE;\r
   return EFI_SUCCESS;\r
-\r
 }\r
 \r
 /**\r
@@ -849,9 +859,9 @@ HMainCommandOpenFile (
   VOID\r
   )\r
 {\r
-  BOOLEAN                         Done;\r
-  EFI_STATUS                      Status;\r
-  EDIT_FILE_TYPE                  BufferType;\r
+  BOOLEAN         Done;\r
+  EFI_STATUS      Status;\r
+  EDIT_FILE_TYPE  BufferType;\r
 \r
   BufferType = HMainEditor.BufferImage->BufferType;\r
 \r
@@ -886,11 +896,11 @@ HMainCommandOpenFile (
   //    save it first.\r
   //\r
   if (HMainEditor.BufferImage->Modified) {\r
-\r
     Status = InputBarSetPrompt (L"Buffer modified. Save (Yes/No/Cancel) ? ");\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
+\r
     //\r
     // the answer is just one character\r
     //\r
@@ -898,6 +908,7 @@ HMainCommandOpenFile (
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
+\r
     //\r
     // loop for user's answer\r
     // valid answer is just 'y' 'Y', 'n' 'N', 'c' 'C'\r
@@ -913,52 +924,53 @@ HMainCommandOpenFile (
         return EFI_SUCCESS;\r
       }\r
 \r
-      switch (InputBarGetString()[0]) {\r
-      case L'y':\r
-      case L'Y':\r
-        //\r
-        // want to save this buffer first\r
-        //\r
-        Status = HBufferImageSave (\r
-                  HMainEditor.BufferImage->FileImage->FileName,\r
-                  HMainEditor.BufferImage->DiskImage->Name,\r
-                  HMainEditor.BufferImage->DiskImage->Offset,\r
-                  HMainEditor.BufferImage->DiskImage->Size,\r
-                  HMainEditor.BufferImage->MemImage->Offset,\r
-                  HMainEditor.BufferImage->MemImage->Size,\r
-                  HMainEditor.BufferImage->BufferType\r
-                  );\r
-        if (EFI_ERROR (Status)) {\r
-          return Status;\r
-        }\r
+      switch (InputBarGetString ()[0]) {\r
+        case L'y':\r
+        case L'Y':\r
+          //\r
+          // want to save this buffer first\r
+          //\r
+          Status = HBufferImageSave (\r
+                     HMainEditor.BufferImage->FileImage->FileName,\r
+                     HMainEditor.BufferImage->DiskImage->Name,\r
+                     HMainEditor.BufferImage->DiskImage->Offset,\r
+                     HMainEditor.BufferImage->DiskImage->Size,\r
+                     HMainEditor.BufferImage->MemImage->Offset,\r
+                     HMainEditor.BufferImage->MemImage->Size,\r
+                     HMainEditor.BufferImage->BufferType\r
+                     );\r
+          if (EFI_ERROR (Status)) {\r
+            return Status;\r
+          }\r
 \r
-        MainTitleBarRefresh (\r
-          HMainEditor.BufferImage->BufferType == FileTypeFileBuffer?HMainEditor.BufferImage->FileImage->FileName:HMainEditor.BufferImage->BufferType == FileTypeDiskBuffer?HMainEditor.BufferImage->DiskImage->Name:NULL,\r
-          HMainEditor.BufferImage->BufferType,\r
-          HMainEditor.BufferImage->FileImage->ReadOnly,\r
-          FALSE,\r
-          HMainEditor.ScreenSize.Column,\r
-          HMainEditor.ScreenSize.Row,\r
-          HMainEditor.BufferImage->BufferType == FileTypeDiskBuffer?HMainEditor.BufferImage->DiskImage->Offset:HMainEditor.BufferImage->BufferType == FileTypeMemBuffer?HMainEditor.BufferImage->MemImage->Offset:0,\r
-          HMainEditor.BufferImage->BufferType == FileTypeDiskBuffer?HMainEditor.BufferImage->DiskImage->Size  :HMainEditor.BufferImage->BufferType == FileTypeMemBuffer?HMainEditor.BufferImage->MemImage->Size  :0\r
-          );\r
-        Done = TRUE;\r
-        break;\r
+          MainTitleBarRefresh (\r
+            HMainEditor.BufferImage->BufferType == FileTypeFileBuffer ? HMainEditor.BufferImage->FileImage->FileName : HMainEditor.BufferImage->BufferType == FileTypeDiskBuffer ? HMainEditor.BufferImage->DiskImage->Name : NULL,\r
+            HMainEditor.BufferImage->BufferType,\r
+            HMainEditor.BufferImage->FileImage->ReadOnly,\r
+            FALSE,\r
+            HMainEditor.ScreenSize.Column,\r
+            HMainEditor.ScreenSize.Row,\r
+            HMainEditor.BufferImage->BufferType == FileTypeDiskBuffer ? HMainEditor.BufferImage->DiskImage->Offset : HMainEditor.BufferImage->BufferType == FileTypeMemBuffer ? HMainEditor.BufferImage->MemImage->Offset : 0,\r
+            HMainEditor.BufferImage->BufferType == FileTypeDiskBuffer ? HMainEditor.BufferImage->DiskImage->Size  : HMainEditor.BufferImage->BufferType == FileTypeMemBuffer ? HMainEditor.BufferImage->MemImage->Size  : 0\r
+            );\r
+          Done = TRUE;\r
+          break;\r
 \r
-      case L'n':\r
-      case L'N':\r
-        //\r
-        // the file won't be saved\r
-        //\r
-        Done = TRUE;\r
-        break;\r
+        case L'n':\r
+        case L'N':\r
+          //\r
+          // the file won't be saved\r
+          //\r
+          Done = TRUE;\r
+          break;\r
 \r
-      case L'c':\r
-      case L'C':\r
-        return EFI_SUCCESS;\r
+        case L'c':\r
+        case L'C':\r
+          return EFI_SUCCESS;\r
       }\r
     }\r
   }\r
+\r
   //\r
   // TO get the open file name\r
   //\r
@@ -980,15 +992,15 @@ HMainCommandOpenFile (
   Status = InputBarSetStringSize (100);\r
   if (EFI_ERROR (Status)) {\r
     Status = HBufferImageRead (\r
-              HMainEditor.BufferImage->FileImage->FileName,\r
-              HMainEditor.BufferImage->DiskImage->Name,\r
-              HMainEditor.BufferImage->DiskImage->Offset,\r
-              HMainEditor.BufferImage->DiskImage->Size,\r
-              HMainEditor.BufferImage->MemImage->Offset,\r
-              HMainEditor.BufferImage->MemImage->Size,\r
-              BufferType,\r
-              TRUE\r
-              );\r
+               HMainEditor.BufferImage->FileImage->FileName,\r
+               HMainEditor.BufferImage->DiskImage->Name,\r
+               HMainEditor.BufferImage->DiskImage->Offset,\r
+               HMainEditor.BufferImage->DiskImage->Size,\r
+               HMainEditor.BufferImage->MemImage->Offset,\r
+               HMainEditor.BufferImage->MemImage->Size,\r
+               BufferType,\r
+               TRUE\r
+               );\r
     return Status;\r
   }\r
 \r
@@ -1000,26 +1012,27 @@ HMainCommandOpenFile (
     //\r
     if (Status == EFI_NOT_READY) {\r
       Status = HBufferImageRead (\r
-                HMainEditor.BufferImage->FileImage->FileName,\r
-                HMainEditor.BufferImage->DiskImage->Name,\r
-                HMainEditor.BufferImage->DiskImage->Offset,\r
-                HMainEditor.BufferImage->DiskImage->Size,\r
-                HMainEditor.BufferImage->MemImage->Offset,\r
-                HMainEditor.BufferImage->MemImage->Size,\r
-                BufferType,\r
-                TRUE\r
-                );\r
+                 HMainEditor.BufferImage->FileImage->FileName,\r
+                 HMainEditor.BufferImage->DiskImage->Name,\r
+                 HMainEditor.BufferImage->DiskImage->Offset,\r
+                 HMainEditor.BufferImage->DiskImage->Size,\r
+                 HMainEditor.BufferImage->MemImage->Offset,\r
+                 HMainEditor.BufferImage->MemImage->Size,\r
+                 BufferType,\r
+                 TRUE\r
+                 );\r
 \r
       return Status;\r
     }\r
+\r
     //\r
     // THE input string length should > 0\r
     //\r
-    if (StrLen (InputBarGetString()) > 0) {\r
+    if (StrLen (InputBarGetString ()) > 0) {\r
       //\r
       // CHECK if filename's valid\r
       //\r
-      if (!IsValidFileName (InputBarGetString())) {\r
+      if (!IsValidFileName (InputBarGetString ())) {\r
         HBufferImageRead (\r
           HMainEditor.BufferImage->FileImage->FileName,\r
           HMainEditor.BufferImage->DiskImage->Name,\r
@@ -1038,19 +1051,20 @@ HMainCommandOpenFile (
       break;\r
     }\r
   }\r
+\r
   //\r
   // read from disk\r
   //\r
   Status = HBufferImageRead (\r
-            InputBarGetString(),\r
-            HMainEditor.BufferImage->DiskImage->Name,\r
-            HMainEditor.BufferImage->DiskImage->Offset,\r
-            HMainEditor.BufferImage->DiskImage->Size,\r
-            HMainEditor.BufferImage->MemImage->Offset,\r
-            HMainEditor.BufferImage->MemImage->Size,\r
-            FileTypeFileBuffer,\r
-            FALSE\r
-            );\r
+             InputBarGetString (),\r
+             HMainEditor.BufferImage->DiskImage->Name,\r
+             HMainEditor.BufferImage->DiskImage->Offset,\r
+             HMainEditor.BufferImage->DiskImage->Size,\r
+             HMainEditor.BufferImage->MemImage->Offset,\r
+             HMainEditor.BufferImage->MemImage->Size,\r
+             FileTypeFileBuffer,\r
+             FALSE\r
+             );\r
 \r
   if (EFI_ERROR (Status)) {\r
     HBufferImageRead (\r
@@ -1083,31 +1097,31 @@ HMainCommandOpenDisk (
   VOID\r
   )\r
 {\r
-  UINT64                          Size;\r
-  UINT64                          Offset;\r
-  CHAR16                          *DeviceName;\r
-  EFI_STATUS                      Status;\r
-  BOOLEAN                         Done;\r
+  UINT64      Size;\r
+  UINT64      Offset;\r
+  CHAR16      *DeviceName;\r
+  EFI_STATUS  Status;\r
+  BOOLEAN     Done;\r
 \r
-  EDIT_FILE_TYPE                  BufferType;\r
+  EDIT_FILE_TYPE  BufferType;\r
 \r
   //\r
   // variable initialization\r
   //\r
-  Size        = 0;\r
-  Offset      = 0;\r
-  BufferType  = HMainEditor.BufferImage->BufferType;\r
+  Size       = 0;\r
+  Offset     = 0;\r
+  BufferType = HMainEditor.BufferImage->BufferType;\r
 \r
   //\r
   // if current file is modified, so you need to choose\r
   // whether to save it first.\r
   //\r
   if (HMainEditor.BufferImage->Modified) {\r
-\r
     Status = InputBarSetPrompt (L"Buffer modified. Save (Yes/No/Cancel) ? ");\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
+\r
     //\r
     // the answer is just one character\r
     //\r
@@ -1115,6 +1129,7 @@ HMainCommandOpenDisk (
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
+\r
     //\r
     // loop for user's answer\r
     // valid answer is just 'y' 'Y', 'n' 'N', 'c' 'C'\r
@@ -1130,52 +1145,53 @@ HMainCommandOpenDisk (
         return EFI_SUCCESS;\r
       }\r
 \r
-      switch (InputBarGetString()[0]) {\r
-      case L'y':\r
-      case L'Y':\r
-        //\r
-        // want to save this buffer first\r
-        //\r
-        Status = HBufferImageSave (\r
-                  HMainEditor.BufferImage->FileImage->FileName,\r
-                  HMainEditor.BufferImage->DiskImage->Name,\r
-                  HMainEditor.BufferImage->DiskImage->Offset,\r
-                  HMainEditor.BufferImage->DiskImage->Size,\r
-                  HMainEditor.BufferImage->MemImage->Offset,\r
-                  HMainEditor.BufferImage->MemImage->Size,\r
-                  BufferType\r
-                  );\r
-        if (EFI_ERROR (Status)) {\r
-          return Status;\r
-        }\r
+      switch (InputBarGetString ()[0]) {\r
+        case L'y':\r
+        case L'Y':\r
+          //\r
+          // want to save this buffer first\r
+          //\r
+          Status = HBufferImageSave (\r
+                     HMainEditor.BufferImage->FileImage->FileName,\r
+                     HMainEditor.BufferImage->DiskImage->Name,\r
+                     HMainEditor.BufferImage->DiskImage->Offset,\r
+                     HMainEditor.BufferImage->DiskImage->Size,\r
+                     HMainEditor.BufferImage->MemImage->Offset,\r
+                     HMainEditor.BufferImage->MemImage->Size,\r
+                     BufferType\r
+                     );\r
+          if (EFI_ERROR (Status)) {\r
+            return Status;\r
+          }\r
 \r
-        MainTitleBarRefresh (\r
-          HMainEditor.BufferImage->BufferType == FileTypeFileBuffer?HMainEditor.BufferImage->FileImage->FileName:HMainEditor.BufferImage->BufferType == FileTypeDiskBuffer?HMainEditor.BufferImage->DiskImage->Name:NULL,\r
-          HMainEditor.BufferImage->BufferType,\r
-          HMainEditor.BufferImage->FileImage->ReadOnly,\r
-          FALSE,\r
-          HMainEditor.ScreenSize.Column,\r
-          HMainEditor.ScreenSize.Row,\r
-          HMainEditor.BufferImage->BufferType == FileTypeDiskBuffer?HMainEditor.BufferImage->DiskImage->Offset:HMainEditor.BufferImage->BufferType == FileTypeMemBuffer?HMainEditor.BufferImage->MemImage->Offset:0,\r
-          HMainEditor.BufferImage->BufferType == FileTypeDiskBuffer?HMainEditor.BufferImage->DiskImage->Size  :HMainEditor.BufferImage->BufferType == FileTypeMemBuffer?HMainEditor.BufferImage->MemImage->Size  :0\r
-          );\r
-        Done = TRUE;\r
-        break;\r
+          MainTitleBarRefresh (\r
+            HMainEditor.BufferImage->BufferType == FileTypeFileBuffer ? HMainEditor.BufferImage->FileImage->FileName : HMainEditor.BufferImage->BufferType == FileTypeDiskBuffer ? HMainEditor.BufferImage->DiskImage->Name : NULL,\r
+            HMainEditor.BufferImage->BufferType,\r
+            HMainEditor.BufferImage->FileImage->ReadOnly,\r
+            FALSE,\r
+            HMainEditor.ScreenSize.Column,\r
+            HMainEditor.ScreenSize.Row,\r
+            HMainEditor.BufferImage->BufferType == FileTypeDiskBuffer ? HMainEditor.BufferImage->DiskImage->Offset : HMainEditor.BufferImage->BufferType == FileTypeMemBuffer ? HMainEditor.BufferImage->MemImage->Offset : 0,\r
+            HMainEditor.BufferImage->BufferType == FileTypeDiskBuffer ? HMainEditor.BufferImage->DiskImage->Size  : HMainEditor.BufferImage->BufferType == FileTypeMemBuffer ? HMainEditor.BufferImage->MemImage->Size  : 0\r
+            );\r
+          Done = TRUE;\r
+          break;\r
 \r
-      case L'n':\r
-      case L'N':\r
-        //\r
-        // the file won't be saved\r
-        //\r
-        Done = TRUE;\r
-        break;\r
+        case L'n':\r
+        case L'N':\r
+          //\r
+          // the file won't be saved\r
+          //\r
+          Done = TRUE;\r
+          break;\r
 \r
-      case L'c':\r
-      case L'C':\r
-        return EFI_SUCCESS;\r
+        case L'c':\r
+        case L'C':\r
+          return EFI_SUCCESS;\r
       }\r
     }\r
   }\r
+\r
   //\r
   // get disk block device name\r
   //\r
@@ -1196,21 +1212,22 @@ HMainCommandOpenDisk (
     // ESC pressed\r
     //\r
     if (Status == EFI_NOT_READY) {\r
-\r
       return EFI_SUCCESS;\r
     }\r
+\r
     //\r
     // THE input string length should > 0\r
     //\r
-    if (StrLen (InputBarGetString()) > 0) {\r
+    if (StrLen (InputBarGetString ()) > 0) {\r
       break;\r
     }\r
   }\r
 \r
-  DeviceName = CatSPrint(NULL, L"%s", InputBarGetString());\r
+  DeviceName = CatSPrint (NULL, L"%s", InputBarGetString ());\r
   if (DeviceName == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   //\r
   // get starting offset\r
   //\r
@@ -1231,14 +1248,14 @@ HMainCommandOpenDisk (
     // ESC pressed\r
     //\r
     if (Status == EFI_NOT_READY) {\r
-\r
       return EFI_SUCCESS;\r
     }\r
+\r
     //\r
     // THE input string length should > 0\r
     //\r
-    if (StrLen (InputBarGetString()) > 0) {\r
-      Status = ShellConvertStringToUint64 (InputBarGetString(), &Offset, TRUE, FALSE);\r
+    if (StrLen (InputBarGetString ()) > 0) {\r
+      Status = ShellConvertStringToUint64 (InputBarGetString (), &Offset, TRUE, FALSE);\r
       if (EFI_ERROR (Status)) {\r
         continue;\r
       }\r
@@ -1246,6 +1263,7 @@ HMainCommandOpenDisk (
       break;\r
     }\r
   }\r
+\r
   //\r
   // get Number of Blocks:\r
   //\r
@@ -1266,14 +1284,14 @@ HMainCommandOpenDisk (
     // ESC pressed\r
     //\r
     if (Status == EFI_NOT_READY) {\r
-\r
       return EFI_SUCCESS;\r
     }\r
+\r
     //\r
     // THE input string length should > 0\r
     //\r
-    if (StrLen (InputBarGetString()) > 0) {\r
-      Status = ShellConvertStringToUint64 (InputBarGetString(), &Size, TRUE, FALSE);\r
+    if (StrLen (InputBarGetString ()) > 0) {\r
+      Status = ShellConvertStringToUint64 (InputBarGetString (), &Size, TRUE, FALSE);\r
       if (EFI_ERROR (Status)) {\r
         continue;\r
       }\r
@@ -1287,18 +1305,17 @@ HMainCommandOpenDisk (
   }\r
 \r
   Status = HBufferImageRead (\r
-            NULL,\r
-            DeviceName,\r
-            (UINTN)Offset,\r
-            (UINTN)Size,\r
-            0,\r
-            0,\r
-            FileTypeDiskBuffer,\r
-            FALSE\r
-            );\r
+             NULL,\r
+             DeviceName,\r
+             (UINTN)Offset,\r
+             (UINTN)Size,\r
+             0,\r
+             0,\r
+             FileTypeDiskBuffer,\r
+             FALSE\r
+             );\r
 \r
   if (EFI_ERROR (Status)) {\r
-\r
     HBufferImageRead (\r
       HMainEditor.BufferImage->FileImage->FileName,\r
       HMainEditor.BufferImage->DiskImage->Name,\r
@@ -1328,29 +1345,29 @@ HMainCommandOpenMemory (
   VOID\r
   )\r
 {\r
-  UINT64                          Size;\r
-  UINT64                          Offset;\r
-  EFI_STATUS                      Status;\r
-  BOOLEAN                         Done;\r
-  EDIT_FILE_TYPE                  BufferType;\r
+  UINT64          Size;\r
+  UINT64          Offset;\r
+  EFI_STATUS      Status;\r
+  BOOLEAN         Done;\r
+  EDIT_FILE_TYPE  BufferType;\r
 \r
   //\r
   // variable initialization\r
   //\r
-  Size        = 0;\r
-  Offset      = 0;\r
-  BufferType  = HMainEditor.BufferImage->BufferType;\r
+  Size       = 0;\r
+  Offset     = 0;\r
+  BufferType = HMainEditor.BufferImage->BufferType;\r
 \r
   //\r
   // if current buffer is modified, so you need to choose\r
   // whether to save it first.\r
   //\r
   if (HMainEditor.BufferImage->Modified) {\r
-\r
     Status = InputBarSetPrompt (L"Buffer modified. Save (Yes/No/Cancel) ? ");\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
+\r
     //\r
     // the answer is just one character\r
     //\r
@@ -1358,6 +1375,7 @@ HMainCommandOpenMemory (
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
+\r
     //\r
     // loop for user's answer\r
     // valid answer is just 'y' 'Y', 'n' 'N', 'c' 'C'\r
@@ -1373,52 +1391,53 @@ HMainCommandOpenMemory (
         return EFI_SUCCESS;\r
       }\r
 \r
-      switch (InputBarGetString()[0]) {\r
-      case L'y':\r
-      case L'Y':\r
-        //\r
-        // want to save this buffer first\r
-        //\r
-        Status = HBufferImageSave (\r
-                  HMainEditor.BufferImage->FileImage->FileName,\r
-                  HMainEditor.BufferImage->DiskImage->Name,\r
-                  HMainEditor.BufferImage->DiskImage->Offset,\r
-                  HMainEditor.BufferImage->DiskImage->Size,\r
-                  HMainEditor.BufferImage->MemImage->Offset,\r
-                  HMainEditor.BufferImage->MemImage->Size,\r
-                  BufferType\r
-                  );\r
-        if (EFI_ERROR (Status)) {\r
-          return Status;\r
-        }\r
+      switch (InputBarGetString ()[0]) {\r
+        case L'y':\r
+        case L'Y':\r
+          //\r
+          // want to save this buffer first\r
+          //\r
+          Status = HBufferImageSave (\r
+                     HMainEditor.BufferImage->FileImage->FileName,\r
+                     HMainEditor.BufferImage->DiskImage->Name,\r
+                     HMainEditor.BufferImage->DiskImage->Offset,\r
+                     HMainEditor.BufferImage->DiskImage->Size,\r
+                     HMainEditor.BufferImage->MemImage->Offset,\r
+                     HMainEditor.BufferImage->MemImage->Size,\r
+                     BufferType\r
+                     );\r
+          if (EFI_ERROR (Status)) {\r
+            return Status;\r
+          }\r
 \r
-        MainTitleBarRefresh (\r
-          HMainEditor.BufferImage->BufferType == FileTypeFileBuffer?HMainEditor.BufferImage->FileImage->FileName:HMainEditor.BufferImage->BufferType == FileTypeDiskBuffer?HMainEditor.BufferImage->DiskImage->Name:NULL,\r
-          HMainEditor.BufferImage->BufferType,\r
-          HMainEditor.BufferImage->FileImage->ReadOnly,\r
-          FALSE,\r
-          HMainEditor.ScreenSize.Column,\r
-          HMainEditor.ScreenSize.Row,\r
-          HMainEditor.BufferImage->BufferType == FileTypeDiskBuffer?HMainEditor.BufferImage->DiskImage->Offset:HMainEditor.BufferImage->BufferType == FileTypeMemBuffer?HMainEditor.BufferImage->MemImage->Offset:0,\r
-          HMainEditor.BufferImage->BufferType == FileTypeDiskBuffer?HMainEditor.BufferImage->DiskImage->Size  :HMainEditor.BufferImage->BufferType == FileTypeMemBuffer?HMainEditor.BufferImage->MemImage->Size  :0\r
-          );\r
-        Done = TRUE;\r
-        break;\r
+          MainTitleBarRefresh (\r
+            HMainEditor.BufferImage->BufferType == FileTypeFileBuffer ? HMainEditor.BufferImage->FileImage->FileName : HMainEditor.BufferImage->BufferType == FileTypeDiskBuffer ? HMainEditor.BufferImage->DiskImage->Name : NULL,\r
+            HMainEditor.BufferImage->BufferType,\r
+            HMainEditor.BufferImage->FileImage->ReadOnly,\r
+            FALSE,\r
+            HMainEditor.ScreenSize.Column,\r
+            HMainEditor.ScreenSize.Row,\r
+            HMainEditor.BufferImage->BufferType == FileTypeDiskBuffer ? HMainEditor.BufferImage->DiskImage->Offset : HMainEditor.BufferImage->BufferType == FileTypeMemBuffer ? HMainEditor.BufferImage->MemImage->Offset : 0,\r
+            HMainEditor.BufferImage->BufferType == FileTypeDiskBuffer ? HMainEditor.BufferImage->DiskImage->Size  : HMainEditor.BufferImage->BufferType == FileTypeMemBuffer ? HMainEditor.BufferImage->MemImage->Size  : 0\r
+            );\r
+          Done = TRUE;\r
+          break;\r
 \r
-      case L'n':\r
-      case L'N':\r
-        //\r
-        // the file won't be saved\r
-        //\r
-        Done = TRUE;\r
-        break;\r
+        case L'n':\r
+        case L'N':\r
+          //\r
+          // the file won't be saved\r
+          //\r
+          Done = TRUE;\r
+          break;\r
 \r
-      case L'c':\r
-      case L'C':\r
-        return EFI_SUCCESS;\r
+        case L'c':\r
+        case L'C':\r
+          return EFI_SUCCESS;\r
       }\r
     }\r
   }\r
+\r
   //\r
   // get starting offset\r
   //\r
@@ -1439,14 +1458,14 @@ HMainCommandOpenMemory (
     // ESC pressed\r
     //\r
     if (Status == EFI_NOT_READY) {\r
-\r
       return EFI_SUCCESS;\r
     }\r
+\r
     //\r
     // THE input string length should > 0\r
     //\r
-    if (StrLen (InputBarGetString()) > 0) {\r
-      Status = ShellConvertStringToUint64 (InputBarGetString(), &Offset, TRUE, FALSE);\r
+    if (StrLen (InputBarGetString ()) > 0) {\r
+      Status = ShellConvertStringToUint64 (InputBarGetString (), &Offset, TRUE, FALSE);\r
       if (EFI_ERROR (Status)) {\r
         continue;\r
       }\r
@@ -1454,6 +1473,7 @@ HMainCommandOpenMemory (
       break;\r
     }\r
   }\r
+\r
   //\r
   // get Number of Blocks:\r
   //\r
@@ -1474,14 +1494,14 @@ HMainCommandOpenMemory (
     // ESC pressed\r
     //\r
     if (Status == EFI_NOT_READY) {\r
-\r
       return EFI_SUCCESS;\r
     }\r
+\r
     //\r
     // THE input string length should > 0\r
     //\r
-    if (StrLen (InputBarGetString()) > 0) {\r
-      Status = ShellConvertStringToUint64 (InputBarGetString(), &Size, TRUE, FALSE);\r
+    if (StrLen (InputBarGetString ()) > 0) {\r
+      Status = ShellConvertStringToUint64 (InputBarGetString (), &Size, TRUE, FALSE);\r
       if (EFI_ERROR (Status)) {\r
         continue;\r
       }\r
@@ -1494,21 +1514,21 @@ HMainCommandOpenMemory (
     }\r
   }\r
 \r
-  if ((Offset + Size - 1)> 0xffffffff) {\r
+  if ((Offset + Size - 1) > 0xffffffff) {\r
     StatusBarSetStatusString (L"Invalid parameter");\r
     return EFI_LOAD_ERROR;\r
   }\r
 \r
   Status = HBufferImageRead (\r
-            NULL,\r
-            NULL,\r
-            0,\r
-            0,\r
-            (UINTN)Offset,\r
-            (UINTN)Size,\r
-            FileTypeMemBuffer,\r
-            FALSE\r
-            );\r
+             NULL,\r
+             NULL,\r
+             0,\r
+             0,\r
+             (UINTN)Offset,\r
+             (UINTN)Size,\r
+             FileTypeMemBuffer,\r
+             FALSE\r
+             );\r
 \r
   if (EFI_ERROR (Status)) {\r
     StatusBarSetStatusString (L"Read Device Error!");\r
@@ -1524,11 +1544,11 @@ HMainCommandOpenMemory (
       );\r
     return EFI_NOT_FOUND;\r
   }\r
-  return EFI_SUCCESS;\r
 \r
+  return EFI_SUCCESS;\r
 }\r
 \r
-MENU_ITEM_FUNCTION HexMainControlBasedMenuFunctions[] = {\r
+MENU_ITEM_FUNCTION  HexMainControlBasedMenuFunctions[] = {\r
   NULL,\r
   NULL,                      /* Ctrl - A */\r
   NULL,                      /* Ctrl - B */\r
@@ -1558,57 +1578,57 @@ MENU_ITEM_FUNCTION HexMainControlBasedMenuFunctions[] = {
   NULL,                      /* Ctrl - Z */\r
 };\r
 \r
-CONST EDITOR_MENU_ITEM HexEditorMenuItems[] = {\r
+CONST EDITOR_MENU_ITEM  HexEditorMenuItems[] = {\r
   {\r
-    STRING_TOKEN(STR_HEXEDIT_LIBMENUBAR_GO_TO_OFFSET),\r
-    STRING_TOKEN(STR_EDIT_LIBMENUBAR_F1),\r
+    STRING_TOKEN (STR_HEXEDIT_LIBMENUBAR_GO_TO_OFFSET),\r
+    STRING_TOKEN (STR_EDIT_LIBMENUBAR_F1),\r
     HMainCommandGoToOffset\r
   },\r
   {\r
-    STRING_TOKEN(STR_HEXEDIT_LIBMENUBAR_SAVE_BUFFER),\r
-    STRING_TOKEN(STR_EDIT_LIBMENUBAR_F2),\r
+    STRING_TOKEN (STR_HEXEDIT_LIBMENUBAR_SAVE_BUFFER),\r
+    STRING_TOKEN (STR_EDIT_LIBMENUBAR_F2),\r
     HMainCommandSaveBuffer\r
   },\r
   {\r
-    STRING_TOKEN(STR_EDIT_LIBMENUBAR_EXIT),\r
-    STRING_TOKEN(STR_EDIT_LIBMENUBAR_F3),\r
+    STRING_TOKEN (STR_EDIT_LIBMENUBAR_EXIT),\r
+    STRING_TOKEN (STR_EDIT_LIBMENUBAR_F3),\r
     HMainCommandExit\r
   },\r
 \r
   {\r
-    STRING_TOKEN(STR_HEXEDIT_LIBMENUBAR_SELECT_START),\r
-    STRING_TOKEN(STR_EDIT_LIBMENUBAR_F4),\r
+    STRING_TOKEN (STR_HEXEDIT_LIBMENUBAR_SELECT_START),\r
+    STRING_TOKEN (STR_EDIT_LIBMENUBAR_F4),\r
     HMainCommandSelectStart\r
   },\r
   {\r
-    STRING_TOKEN(STR_HEXEDIT_LIBMENUBAR_SELECT_END),\r
-    STRING_TOKEN(STR_EDIT_LIBMENUBAR_F5),\r
+    STRING_TOKEN (STR_HEXEDIT_LIBMENUBAR_SELECT_END),\r
+    STRING_TOKEN (STR_EDIT_LIBMENUBAR_F5),\r
     HMainCommandSelectEnd\r
   },\r
   {\r
-    STRING_TOKEN(STR_HEXEDIT_LIBMENUBAR_CUT),\r
-    STRING_TOKEN(STR_EDIT_LIBMENUBAR_F6),\r
+    STRING_TOKEN (STR_HEXEDIT_LIBMENUBAR_CUT),\r
+    STRING_TOKEN (STR_EDIT_LIBMENUBAR_F6),\r
     HMainCommandCut\r
   },\r
   {\r
-    STRING_TOKEN(STR_HEXEDIT_LIBMENUBAR_PASTE),\r
-    STRING_TOKEN(STR_EDIT_LIBMENUBAR_F7),\r
+    STRING_TOKEN (STR_HEXEDIT_LIBMENUBAR_PASTE),\r
+    STRING_TOKEN (STR_EDIT_LIBMENUBAR_F7),\r
     HMainCommandPaste\r
   },\r
 \r
   {\r
-    STRING_TOKEN(STR_HEXEDIT_LIBMENUBAR_OPEN_FILE),\r
-    STRING_TOKEN(STR_EDIT_LIBMENUBAR_F8),\r
+    STRING_TOKEN (STR_HEXEDIT_LIBMENUBAR_OPEN_FILE),\r
+    STRING_TOKEN (STR_EDIT_LIBMENUBAR_F8),\r
     HMainCommandOpenFile\r
   },\r
   {\r
-    STRING_TOKEN(STR_HEXEDIT_LIBMENUBAR_OPEN_DISK),\r
-    STRING_TOKEN(STR_EDIT_LIBMENUBAR_F9),\r
+    STRING_TOKEN (STR_HEXEDIT_LIBMENUBAR_OPEN_DISK),\r
+    STRING_TOKEN (STR_EDIT_LIBMENUBAR_F9),\r
     HMainCommandOpenDisk\r
   },\r
   {\r
-    STRING_TOKEN(STR_HEXEDIT_LIBMENUBAR_OPEN_MEMORY),\r
-    STRING_TOKEN(STR_EDIT_LIBMENUBAR_F10),\r
+    STRING_TOKEN (STR_HEXEDIT_LIBMENUBAR_OPEN_MEMORY),\r
+    STRING_TOKEN (STR_EDIT_LIBMENUBAR_F10),\r
     HMainCommandOpenMemory\r
   },\r
 \r
@@ -1645,7 +1665,7 @@ HMainEditorInit (
   //\r
   HMainEditor.ColorAttributes.Colors.Foreground = gST->ConOut->Mode->Attribute & 0x000000ff;\r
 \r
-  HMainEditor.ColorAttributes.Colors.Background = (UINT8) (gST->ConOut->Mode->Attribute >> 4);\r
+  HMainEditor.ColorAttributes.Colors.Background = (UINT8)(gST->ConOut->Mode->Attribute >> 4);\r
 \r
   HOriginalColors = HMainEditor.ColorAttributes.Colors;\r
 \r
@@ -1655,21 +1675,21 @@ HMainEditorInit (
   // query screen size\r
   //\r
   gST->ConOut->QueryMode (\r
-        gST->ConOut,\r
-        gST->ConOut->Mode->Mode,\r
-        &(HMainEditor.ScreenSize.Column),\r
-        &(HMainEditor.ScreenSize.Row)\r
-        );\r
+                 gST->ConOut,\r
+                 gST->ConOut->Mode->Mode,\r
+                 &(HMainEditor.ScreenSize.Column),\r
+                 &(HMainEditor.ScreenSize.Row)\r
+                 );\r
 \r
   //\r
   // Find TextInEx in System Table ConsoleInHandle\r
   // Per UEFI Spec, TextInEx is required for a console capable platform.\r
   //\r
   Status = gBS->HandleProtocol (\r
-              gST->ConsoleInHandle,\r
-              &gEfiSimpleTextInputExProtocolGuid,\r
-              (VOID**)&HMainEditor.TextInputEx\r
-              );\r
+                  gST->ConsoleInHandle,\r
+                  &gEfiSimpleTextInputExProtocolGuid,\r
+                  (VOID **)&HMainEditor.TextInputEx\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -1678,47 +1698,48 @@ HMainEditorInit (
   // Find mouse in System Table ConsoleInHandle\r
   //\r
   Status = gBS->HandleProtocol (\r
-                gST->ConsoleInHandle,\r
-                &gEfiSimplePointerProtocolGuid,\r
-                (VOID**)&HMainEditor.MouseInterface\r
-                );\r
+                  gST->ConsoleInHandle,\r
+                  &gEfiSimplePointerProtocolGuid,\r
+                  (VOID **)&HMainEditor.MouseInterface\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     //\r
     // If there is no Simple Pointer Protocol on System Table\r
     //\r
-    HandleBuffer = NULL;\r
+    HandleBuffer               = NULL;\r
     HMainEditor.MouseInterface = NULL;\r
-    Status = gBS->LocateHandleBuffer (\r
-                  ByProtocol,\r
-                  &gEfiSimplePointerProtocolGuid,\r
-                  NULL,\r
-                  &HandleCount,\r
-                  &HandleBuffer\r
-                  );\r
-    if (!EFI_ERROR (Status) && HandleCount > 0) {\r
+    Status                     = gBS->LocateHandleBuffer (\r
+                                        ByProtocol,\r
+                                        &gEfiSimplePointerProtocolGuid,\r
+                                        NULL,\r
+                                        &HandleCount,\r
+                                        &HandleBuffer\r
+                                        );\r
+    if (!EFI_ERROR (Status) && (HandleCount > 0)) {\r
       //\r
       // Try to find the first available mouse device\r
       //\r
       for (Index = 0; Index < HandleCount; Index++) {\r
         Status = gBS->HandleProtocol (\r
-                      HandleBuffer[Index],\r
-                      &gEfiSimplePointerProtocolGuid,\r
-                      (VOID**)&HMainEditor.MouseInterface\r
-                      );\r
+                        HandleBuffer[Index],\r
+                        &gEfiSimplePointerProtocolGuid,\r
+                        (VOID **)&HMainEditor.MouseInterface\r
+                        );\r
         if (!EFI_ERROR (Status)) {\r
           break;\r
         }\r
       }\r
     }\r
+\r
     if (HandleBuffer != NULL) {\r
       FreePool (HandleBuffer);\r
     }\r
   }\r
 \r
-  if (!EFI_ERROR (Status) && HMainEditor.MouseInterface != NULL) {\r
-    HMainEditor.MouseAccumulatorX  = 0;\r
-    HMainEditor.MouseAccumulatorY  = 0;\r
-    HMainEditor.MouseSupported     = TRUE;\r
+  if (!EFI_ERROR (Status) && (HMainEditor.MouseInterface != NULL)) {\r
+    HMainEditor.MouseAccumulatorX = 0;\r
+    HMainEditor.MouseAccumulatorY = 0;\r
+    HMainEditor.MouseSupported    = TRUE;\r
   }\r
 \r
   //\r
@@ -1726,24 +1747,25 @@ HMainEditorInit (
   //\r
   Status = MainTitleBarInit (L"UEFI HEXEDIT");\r
   if (EFI_ERROR (Status)) {\r
-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_TITLE), gShellDebug1HiiHandle);\r
+    ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_TITLE), gShellDebug1HiiHandle);\r
     return EFI_LOAD_ERROR;\r
   }\r
 \r
   Status = ControlHotKeyInit (HexMainControlBasedMenuFunctions);\r
   if (EFI_ERROR (Status)) {\r
-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_MAINMENU), gShellDebug1HiiHandle);\r
+    ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_MAINMENU), gShellDebug1HiiHandle);\r
     return EFI_LOAD_ERROR;\r
   }\r
+\r
   Status = MenuBarInit (HexEditorMenuItems);\r
   if (EFI_ERROR (Status)) {\r
-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_MAINMENU), gShellDebug1HiiHandle);\r
+    ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_MAINMENU), gShellDebug1HiiHandle);\r
     return EFI_LOAD_ERROR;\r
   }\r
 \r
   Status = StatusBarInit ();\r
   if (EFI_ERROR (Status)) {\r
-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_STATUS), gShellDebug1HiiHandle);\r
+    ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_STATUS), gShellDebug1HiiHandle);\r
     return EFI_LOAD_ERROR;\r
   }\r
 \r
@@ -1751,15 +1773,16 @@ HMainEditorInit (
 \r
   Status = HBufferImageInit ();\r
   if (EFI_ERROR (Status)) {\r
-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_BUFFERIMAGE), gShellDebug1HiiHandle);\r
+    ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_BUFFERIMAGE), gShellDebug1HiiHandle);\r
     return EFI_LOAD_ERROR;\r
   }\r
 \r
   Status = HClipBoardInit ();\r
   if (EFI_ERROR (Status)) {\r
-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_CLIPBOARD), gShellDebug1HiiHandle);\r
+    ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_CLIPBOARD), gShellDebug1HiiHandle);\r
     return EFI_LOAD_ERROR;\r
   }\r
+\r
   //\r
   // clear whole screen and enable cursor\r
   //\r
@@ -1769,9 +1792,9 @@ HMainEditorInit (
   //\r
   // initialize EditorFirst and EditorExit\r
   //\r
-  HEditorFirst        = TRUE;\r
-  HEditorExit         = FALSE;\r
-  HEditorMouseAction  = FALSE;\r
+  HEditorFirst       = TRUE;\r
+  HEditorExit        = FALSE;\r
+  HEditorMouseAction = FALSE;\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -1802,13 +1825,14 @@ HMainEditorCleanup (
 \r
   Status = HBufferImageCleanup ();\r
   if (EFI_ERROR (Status)) {\r
-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_BUFFERIMAGE_CLEAN), gShellDebug1HiiHandle);\r
+    ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_BUFFERIMAGE_CLEAN), gShellDebug1HiiHandle);\r
   }\r
 \r
   Status = HClipBoardCleanup ();\r
   if (EFI_ERROR (Status)) {\r
-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_CLIPBOARD_CLEAN), gShellDebug1HiiHandle);\r
+    ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_CLIPBOARD_CLEAN), gShellDebug1HiiHandle);\r
   }\r
+\r
   //\r
   // restore old mode\r
   //\r
@@ -1817,9 +1841,9 @@ HMainEditorCleanup (
   }\r
 \r
   gST->ConOut->SetAttribute (\r
-        gST->ConOut,\r
-        EFI_TEXT_ATTR (HOriginalColors.Foreground, HOriginalColors.Background)\r
-        );\r
+                 gST->ConOut,\r
+                 EFI_TEXT_ATTR (HOriginalColors.Foreground, HOriginalColors.Background)\r
+                 );\r
   gST->ConOut->ClearScreen (gST->ConOut);\r
 \r
   return EFI_SUCCESS;\r
@@ -1835,38 +1859,43 @@ HMainEditorRefresh (
   VOID\r
   )\r
 {\r
-  BOOLEAN NameChange;\r
-  BOOLEAN ReadChange;\r
+  BOOLEAN  NameChange;\r
+  BOOLEAN  ReadChange;\r
 \r
   NameChange = FALSE;\r
   ReadChange = FALSE;\r
 \r
   if (HMainEditor.BufferImage->BufferType == FileTypeDiskBuffer) {\r
-    if (HMainEditor.BufferImage->DiskImage != NULL &&\r
-        HBufferImageBackupVar.DiskImage != NULL &&\r
-        (HMainEditor.BufferImage->DiskImage->Offset != HBufferImageBackupVar.DiskImage->Offset ||\r
-           HMainEditor.BufferImage->DiskImage->Size != HBufferImageBackupVar.DiskImage->Size) ){\r
+    if ((HMainEditor.BufferImage->DiskImage != NULL) &&\r
+        (HBufferImageBackupVar.DiskImage != NULL) &&\r
+        ((HMainEditor.BufferImage->DiskImage->Offset != HBufferImageBackupVar.DiskImage->Offset) ||\r
+         (HMainEditor.BufferImage->DiskImage->Size != HBufferImageBackupVar.DiskImage->Size)))\r
+    {\r
       NameChange = TRUE;\r
     }\r
   } else if (HMainEditor.BufferImage->BufferType == FileTypeMemBuffer) {\r
-    if (HMainEditor.BufferImage->MemImage != NULL &&\r
-        HBufferImageBackupVar.MemImage != NULL &&\r
-        (HMainEditor.BufferImage->MemImage->Offset != HBufferImageBackupVar.MemImage->Offset ||\r
-           HMainEditor.BufferImage->MemImage->Size != HBufferImageBackupVar.MemImage->Size) ){\r
+    if ((HMainEditor.BufferImage->MemImage != NULL) &&\r
+        (HBufferImageBackupVar.MemImage != NULL) &&\r
+        ((HMainEditor.BufferImage->MemImage->Offset != HBufferImageBackupVar.MemImage->Offset) ||\r
+         (HMainEditor.BufferImage->MemImage->Size != HBufferImageBackupVar.MemImage->Size)))\r
+    {\r
       NameChange = TRUE;\r
     }\r
   } else if (HMainEditor.BufferImage->BufferType == FileTypeFileBuffer) {\r
-    if ( HMainEditor.BufferImage->FileImage != NULL &&\r
-         HMainEditor.BufferImage->FileImage->FileName != NULL &&\r
-         HBufferImageBackupVar.FileImage != NULL &&\r
-         HBufferImageBackupVar.FileImage->FileName != NULL &&\r
-         StrCmp (HMainEditor.BufferImage->FileImage->FileName, HBufferImageBackupVar.FileImage->FileName) != 0 ) {\r
+    if ((HMainEditor.BufferImage->FileImage != NULL) &&\r
+        (HMainEditor.BufferImage->FileImage->FileName != NULL) &&\r
+        (HBufferImageBackupVar.FileImage != NULL) &&\r
+        (HBufferImageBackupVar.FileImage->FileName != NULL) &&\r
+        (StrCmp (HMainEditor.BufferImage->FileImage->FileName, HBufferImageBackupVar.FileImage->FileName) != 0))\r
+    {\r
       NameChange = TRUE;\r
     }\r
   }\r
-  if ( HMainEditor.BufferImage->FileImage != NULL &&\r
-       HBufferImageBackupVar.FileImage != NULL &&\r
-       HMainEditor.BufferImage->FileImage->ReadOnly != HBufferImageBackupVar.FileImage->ReadOnly ) {\r
+\r
+  if ((HMainEditor.BufferImage->FileImage != NULL) &&\r
+      (HBufferImageBackupVar.FileImage != NULL) &&\r
+      (HMainEditor.BufferImage->FileImage->ReadOnly != HBufferImageBackupVar.FileImage->ReadOnly))\r
+  {\r
     ReadChange = TRUE;\r
   }\r
 \r
@@ -1879,29 +1908,30 @@ HMainEditorRefresh (
   //\r
   // call the components refresh function\r
   //\r
-  if (HEditorFirst\r
-    || NameChange\r
-    || HMainEditor.BufferImage->BufferType != HBufferImageBackupVar.BufferType\r
-    || HBufferImageBackupVar.Modified != HMainEditor.BufferImage->Modified\r
-    || ReadChange ) {\r
-\r
+  if (  HEditorFirst\r
+     || NameChange\r
+     || (HMainEditor.BufferImage->BufferType != HBufferImageBackupVar.BufferType)\r
+     || (HBufferImageBackupVar.Modified != HMainEditor.BufferImage->Modified)\r
+     || ReadChange )\r
+  {\r
     MainTitleBarRefresh (\r
-      HMainEditor.BufferImage->BufferType == FileTypeFileBuffer&&HMainEditor.BufferImage->FileImage!=NULL?HMainEditor.BufferImage->FileImage->FileName:HMainEditor.BufferImage->BufferType == FileTypeDiskBuffer&&HMainEditor.BufferImage->DiskImage!=NULL?HMainEditor.BufferImage->DiskImage->Name:NULL,\r
+      HMainEditor.BufferImage->BufferType == FileTypeFileBuffer && HMainEditor.BufferImage->FileImage != NULL ? HMainEditor.BufferImage->FileImage->FileName : HMainEditor.BufferImage->BufferType == FileTypeDiskBuffer && HMainEditor.BufferImage->DiskImage != NULL ? HMainEditor.BufferImage->DiskImage->Name : NULL,\r
       HMainEditor.BufferImage->BufferType,\r
-      (BOOLEAN)(HMainEditor.BufferImage->FileImage!=NULL?HMainEditor.BufferImage->FileImage->ReadOnly:FALSE),\r
+      (BOOLEAN)(HMainEditor.BufferImage->FileImage != NULL ? HMainEditor.BufferImage->FileImage->ReadOnly : FALSE),\r
       HMainEditor.BufferImage->Modified,\r
       HMainEditor.ScreenSize.Column,\r
       HMainEditor.ScreenSize.Row,\r
-      HMainEditor.BufferImage->BufferType == FileTypeDiskBuffer&&HMainEditor.BufferImage->DiskImage!=NULL?HMainEditor.BufferImage->DiskImage->Offset:HMainEditor.BufferImage->BufferType == FileTypeMemBuffer&&HMainEditor.BufferImage->MemImage!=NULL?HMainEditor.BufferImage->MemImage->Offset:0,\r
-      HMainEditor.BufferImage->BufferType == FileTypeDiskBuffer&&HMainEditor.BufferImage->DiskImage!=NULL?HMainEditor.BufferImage->DiskImage->Size  :HMainEditor.BufferImage->BufferType == FileTypeMemBuffer&&HMainEditor.BufferImage->MemImage!=NULL?HMainEditor.BufferImage->MemImage->Size  :0\r
+      HMainEditor.BufferImage->BufferType == FileTypeDiskBuffer && HMainEditor.BufferImage->DiskImage != NULL ? HMainEditor.BufferImage->DiskImage->Offset : HMainEditor.BufferImage->BufferType == FileTypeMemBuffer && HMainEditor.BufferImage->MemImage != NULL ? HMainEditor.BufferImage->MemImage->Offset : 0,\r
+      HMainEditor.BufferImage->BufferType == FileTypeDiskBuffer && HMainEditor.BufferImage->DiskImage != NULL ? HMainEditor.BufferImage->DiskImage->Size  : HMainEditor.BufferImage->BufferType == FileTypeMemBuffer && HMainEditor.BufferImage->MemImage != NULL ? HMainEditor.BufferImage->MemImage->Size  : 0\r
       );\r
     HBufferImageRefresh ();\r
   }\r
-  if (HEditorFirst\r
-    || HBufferImageBackupVar.DisplayPosition.Row != HMainEditor.BufferImage->DisplayPosition.Row\r
-    || HBufferImageBackupVar.DisplayPosition.Column != HMainEditor.BufferImage->DisplayPosition.Column\r
-    || StatusBarGetRefresh()) {\r
 \r
+  if (  HEditorFirst\r
+     || (HBufferImageBackupVar.DisplayPosition.Row != HMainEditor.BufferImage->DisplayPosition.Row)\r
+     || (HBufferImageBackupVar.DisplayPosition.Column != HMainEditor.BufferImage->DisplayPosition.Column)\r
+     || StatusBarGetRefresh ())\r
+  {\r
     StatusBarRefresh (\r
       HEditorFirst,\r
       HMainEditor.ScreenSize.Row,\r
@@ -1938,17 +1968,16 @@ HMainEditorRefresh (
 **/\r
 EFI_STATUS\r
 HMainEditorHandleMouseInput (\r
-  IN  EFI_SIMPLE_POINTER_STATE       MouseState,\r
-  OUT BOOLEAN                        *BeforeLeftButtonDown\r
+  IN  EFI_SIMPLE_POINTER_STATE  MouseState,\r
+  OUT BOOLEAN                   *BeforeLeftButtonDown\r
   )\r
 {\r
-\r
   INT32             TextX;\r
   INT32             TextY;\r
   UINTN             FRow;\r
   UINTN             FCol;\r
   BOOLEAN           HighBits;\r
-  LIST_ENTRY    *Link;\r
+  LIST_ENTRY        *Link;\r
   HEFI_EDITOR_LINE  *Line;\r
   UINTN             Index;\r
   BOOLEAN           Action;\r
@@ -1968,14 +1997,13 @@ HMainEditorHandleMouseInput (
     HBufferImageAdjustMousePosition (TextX, TextY);\r
 \r
     Action = TRUE;\r
-\r
   }\r
 \r
   if (MouseState.LeftButton) {\r
     HighBits = HBufferImageIsAtHighBits (\r
-                HMainEditor.BufferImage->MousePosition.Column,\r
-                &FCol\r
-                );\r
+                 HMainEditor.BufferImage->MousePosition.Column,\r
+                 &FCol\r
+                 );\r
 \r
     //\r
     // not at an movable place\r
@@ -2003,12 +2031,11 @@ HMainEditorHandleMouseInput (
       }\r
 \r
       HighBits = TRUE;\r
-\r
     }\r
 \r
     FRow = HMainEditor.BufferImage->BufferPosition.Row +\r
-      HMainEditor.BufferImage->MousePosition.Row -\r
-      HMainEditor.BufferImage->DisplayPosition.Row;\r
+           HMainEditor.BufferImage->MousePosition.Row -\r
+           HMainEditor.BufferImage->DisplayPosition.Row;\r
 \r
     if (HMainEditor.BufferImage->NumLines < FRow) {\r
       //\r
@@ -2017,8 +2044,8 @@ HMainEditorHandleMouseInput (
       //\r
       // now just move mouse pointer to legal position\r
       //\r
-      FRow      = HMainEditor.BufferImage->NumLines;\r
-      HighBits  = TRUE;\r
+      FRow     = HMainEditor.BufferImage->NumLines;\r
+      HighBits = TRUE;\r
     }\r
 \r
     Link = HMainEditor.BufferImage->ListHead->ForwardLink;\r
@@ -2043,26 +2070,25 @@ HMainEditorHandleMouseInput (
             FRow--;\r
             FCol = 16;\r
           } else {\r
-            FRow  = 1;\r
-            FCol  = 1;\r
+            FRow = 1;\r
+            FCol = 1;\r
           }\r
-\r
         } else {\r
           FCol = Line->Size;\r
         }\r
       } else {\r
-        FCol      = Line->Size + 1;\r
-        HighBits  = TRUE;\r
+        FCol     = Line->Size + 1;\r
+        HighBits = TRUE;\r
       }\r
     }\r
 \r
     HBufferImageMovePosition (FRow, FCol, HighBits);\r
 \r
-    HMainEditor.BufferImage->MousePosition.Row    = HMainEditor.BufferImage->DisplayPosition.Row;\r
+    HMainEditor.BufferImage->MousePosition.Row = HMainEditor.BufferImage->DisplayPosition.Row;\r
 \r
     HMainEditor.BufferImage->MousePosition.Column = HMainEditor.BufferImage->DisplayPosition.Column;\r
 \r
-    *BeforeLeftButtonDown                         = TRUE;\r
+    *BeforeLeftButtonDown = TRUE;\r
 \r
     Action = TRUE;\r
   } else {\r
@@ -2074,6 +2100,7 @@ HMainEditorHandleMouseInput (
     if (*BeforeLeftButtonDown) {\r
       Action = TRUE;\r
     }\r
+\r
     //\r
     // mouse up\r
     //\r
@@ -2118,20 +2145,19 @@ HMainEditorKeyInput (
   //\r
   // variable initialization\r
   //\r
-  OldSize       = 0;\r
-  FRow          = 0;\r
-  FCol          = 0;\r
-  LengthChange  = FALSE;\r
+  OldSize      = 0;\r
+  FRow         = 0;\r
+  FCol         = 0;\r
+  LengthChange = FALSE;\r
 \r
-  MouseIsDown   = FALSE;\r
-  FirstDown     = FALSE;\r
-  MouseDrag     = FALSE;\r
+  MouseIsDown = FALSE;\r
+  FirstDown   = FALSE;\r
+  MouseDrag   = FALSE;\r
 \r
   do {\r
+    Status = EFI_SUCCESS;\r
 \r
-    Status              = EFI_SUCCESS;\r
-\r
-    HEditorMouseAction  = FALSE;\r
+    HEditorMouseAction = FALSE;\r
 \r
     //\r
     // backup some key elements, so that can aVOID some refresh work\r
@@ -2148,14 +2174,13 @@ HMainEditorKeyInput (
     //\r
     if (HMainEditor.MouseSupported) {\r
       Status = HMainEditor.MouseInterface->GetState (\r
-                                            HMainEditor.MouseInterface,\r
-                                            &MouseState\r
-                                            );\r
+                                             HMainEditor.MouseInterface,\r
+                                             &MouseState\r
+                                             );\r
       if (!EFI_ERROR (Status)) {\r
-\r
         BeforeMouseIsDown = MouseIsDown;\r
 \r
-        Status            = HMainEditorHandleMouseInput (MouseState, &MouseIsDown);\r
+        Status = HMainEditorHandleMouseInput (MouseState, &MouseIsDown);\r
 \r
         if (!EFI_ERROR (Status)) {\r
           if (!BeforeMouseIsDown) {\r
@@ -2168,10 +2193,9 @@ HMainEditorKeyInput (
               SelectStartBackup = HMainEditor.SelectStart;\r
               SelectEndBackup   = HMainEditor.SelectEnd;\r
 \r
-              FirstDown         = TRUE;\r
+              FirstDown = TRUE;\r
             }\r
           } else {\r
-\r
             SelectStartBackup = HMainEditor.SelectStart;\r
             SelectEndBackup   = HMainEditor.SelectEnd;\r
 \r
@@ -2185,23 +2209,25 @@ HMainEditorKeyInput (
                   HMainEditor.SelectEnd   = 0;\r
                   HMainEditor.SelectStart = (FRow - 1) * 0x10 + FCol;\r
 \r
-                  MouseDrag               = TRUE;\r
-                  FirstDown               = FALSE;\r
+                  MouseDrag = TRUE;\r
+                  FirstDown = FALSE;\r
                 }\r
               } else {\r
                 if ((\r
-                      (HBufferImage.BufferPosition.Row - 1) *\r
-                    0x10 +\r
-                    HBufferImage.BufferPosition.Column\r
-                      ) >= HMainEditor.SelectStart\r
-                        ) {\r
+                     (HBufferImage.BufferPosition.Row - 1) *\r
+                     0x10 +\r
+                     HBufferImage.BufferPosition.Column\r
+                     ) >= HMainEditor.SelectStart\r
+                    )\r
+                {\r
                   HMainEditor.SelectEnd = (HBufferImage.BufferPosition.Row - 1) *\r
-                    0x10 +\r
-                    HBufferImage.BufferPosition.Column;\r
+                                          0x10 +\r
+                                          HBufferImage.BufferPosition.Column;\r
                 } else {\r
                   HMainEditor.SelectEnd = 0;\r
                 }\r
               }\r
+\r
               //\r
               // end of if RelativeX/Y\r
               //\r
@@ -2218,14 +2244,15 @@ HMainEditorKeyInput (
                 }\r
 \r
                 if ((\r
-                      (HBufferImage.BufferPosition.Row - 1) *\r
-                    0x10 +\r
-                    HBufferImage.BufferPosition.Column\r
-                      ) >= HMainEditor.SelectStart\r
-                        ) {\r
+                     (HBufferImage.BufferPosition.Row - 1) *\r
+                     0x10 +\r
+                     HBufferImage.BufferPosition.Column\r
+                     ) >= HMainEditor.SelectStart\r
+                    )\r
+                {\r
                   HMainEditor.SelectEnd = (HBufferImage.BufferPosition.Row - 1) *\r
-                    0x10 +\r
-                    HBufferImage.BufferPosition.Column;\r
+                                          0x10 +\r
+                                          HBufferImage.BufferPosition.Column;\r
                 } else {\r
                   HMainEditor.SelectEnd = 0;\r
                 }\r
@@ -2239,7 +2266,7 @@ HMainEditorKeyInput (
               MouseDrag = FALSE;\r
             }\r
 \r
-            if (SelectStartBackup != HMainEditor.SelectStart || SelectEndBackup != HMainEditor.SelectEnd) {\r
+            if ((SelectStartBackup != HMainEditor.SelectStart) || (SelectEndBackup != HMainEditor.SelectEnd)) {\r
               if ((SelectStartBackup - 1) / 0x10 != (HMainEditor.SelectStart - 1) / 0x10) {\r
                 HBufferImageNeedRefresh = TRUE;\r
               } else {\r
@@ -2252,9 +2279,8 @@ HMainEditorKeyInput (
             }\r
           }\r
 \r
-          HEditorMouseAction            = TRUE;\r
-          HBufferImageMouseNeedRefresh  = TRUE;\r
-\r
+          HEditorMouseAction           = TRUE;\r
+          HBufferImageMouseNeedRefresh = TRUE;\r
         } else if (Status == EFI_LOAD_ERROR) {\r
           StatusBarSetStatusString (L"Invalid Mouse Movement ");\r
         }\r
@@ -2277,7 +2303,7 @@ HMainEditorKeyInput (
         //\r
         // clear previous status string\r
         //\r
-        StatusBarSetRefresh();\r
+        StatusBarSetRefresh ();\r
         //\r
         // NoShiftState: TRUE when no shift key is pressed.\r
         //\r
@@ -2285,13 +2311,13 @@ HMainEditorKeyInput (
         //\r
         // dispatch to different components' key handling function\r
         //\r
-        if (EFI_SUCCESS == MenuBarDispatchControlHotKey(&KeyData)) {\r
+        if (EFI_SUCCESS == MenuBarDispatchControlHotKey (&KeyData)) {\r
           Status = EFI_SUCCESS;\r
-        } else if (NoShiftState && KeyData.Key.ScanCode == SCAN_NULL) {\r
+        } else if (NoShiftState && (KeyData.Key.ScanCode == SCAN_NULL)) {\r
           Status = HBufferImageHandleInput (&KeyData.Key);\r
         } else if (NoShiftState && ((KeyData.Key.ScanCode >= SCAN_UP) && (KeyData.Key.ScanCode <= SCAN_PAGE_DOWN))) {\r
           Status = HBufferImageHandleInput (&KeyData.Key);\r
-        } else if (NoShiftState && ((KeyData.Key.ScanCode >= SCAN_F1) && KeyData.Key.ScanCode <= SCAN_F12)) {\r
+        } else if (NoShiftState && ((KeyData.Key.ScanCode >= SCAN_F1) && (KeyData.Key.ScanCode <= SCAN_F12))) {\r
           Status = MenuBarDispatchFunctionKey (&KeyData.Key);\r
         } else {\r
           StatusBarSetStatusString (L"Unknown Command");\r
@@ -2299,15 +2325,16 @@ HMainEditorKeyInput (
           HBufferImageMouseNeedRefresh = FALSE;\r
         }\r
 \r
-        if (Status != EFI_SUCCESS && Status != EFI_OUT_OF_RESOURCES) {\r
+        if ((Status != EFI_SUCCESS) && (Status != EFI_OUT_OF_RESOURCES)) {\r
           //\r
           // not already has some error status\r
           //\r
-          if (StrCmp (L"", StatusBarGetString()) == 0) {\r
+          if (StrCmp (L"", StatusBarGetString ()) == 0) {\r
             StatusBarSetStatusString (L"Disk Error. Try Again");\r
           }\r
         }\r
       }\r
+\r
       //\r
       // decide if has to set length warning\r
       //\r
@@ -2321,17 +2348,17 @@ HMainEditorKeyInput (
           Size = HBufferImageGetTotalSize ();\r
 \r
           switch (HBufferImage.BufferType) {\r
-          case FileTypeDiskBuffer:\r
-            OldSize = HBufferImage.DiskImage->Size * HBufferImage.DiskImage->BlockSize;\r
-            break;\r
+            case FileTypeDiskBuffer:\r
+              OldSize = HBufferImage.DiskImage->Size * HBufferImage.DiskImage->BlockSize;\r
+              break;\r
 \r
-          case FileTypeMemBuffer:\r
-            OldSize = HBufferImage.MemImage->Size;\r
-            break;\r
+            case FileTypeMemBuffer:\r
+              OldSize = HBufferImage.MemImage->Size;\r
+              break;\r
 \r
-          default:\r
-            OldSize = 0;\r
-            break;\r
+            default:\r
+              OldSize = 0;\r
+              break;\r
           }\r
 \r
           if (!LengthChange) {\r
@@ -2348,11 +2375,11 @@ HMainEditorKeyInput (
         }\r
       }\r
     }\r
+\r
     //\r
     // after handling, refresh editor\r
     //\r
     HMainEditorRefresh ();\r
-\r
   } while (Status != EFI_OUT_OF_RESOURCES && !HEditorExit);\r
 \r
   return Status;\r
@@ -2366,7 +2393,7 @@ HMainEditorBackup (
   VOID\r
   )\r
 {\r
-  HMainEditorBackupVar.SelectStart  = HMainEditor.SelectStart;\r
-  HMainEditorBackupVar.SelectEnd    = HMainEditor.SelectEnd;\r
+  HMainEditorBackupVar.SelectStart = HMainEditor.SelectStart;\r
+  HMainEditorBackupVar.SelectEnd   = HMainEditor.SelectEnd;\r
   HBufferImageBackup ();\r
 }\r