diff options
| author | Zenith432 <zenith432@users.sourceforge.net> | 2016-05-16 23:52:21 +0800 |
|---|---|---|
| committer | Hao Wu <hao.a.wu@intel.com> | 2016-07-13 09:33:17 +0800 |
| commit | 3f75b25c18c90b9fd03b39f1ac95e573c4bfe4fa (patch) | |
| tree | 71c8661cbb69bbecda5d87cd50797a15c9194a82 /BaseTools | |
| parent | ec4152cf87002e8dd4ad4d054dc9baa2c886efba (diff) | |
| download | edk2-platforms-3f75b25c18c90b9fd03b39f1ac95e573c4bfe4fa.tar.xz | |
BaseTools: Eliminate two shift-negative-value in FvLib.c
clang 3.8 flags -Wshift-negative-value warning, which turns fatal due to
use of -Werror.
Fixes: https://github.com/tianocore/edk2/issues/49
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Zenith432 <zenith432@users.sourceforge.net>
Reviewed-by: Liming Gao <liming.gao@intel.com>
(cherry picked from commit d3bb711834acd3eda35a07d0be7911bc3dbb9e6f)
Diffstat (limited to 'BaseTools')
| -rw-r--r-- | BaseTools/Source/C/Common/FvLib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/BaseTools/Source/C/Common/FvLib.c b/BaseTools/Source/C/Common/FvLib.c index 938aa098f5..f97a7f21ce 100644 --- a/BaseTools/Source/C/Common/FvLib.c +++ b/BaseTools/Source/C/Common/FvLib.c @@ -194,7 +194,7 @@ Returns: //
// Get next file, compensate for 8 byte alignment if necessary.
//
- *NextFile = (EFI_FFS_FILE_HEADER *) ((((UINTN) CurrentFile - (UINTN) mFvHeader + GetFfsFileLength(CurrentFile) + 0x07) & (-1 << 3)) + (UINT8 *) mFvHeader);
+ *NextFile = (EFI_FFS_FILE_HEADER *) ((((UINTN) CurrentFile - (UINTN) mFvHeader + GetFfsFileLength(CurrentFile) + 0x07) & (~(UINTN) 7)) + (UINT8 *) mFvHeader);
//
// Verify file is in this FV.
@@ -479,7 +479,7 @@ Returns: //
// Find next section (including compensating for alignment issues.
//
- CurrentSection.CommonHeader = (EFI_COMMON_SECTION_HEADER *) ((((UINTN) CurrentSection.CommonHeader) + GetSectionFileLength(CurrentSection.CommonHeader) + 0x03) & (-1 << 2));
+ CurrentSection.CommonHeader = (EFI_COMMON_SECTION_HEADER *) ((((UINTN) CurrentSection.CommonHeader) + GetSectionFileLength(CurrentSection.CommonHeader) + 0x03) & (~(UINTN) 3));
}
return EFI_NOT_FOUND;
|