Clean up IfrSupportLib.

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

diff --git a/MdePkg/Include/Library/IfrSupportLib.h b/MdePkg/Include/Library/IfrSupportLib.h
index f4f7a1907b7c8c81c40e14431b5ea5e3ec306462..953cd47314b5b5f3dc735a54183b5fda8dac80ee 100644 (file)
--- a/MdePkg/Include/Library/IfrSupportLib.h
+++ b/MdePkg/Include/Library/IfrSupportLib.h
@@ -431,6 +431,7 @@ CreateStringOpCode (
   
 **/
 VOID
   
 **/
 VOID

+EFIAPI

 ToLower (
   IN OUT CHAR16    *Str
   )
 ToLower (
   IN OUT CHAR16    *Str
   )


@@ -494,7 +495,9 @@ HexStringToBuffer (
   @retval EFI_SUCCESS          Routine success.
   @retval EFI_BUFFER_TOO_SMALL The string buffer is too small.
 
   @retval EFI_SUCCESS          Routine success.
   @retval EFI_BUFFER_TOO_SMALL The string buffer is too small.
 

-**/EFI_STATUS
+**/
+EFI_STATUS
+EFIAPI

 ConfigStringToUnicode (
   IN OUT CHAR16                *UnicodeString,
   IN OUT UINTN                 *StrBufferLen,
 ConfigStringToUnicode (
   IN OUT CHAR16                *UnicodeString,
   IN OUT UINTN                 *StrBufferLen,


@@ -518,7 +521,9 @@ ConfigStringToUnicode (
   @retval EFI_SUCCESS           Routine success.
   @retval EFI_BUFFER_TOO_SMALL  The string buffer is too small.
 
   @retval EFI_SUCCESS           Routine success.
   @retval EFI_BUFFER_TOO_SMALL  The string buffer is too small.
 

-**/EFI_STATUS
+**/
+EFI_STATUS
+EFIAPI

 UnicodeToConfigString (
   IN OUT CHAR16                *ConfigString,
   IN OUT UINTN                 *StrBufferLen,
 UnicodeToConfigString (
   IN OUT CHAR16                *ConfigString,
   IN OUT UINTN                 *StrBufferLen,


@@ -640,7 +645,7 @@ SetBrowserData (
   @param  NumberOfLines          The number of lines for the dialog box
   @param  KeyValue               The EFI_KEY value returned if HotKey is TRUE..
   @param  String                 Pointer to the first string in the list
   @param  NumberOfLines          The number of lines for the dialog box
   @param  KeyValue               The EFI_KEY value returned if HotKey is TRUE..
   @param  String                 Pointer to the first string in the list

-  @param  ...                    A series of (quantity == NumberOfLines) text
+  @param  ...                    A series of (quantity == NumberOfLines - 1) text

                                  strings which will be used to construct the dialog
                                  box
 
                                  strings which will be used to construct the dialog
                                  box
 

diff --git a/MdePkg/Library/HiiLib/HiiLib.c b/MdePkg/Library/HiiLib/HiiLib.c
index a178012b6e8917fb7837221d069e3639ae74aadb..be3a31704d2f61799a16444bb0818d00c48fe2fd 100644 (file)
--- a/MdePkg/Library/HiiLib/HiiLib.c
+++ b/MdePkg/Library/HiiLib/HiiLib.c
@@ -78,7 +78,7 @@ EFI_HII_PACKAGE_LIST_HEADER *
 InternalHiiLibPreparePackages (\r
   IN UINTN           NumberOfPackages,\r
   IN CONST EFI_GUID  *GuidId,\r
 InternalHiiLibPreparePackages (\r
   IN UINTN           NumberOfPackages,\r
   IN CONST EFI_GUID  *GuidId,\r

-  VA_LIST            Marker\r
+  IN VA_LIST         Marker\r

   )\r
 {\r
   EFI_HII_PACKAGE_LIST_HEADER *PackageListHeader;\r
   )\r
 {\r
   EFI_HII_PACKAGE_LIST_HEADER *PackageListHeader;\r

diff --git a/MdePkg/Library/IfrSupportLib/UefiIfrForm.c b/MdePkg/Library/IfrSupportLib/UefiIfrForm.c
index d0da744240bdd493c39b1974194cd129d96d0094..179fc1cb9f412a18e1d56196e5981acdbab53544 100644 (file)
--- a/MdePkg/Library/IfrSupportLib/UefiIfrForm.c
+++ b/MdePkg/Library/IfrSupportLib/UefiIfrForm.c
@@ -18,7 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //
 // Fake <ConfigHdr>
 //
 //
 // Fake <ConfigHdr>
 //

-UINT16 mFakeConfigHdr[] = L"GUID=00000000000000000000000000000000&NAME=0000&PATH=0";
+GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT16 mFakeConfigHdr[] = L"GUID=00000000000000000000000000000000&NAME=0000&PATH=0";

 
 /**
   Draw a dialog and return the selected key.
 
 /**
   Draw a dialog and return the selected key.


@@ -26,7 +26,7 @@ UINT16 mFakeConfigHdr[] = L"GUID=00000000000000000000000000000000&NAME=0000&PATH
   @param  NumberOfLines          The number of lines for the dialog box
   @param  KeyValue               The EFI_KEY value returned if HotKey is TRUE..
   @param  String                 Pointer to the first string in the list
   @param  NumberOfLines          The number of lines for the dialog box
   @param  KeyValue               The EFI_KEY value returned if HotKey is TRUE..
   @param  String                 Pointer to the first string in the list

-  @param  ...                    A series of (quantity == NumberOfLines) text
+  @param  ...                    A series of (quantity == NumberOfLines - 1) text

                                  strings which will be used to construct the dialog
                                  box
 
                                  strings which will be used to construct the dialog
                                  box
 


@@ -109,6 +109,7 @@ IfrLibCreatePopUp (
       LargestString = StringLen;
     }
   }
       LargestString = StringLen;
     }
   }

+  VA_END (Marker);

 
   if ((LargestString + 2) > DimensionsWidth) {
     LargestString = DimensionsWidth - 2;
 
   if ((LargestString + 2) > DimensionsWidth) {
     LargestString = DimensionsWidth - 2;


@@ -250,6 +251,7 @@ SwapBuffer (
 
 **/
 VOID
 
 **/
 VOID

+EFIAPI

 ToLower (
   IN OUT CHAR16    *Str
   )
 ToLower (
   IN OUT CHAR16    *Str
   )


@@ -292,7 +294,7 @@ BufferToHexString (
   StrBufferLen = BufferSize * sizeof (CHAR16) + 1;
   Status = BufToHexString (Str, &StrBufferLen, NewBuffer, BufferSize);
 
   StrBufferLen = BufferSize * sizeof (CHAR16) + 1;
   Status = BufToHexString (Str, &StrBufferLen, NewBuffer, BufferSize);
 

-  gBS->FreePool (NewBuffer);
+  FreePool (NewBuffer);

   //
   // Convert the uppercase to lowercase since <HexAf> is defined in lowercase format.
   //
   //
   // Convert the uppercase to lowercase since <HexAf> is defined in lowercase format.
   //


@@ -354,6 +356,7 @@ HexStringToBuffer (
 
 **/
 EFI_STATUS
 
 **/
 EFI_STATUS

+EFIAPI

 ConfigStringToUnicode (
   IN OUT CHAR16                *UnicodeString,
   IN OUT UINTN                 *StrBufferLen,
 ConfigStringToUnicode (
   IN OUT CHAR16                *UnicodeString,
   IN OUT UINTN                 *StrBufferLen,


@@ -413,6 +416,7 @@ ConfigStringToUnicode (
 
 **/
 EFI_STATUS
 
 **/
 EFI_STATUS

+EFIAPI

 UnicodeToConfigString (
   IN OUT CHAR16                *ConfigString,
   IN OUT UINTN                 *StrBufferLen,
 UnicodeToConfigString (
   IN OUT CHAR16                *ConfigString,
   IN OUT UINTN                 *StrBufferLen,


@@ -566,6 +570,7 @@ ConstructConfigHdr (
 
 **/
 BOOLEAN
 
 **/
 BOOLEAN

+EFIAPI

 FindBlockName (
   IN OUT CHAR16                *String,
   UINTN                        Offset,
 FindBlockName (
   IN OUT CHAR16                *String,
   UINTN                        Offset,


@@ -644,7 +649,7 @@ GetBrowserData (
   )
 {
   EFI_STATUS                      Status;
   )
 {
   EFI_STATUS                      Status;

-  CHAR16                          *ConfigHdr;
+  CONST CHAR16                    *ConfigHdr;

   CHAR16                          *ConfigResp;
   CHAR16                          *StringPtr;
   UINTN                           HeaderLen;
   CHAR16                          *ConfigResp;
   CHAR16                          *StringPtr;
   UINTN                           HeaderLen;


@@ -688,7 +693,7 @@ GetBrowserData (
                            VariableName
                            );
   if (Status == EFI_BUFFER_TOO_SMALL) {
                            VariableName
                            );
   if (Status == EFI_BUFFER_TOO_SMALL) {

-    gBS->FreePool (ConfigResp);
+    FreePool (ConfigResp);

     ConfigResp = AllocateZeroPool (BufferLen + HeaderLen);
 
     StringPtr = ConfigResp + HeaderLen;
     ConfigResp = AllocateZeroPool (BufferLen + HeaderLen);
 
     StringPtr = ConfigResp + HeaderLen;


@@ -705,7 +710,7 @@ GetBrowserData (
                              );
   }
   if (EFI_ERROR (Status)) {
                              );
   }
   if (EFI_ERROR (Status)) {

-    gBS->FreePool (ConfigResp);
+    FreePool (ConfigResp);

     return Status;
   }
   CopyMem (ConfigResp, ConfigHdr, HeaderLen * sizeof (UINT16));
     return Status;
   }
   CopyMem (ConfigResp, ConfigHdr, HeaderLen * sizeof (UINT16));


@@ -720,7 +725,7 @@ GetBrowserData (
                                BufferSize,
                                &Progress
                                );
                                BufferSize,
                                &Progress
                                );

-  gBS->FreePool (ConfigResp);
+  FreePool (ConfigResp);

 
   return Status;
 }
 
   return Status;
 }


@@ -756,7 +761,7 @@ SetBrowserData (
   )
 {
   EFI_STATUS                      Status;
   )
 {
   EFI_STATUS                      Status;

-  CHAR16                          *ConfigHdr;
+  CONST CHAR16                    *ConfigHdr;

   CHAR16                          *ConfigResp;
   CHAR16                          *StringPtr;
   UINTN                           HeaderLen;
   CHAR16                          *ConfigResp;
   CHAR16                          *StringPtr;
   UINTN                           HeaderLen;


@@ -825,7 +830,7 @@ SetBrowserData (
                                 &Progress
                                 );
   if (EFI_ERROR (Status)) {
                                 &Progress
                                 );
   if (EFI_ERROR (Status)) {

-    gBS->FreePool (ConfigResp);
+    FreePool (ConfigResp);

     return Status;
   }
 
     return Status;
   }
 


@@ -845,6 +850,6 @@ SetBrowserData (
                            NULL,
                            NULL
                            );
                            NULL,
                            NULL
                            );

-  gBS->FreePool (ConfigResp);
+  FreePool (ConfigResp);

   return Status;
 }
   return Status;
 }