X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=BaseTools%2FSource%2FC%2FVfrCompile%2FVfrCompiler.cpp;fp=BaseTools%2FSource%2FC%2FVfrCompile%2FVfrCompiler.cpp;h=0e9c2df48d93b1ef09b8fa7caaf2ba3bb7e65350;hp=84c0e59b76f2c47af519066d8cbb000e0d568966;hb=f7496d717357b9af78414d19679b073403812340;hpb=39456d00f36e04b7e7efb208f350f4e83b6c3531 diff --git a/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp b/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp index 84c0e59b76..0e9c2df48d 100644 --- a/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp +++ b/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp @@ -1,15 +1,15 @@ /** @file - + VfrCompiler main class and main function. Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
-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 -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +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 +http://opensource.org/licenses/bsd-license.php + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ @@ -24,7 +24,7 @@ PACKAGE_DATA gCBuffer; PACKAGE_DATA gRBuffer; CVfrStringDB gCVfrStringDB; -VOID +VOID CVfrCompiler::DebugError ( IN CHAR8 *FileName, IN UINT32 LineNumber, @@ -32,7 +32,7 @@ CVfrCompiler::DebugError ( IN CONST CHAR8 *Text, IN CONST CHAR8 *MsgFmt, ... - ) + ) { va_list List; va_start (List, MsgFmt); @@ -58,7 +58,7 @@ CVfrCompiler::IS_RUN_STATUS ( VOID CVfrCompiler::OptionInitialization ( - IN INT32 Argc, + IN INT32 Argc, IN CHAR8 **Argv ) { @@ -86,7 +86,7 @@ CVfrCompiler::OptionInitialization ( mOptions.AutoDefault = FALSE; mOptions.CheckDefault = FALSE; memset (&mOptions.OverrideClassGuid, 0, sizeof (EFI_GUID)); - + if (Argc == 1) { Usage (); SET_RUN_STATUS (STATUS_DEAD); @@ -108,7 +108,7 @@ CVfrCompiler::OptionInitialization ( } else if (stricmp(Argv[Index], "-i") == 0) { Index++; if ((Index >= Argc) || (Argv[Index][0] == '-')) { - DebugError (NULL, 0, 1001, "Missing option", "-i missing path argument"); + DebugError (NULL, 0, 1001, "Missing option", "-i missing path argument"); goto Fail; } @@ -126,7 +126,7 @@ CVfrCompiler::OptionInitialization ( goto Fail; } strcpy (mOptions.OutputDirectory, Argv[Index]); - + CHAR8 lastChar = mOptions.OutputDirectory[strlen(mOptions.OutputDirectory) - 1]; if ((lastChar != '/') && (lastChar != '\\')) { if (strchr(mOptions.OutputDirectory, '/') != NULL) { @@ -253,7 +253,7 @@ Fail: if (mOptions.IncludePaths != NULL) { delete mOptions.IncludePaths; mOptions.IncludePaths = NULL; - } + } if (mOptions.CPreprocessorOptions != NULL) { delete mOptions.CPreprocessorOptions; mOptions.CPreprocessorOptions = NULL; @@ -473,7 +473,7 @@ CVfrCompiler::SetRecordListFileName ( } CVfrCompiler::CVfrCompiler ( - IN INT32 Argc, + IN INT32 Argc, IN CHAR8 **Argv ) { @@ -543,14 +543,14 @@ CVfrCompiler::~CVfrCompiler ( SET_RUN_STATUS(STATUS_DEAD); } -VOID +VOID CVfrCompiler::Usage ( VOID ) { UINT32 Index; CONST CHAR8 *Help[] = { - " ", + " ", "VfrCompile version " VFR_COMPILER_VERSION "Build " __BUILD_VERSION, "Copyright (c) 2004-2016 Intel Corporation. All rights reserved.", " ", @@ -585,7 +585,7 @@ CVfrCompiler::Usage ( } } -VOID +VOID CVfrCompiler::Version ( VOID ) @@ -623,8 +623,8 @@ CVfrCompiler::PreProcess ( } fclose (pVfrFile); - CmdLen = strlen (mPreProcessCmd) + strlen (mPreProcessOpt) + - strlen (mOptions.VfrFileName) + strlen (mOptions.PreprocessorOutputFileName); + CmdLen = strlen (mPreProcessCmd) + strlen (mPreProcessOpt) + + strlen (mOptions.VfrFileName) + strlen (mOptions.PreprocessorOutputFileName); if (mOptions.CPreprocessorOptions != NULL) { CmdLen += strlen (mOptions.CPreprocessorOptions); } @@ -756,7 +756,7 @@ CVfrCompiler::AdjustBin ( // Get Package Data and IfrRecord Data // gCFormPkg.BuildPkg (gCBuffer); - gCIfrRecordInfoDB.IfrRecordOutput (gRBuffer); + gCIfrRecordInfoDB.IfrRecordOutput (gRBuffer); // // Compare Form and Record data @@ -799,7 +799,7 @@ CVfrCompiler::AdjustBin ( // // Re get the IfrRecord Buffer. // - gCIfrRecordInfoDB.IfrRecordOutput (gRBuffer); + gCIfrRecordInfoDB.IfrRecordOutput (gRBuffer); } return; @@ -858,7 +858,7 @@ CVfrCompiler::GenCFile ( if (!IS_RUN_STATUS(STATUS_GENBINARY)) { goto Fail; } - + if (!mOptions.CreateIfrPkgFile || mOptions.CompatibleMode) { if ((pFile = fopen (LongFilePath (mOptions.COutputFileName), "w")) == NULL) { DebugError (NULL, 0, 0001, "Error opening output C file", "%s", mOptions.COutputFileName); @@ -869,7 +869,7 @@ CVfrCompiler::GenCFile ( fprintf (pFile, "%s\n", gSourceFileHeader[Index]); } - if (mOptions.CompatibleMode) { + if (mOptions.CompatibleMode) { gCVfrBufferConfig.OutputCFile (pFile, mOptions.VfrBaseFileName); } @@ -926,7 +926,7 @@ CVfrCompiler::GenRecordListFile ( gCIfrRecordInfoDB.IfrRecordOutput (pOutFile, LineNo); } } - + fprintf (pOutFile, "\n//\n// All Opcode Record List \n//\n"); gCIfrRecordInfoDB.IfrRecordOutput (pOutFile, 0); gCVfrVarDataTypeDB.Dump(pOutFile); @@ -943,7 +943,7 @@ Err1: int main ( - IN int Argc, + IN int Argc, IN char **Argv ) { @@ -951,7 +951,7 @@ main ( SetPrintLevel(WARNING_LOG_LEVEL); CVfrCompiler Compiler(Argc, Argv); - + Compiler.PreProcess(); Compiler.Compile(); Compiler.AdjustBin(); @@ -967,7 +967,7 @@ main ( if (gCBuffer.Buffer != NULL) { delete[] gCBuffer.Buffer; } - + if (gRBuffer.Buffer != NULL) { delete[] gRBuffer.Buffer; }