From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 92E328030F for ; Sun, 5 Mar 2017 21:10:52 -0800 (PST) Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Mar 2017 21:10:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,251,1484035200"; d="scan'208";a="71987719" Received: from shwdeopenpsi014.ccr.corp.intel.com ([10.239.9.13]) by orsmga005.jf.intel.com with ESMTP; 05 Mar 2017 21:10:51 -0800 From: Hao Wu To: edk2-devel@lists.01.org Cc: Hao Wu , Yonghong Zhu , Liming Gao Date: Mon, 6 Mar 2017 13:10:39 +0800 Message-Id: <20170306051041.25480-2-hao.a.wu@intel.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20170306051041.25480-1-hao.a.wu@intel.com> References: <20170306051041.25480-1-hao.a.wu@intel.com> Subject: [PATCH 1/3] BaseTools/GenFw: Fix VS2010/VS2012 build failure X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Mar 2017 05:10:52 -0000 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 ''. 2. Refines coding style for function 'GetSymName' to declare local variables at the beginning of the function block. Cc: Yonghong Zhu Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hao Wu --- BaseTools/Source/C/GenFw/Elf32Convert.c | 17 ++++++++++------- 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.
+Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.
Portions copyright (c) 2013, ARM Ltd. All rights reserved.
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 #endif #include -#include #include #include #include @@ -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.
+Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.
Portions copyright (c) 2013-2014, ARM Ltd. All rights reserved.
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 #endif #include -#include #include #include #include @@ -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); -- 2.12.0.windows.1