diff options
| author | Yonghong Zhu <yonghong.zhu@intel.com> | 2015-12-01 02:30:17 +0000 |
|---|---|---|
| committer | vanjeff <vanjeff@Edk2> | 2015-12-01 02:30:17 +0000 |
| commit | e55444859f00eca2676aef4f3290571d386dd6be (patch) | |
| tree | 881816da23fa9d3fb9d220251c25507d5da924b2 /BaseTools/Source | |
| parent | 988a36669834068d2ba69df9a1598d740513662e (diff) | |
| download | edk2-platforms-e55444859f00eca2676aef4f3290571d386dd6be.tar.xz | |
BaseTools: Fix two warning reported in the make phase.
when we make BaseTools, it report warnings about VfrError.cpp and VolInfo,
so this patch fix this warning.
(Sync patch r18851 from main trunk.)
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/branches/UDK2015@19073 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'BaseTools/Source')
| -rw-r--r-- | BaseTools/Source/C/VfrCompile/VfrError.cpp | 2 | ||||
| -rw-r--r-- | BaseTools/Source/C/VolInfo/VolInfo.c | 19 |
2 files changed, 18 insertions, 3 deletions
diff --git a/BaseTools/Source/C/VfrCompile/VfrError.cpp b/BaseTools/Source/C/VfrCompile/VfrError.cpp index 3be2bd84db..3c506ec204 100644 --- a/BaseTools/Source/C/VfrCompile/VfrError.cpp +++ b/BaseTools/Source/C/VfrCompile/VfrError.cpp @@ -280,7 +280,7 @@ CVfrErrorHandle::HandleWarning ( GetFileNameLineNum (LineNum, &FileName, &FileLine);
if (mWarningAsError) {
- Error (FileName, FileLine, 0x2220, "warning treated as error", NULL);
+ Error (FileName, FileLine, 0x2220, (CHAR8 *) "warning treated as error", NULL);
}
for (Index = 0; mVfrWarningHandleTable[Index].mWarningCode != VFR_WARNING_CODEUNDEFINED; Index++) {
diff --git a/BaseTools/Source/C/VolInfo/VolInfo.c b/BaseTools/Source/C/VolInfo/VolInfo.c index 7e79d75367..87e78d48a8 100644 --- a/BaseTools/Source/C/VolInfo/VolInfo.c +++ b/BaseTools/Source/C/VolInfo/VolInfo.c @@ -1,7 +1,7 @@ /** @file
The tool dumps the contents of a firmware volume
-Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 1999 - 2015, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -17,6 +17,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <string.h>
#include <ctype.h>
#include <assert.h>
+#ifdef __GNUC__
+#include <unistd.h>
+#endif
#include <FvLib.h>
#include <Common/UefiBaseTypes.h>
@@ -1422,9 +1425,21 @@ Returns: );
if (ExtractionTool != NULL) {
-
+ #ifndef __GNUC__
ToolInputFile = CloneString (tmpnam (NULL));
ToolOutputFile = CloneString (tmpnam (NULL));
+ #else
+ char tmp1[] = "/tmp/fileXXXXXX";
+ char tmp2[] = "/tmp/fileXXXXXX";
+ int fd1;
+ int fd2;
+ fd1 = mkstemp(tmp1);
+ fd2 = mkstemp(tmp2);
+ ToolInputFile = CloneString(tmp1);
+ ToolOutputFile = CloneString(tmp2);
+ close(fd1);
+ close(fd2);
+ #endif
//
// Construction 'system' command string
|