From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web12.6458.1602573830789791188 for ; Tue, 13 Oct 2020 00:23:50 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: bob.c.feng@intel.com) IronPort-SDR: oBk0ooDxGX9Cz4iCEStaMqf3MHgDyc3Trk0cd0znD0NUU7Vn5Ud1U+tl6+hz4x6TZOZlg+IQEz gAbl/bKrRTkw== X-IronPort-AV: E=McAfee;i="6000,8403,9772"; a="145730914" X-IronPort-AV: E=Sophos;i="5.77,369,1596524400"; d="scan'208";a="145730914" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Oct 2020 00:23:49 -0700 IronPort-SDR: +L6N0ai7IPRudWrePIVSw1F0BX/KJ24GsMv7yeJEwwASajWREh78BXI/o48p/xzDqfvQ3W3ufr gyg5FBH6A1Bg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,369,1596524400"; d="scan'208";a="463391508" Received: from shwdepsi1121.ccr.corp.intel.com ([10.239.158.66]) by orsmga004.jf.intel.com with ESMTP; 13 Oct 2020 00:23:48 -0700 From: "Bob Feng" To: devel@edk2.groups.io Cc: Yunhua Feng , Liming Gao Subject: [Patch] Basetools: Fixed FMMT Linux build break issue Date: Tue, 13 Oct 2020 15:23:39 +0800 Message-Id: <20201013072339.20644-1-bob.c.feng@intel.com> X-Mailer: git-send-email 2.20.1.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Fixed the FMMT Linux build issue which was introduced by the commit 950333853b5fe2b73a7b5148501458cc97a01481 Signed-off-by: Bob Feng Cc: Yunhua Feng Cc: Liming Gao --- .../Source/C/FMMT/FirmwareModuleManagement.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/BaseTools/Source/C/FMMT/FirmwareModuleManagement.c b/BaseTools/Source/C/FMMT/FirmwareModuleManagement.c index 20663ba163..8a7ae096d0 100644 --- a/BaseTools/Source/C/FMMT/FirmwareModuleManagement.c +++ b/BaseTools/Source/C/FMMT/FirmwareModuleManagement.c @@ -9,11 +9,14 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include "FirmwareModuleManagement.h" #include "Rebase.h" #include #include - +#if defined(__linux__) +#include +#define _MAX_DIR PATH_MAX +#endif CHAR8* mGuidToolDefinition = "FmmtConf.ini"; extern EFI_FIRMWARE_VOLUME_HEADER *mFvHeader; extern UINT32 mFvLength; // @@ -1715,15 +1718,10 @@ FmmtImageExtract ( EFI_STATUS Status; FIRMWARE_DEVICE *FdData; FV_INFORMATION *FvInFd; UINT32 Index; UINT32 FfsFoundFlag; - FFS_INFORMATION *OutputFileName; - FILE* NewFdFile; - FILE* NewFvFile; - UINT64 NewFvLength; - VOID* Buffer; CHAR8 *TemDir; UINT8 FvNumInFd; UINT32 Offset; UINT8 *FdBuffer; EFI_FFS_FILE_HEADER2 *CurrentFile; @@ -1738,18 +1736,13 @@ FmmtImageExtract ( int j; CHAR8 FfsOutputFileName[_MAX_DIR]; FdSize = 0; Index = 0; - NewFvLength = 0; FfsFoundFlag = 0; FdData = NULL; FvInFd = NULL; - OutputFileName = NULL; - NewFdFile = NULL; - NewFvFile = NULL; - Buffer = NULL; TemDir = NULL; FvNumInFd = 0; Offset = 0; FdBuffer = NULL; if (sizeof(FfsOutFileOrDirName) > _MAX_DIR) { -- 2.20.1.windows.1