ShellPkg: Fix ARM build errors.

[mirror_edk2.git] / ShellPkg / Library / UefiShellDebug1CommandsLib / HexEdit / BufferImage.c

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
index 57c4a9c739f29e0a17dd637f1c5977f007a51a2e..ba15a49ce101d338f1d3f66ae27619531b5145e2 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
@@ -580,6 +580,7 @@ HBufferImageRestoreMousePosition (
       // backup the old screen attributes\r
       //\r
       Orig                  = HMainEditor.ColorAttributes;\r
+      New.Data              = 0;\r
       New.Colors.Foreground = Orig.Colors.Background;\r
       New.Colors.Background = Orig.Colors.Foreground;\r
 \r
@@ -752,10 +753,10 @@ HBufferImageRefresh (
   UINTN                   StartRow;\r
   UINTN                   EndRow;\r
   UINTN                   FStartRow;\r
-  UINTN                   FEndRow;\r
   UINTN                   Tmp;\r
 \r
   Orig                  = HMainEditor.ColorAttributes;\r
+  New.Data              = 0;\r
   New.Colors.Foreground = Orig.Colors.Background;\r
   New.Colors.Background = Orig.Colors.Foreground;\r
 \r
@@ -821,7 +822,6 @@ HBufferImageRefresh (
       }\r
 \r
       FStartRow = StartRow;\r
-      FEndRow   = EndRow;\r
 \r
       StartRow  = 2 + StartRow - HBufferImage.LowVisibleRow;\r
       EndRow    = 2 + EndRow - HBufferImage.LowVisibleRow;\r
@@ -832,7 +832,7 @@ HBufferImageRefresh (
       //\r
       FStartRow = HBufferImage.LowVisibleRow;\r
       StartRow  = 2;\r
-      EndRow    = (HMainEditor.ScreenSize.Row - 4);\r
+      EndRow    = (HMainEditor.ScreenSize.Row - 1);\r
     }\r
     //\r
     // no line\r
@@ -1404,7 +1404,7 @@ HUnderCurrentScreen (
   IN  UINTN FileRow\r
   )\r
 {\r
-  if (FileRow > HBufferImage.LowVisibleRow + (HMainEditor.ScreenSize.Row - 5) - 1) {\r
+  if (FileRow > HBufferImage.LowVisibleRow + (HMainEditor.ScreenSize.Row - 2) - 1) {\r
     return TRUE;\r
   }\r
 \r
@@ -1712,8 +1712,8 @@ HBufferImagePageDown (
   //\r
   // has next page\r
   //\r
-  if (HBufferImage.NumLines >= FRow + (HMainEditor.ScreenSize.Row - 5)) {\r
-    Gap = (HMainEditor.ScreenSize.Row - 5);\r
+  if (HBufferImage.NumLines >= FRow + (HMainEditor.ScreenSize.Row - 2)) {\r
+    Gap = (HMainEditor.ScreenSize.Row - 2);\r
   } else {\r
     //\r
     // MOVE CURSOR TO LAST LINE\r
@@ -1750,22 +1750,19 @@ HBufferImagePageUp (
   VOID\r
   )\r
 {\r
-  HEFI_EDITOR_LINE  *Line;\r
   UINTN             FRow;\r
   UINTN             FCol;\r
   UINTN             Gap;\r
   INTN              Retreat;\r
 \r
-  Line  = HBufferImage.CurrentLine;\r
-\r
   FRow  = HBufferImage.BufferPosition.Row;\r
   FCol  = HBufferImage.BufferPosition.Column;\r
 \r
   //\r
   // has previous page\r
   //\r
-  if (FRow > (HMainEditor.ScreenSize.Row - 5)) {\r
-    Gap = (HMainEditor.ScreenSize.Row - 5);\r
+  if (FRow > (HMainEditor.ScreenSize.Row - 2)) {\r
+    Gap = (HMainEditor.ScreenSize.Row - 2);\r
   } else {\r
     //\r
     // the first line of file will displayed on the first line of screen\r
@@ -1776,11 +1773,6 @@ HBufferImagePageUp (
   Retreat = Gap;\r
   Retreat = -Retreat;\r
 \r
-  //\r
-  // get correct line\r
-  //\r
-  Line = HMoveLine (Retreat);\r
-\r
   FRow -= Gap;\r
 \r
   HBufferImageMovePosition (FRow, FCol, HBufferImage.HighBits);\r
@@ -1798,13 +1790,10 @@ HBufferImageHome (
   VOID\r
   )\r
 {\r
-  HEFI_EDITOR_LINE  *Line;\r
   UINTN             FRow;\r
   UINTN             FCol;\r
   BOOLEAN           HighBits;\r
 \r
-  Line = HBufferImage.CurrentLine;\r
-\r
   //\r
   // curosr will at the high bit\r
   //\r
@@ -1918,7 +1907,6 @@ HBufferImageDeleteCharacterFromBuffer (
 \r
   HEFI_EDITOR_LINE  *Line;\r
   LIST_ENTRY    *Link;\r
-  UINTN             StartRow;\r
 \r
   UINTN             OldFCol;\r
   UINTN             OldFRow;\r
@@ -1928,11 +1916,6 @@ HBufferImageDeleteCharacterFromBuffer (
 \r
   EFI_STATUS        Status;\r
 \r
-  //\r
-  // get the line that start position is at\r
-  //\r
-  StartRow  = Pos / 0x10;\r
-\r
   Size      = HBufferImageGetTotalSize ();\r
 \r
   if (Size < Count) {\r
@@ -2054,7 +2037,6 @@ HBufferImageAddCharacterToBuffer (
   HEFI_EDITOR_LINE  *Line;\r
 \r
   LIST_ENTRY    *Link;\r
-  UINTN             StartRow;\r
 \r
   UINTN             OldFCol;\r
   UINTN             OldFRow;\r
@@ -2062,11 +2044,6 @@ HBufferImageAddCharacterToBuffer (
 \r
   UINTN             NewPos;\r
 \r
-  //\r
-  // get the line that start position is at\r
-  //\r
-  StartRow  = Pos / 0x10;\r
-\r
   Size      = HBufferImageGetTotalSize ();\r
 \r
   //\r
@@ -2392,12 +2369,12 @@ HBufferImageAdjustMousePosition (
   // check whether new mouse row position is beyond screen\r
   // if not, adjust it\r
   //\r
-  if (TempY >= 2 && TempY <= (HMainEditor.ScreenSize.Row - 4)) {\r
+  if (TempY >= 2 && TempY <= (HMainEditor.ScreenSize.Row - 1)) {\r
     HBufferImage.MousePosition.Row = TempY;\r
   } else if (TempY < 2) {\r
     HBufferImage.MousePosition.Row = 2;\r
-  } else if (TempY > (HMainEditor.ScreenSize.Row - 4)) {\r
-    HBufferImage.MousePosition.Row = (HMainEditor.ScreenSize.Row - 4);\r
+  } else if (TempY > (HMainEditor.ScreenSize.Row - 1)) {\r
+    HBufferImage.MousePosition.Row = (HMainEditor.ScreenSize.Row - 1);\r
   }\r
 \r
 }\r