diff options
| author | Laszlo Ersek <lersek@redhat.com> | 2015-05-14 02:46:11 +0000 |
|---|---|---|
| committer | ydong10 <ydong10@Edk2> | 2015-05-14 02:46:11 +0000 |
| commit | c24001450b0fcac86fde6d10c1564246e432e1f9 (patch) | |
| tree | b508f4632fb978c0230918283ad7acd75be3011b /MdeModulePkg/Universal | |
| parent | 833a8349c15326ad4226c96fc2aa0357f10e8824 (diff) | |
| download | edk2-platforms-c24001450b0fcac86fde6d10c1564246e432e1f9.tar.xz | |
MdeModulePkg: ConfigKeywordHandler: fix pointer target signedness.
SVN r17428 ("MdeModulePkg: Implement UEFI25 HII Config keyword handler protocol") introduced code that triggers
-Werror=pointer-sign
under gcc ("warn for pointer argument passing or assignment with different signedness"). This patch fix up those locations.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17445 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg/Universal')
| -rw-r--r-- | MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c index 6a71540448..c3cd064074 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c @@ -806,7 +806,7 @@ GetStringIdFromString ( Offset = sizeof (EFI_HII_STRING_BLOCK);
StringTextPtr = BlockHdr + Offset;
BlockSize += Offset + AsciiStrSize ((CHAR8 *) StringTextPtr);
- if (AsciiStrCmp(AsciiKeywordValue, StringTextPtr) == 0) {
+ if (AsciiStrCmp(AsciiKeywordValue, (CHAR8 *) StringTextPtr) == 0) {
*StringId = CurrentStringId;
goto Done;
}
@@ -816,7 +816,7 @@ GetStringIdFromString ( case EFI_HII_SIBT_STRING_SCSU_FONT:
Offset = sizeof (EFI_HII_SIBT_STRING_SCSU_FONT_BLOCK) - sizeof (UINT8);
StringTextPtr = BlockHdr + Offset;
- if (AsciiStrCmp(AsciiKeywordValue, StringTextPtr) == 0) {
+ if (AsciiStrCmp(AsciiKeywordValue, (CHAR8 *) StringTextPtr) == 0) {
*StringId = CurrentStringId;
goto Done;
}
@@ -831,7 +831,7 @@ GetStringIdFromString ( for (Index = 0; Index < StringCount; Index++) {
BlockSize += AsciiStrSize ((CHAR8 *) StringTextPtr);
- if (AsciiStrCmp(AsciiKeywordValue, StringTextPtr) == 0) {
+ if (AsciiStrCmp(AsciiKeywordValue, (CHAR8 *) StringTextPtr) == 0) {
*StringId = CurrentStringId;
goto Done;
}
@@ -851,7 +851,7 @@ GetStringIdFromString ( for (Index = 0; Index < StringCount; Index++) {
BlockSize += AsciiStrSize ((CHAR8 *) StringTextPtr);
- if (AsciiStrCmp(AsciiKeywordValue, StringTextPtr) == 0) {
+ if (AsciiStrCmp(AsciiKeywordValue, (CHAR8 *) StringTextPtr) == 0) {
*StringId = CurrentStringId;
goto Done;
}
@@ -1069,7 +1069,7 @@ GetNextStringId ( if (*KeywordValue == NULL) {
return 0;
}
- AsciiStrToUnicodeStr(StringTextPtr, *KeywordValue);
+ AsciiStrToUnicodeStr ((CHAR8 *) StringTextPtr, *KeywordValue);
return CurrentStringId;
} else if (CurrentStringId == StringId) {
FindString = TRUE;
@@ -1088,7 +1088,7 @@ GetNextStringId ( if (*KeywordValue == NULL) {
return 0;
}
- AsciiStrToUnicodeStr(StringTextPtr, *KeywordValue);
+ AsciiStrToUnicodeStr ((CHAR8 *) StringTextPtr, *KeywordValue);
return CurrentStringId;
} else if (CurrentStringId == StringId) {
FindString = TRUE;
@@ -1109,7 +1109,7 @@ GetNextStringId ( if (*KeywordValue == NULL) {
return 0;
}
- AsciiStrToUnicodeStr(StringTextPtr, *KeywordValue);
+ AsciiStrToUnicodeStr ((CHAR8 *) StringTextPtr, *KeywordValue);
return CurrentStringId;
} else if (CurrentStringId == StringId) {
FindString = TRUE;
@@ -1136,7 +1136,7 @@ GetNextStringId ( if (*KeywordValue == NULL) {
return 0;
}
- AsciiStrToUnicodeStr(StringTextPtr, *KeywordValue);
+ AsciiStrToUnicodeStr ((CHAR8 *) StringTextPtr, *KeywordValue);
return CurrentStringId;
} else if (CurrentStringId == StringId) {
FindString = TRUE;
@@ -1674,7 +1674,7 @@ ConstructConfigHdr ( switch (((EFI_IFR_OP_HEADER *)OpCodeData)->OpCode) {
case EFI_IFR_VARSTORE_OP:
Guid = (EFI_GUID *)(UINTN *)&((EFI_IFR_VARSTORE *) OpCodeData)->Guid;
- AsciiName = ((EFI_IFR_VARSTORE *) OpCodeData)->Name;
+ AsciiName = (CHAR8 *) ((EFI_IFR_VARSTORE *) OpCodeData)->Name;
break;
case EFI_IFR_VARSTORE_NAME_VALUE_OP:
@@ -1684,7 +1684,7 @@ ConstructConfigHdr ( case EFI_IFR_VARSTORE_EFI_OP:
Guid = (EFI_GUID *)(UINTN *)&((EFI_IFR_VARSTORE_EFI *) OpCodeData)->Guid;
- AsciiName = ((EFI_IFR_VARSTORE_EFI *) OpCodeData)->Name;
+ AsciiName = (CHAR8 *) ((EFI_IFR_VARSTORE_EFI *) OpCodeData)->Name;
break;
default:
@@ -2571,7 +2571,7 @@ EnumerateAllKeywords ( CHAR8 *LocalNameSpace;
EFI_STRING_ID NextStringId;
EFI_STATUS Status;
- CHAR8 *OpCode;
+ UINT8 *OpCode;
CHAR16 *ConfigRequest;
CHAR16 *ValueElement;
CHAR16 *KeywordResp;
|