Thanks for fixing them.
Reviewed-by: Ruiyu Ni<[email protected]>
-----Original Message-----
From: Laszlo Ersek [mailto:[email protected]]
Sent: Friday, October 19, 2012 2:38 AM
To: [email protected]; Ni, Ruiyu
Subject: [PATCH] IntelFrameworkModulePkg: fix IsKeyOptionVariable and gcc build
of Hotkey.c
gcc-4.4 refuses the following constructs (added in svn rev 13861):
(a)
Hotkey.c: In function 'IsKeyOptionVariable':
Hotkey.c:424:error: suggest parentheses around '&&' within '||'
Looking at it more closely, we should rather return FALSE if either requirement
fails.
(b)
Hotkey.c: In function 'InitializeHotkeyService':
Hotkey.c:551: error: passing argument 2 of 'GetEfiGlobalVariable2'
from incompatible pointer type
MdePkg/Include/Library/UefiLib.h:736: note: expected 'void **' but
argument is of type 'struct
EFI_KEY_OPTION **'
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <[email protected]>
---
IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c
b/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c
index ee1df6f..dcb547a 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c
@@ -419,7 +419,7 @@ IsKeyOptionVariable (
UINTN Index;
if (!CompareGuid (Guid, &gEfiGlobalVariableGuid) ||
- (StrSize (Name) != sizeof (L"Key####")) &&
+ (StrSize (Name) != sizeof (L"Key####")) ||
(StrnCmp (Name, L"Key", 3) != 0)
) {
return FALSE;
@@ -548,7 +548,7 @@ InitializeHotkeyService (
KeyOptionNumbers = HotkeyGetOptionNumbers (&KeyOptionCount);
for (Index = 0; Index < KeyOptionCount; Index ++) {
UnicodeSPrint (KeyOptionName, sizeof (KeyOptionName), L"Key%04x",
KeyOptionNumbers[Index]);
- GetEfiGlobalVariable2 (KeyOptionName, &KeyOption, NULL);
+ GetEfiGlobalVariable2 (KeyOptionName, (VOID **) &KeyOption, NULL);
ASSERT (KeyOption != NULL);
if (IsKeyOptionValid (KeyOption)) {
HotkeyInsertList (KeyOption);
--
1.7.1
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_sfd2d_oct
_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-devel
