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

2 files changed, 13 insertions, 10 deletions

diff --git a/ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.c b/ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.c
index 023210e8e..9136b9c20 100644
--- a/ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.c
+++ b/ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.c
@@ -648,8 +648,8 @@ FileHandleGetSize (
   if Destination's current length (including NULL terminator) is already more then 

   CurrentSize, then ASSERT()

 

-  @param[in][out] Destination   The String to append onto

-  @param[in][out] CurrentSize   on call the number of bytes in Destination.  On 

+  @param[in,out] Destination   The String to append onto

+  @param[in,out] CurrentSize   on call the number of bytes in Destination.  On 

                                 return possibly the new size (still in bytes).  if NULL

                                 then allocate whatever is needed.

   @param[in]      Source        The String to append from

@@ -808,8 +808,8 @@ FileHandleGetFileName (
   Function to read a single line (up to but not including the \n) from a file.

 

   @param[in]      Handle        FileHandle to read from

-  @param[in][out] Buffer        pointer to buffer to read into

-  @param[in][out] Size          pointer to number of bytes in buffer

+  @param[in,out] Buffer        pointer to buffer to read into

+  @param[in,out] Size          pointer to number of bytes in buffer

   @param[in[      Truncate      if TRUE then allows for truncation of the line to fit.

                                 if FALSE will reset the position to the begining of the 

                                 line if the buffer is not large enough.

diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.c b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
index 3a5690378..20805725f 100644
--- a/ShellPkg/Library/UefiShellLib/UefiShellLib.c
+++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
@@ -562,7 +562,7 @@ ShellOpenFileByDevicePath(
 EFI_STATUS

 EFIAPI

 ShellOpenFileByName(

-  IN CHAR16		                  *FileName,

+  IN CONST CHAR16		            *FileName,

   OUT EFI_FILE_HANDLE           *FileHandle,

   IN UINT64                     OpenMode,

   IN UINT64                    	Attributes

@@ -599,7 +599,7 @@ ShellOpenFileByName(
   // since this will use EFI method again that will open it.

   //

   ASSERT(mEfiShellEnvironment2 != NULL);

-  FilePath = mEfiShellEnvironment2->NameToPath (FileName);

+  FilePath = mEfiShellEnvironment2->NameToPath ((CHAR16*)FileName);

   if (FileDevicePath != NULL) {

     return (ShellOpenFileByDevicePath(&FilePath,

                                       &DeviceHandle,

@@ -640,7 +640,7 @@ ShellOpenFileByName(
 EFI_STATUS

 EFIAPI

 ShellCreateDirectory(

-  IN CHAR16                   *DirectoryName,

+  IN CONST CHAR16             *DirectoryName,

   OUT EFI_FILE_HANDLE         *FileHandle

   )

 {

@@ -1220,7 +1220,7 @@ typedef struct {
   the ShellCloseFileMetaArg function.

 

   @param[in] FileList           the EFI shell list type

-  @param[in][out] ListHead      the list to add to

+  @param[in,out] ListHead      the list to add to

 

   @retval the resultant head of the double linked new format list;

 **/

@@ -1923,7 +1923,10 @@ ShellCommandLineGetRawValue (
   //

   // enumerate through the list of parametrs

   //

-  for (Node = GetFirstNode(CheckPackage) ; !IsNull (CheckPackage, Node) ; Node = GetNextNode(CheckPackage, Node) ) {

+  for ( Node = GetFirstNode(CheckPackage) 

+      ; !IsNull (CheckPackage, Node) 

+      ; Node = GetNextNode(CheckPackage, Node) 

+      ){

     //

     // If the position matches, return the value

     //

@@ -1940,7 +1943,7 @@ ShellCommandLineGetRawValue (
   If the string would grow bigger than NewSize it will halt and return error.

 

   @param[in] SourceString             String with source buffer

-  @param[in][out] NewString           String with resultant buffer

+  @param[in,out] NewString           String with resultant buffer

   @param[in] NewSize                  Size in bytes of NewString

   @param[in] FindTarget               String to look for

   @param[in[ ReplaceWith              String to replace FindTarget with