Fix various warnings with the Intel C compiler.

EfiBind.h:
* Adding ignores for certain warnings with the Intel C compiler.
  (Partially merged from MdePkg.)

EfiPxe.h:
* Make sure PXE_NO_UINT64_SUPPORT is defined

Decompress.c:
* Removed 'unreachable' return statement.

EdkCompatibilityPkg/**: (all other files)
* Remove trailing comma from last value in enum.
* Include <EfiBind.h> instead of "EfiBind.h", or
  for some reason __STDC_VERSION__ is not defined.
* Introduce more explicit function call ordering by
  storing results in local variables before using
  in a calculation.
* Add some additional casting for BOOLEAN & UINT8
  following calculations which change the type to 'int'.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5123 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Include/EfiApi.h b/EdkCompatibilityPkg/Foundation/Efi/Include/EfiApi.h
index 693948185d2d460bc8f79565a7aeefe36d94a524..052f45b5de8cf0eda57def4d13a5e2e195daf1ed 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Efi/Include/EfiApi.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Include/EfiApi.h
@@ -414,10 +414,10 @@ EFI_STATUS
 typedef enum {\r
   EfiResetCold,\r
   EfiResetWarm,\r
-  EfiResetShutdown,\r
+  EfiResetShutdown\r
 \r
 #if ((TIANO_RELEASE_VERSION != 0) && (EFI_SPECIFICATION_VERSION < 0x00020000))\r
-  EfiResetUpdate\r
+  , EfiResetUpdate\r
 #endif\r
 \r
 } EFI_RESET_TYPE;\r

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMemory.h b/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMemory.h
index 54e7b44377821fdea77e95f2c239bef70c093310..2ee545af5a0fe344b7a3a57943f208877dc7cd73 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMemory.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMemory.h
@@ -78,7 +78,7 @@ typedef enum _EFI_MEMORY_ARRAY_USE {
   EfiMemoryArrayUseVideoMemory                = 0x04,\r
   EfiMemoryArrayUseFlashMemory                = 0x05,\r
   EfiMemoryArrayUseNonVolatileRam             = 0x06,\r
-  EfiMemoryArrayUseCacheMemory                = 0x07,\r
+  EfiMemoryArrayUseCacheMemory                = 0x07\r
 } EFI_MEMORY_ARRAY_USE;\r
 \r
 typedef enum _EFI_MEMORY_ERROR_CORRECTION {\r
@@ -88,7 +88,7 @@ typedef enum _EFI_MEMORY_ERROR_CORRECTION {
   EfiMemoryErrorCorrectionParity              = 0x04,\r
   EfiMemoryErrorCorrectionSingleBitEcc        = 0x05,\r
   EfiMemoryErrorCorrectionMultiBitEcc         = 0x06,\r
-  EfiMemoryErrorCorrectionCrc                 = 0x07,\r
+  EfiMemoryErrorCorrectionCrc                 = 0x07\r
 } EFI_MEMORY_ERROR_CORRECTION;\r
 \r
 typedef struct {\r

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMisc.h b/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMisc.h
index 77519d67a7f0657c60a1eb68d5729b067a6bbd9c..d2956ec130b8cdcabcb618c5a8252b12d8442f3d 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMisc.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMisc.h
@@ -137,7 +137,7 @@ typedef enum {
   EfiSystemWakeupTypeLanRemote = 5,\r
   EfiSystemWakeupTypePowerSwitch = 6,\r
   EfiSystemWakeupTypePciPme = 7,\r
-  EfiSystemWakeupTypeAcPowerRestored = 8,\r
+  EfiSystemWakeupTypeAcPowerRestored = 8\r
 } EFI_MISC_SYSTEM_WAKEUP_TYPE;\r
 \r
 typedef struct {\r
@@ -180,7 +180,7 @@ typedef enum {
   EfiBaseBoardTypeMotherBoard = 0xA,\r
   EfiBaseBoardTypeProcessorMemoryModule = 0xB,\r
   EfiBaseBoardTypeProcessorIOModule = 0xC,\r
-  EfiBaseBoardTypeInterconnectBoard = 0xD,\r
+  EfiBaseBoardTypeInterconnectBoard = 0xD\r
 } EFI_BASE_BOARD_TYPE;\r
 \r
 typedef struct {\r
@@ -248,7 +248,7 @@ typedef enum {
   EfiChassisStateSafe = 3,\r
   EfiChassisStateWarning = 4,\r
   EfiChassisStateCritical = 5,\r
-  EfiChassisStateNonRecoverable = 6,\r
+  EfiChassisStateNonRecoverable = 6\r
 } EFI_MISC_CHASSIS_STATE;\r
 \r
 typedef enum {  \r
@@ -256,7 +256,7 @@ typedef enum {
   EfiChassisSecurityStatusUnknown = 2,\r
   EfiChassisSecurityStatusNone = 3,\r
   EfiChassisSecurityStatusExternalInterfaceLockedOut = 4,\r
-  EfiChassisSecurityStatusExternalInterfaceLockedEnabled = 5,\r
+  EfiChassisSecurityStatusExternalInterfaceLockedEnabled = 5\r
 } EFI_MISC_CHASSIS_SECURITY_STATE;\r
 \r
 typedef struct {\r
@@ -338,7 +338,7 @@ typedef enum {
   EfiPortConnectorTypePCH98 = 0xA2,\r
   EfiPortConnectorTypePC98Note = 0xA3,\r
   EfiPortConnectorTypePC98Full = 0xA4,\r
-  EfiPortConnectorTypeOther = 0xFF,\r
+  EfiPortConnectorTypeOther = 0xFF\r
 } EFI_MISC_PORT_CONNECTOR_TYPE;\r
 \r
 typedef enum {  \r
@@ -378,7 +378,7 @@ typedef enum {
   EfiPortTypeSas = 0x21,\r
   EfiPortType8251Compatible = 0xA0,\r
   EfiPortType8251FifoCompatible = 0xA1,\r
-  EfiPortTypeOther = 0xFF,\r
+  EfiPortTypeOther = 0xFF\r
 } EFI_MISC_PORT_TYPE;\r
 \r
 \r
@@ -445,14 +445,14 @@ typedef enum {
   EfiSlotDataBusWidth8xOrx8 = 0xB,\r
   EfiSlotDataBusWidth12xOrx12 = 0xC,\r
   EfiSlotDataBusWidth16xOrx16 = 0xD,\r
-  EfiSlotDataBusWidth32xOrx32 = 0xE,\r
+  EfiSlotDataBusWidth32xOrx32 = 0xE\r
 } EFI_MISC_SLOT_DATA_BUS_WIDTH;\r
 \r
 typedef enum {  \r
   EfiSlotUsageOther = 1,\r
   EfiSlotUsageUnknown = 2,\r
   EfiSlotUsageAvailable = 3,\r
-  EfiSlotUsageInUse = 4,\r
+  EfiSlotUsageInUse = 4\r
 } EFI_MISC_SLOT_USAGE;\r
   \r
 typedef enum {  \r
@@ -613,7 +613,7 @@ typedef enum {
   EfiPointingDeviceTypeGlidePoint = 6,\r
   EfiPointingDeviceTouchPad = 7,\r
   EfiPointingDeviceTouchScreen = 8,\r
-  EfiPointingDeviceOpticalSensor = 9,\r
+  EfiPointingDeviceOpticalSensor = 9\r
 } EFI_MISC_POINTING_DEVICE_TYPE;\r
 \r
 typedef enum {  \r
@@ -627,7 +627,7 @@ typedef enum {
   EfiPointingDeviceInterfaceADB = 8,\r
   EfiPointingDeviceInterfaceBusMouseDB9 = 0xA0,\r
   EfiPointingDeviceInterfaceBusMouseMicroDin = 0xA1,\r
-  EfiPointingDeviceInterfaceUsb = 0xA2,\r
+  EfiPointingDeviceInterfaceUsb = 0xA2\r
 } EFI_MISC_POINTING_DEVICE_INTERFACE;\r
 \r
 typedef struct {\r
@@ -652,7 +652,7 @@ typedef enum {
   EfiPortableBatteryDeviceChemistryNickelMetalHydride = 5,\r
   EfiPortableBatteryDeviceChemistryLithiumIon = 6,\r
   EfiPortableBatteryDeviceChemistryZincAir = 7,\r
-  EfiPortableBatteryDeviceChemistryLithiumPolymer = 8,\r
+  EfiPortableBatteryDeviceChemistryLithiumPolymer = 8\r
 } EFI_MISC_PORTABLE_BATTERY_DEVICE_CHEMISTRY;\r
 \r
 typedef struct {\r
@@ -908,7 +908,7 @@ typedef enum {
   EfiBootInformationStatusWatchdogTimerExpired = 8,\r
   EfiBootInformationStatusStartReserved = 9,\r
   EfiBootInformationStatusStartOemSpecific = 128,\r
-  EfiBootInformationStatusStartProductSpecific = 192,\r
+  EfiBootInformationStatusStartProductSpecific = 192\r
 } EFI_MISC_BOOT_INFORMATION_STATUS_TYPE;\r
 \r
 typedef struct {\r
@@ -977,7 +977,7 @@ typedef enum {
   EfiIpmiOther = 0,\r
   EfiIpmiKcs = 1,\r
   EfiIpmiSmic = 2,\r
-  EfiIpmiBt = 3,\r
+  EfiIpmiBt = 3\r
 } EFI_MISC_IPMI_INTERFACE_TYPE;\r
 \r
 typedef struct {\r

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Include/TianoSpecError.h b/EdkCompatibilityPkg/Foundation/Framework/Include/TianoSpecError.h
index 4836462ff750b63c05b765b68de9016f91fae15c..4a7445f3baaaf7faf3c729c2df4137685bb28417 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Include/TianoSpecError.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Include/TianoSpecError.h
@@ -22,7 +22,7 @@ Abstract:
 #ifndef _TIANO_SPEC_ERROR_H_\r
 #define _TIANO_SPEC_ERROR_H_\r
 \r
-#include "EfiBind.h"\r
+#include <EfiBind.h>\r
 #define TIANO_ERROR(a)          (MAX_2_BITS | (a))\r
 \r
 //\r

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Reset/Reset.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Reset/Reset.h
index 88f7b83de6826d11491e263a2e69fe5304944a08..79b671de33899c041d620fea3609035c37839fa3 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Reset/Reset.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Reset/Reset.h
@@ -36,7 +36,7 @@ Abstract:
 //\r
 typedef enum {\r
   PeiResetCold,\r
-  PeiResetWarm,\r
+  PeiResetWarm\r
 } PEI_RESET_TYPE;\r
 \r
 typedef\r

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/LegacyBios/LegacyBios.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/LegacyBios/LegacyBios.h
index b273fb683fd7722667bb2e76179acd785871c865..ef9dae4f0ff748e72d5c52c99667e11e3094cae8 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/LegacyBios/LegacyBios.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/LegacyBios/LegacyBios.h
@@ -218,7 +218,7 @@ typedef enum {
   Compatibility16DispatchOprom          = 0x0005,\r
   Compatibility16GetTableAddress        = 0x0006,\r
   Compatibility16SetKeyboardLeds        = 0x0007,\r
-  Compatibility16InstallPciHandler      = 0x0008,\r
+  Compatibility16InstallPciHandler      = 0x0008\r
 } EFI_COMPATIBILITY_FUNCTIONS;\r
 \r
 //\r

diff --git a/EdkCompatibilityPkg/Foundation/Include/Ebc/TianoBind.h b/EdkCompatibilityPkg/Foundation/Include/Ebc/TianoBind.h
index 027d2478afd55af02d3e3da827f3b60c0e51b32f..c1778824ecf997f149620056111a1ca686d46cc7 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Include/Ebc/TianoBind.h
+++ b/EdkCompatibilityPkg/Foundation/Include/Ebc/TianoBind.h
@@ -23,7 +23,7 @@ Abstract:
 #ifndef _TIANO_BIND_H_\r
 #define _TIANO_BIND_H_\r
 \r
-#include "EfiBind.h"\r
+#include <EfiBind.h>\r
 \r
 #define EFI_DXE_ENTRY_POINT(InitFunction)\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiCommon.h b/EdkCompatibilityPkg/Foundation/Include/EfiCommon.h
index 305bfeaf8a566426071c9e60f7c3e570798209a3..63191fef3da8d8d360ff29fc62b50b04ac21f017 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Include/EfiCommon.h
+++ b/EdkCompatibilityPkg/Foundation/Include/EfiCommon.h
@@ -20,7 +20,7 @@ Abstract:
 #ifndef _EFI_COMMON_H_\r
 #define _EFI_COMMON_H_\r
 \r
-#include "EfiBind.h"\r
+#include <EfiBind.h>\r
 #include "EfiTypes.h"\r
 #include "EfiStdArg.h"\r
 #include "EfiError.h"\r

diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiPxe.h b/EdkCompatibilityPkg/Foundation/Include/EfiPxe.h
index 0ff225246963242846b8952b2db0471bc781296a..623069e969e1cee97867569bb0d1e7c142160186 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Include/EfiPxe.h
+++ b/EdkCompatibilityPkg/Foundation/Include/EfiPxe.h
@@ -33,7 +33,11 @@ Abstract:
 // #define PXE_NETWORK_ORDER         1   // network order\r
 //\r
 #define PXE_UINT64_SUPPORT  1 // UINT64 supported\r
-// #define PXE_NO_UINT64_SUPPORT     1   // UINT64 not supported\r
+#if PXE_UINT64_SUPPORT == 0\r
+#define PXE_NO_UINT64_SUPPORT     1\r
+#else\r
+#define PXE_NO_UINT64_SUPPORT     0\r
+#endif\r
 //\r
 #define PXE_BUSTYPE(a, b, c, d) \\r
     ( \\r

diff --git a/EdkCompatibilityPkg/Foundation/Include/Ia32/TianoBind.h b/EdkCompatibilityPkg/Foundation/Include/Ia32/TianoBind.h
index edf599a27f4b5f8e5e1f21f6aa451e63f3d12700..60699c10997fbe501b42dcaa1cd1ad3ac6e1e00e 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Include/Ia32/TianoBind.h
+++ b/EdkCompatibilityPkg/Foundation/Include/Ia32/TianoBind.h
@@ -23,7 +23,7 @@ Abstract:
 #ifndef _TIANO_BIND_H_\r
 #define _TIANO_BIND_H_\r
 \r
-#include "EfiBind.h"\r
+#include <EfiBind.h>\r
 \r
 #ifdef EFI_DEBUG\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/usb.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/usb.h
index f3858ed3907dd7e281165c452d96c3a53020c1f8..7ec33a1d3664cc65fa726ab3e28625f56b00d070 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/usb.h
+++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/usb.h
@@ -160,7 +160,7 @@ enum {
   //\r
   //Use 200 ms to increase the error handling response time\r
   //\r
-  EFI_USB_INTERRUPT_DELAY = 2000000,\r
+  EFI_USB_INTERRUPT_DELAY = 2000000\r
 };\r
 \r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Include/Ipf/TianoBind.h b/EdkCompatibilityPkg/Foundation/Include/Ipf/TianoBind.h
index dc51e1d37e60a100f811ec655c46cf77509d0c66..de84156789e8c055bc43ecc035fb5a55bb0bf90b 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Include/Ipf/TianoBind.h
+++ b/EdkCompatibilityPkg/Foundation/Include/Ipf/TianoBind.h
@@ -23,7 +23,7 @@ Abstract:
 #ifndef _TIANO_BIND_H_\r
 #define _TIANO_BIND_H_\r
 \r
-#include "EfiBind.h"\r
+#include <EfiBind.h>\r
 \r
 #define EFI_DXE_ENTRY_POINT(InitFunction)\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h b/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h
index 349d79c675aa225ef3bb2c65c432380ef49bfecf..52a223990d8789b3d2c89f9a3f21a282750ea88e 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h
+++ b/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h
@@ -37,6 +37,38 @@ Abstract:
 //\r
 #pragma pack()\r
 \r
+#if __INTEL_COMPILER\r
+//\r
+// Disable ICC's warning: trailing comma is nonstandard\r
+//\r
+//#pragma warning ( disable : 271 )\r
+\r
+//\r
+// Disable ICC's warning: extra ";" ignored\r
+//\r
+#pragma warning ( disable : 424 )\r
+\r
+//\r
+// Disable ICC's warning: : variable "foo" was set but never used\r
+//\r
+#pragma warning ( disable : 593 )\r
+\r
+//\r
+// Disable ICC's remark #1418: external function definition with no prior declaration.\r
+// This is legal ANSI C code so we disable the remark that is turned on with /W4\r
+//\r
+#pragma warning ( disable : 1418 )\r
+\r
+\r
+//\r
+// Disable ICC's remark #1419: external declaration in primary source file\r
+// This is legal ANSI C code so we disable the remark that is turned on with /W4\r
+//\r
+#pragma warning ( disable : 1419 )\r
+\r
+#endif\r
+\r
+\r
 #if _MSC_EXTENSIONS\r
 \r
 //\r
@@ -89,7 +121,7 @@ Abstract:
 #endif\r
 \r
 \r
-#if (__STDC_VERSION__ < 199901L)\r
+#if !defined(__GNUC__) && (__STDC_VERSION__ < 199901L)\r
   //\r
   // No ANSI C 2000 stdint.h integer width declarations, so define equivalents\r
   //\r

diff --git a/EdkCompatibilityPkg/Foundation/Include/X64/TianoBind.h b/EdkCompatibilityPkg/Foundation/Include/X64/TianoBind.h
index 45fe2119acce64c5fc34e38a21421378b323b1d8..006755c519cff34eea1202cf37c6a74d6e87e145 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Include/X64/TianoBind.h
+++ b/EdkCompatibilityPkg/Foundation/Include/X64/TianoBind.h
@@ -23,7 +23,7 @@ Abstract:
 #ifndef _TIANO_BIND_H_\r
 #define _TIANO_BIND_H_\r
 \r
-#include "EfiBind.h"\r
+#include <EfiBind.h>\r
 \r
 #define EFI_DXE_ENTRY_POINT(InitFunction)\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrCommon.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrCommon.c
index 44370a5e1cafaffb2d012b13f7f4eadd385c4d5f..996421d039361b49c697e1836369c92aaaaf7006 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrCommon.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrCommon.c
@@ -119,6 +119,8 @@ Returns:
   UINT8               *Destination;\r
   UINTN               Index;\r
   BOOLEAN             Finished;\r
+  UINTN               SizeofLanguage;\r
+  UINTN               SizeofString;\r
 \r
   StringPack  = (EFI_HII_STRING_PACK *) StringBuffer;\r
   Finished    = FALSE;\r
@@ -239,14 +241,16 @@ Returns:
     //\r
     // Pointing to a new string pack location\r
     //\r
+    SizeofLanguage = EfiStrSize (Language);\r
+    SizeofString   = EfiStrSize (String);\r
     StringPackBuffer->Header.Length = (UINT32)\r
       (\r
         sizeof (EFI_HII_STRING_PACK) -\r
         sizeof (EFI_STRING) +\r
         sizeof (RELOFST) +\r
         sizeof (RELOFST) +\r
-        EfiStrSize (Language) +\r
-        EfiStrSize (String)\r
+        SizeofLanguage +\r
+        SizeofString\r
       );\r
     StringPackBuffer->Header.Type           = EFI_HII_STRING;\r
     StringPackBuffer->LanguageNameString    = (UINT16) ((UINTN) &PackDestination[3] - (UINTN) StringPackBuffer);\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrVariable.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrVariable.c
index 1340daf044ca14e101d112c33e7562e27720829f..ef23d6fcc3ce58f67ed2b0bd70574f6a11724163 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrVariable.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrVariable.c
@@ -471,11 +471,15 @@ Returns:
 {\r
   EFI_STATUS    Status;\r
   CHAR16       *NameSuffixed;\r
+  UINTN         NameLength;\r
+  UINTN         SuffixLength;\r
 \r
   //\r
   // enough to concatenate both strings.\r
   //\r
-  NameSuffixed = EfiLibAllocateZeroPool ((EfiStrLen (Name) + EfiStrLen (Suffix) + 1) * sizeof (CHAR16)); \r
+  NameLength   = EfiStrLen (Name);\r
+  SuffixLength = EfiStrLen (Suffix);\r
+  NameSuffixed = EfiLibAllocateZeroPool ((NameLength + SuffixLength + 1) * sizeof (CHAR16)); \r
   \r
   EfiStrCpy (NameSuffixed, Name);\r
   EfiStrCat (NameSuffixed, Suffix);\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrForm.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrForm.c
index abee5318d8e55750611df8a76221634541699b4b..222ca27763d2f5873c517cca86ff558099bd1f4c 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrForm.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrForm.c
@@ -118,7 +118,7 @@ UpdateFormPackageData (
   EfiCopyMem (&PackageHeader, Package, sizeof (EFI_HII_PACKAGE_HEADER));\r
   IfrOpHdr   = (EFI_IFR_OP_HEADER *)((UINT8 *) Package + sizeof (EFI_HII_PACKAGE_HEADER));\r
   Offset     = sizeof (EFI_HII_PACKAGE_HEADER);\r
-  GetFormSet = (FormSetGuid == NULL) ? TRUE : FALSE;\r
+  GetFormSet = (BOOLEAN)((FormSetGuid == NULL) ? TRUE : FALSE);\r
   GetForm    = FALSE;\r
   Updated    = FALSE;\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrOpCodeCreation.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrOpCodeCreation.c
index 3729fa216ffede192a9b12272cf6ed78a5211246..56463266d1fce3447033842dbf68f3bf18099521 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrOpCodeCreation.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrOpCodeCreation.c
@@ -32,7 +32,7 @@ IsValidQuestionFlags (
   IN UINT8                   Flags\r
   )\r
 {\r
-  return (Flags & (~QUESTION_FLAGS)) ? FALSE : TRUE;\r
+  return (BOOLEAN)((Flags & (~QUESTION_FLAGS)) ? FALSE : TRUE);\r
 }\r
 \r
 STATIC\r
@@ -41,7 +41,7 @@ IsValidValueType (
   IN UINT8                   Type\r
   )\r
 {\r
-  return (Type <= EFI_IFR_TYPE_OTHER) ? TRUE : FALSE;\r
+  return (BOOLEAN)((Type <= EFI_IFR_TYPE_OTHER) ? TRUE : FALSE);\r
 }\r
 \r
 STATIC\r
@@ -67,7 +67,7 @@ IsValidCheckboxFlags (
   IN UINT8                   Flags\r
   )\r
 {\r
-  return (Flags <= EFI_IFR_CHECKBOX_DEFAULT_MFG) ? TRUE : FALSE;\r
+  return (BOOLEAN)((Flags <= EFI_IFR_CHECKBOX_DEFAULT_MFG) ? TRUE : FALSE);\r
 }\r
 \r
 EFI_STATUS\r
@@ -302,7 +302,7 @@ CreateOneOfOptionOpCode (
 \r
     OneOfOption.Option        = OptionsList[Index].StringToken;\r
     OneOfOption.Value         = OptionsList[Index].Value;\r
-    OneOfOption.Flags         = OptionsList[Index].Flags & (EFI_IFR_OPTION_DEFAULT | EFI_IFR_OPTION_DEFAULT_MFG);\r
+    OneOfOption.Flags         = (UINT8)(OptionsList[Index].Flags & (EFI_IFR_OPTION_DEFAULT | EFI_IFR_OPTION_DEFAULT_MFG));\r
     OneOfOption.Type          = Type;\r
 \r
     LocalBuffer = (UINT8 *) Data->Data + Data->Offset;\r
@@ -360,7 +360,7 @@ CreateOneOfOpCode (
   EfiCopyMem (LocalBuffer, &OneOf, sizeof (EFI_IFR_ONE_OF));\r
   Data->Offset += sizeof (EFI_IFR_ONE_OF);\r
 \r
-  CreateOneOfOptionOpCode (OptionCount, OptionsList, (OneOfFlags & EFI_IFR_NUMERIC_SIZE), Data);\r
+  CreateOneOfOptionOpCode (OptionCount, OptionsList, (UINT8)(OneOfFlags & EFI_IFR_NUMERIC_SIZE), Data);\r
 \r
   CreateEndOpCode (Data);\r
 \r
@@ -549,7 +549,7 @@ CreateNumericOpCode (
   Data->Offset += sizeof (EFI_IFR_NUMERIC);\r
 \r
   DefaultValue.u64 = Default;\r
-  Status = CreateDefaultOpCode (&DefaultValue, (NumericFlags & EFI_IFR_NUMERIC_SIZE), Data);\r
+  Status = CreateDefaultOpCode (&DefaultValue, (UINT8)(NumericFlags & EFI_IFR_NUMERIC_SIZE), Data);\r
   if (EFI_ERROR(Status)) {\r
     return Status;\r
   }\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/Math.c b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/Math.c
index 64e683ec8944477f32a21db57ab0060f5e3700f9..ba00c8bb3d3f467923c902cb2ce2abe4bc95baac 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/Math.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/Math.c
@@ -167,7 +167,7 @@ Returns:
     Operand >>= 1;\r
     Bitpos++;\r
   }\r
-  return (Bitpos - 1);\r
+  return (UINT8)(Bitpos - 1);\r
 \r
 }\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/PostCode.c b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/PostCode.c
index 31232bebdcdfd0b7fa8c99f7366cc5b0944345ab..69171eaeae8e984a2cab5994b615588a252b4cfa 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/PostCode.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/PostCode.c
@@ -54,7 +54,7 @@ Returns:
   if (((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_PROGRESS_CODE) ||\r
       ((CodeType & EFI_STATUS_CODE_TYPE_MASK)== EFI_ERROR_CODE)) {\r
     *PostCode = (UINT8) (((Value & EFI_STATUS_CODE_CLASS_MASK) >> 24) << 5);\r
-    *PostCode |= (UINT8) (((Value & EFI_STATUS_CODE_SUBCLASS_MASK) >> 16) & 0x1f);\r
+    *PostCode = (UINT8)(*PostCode | (((Value & EFI_STATUS_CODE_SUBCLASS_MASK) >> 16) & 0x1f));\r
     return TRUE;\r
   }\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/ReportStatusCode.c b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/ReportStatusCode.c
index 4a9fca82bc797ffd6b9d3b83dcf0e01ab0da7373..49328e6ca2175385a5cfd67dc21320e89b2f3366 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/ReportStatusCode.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/ReportStatusCode.c
@@ -196,7 +196,8 @@ Returns:
   // Make sure it will all fit in the passed in buffer\r
   //\r
   TotalSize = sizeof (EFI_STATUS_CODE_DATA) + sizeof (EFI_DEBUG_ASSERT_DATA);\r
-  TotalSize += EfiAsciiStrLen (Filename) + EfiAsciiStrLen (Description);\r
+  TotalSize += EfiAsciiStrLen (Filename);\r
+  TotalSize += EfiAsciiStrLen (Description);\r
   if (TotalSize > BufferSize) {\r
     return EFI_BUFFER_TOO_SMALL;\r
   }\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/String.c b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/String.c
index 150f650598edab41c3c4cb4314b5a26071d84b6f..54523b241729289fbe42bcd2e2d69eca6283997c 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/String.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/String.c
@@ -593,7 +593,7 @@ HexStringToBuf (
     } else {\r
       Byte = Buf[Idx / 2];\r
       Byte &= 0x0F;\r
-      Byte |= Digit << 4;\r
+      Byte = (UINT8)(Byte | (Digit << 4));\r
     }\r
 \r
     Buf[Idx / 2] = Byte;\r
@@ -749,9 +749,11 @@ Returns:
   Sub = StrCharSet;\r
   \r
   while ((*String != L'\0') && (*StrCharSet != L'\0')) {\r
-    if (*String++ != *StrCharSet++) {\r
+    if (*String++ != *StrCharSet) {\r
       String = ++Src;\r
       StrCharSet = Sub;\r
+    } else {\r
+      StrCharSet++;\r
     }\r
   }\r
   if (*StrCharSet == L'\0') {\r
@@ -788,9 +790,11 @@ Returns:
   Sub = StrCharSet;\r
   \r
   while ((*String != '\0') && (*StrCharSet != '\0')) {\r
-    if (*String++ != *StrCharSet++) {\r
+    if (*String++ != *StrCharSet) {\r
       String = ++Src;\r
       StrCharSet = Sub;\r
+    } else {\r
+      StrCharSet++;\r
     }\r
   }\r
   if (*StrCharSet == '\0') {\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/Decompress.c b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/Decompress.c
index d35d946d63663f3a54fd8a5e49532784cfdb987d..efcda80334271a24d3eb02f2e8cf9f3c6635f60f 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/Decompress.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/Decompress.c
@@ -762,8 +762,6 @@ Returns: (VOID)
       }\r
     }\r
   }\r
-\r
-  return ;\r
 }\r
 \r
 EFI_STATUS\r