git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8681 6f19259b...

diff --git a/ShellPkg/Include/Library/FileHandleLib.h b/ShellPkg/Include/Library/FileHandleLib.h
index c03a112ceca265bd8c75bcdcf201629b1fe1d5cf..1307927fae2fab96789ca04fd800e5916cc034d3 100644 (file)
--- a/ShellPkg/Include/Library/FileHandleLib.h
+++ b/ShellPkg/Include/Library/FileHandleLib.h
@@ -349,8 +349,8 @@ FileHandleGetFileName (
   Function to read a single line (up to but not including the \n) from a file.\r
 \r
   @param[in]      Handle        FileHandle to read from\r
-  @param[in][out] Buffer        pointer to buffer to read into\r
-  @param[in][out] Size          pointer to number of bytes in buffer\r
+  @param[in,out] Buffer        pointer to buffer to read into\r
+  @param[in,out] Size          pointer to number of bytes in buffer\r
   @param[in[      Truncate      if TRUE then allows for truncation of the line to fit.\r
                                 if FALSE will reset the position to the begining of the \r
                                 line if the buffer is not large enough.\r

diff --git a/ShellPkg/Include/Library/ShellLib.h b/ShellPkg/Include/Library/ShellLib.h
index 37c85e94dcc771da4fdb3a644f215b75d0d31718..6bf4e6ec9b41fe7771733f776fe8a6d4dfcd1693 100644 (file)
--- a/ShellPkg/Include/Library/ShellLib.h
+++ b/ShellPkg/Include/Library/ShellLib.h
@@ -135,7 +135,7 @@ ShellOpenFileByDevicePath(
 EFI_STATUS\r
 EFIAPI\r
 ShellOpenFileByName(\r
-  IN CHAR16                              *FilePath,\r
+  IN CONST CHAR16                          *FilePath,\r
   OUT EFI_FILE_HANDLE           *FileHandle,\r
   IN UINT64                     OpenMode,\r
   IN UINT64                            Attributes\r
@@ -171,7 +171,7 @@ ShellOpenFileByName(
 EFI_STATUS\r
 EFIAPI\r
 ShellCreateDirectory(\r
-  IN CHAR16                   *DirectoryName,\r
+  IN CONST CHAR16             *DirectoryName,\r
   OUT EFI_FILE_HANDLE         *FileHandle\r
   );\r
 \r

diff --git a/ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.c b/ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.c
index 023210e8e0f0dc484a24b830d9f35e2d130d7a72..9136b9c20080b5dca78088beb64fb5ac1f519624 100644 (file)
--- 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 \r
   CurrentSize, then ASSERT()\r
 \r
-  @param[in][out] Destination   The String to append onto\r
-  @param[in][out] CurrentSize   on call the number of bytes in Destination.  On \r
+  @param[in,out] Destination   The String to append onto\r
+  @param[in,out] CurrentSize   on call the number of bytes in Destination.  On \r
                                 return possibly the new size (still in bytes).  if NULL\r
                                 then allocate whatever is needed.\r
   @param[in]      Source        The String to append from\r
@@ -808,8 +808,8 @@ FileHandleGetFileName (
   Function to read a single line (up to but not including the \n) from a file.\r
 \r
   @param[in]      Handle        FileHandle to read from\r
-  @param[in][out] Buffer        pointer to buffer to read into\r
-  @param[in][out] Size          pointer to number of bytes in buffer\r
+  @param[in,out] Buffer        pointer to buffer to read into\r
+  @param[in,out] Size          pointer to number of bytes in buffer\r
   @param[in[      Truncate      if TRUE then allows for truncation of the line to fit.\r
                                 if FALSE will reset the position to the begining of the \r
                                 line if the buffer is not large enough.\r

diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.c b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
index 3a56903789a1693b0c57a6215148e83337a6d8b7..20805725fcec08578277bbdb393c6991d75449e5 100644 (file)
--- a/ShellPkg/Library/UefiShellLib/UefiShellLib.c
+++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
@@ -562,7 +562,7 @@ ShellOpenFileByDevicePath(
 EFI_STATUS\r
 EFIAPI\r
 ShellOpenFileByName(\r
-  IN CHAR16                              *FileName,\r
+  IN CONST CHAR16                          *FileName,\r
   OUT EFI_FILE_HANDLE           *FileHandle,\r
   IN UINT64                     OpenMode,\r
   IN UINT64                            Attributes\r
@@ -599,7 +599,7 @@ ShellOpenFileByName(
   // since this will use EFI method again that will open it.\r
   //\r
   ASSERT(mEfiShellEnvironment2 != NULL);\r
-  FilePath = mEfiShellEnvironment2->NameToPath (FileName);\r
+  FilePath = mEfiShellEnvironment2->NameToPath ((CHAR16*)FileName);\r
   if (FileDevicePath != NULL) {\r
     return (ShellOpenFileByDevicePath(&FilePath,\r
                                       &DeviceHandle,\r
@@ -640,7 +640,7 @@ ShellOpenFileByName(
 EFI_STATUS\r
 EFIAPI\r
 ShellCreateDirectory(\r
-  IN CHAR16                   *DirectoryName,\r
+  IN CONST CHAR16             *DirectoryName,\r
   OUT EFI_FILE_HANDLE         *FileHandle\r
   )\r
 {\r
@@ -1220,7 +1220,7 @@ typedef struct {
   the ShellCloseFileMetaArg function.\r
 \r
   @param[in] FileList           the EFI shell list type\r
-  @param[in][out] ListHead      the list to add to\r
+  @param[in,out] ListHead      the list to add to\r
 \r
   @retval the resultant head of the double linked new format list;\r
 **/\r
@@ -1923,7 +1923,10 @@ ShellCommandLineGetRawValue (
   //\r
   // enumerate through the list of parametrs\r
   //\r
-  for (Node = GetFirstNode(CheckPackage) ; !IsNull (CheckPackage, Node) ; Node = GetNextNode(CheckPackage, Node) ) {\r
+  for ( Node = GetFirstNode(CheckPackage) \r
+      ; !IsNull (CheckPackage, Node) \r
+      ; Node = GetNextNode(CheckPackage, Node) \r
+      ){\r
     //\r
     // If the position matches, return the value\r
     //\r
@@ -1940,7 +1943,7 @@ ShellCommandLineGetRawValue (
   If the string would grow bigger than NewSize it will halt and return error.\r
 \r
   @param[in] SourceString             String with source buffer\r
-  @param[in][out] NewString           String with resultant buffer\r
+  @param[in,out] NewString           String with resultant buffer\r
   @param[in] NewSize                  Size in bytes of NewString\r
   @param[in] FindTarget               String to look for\r
   @param[in[ ReplaceWith              String to replace FindTarget with\r