Fix ICC build warning.

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

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
index 9fa2556cd5029e60b6ee7706f0878bee33608237..4be68a0e06b4b4e0b54bc2e9e927058655585301 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
@@ -691,6 +691,7 @@ UpdateConModePage (
   UINTN                         Row;\r
   CHAR16                        RowString[50];\r
   CHAR16                        ModeString[50];\r
   UINTN                         Row;\r
   CHAR16                        RowString[50];\r
   CHAR16                        ModeString[50];\r

+  UINTN                         TempStringLen;\r

   UINTN                         MaxMode;\r
   UINTN                         ValidMode;\r
   EFI_STRING_ID                 *ModeToken;\r
   UINTN                         MaxMode;\r
   UINTN                         ValidMode;\r
   EFI_STRING_ID                 *ModeToken;\r


@@ -745,11 +746,11 @@ UpdateConModePage (
     //\r
     // Build mode string Column x Row\r
     //\r
     //\r
     // Build mode string Column x Row\r
     //\r

-    UnicodeValueToString (ModeString, 0, Col, 0);\r
-    ASSERT ((StrLen (ModeString)  + 1) < (sizeof (ModeString) / sizeof (ModeString[0])));\r
+    TempStringLen = UnicodeValueToString (ModeString, 0, Col, 0);\r
+    ASSERT ((TempStringLen + StrLen (L" x ")) < (sizeof (ModeString) / sizeof (ModeString[0])));\r

     StrCat (ModeString, L" x ");\r
     StrCat (ModeString, L" x ");\r

-    UnicodeValueToString (RowString, 0, Row, 0);\r
-    ASSERT ((StrLen (ModeString)  + StrLen(RowString)) < (sizeof (ModeString) / sizeof (ModeString[0])));\r
+    TempStringLen = UnicodeValueToString (RowString, 0, Row, 0);\r
+    ASSERT ((StrLen (ModeString)  + TempStringLen) < (sizeof (ModeString) / sizeof (ModeString[0])));\r

     StrCat (ModeString, RowString);\r
 \r
     HiiLibNewString (CallbackData->BmmHiiHandle, &ModeToken[Index], ModeString);\r
     StrCat (ModeString, RowString);\r
 \r
     HiiLibNewString (CallbackData->BmmHiiHandle, &ModeToken[Index], ModeString);\r