From f5ba4007ae30597c5a8b5dde20f2e0bac3f4f7bc Mon Sep 17 00:00:00 2001 From: Qiu Shumin Date: Mon, 18 Aug 2014 00:48:22 +0000 Subject: [PATCH] ShellPkg: Fix comments. Refine code style. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Qiu Shumin Reviewed-by: Jaben Carsey git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15815 6f19259b-4bc3-4df7-8a09-765794883524 --- ShellPkg/Application/Shell/ShellProtocol.c | 6 +++--- ShellPkg/Include/Protocol/EfiShell.h | 4 ++-- .../UefiHandleParsingLib/UefiHandleParsingLib.c | 4 ++-- .../Library/UefiShellCommandLib/UefiShellCommandLib.c | 4 ++-- ShellPkg/Library/UefiShellLevel3CommandsLib/Help.c | 10 +++++++--- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/ShellPkg/Application/Shell/ShellProtocol.c b/ShellPkg/Application/Shell/ShellProtocol.c index 798f5476f6..24fa485137 100644 --- a/ShellPkg/Application/Shell/ShellProtocol.c +++ b/ShellPkg/Application/Shell/ShellProtocol.c @@ -2054,7 +2054,7 @@ EfiShellFindFilesInDir( } SHELL_FREE_NON_NULL(BasePath); return(Status); - } +} /** Get the GUID value from a human readable name. @@ -2586,8 +2586,8 @@ EfiShellOpenFileList( multiple environment variables are being returned, Attributes is undefined. - @retval NULL The environment variable doesn’t exist. - @return A non-NULL value points to the variable’s value. The returned + @retval NULL The environment variable doesn't exist. + @return A non-NULL value points to the variable's value. The returned pointer does not need to be freed by the caller. **/ CONST CHAR16 * diff --git a/ShellPkg/Include/Protocol/EfiShell.h b/ShellPkg/Include/Protocol/EfiShell.h index c39843ea45..ca21899df7 100644 --- a/ShellPkg/Include/Protocol/EfiShell.h +++ b/ShellPkg/Include/Protocol/EfiShell.h @@ -431,8 +431,8 @@ CONST CHAR16 * multiple environment variables are being returned, Attributes is undefined. - @retval NULL The environment variable doesn’t exist. - @return The environment variable’s value. The returned pointer does not + @retval NULL The environment variable doesn't exist. + @return The environment variable's value. The returned pointer does not need to be freed by the caller. **/ typedef 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); -- 2.39.2