diff options
author | Hao Wu <hao.a.wu@intel.com> | 2017-03-06 09:56:02 +0800 |
---|---|---|
committer | Hao Wu <hao.a.wu@intel.com> | 2017-03-07 08:43:26 +0800 |
commit | 7be7b25d11a64d186060161ebc63f0ba63500a1d (patch) | |
tree | 0b2909258309f5cc9106c802e7e15b93326b2052 /BaseTools | |
parent | e1e7e0fb3759d520517249ef696c4b67f614b47a (diff) | |
download | edk2-platforms-7be7b25d11a64d186060161ebc63f0ba63500a1d.tar.xz |
BaseTools/GenFw: Fix VS2010/VS2012 build failure
https://bugzilla.tianocore.org/show_bug.cgi?id=417
The commit makes the following refinements in GenFw source codes to
avoid VS2010/VS2012 build failure:
1. Replaces the uses of 'bool' with 'BOOLEAN' for accordance, and remove
the header file dependency for '<stdbool.h>'.
2. Refines coding style for function 'GetSymName' to declare local
variables at the beginning of the function block.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
Diffstat (limited to 'BaseTools')
-rw-r--r-- | BaseTools/Source/C/GenFw/Elf32Convert.c | 17 | ||||
-rw-r--r-- | BaseTools/Source/C/GenFw/Elf64Convert.c | 17 |
2 files changed, 20 insertions, 14 deletions
diff --git a/BaseTools/Source/C/GenFw/Elf32Convert.c b/BaseTools/Source/C/GenFw/Elf32Convert.c index f420bc89da..f7b084dc9b 100644 --- a/BaseTools/Source/C/GenFw/Elf32Convert.c +++ b/BaseTools/Source/C/GenFw/Elf32Convert.c @@ -1,7 +1,7 @@ /** @file
Elf32 Convert solution
-Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
Portions copyright (c) 2013, ARM Ltd. All rights reserved.<BR>
This program and the accompanying materials are licensed and made available
@@ -21,7 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <io.h>
#endif
#include <assert.h>
-#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -304,23 +303,27 @@ GetSymName ( Elf_Sym *Sym
)
{
+ Elf_Shdr *StrtabShdr;
+ UINT8 *StrtabContents;
+ BOOLEAN foundEnd;
+ UINT32 i;
+
if (Sym->st_name == 0) {
return NULL;
}
- Elf_Shdr *StrtabShdr = FindStrtabShdr();
+ StrtabShdr = FindStrtabShdr();
if (StrtabShdr == NULL) {
return NULL;
}
assert(Sym->st_name < StrtabShdr->sh_size);
- UINT8* StrtabContents = (UINT8*)mEhdr + StrtabShdr->sh_offset;
+ StrtabContents = (UINT8*)mEhdr + StrtabShdr->sh_offset;
- bool foundEnd = false;
- UINT32 i;
+ foundEnd = FALSE;
for (i = Sym->st_name; (i < StrtabShdr->sh_size) && !foundEnd; i++) {
- foundEnd = StrtabContents[i] == 0;
+ foundEnd = (BOOLEAN)(StrtabContents[i] == 0);
}
assert(foundEnd);
diff --git a/BaseTools/Source/C/GenFw/Elf64Convert.c b/BaseTools/Source/C/GenFw/Elf64Convert.c index acf021667e..7eed7b92d3 100644 --- a/BaseTools/Source/C/GenFw/Elf64Convert.c +++ b/BaseTools/Source/C/GenFw/Elf64Convert.c @@ -1,7 +1,7 @@ /** @file
Elf64 convert solution
-Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
Portions copyright (c) 2013-2014, ARM Ltd. All rights reserved.<BR>
This program and the accompanying materials are licensed and made available
@@ -21,7 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <io.h>
#endif
#include <assert.h>
-#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -296,23 +295,27 @@ GetSymName ( Elf_Sym *Sym
)
{
+ Elf_Shdr *StrtabShdr;
+ UINT8 *StrtabContents;
+ BOOLEAN foundEnd;
+ UINT32 i;
+
if (Sym->st_name == 0) {
return NULL;
}
- Elf_Shdr *StrtabShdr = FindStrtabShdr();
+ StrtabShdr = FindStrtabShdr();
if (StrtabShdr == NULL) {
return NULL;
}
assert(Sym->st_name < StrtabShdr->sh_size);
- UINT8* StrtabContents = (UINT8*)mEhdr + StrtabShdr->sh_offset;
+ StrtabContents = (UINT8*)mEhdr + StrtabShdr->sh_offset;
- bool foundEnd = false;
- UINT32 i;
+ foundEnd = FALSE;
for (i= Sym->st_name; (i < StrtabShdr->sh_size) && !foundEnd; i++) {
- foundEnd = StrtabContents[i] == 0;
+ foundEnd = (BOOLEAN)(StrtabContents[i] == 0);
}
assert(foundEnd);
|