3 files changed, 11 insertions, 7 deletions
diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
index 7f272da7f5..f361f3a274 100644
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
@@ -820,8 +820,8 @@ InternalShellGetNodeFromGuid(
 Function to add a new GUID/Name mapping.
 
 @param[in] Guid       The Guid
-@param[in] NameId     The STRING id of the HII string to use
-@param[in] Dump       The pointer to the dump function
+@param[in] NameID     The STRING id of the HII string to use
+@param[in] DumpFunc   The pointer to the dump function
 
 
 @retval EFI_SUCCESS           The operation was sucessful
diff --git a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
index ebb84dd55e..2984da9699 100644
--- a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
+++ b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
@@ -215,7 +215,7 @@ ShellCommandLibDestructor (
 }
 
 /**
-  Find a dynamic command protocol instance given a command name string
+  Find a dynamic command protocol instance given a command name string.
 
   @param CommandString  the command name string
 
@@ -277,7 +277,7 @@ ShellCommandDynamicCommandExists (
   IN CONST CHAR16 *CommandString
   )
 {
-  return (ShellCommandFindDynamicCommand(CommandString) != NULL);
+  return (BOOLEAN) ((ShellCommandFindDynamicCommand(CommandString) != NULL));
 }
 
 /**
diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/Help.c b/ShellPkg/Library/UefiShellLevel3CommandsLib/Help.c
index a5dfade8f1..e0e15dbc3d 100644
--- a/ShellPkg/Library/UefiShellLevel3CommandsLib/Help.c
+++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/Help.c
@@ -35,11 +35,15 @@ PrintDynamicCommandHelp(
   )
 {
   EFI_STATUS                          Status;
-  BOOLEAN                             Found = FALSE;
-  EFI_HANDLE                          *CommandHandleList = NULL;
+  BOOLEAN                             Found;
+  EFI_HANDLE                          *CommandHandleList;
   EFI_HANDLE                          *NextCommand;
   EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL  *DynamicCommand;
-  CHAR16                              *OutText = NULL;
+  CHAR16                              *OutText;
+  
+  Found = FALSE;
+  CommandHandleList = NULL;
+  OutText = NULL;
 
   CommandHandleList = GetHandleListByProtocol(&gEfiShellDynamicCommandProtocolGuid);