Skip to content

Commit 131fc32

Browse files
committed
Deleted function generateManagerFile() in bin2cpp's main.cpp. The implementation is now identical to generateFile().
1 parent 538b79b commit 131fc32

File tree

1 file changed

+2
-34
lines changed

1 file changed

+2
-34
lines changed

src/bin2cpp/main.cpp

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ struct ARGUMENTS
136136

137137
//pre-declarations
138138
bool generateFile(const Context & c, const std::string & output_file_path, bin2cpp::IGenerator * generator);
139-
bool generateManagerFile(const Context & c, const std::string & output_file_path, bin2cpp::IGenerator * generator);
140139
APP_ERROR_CODES processInputFile(const Context & c, bin2cpp::IGenerator * generator);
141140
APP_ERROR_CODES processInputDirectory(const Context & c, bin2cpp::IGenerator * generator);
142141
APP_ERROR_CODES processManagerFiles(const Context & c);
@@ -716,37 +715,6 @@ bool generateFile(const Context & c, const std::string & output_file_path, bin2c
716715
return result;
717716
}
718717

719-
bool generateManagerFile(const Context & c, const std::string & output_file_path, bin2cpp::IGenerator * generator)
720-
{
721-
std::string processPath = ra::process::GetCurrentProcessPath();
722-
FILE_UPDATE_MODE mode = getFileUpdateMode(processPath, output_file_path, c.overrideExistingFiles);
723-
724-
//writing message
725-
ra::logging::Log(ra::logging::LOG_INFO, "%s file \"%s\"...", getUpdateModeText(mode), output_file_path.c_str());
726-
727-
if (mode == SKIPPING)
728-
return true; //skipping is success
729-
730-
//generate file
731-
bool result = false;
732-
if (isCppHeaderFile(output_file_path))
733-
{
734-
//generate header
735-
result = generator->createCppHeaderFile(output_file_path.c_str());
736-
}
737-
else
738-
{
739-
//generate cpp
740-
result = generator->createCppSourceFile(output_file_path.c_str());
741-
}
742-
if (!result)
743-
{
744-
//there was an error generating file
745-
ra::logging::Log(ra::logging::LOG_ERROR, "%s failed!", getUpdateModeText(mode));
746-
}
747-
return result;
748-
}
749-
750718
APP_ERROR_CODES processManagerFiles(const Context & c)
751719
{
752720
// printing info
@@ -769,11 +737,11 @@ APP_ERROR_CODES processManagerFiles(const Context & c)
769737
generator.setContext(c);
770738

771739
//process files
772-
bool headerResult = generateManagerFile(c, outputHeaderPath, &generator);
740+
bool headerResult = generateFile(c, outputHeaderPath, &generator);
773741
if (!headerResult)
774742
return APP_ERROR_UNABLETOCREATEOUTPUTFILES;
775743

776-
bool cppResult = generateManagerFile(c, outputCppPath, &generator);
744+
bool cppResult = generateFile(c, outputCppPath, &generator);
777745
if (!cppResult)
778746
return APP_ERROR_UNABLETOCREATEOUTPUTFILES;
779747

0 commit comments

Comments
 (0)