Revision: 17445
http://sourceforge.net/p/edk2/code/17445
Author: ydong10
Date: 2015-05-14 02:46:11 +0000 (Thu, 14 May 2015)
Log Message:
-----------
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 <[email protected]>
Reviewed-by: Eric Dong <[email protected]>
Revision Links:
--------------
http://sourceforge.net/p/edk2/code/17428
Modified Paths:
--------------
trunk/edk2/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
Modified:
trunk/edk2/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
2015-05-14 02:09:59 UTC (rev 17444)
+++ trunk/edk2/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
2015-05-14 02:46:11 UTC (rev 17445)
@@ -806,7 +806,7 @@
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 @@
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 @@
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 @@
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 @@
if (*KeywordValue == NULL) {
return 0;
}
- AsciiStrToUnicodeStr(StringTextPtr, *KeywordValue);
+ AsciiStrToUnicodeStr ((CHAR8 *) StringTextPtr, *KeywordValue);
return CurrentStringId;
} else if (CurrentStringId == StringId) {
FindString = TRUE;
@@ -1088,7 +1088,7 @@
if (*KeywordValue == NULL) {
return 0;
}
- AsciiStrToUnicodeStr(StringTextPtr, *KeywordValue);
+ AsciiStrToUnicodeStr ((CHAR8 *) StringTextPtr, *KeywordValue);
return CurrentStringId;
} else if (CurrentStringId == StringId) {
FindString = TRUE;
@@ -1109,7 +1109,7 @@
if (*KeywordValue == NULL) {
return 0;
}
- AsciiStrToUnicodeStr(StringTextPtr, *KeywordValue);
+ AsciiStrToUnicodeStr ((CHAR8 *) StringTextPtr, *KeywordValue);
return CurrentStringId;
} else if (CurrentStringId == StringId) {
FindString = TRUE;
@@ -1136,7 +1136,7 @@
if (*KeywordValue == NULL) {
return 0;
}
- AsciiStrToUnicodeStr(StringTextPtr, *KeywordValue);
+ AsciiStrToUnicodeStr ((CHAR8 *) StringTextPtr, *KeywordValue);
return CurrentStringId;
} else if (CurrentStringId == StringId) {
FindString = TRUE;
@@ -1674,7 +1674,7 @@
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 @@
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 @@
CHAR8 *LocalNameSpace;
EFI_STRING_ID NextStringId;
EFI_STATUS Status;
- CHAR8 *OpCode;
+ UINT8 *OpCode;
CHAR16 *ConfigRequest;
CHAR16 *ValueElement;
CHAR16 *KeywordResp;
------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
