Update based on review feedback.

signed-off-by:andrewfish
reviewed-by:Elvin

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

diff --git a/EmulatorPkg/Include/Library/SmbiosLib.h b/EmulatorPkg/Include/Library/SmbiosLib.h
index 9bfb3fa669eb46a4b6206a8d5e91a4098f0fc0da..f0b4582cb0f0840168c66229f92855b490e2bcc9 100644 (file)
--- a/EmulatorPkg/Include/Library/SmbiosLib.h
+++ b/EmulatorPkg/Include/Library/SmbiosLib.h
@@ -149,15 +149,16 @@ SmbiosLibUpdateUnicodeString (
   Allow caller to read a specific SMBIOS string
   
   @param[in]    Header          SMBIOS record that contains the string. 
-  @param[in[    Intance         Instance of SMBIOS string 0 - N-1. 
+  @param[in[    StringNumber    Instance of SMBIOS string 1 - N. 
 
   @retval NULL                  Instance of Type SMBIOS string was not found. 
   @retval Other                 Pointer to matching SMBIOS string. 
 **/
 CHAR8 *
+EFIAPI
 SmbiosLibReadString (
-  IN SMBIOS_STRUCTURE *Header,
-  IN UINTN            Instance
+  IN SMBIOS_STRUCTURE   *Header,
+  IN EFI_SMBIOS_STRING  StringNumber
   );
 
 

diff --git a/EmulatorPkg/Library/SmbiosLib/SmbiosLib.c b/EmulatorPkg/Library/SmbiosLib/SmbiosLib.c
index 15e135974f646bd8dfb46c21434cc34ac0d59e4c..604aa39d0c61917673282c2e97117a344e3431a6 100644 (file)
--- a/EmulatorPkg/Library/SmbiosLib/SmbiosLib.c
+++ b/EmulatorPkg/Library/SmbiosLib/SmbiosLib.c
@@ -241,28 +241,29 @@ SmbiosLibUpdateUnicodeString (
   Allow caller to read a specific SMBIOS string
   
   @param[in]    Header          SMBIOS record that contains the string. 
-  @param[in[    Intance         Instance of SMBIOS string 0 - N-1. 
+  @param[in[    StringNumber    Instance of SMBIOS string 1 - N. 
 
   @retval NULL                  Instance of Type SMBIOS string was not found. 
   @retval Other                 Pointer to matching SMBIOS string. 
 **/
 CHAR8 *
+EFIAPI
 SmbiosLibReadString (
-  IN SMBIOS_STRUCTURE *Header,
-  IN UINTN            Instance
+  IN SMBIOS_STRUCTURE   *Header,
+  IN EFI_SMBIOS_STRING  StringNumber
   )
 {
   CHAR8       *Data;
-  UINTN       NullCount;
+  UINTN       Match;
   
   Data = (CHAR8 *)Header + Header->Length;
-  for (NullCount = 0;!(*Data == 0 && *(Data+1) == 0); ) {
-    if (Instance == NullCount) {
+  for (Match = 1;!(*Data == 0 && *(Data+1) == 0); ) {
+    if (StringNumber == Match) {
       return Data;
     }
     Data++;
     if (*(Data - 1) == '\0') {
-      NullCount++;
+      Match++;
     }
   }