summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYonghong Zhu <yonghong.zhu@intel.com>2017-12-05 21:52:40 +0800
committerYonghong Zhu <yonghong.zhu@intel.com>2017-12-06 09:46:41 +0800
commit1e6e6e188e01fa08f653706076a6465e0fcb0441 (patch)
tree18fabca41fd549df8c97faa9a1d8519a3a93b7d2
parent2f808acc87ccc7bbaade923886e968b719104d11 (diff)
downloadedk2-1e6e6e188e01fa08f653706076a6465e0fcb0441.zip
edk2-1e6e6e188e01fa08f653706076a6465e0fcb0441.tar.gz
edk2-1e6e6e188e01fa08f653706076a6465e0fcb0441.tar.bz2
BaseTools: Fix GenSec GCC make failure
It is a regression bug introduced by the patch b37b108, it cause GenSec make failure on GCC Env. Cc: Liming Gao <liming.gao@intel.com> Cc: Leif Lindholm <leif.lindholm@linaro.org> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com> Tested-by: Leif Lindholm <leif.lindholm@linaro.org> Tested-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org> Reviewed-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Liming Gao <liming.gao@intel.com>
-rw-r--r--BaseTools/Source/C/GenSec/GenSec.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/BaseTools/Source/C/GenSec/GenSec.c b/BaseTools/Source/C/GenSec/GenSec.c
index 2b2def1..5545f12 100644
--- a/BaseTools/Source/C/GenSec/GenSec.c
+++ b/BaseTools/Source/C/GenSec/GenSec.c
@@ -1326,7 +1326,7 @@ Returns:
DummyFile = fopen (LongFilePath (DummyFileName), "rb");
if (DummyFile == NULL) {
Error (NULL, 0, 0001, "Error opening file", DummyFileName);
- return EFI_ABORTED;
+ goto Finish;
}
fseek (DummyFile, 0, SEEK_END);
@@ -1340,7 +1340,7 @@ Returns:
InFile = fopen(LongFilePath(InputFileName[0]), "rb");
if (InFile == NULL) {
Error (NULL, 0, 0001, "Error opening file", InputFileName[0]);
- return EFI_ABORTED;
+ goto Finish;
}
fseek (InFile, 0, SEEK_END);
@@ -1351,7 +1351,7 @@ Returns:
fclose(InFile);
DebugMsg (NULL, 0, 9, "Input files", "the input file name is %s and the size is %u bytes", InputFileName[0], (unsigned) InFileSize);
if (InFileSize > DummyFileSize){
- if (stricmp(DummyFileBuffer, InFileBuffer + (InFileSize - DummyFileSize)) == 0){
+ if (stricmp((CHAR8 *)DummyFileBuffer, (CHAR8 *)(InFileBuffer + (InFileSize - DummyFileSize))) == 0){
SectGuidHeaderLength = InFileSize - DummyFileSize;
}
}