1) Add type cast for better coding style.
2) replace StrCpy() usage in Variable driver with StrnCpy(). Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Feng Tian <feng.tian@intel.com> Reviewed-by: Eric Dong <eric.dong@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15770 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -79,13 +79,13 @@ GetImageIdOrAddress (
|
||||
}
|
||||
switch (((EFI_HII_IMAGE_BLOCK *) ImageBlock)->BlockType) {
|
||||
case EFI_HII_IIBT_EXT1:
|
||||
Length8 = *(ImageBlock + sizeof (EFI_HII_IMAGE_BLOCK) + sizeof (UINT8));
|
||||
Length8 = *(UINT8*)((UINTN)ImageBlock + sizeof (EFI_HII_IMAGE_BLOCK) + sizeof (UINT8));
|
||||
ImageBlock += Length8;
|
||||
break;
|
||||
case EFI_HII_IIBT_EXT2:
|
||||
CopyMem (
|
||||
&Length16,
|
||||
ImageBlock + sizeof (EFI_HII_IMAGE_BLOCK) + sizeof (UINT8),
|
||||
(UINT8*)((UINTN)ImageBlock + sizeof (EFI_HII_IMAGE_BLOCK) + sizeof (UINT8)),
|
||||
sizeof (UINT16)
|
||||
);
|
||||
ImageBlock += Length16;
|
||||
@@ -93,7 +93,7 @@ GetImageIdOrAddress (
|
||||
case EFI_HII_IIBT_EXT4:
|
||||
CopyMem (
|
||||
&Length32,
|
||||
ImageBlock + sizeof (EFI_HII_IMAGE_BLOCK) + sizeof (UINT8),
|
||||
(UINT8*)((UINTN)ImageBlock + sizeof (EFI_HII_IMAGE_BLOCK) + sizeof (UINT8)),
|
||||
sizeof (UINT32)
|
||||
);
|
||||
ImageBlock += Length32;
|
||||
@@ -920,19 +920,19 @@ HiiGetImage (
|
||||
if (BlockType == EFI_HII_IIBT_IMAGE_1BIT || BlockType == EFI_HII_IIBT_IMAGE_1BIT_TRANS) {
|
||||
Output1bitPixel (
|
||||
Image,
|
||||
(UINT8 *) (ImageBlock + sizeof (EFI_HII_IIBT_IMAGE_1BIT_BLOCK) - sizeof (UINT8)),
|
||||
(UINT8 *) ((UINTN)ImageBlock + sizeof (EFI_HII_IIBT_IMAGE_1BIT_BLOCK) - sizeof (UINT8)),
|
||||
(EFI_HII_IMAGE_PALETTE_INFO *) PaletteInfo
|
||||
);
|
||||
} else if (BlockType == EFI_HII_IIBT_IMAGE_4BIT || BlockType == EFI_HII_IIBT_IMAGE_4BIT_TRANS) {
|
||||
Output4bitPixel (
|
||||
Image,
|
||||
(UINT8 *) (ImageBlock + sizeof (EFI_HII_IIBT_IMAGE_4BIT_BLOCK) - sizeof (UINT8)),
|
||||
(UINT8 *) ((UINTN)ImageBlock + sizeof (EFI_HII_IIBT_IMAGE_4BIT_BLOCK) - sizeof (UINT8)),
|
||||
(EFI_HII_IMAGE_PALETTE_INFO *) PaletteInfo
|
||||
);
|
||||
} else {
|
||||
Output8bitPixel (
|
||||
Image,
|
||||
(UINT8 *) (ImageBlock + sizeof (EFI_HII_IIBT_IMAGE_8BIT_BLOCK) - sizeof (UINT8)),
|
||||
(UINT8 *) ((UINTN)ImageBlock + sizeof (EFI_HII_IIBT_IMAGE_8BIT_BLOCK) - sizeof (UINT8)),
|
||||
(EFI_HII_IMAGE_PALETTE_INFO *) PaletteInfo
|
||||
);
|
||||
}
|
||||
|
Reference in New Issue
Block a user