From d3b4af2bca5b70a870148f1358b6babae5d36c88 Mon Sep 17 00:00:00 2001 From: ydong10 Date: Fri, 10 Dec 2010 08:42:36 +0000 Subject: fix build error on ICC compile. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11150 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Universal/BdsDxe/DeviceMngr/DeviceManager.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c') diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c index 79c12b4607..5406249f45 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c @@ -802,7 +802,8 @@ CallDeviceManager ( // if (mNextShowFormId == NETWORK_DEVICE_FORM_ID) { String = HiiGetString (HiiHandle, STRING_TOKEN (STR_FORM_NETWORK_DEVICE_TITLE), NULL); - NewStringLen = (StrLen(String) + StrLen(mSelectedMacAddrString) + 2) * 2; + NewStringLen = StrLen(mSelectedMacAddrString); + NewStringLen += (StrLen(String) + 2) * 2; NewStringTitle = AllocatePool (NewStringLen); UnicodeSPrint (NewStringTitle, NewStringLen, L"%s %s", String, mSelectedMacAddrString); HiiSetString (HiiHandle, STRING_TOKEN (STR_FORM_NETWORK_DEVICE_TITLE), NewStringTitle, NULL); @@ -827,7 +828,7 @@ CallDeviceManager ( // // According to the next show Form id(mNextShowFormId) to decide which form need to update. // - StartLabel->Number = LABEL_FORM_ID_OFFSET + mNextShowFormId; + StartLabel->Number = (UINT16) (LABEL_FORM_ID_OFFSET + mNextShowFormId); // // Create Hii Extend Label OpCode as the end opcode @@ -1064,7 +1065,7 @@ CallDeviceManager ( if(mNextShowFormId - 1 < DEVICE_MANAGER_FORM_ID) { mNextShowFormId = DEVICE_MANAGER_FORM_ID; } else { - mNextShowFormId = mNextShowFormId - 1; + mNextShowFormId = (UINT16) (mNextShowFormId - 1); gCallbackKey = FRONT_PAGE_KEY_DEVICE_MANAGER; } -- cgit v1.2.3