X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkModulePkg%2FUniversal%2FPCD%2FDxe%2FService.c;fp=EdkModulePkg%2FUniversal%2FPCD%2FDxe%2FService.c;h=8ff45d38da5bb4068357b0dd376f383ea559f1c5;hp=51e16624efcd51aa35eab70c9c34d12b98a84bfe;hb=1cc8ee7861a59532700a6fd1255689576eda0f52;hpb=582510249f2fb1334e507b99421b9485f6b89159 diff --git a/EdkModulePkg/Universal/PCD/Dxe/Service.c b/EdkModulePkg/Universal/PCD/Dxe/Service.c index 51e16624ef..8ff45d38da 100644 --- a/EdkModulePkg/Universal/PCD/Dxe/Service.c +++ b/EdkModulePkg/Universal/PCD/Dxe/Service.c @@ -28,7 +28,6 @@ GetWorker ( ) { UINT32 *LocalTokenNumberTable; - UINT16 *SizeTable; EFI_GUID *GuidTable; UINT16 *StringTable; EFI_GUID *Guid; @@ -76,14 +75,11 @@ GetWorker ( // EBC compiler is very choosy. It may report warning about comparison // between UINTN and 0 . So we add 1 in each size of the // comparison. - IsPeiDb = (TokenNumber + 1 < PEI_LOCAL_TOKEN_NUMBER + 1) ? TRUE : FALSE; + IsPeiDb = (BOOLEAN) ((TokenNumber + 1 < PEI_LOCAL_TOKEN_NUMBER + 1) ? TRUE : FALSE); LocalTokenNumberTable = IsPeiDb ? mPcdDatabase->PeiDb.Init.LocalTokenNumberTable : mPcdDatabase->DxeDb.Init.LocalTokenNumberTable; - SizeTable = IsPeiDb ? mPcdDatabase->PeiDb.Init.SizeTable: - mPcdDatabase->DxeDb.Init.SizeTable; - TokenNumber = IsPeiDb ? TokenNumber : TokenNumber - PEI_LOCAL_TOKEN_NUMBER; @@ -496,7 +492,7 @@ GetSkuEnabledTokenNumber ( - +STATIC VOID InvokeCallbackOnSet ( UINT32 ExTokenNumber, @@ -597,7 +593,7 @@ SetWorker ( // EBC compiler is very choosy. It may report warning about comparison // between UINTN and 0 . So we add 1 in each size of the // comparison. - IsPeiDb = (TokenNumber + 1 < PEI_LOCAL_TOKEN_NUMBER + 1) ? TRUE : FALSE; + IsPeiDb = (BOOLEAN) ((TokenNumber + 1 < PEI_LOCAL_TOKEN_NUMBER + 1) ? TRUE : FALSE); LocalTokenNumberTable = IsPeiDb ? mPcdDatabase->PeiDb.Init.LocalTokenNumberTable : mPcdDatabase->DxeDb.Init.LocalTokenNumberTable; @@ -895,7 +891,7 @@ GetExPcdTokenNumber ( } - +STATIC SKU_ID * GetSkuIdArray ( IN UINTN LocalTokenNumberTableIdx, @@ -923,7 +919,7 @@ GetSkuIdArray ( } - +STATIC UINTN GetSizeTableIndexA ( IN UINTN LocalTokenNumberTableIdx, @@ -980,7 +976,7 @@ GetSizeTableIndexA ( - +STATIC UINTN GetSizeTableIndex ( IN UINTN LocalTokenNumberTableIdx,