public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Bob Feng" <bob.c.feng@intel.com>
To: devel@edk2.groups.io
Cc: Yunhua Feng <fengyunhua@byosoft.com.cn>,
	Liming Gao <gaoliming@byosoft.com.cn>
Subject: [Patch] Basetools: Fixed FMMT Linux build break issue
Date: Tue, 13 Oct 2020 15:23:39 +0800	[thread overview]
Message-ID: <20201013072339.20644-1-bob.c.feng@intel.com> (raw)

Fixed the FMMT Linux build issue which was introduced
by the commit 950333853b5fe2b73a7b5148501458cc97a01481

Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Yunhua Feng <fengyunhua@byosoft.com.cn>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
---
 .../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 <stdlib.h>
 #include <wchar.h>
-
+#if defined(__linux__)
+#include <limits.h>
+#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


             reply	other threads:[~2020-10-13  7:23 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-13  7:23 Bob Feng [this message]
2020-10-13  8:02 ` [edk2-devel] [Patch] Basetools: Fixed FMMT Linux build break issue Philippe Mathieu-Daudé
2020-10-13  8:32   ` Bob Feng
2020-10-13  8:48     ` Philippe Mathieu-Daudé
2020-10-13  9:05       ` Bob Feng

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201013072339.20644-1-bob.c.feng@intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox