Fix Xcode, clang, and ARM build and link issues.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11513 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 24 insertions, 6 deletions

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
index 469642245d..57c4a9c739 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
@@ -176,12 +176,15 @@ HBufferImageBackup (
   case FileTypeMemBuffer:

     HMemImageBackup ();

     break;

+

+  default:

+    break;

   }

 

   return EFI_SUCCESS;

 }

 

-/**

+/**
   Free all the lines in HBufferImage.

     Fields affected:

     Lines

@@ -728,7 +731,7 @@ HBufferImageRestorePosition (
   return EFI_SUCCESS;

 }

 

-/**

+/**
   Refresh function for HBufferImage.

 

   @retval EFI_SUCCESS     The operation was successful.

@@ -944,6 +947,10 @@ HBufferImageRead (
   case FileTypeMemBuffer:

     Status = HMemImageRead (MemOffset, MemSize, Recover);

     break;

+    

+  default:

+    Status = EFI_NOT_FOUND;

+    break;

   }

 

   if (EFI_ERROR (Status)) {

@@ -1007,6 +1014,10 @@ HBufferImageSave (
   case FileTypeMemBuffer:

     Status = HMemImageSave (MemOffset, MemSize);

     break;

+    

+  default:

+    Status = EFI_NOT_FOUND;

+    break;

   }

 

   if (EFI_ERROR (Status)) {

@@ -1016,7 +1027,7 @@ HBufferImageSave (
   return Status;

 }

 

-/**

+/**
   Create a new line and append it to the line list.

     Fields affected:

     NumLines

@@ -1063,7 +1074,7 @@ HBufferImageCreateLine (
   return Line;

 }

 

-/**

+/**
   Free the current image.

 

   @retval EFI_SUCCESS   The operation was successful.

@@ -1081,7 +1092,7 @@ HBufferImageFree (
   return EFI_SUCCESS;

 }

 

-/**

+/**
   change char to int value based on Hex.

 

   @param[in] Char     The input char.

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEdit.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEdit.c
index 11a11ee970..1f5e1c908d 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEdit.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEdit.c
@@ -170,7 +170,7 @@ ShellCommandRunHexEdit (
     } else if (WhatToDo == FileTypeFileBuffer && ShellGetCurrentDir(NULL) == NULL) {

       ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellDebug1HiiHandle);

       ShellStatus = SHELL_INVALID_PARAMETER;

-    }    

+    }

 

     if (ShellStatus == SHELL_SUCCESS) {

       //

@@ -223,6 +223,9 @@ ShellCommandRunHexEdit (
                     );

           break;

 

+        default:

+          Status = EFI_NOT_FOUND;

+          break;

         }

         if (!EFI_ERROR (Status)) {

           HMainEditorRefresh ();

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
index 73fa4c238d..ccd73a9882 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
@@ -2164,6 +2164,10 @@ HMainEditorKeyInput (
         case FileTypeMemBuffer:

           OldSize = HBufferImage.MemImage->Size;

           break;

+        

+        default:

+          OldSize = 0;

+          break;

         }

 

         if (!LengthChange) {