gfgit
/
Heimdall
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Remove some extra whitespace and convert some spaces to tabs

This commit is contained in:
Henrik Grimler 2021-12-07 19:55:20 +01:00
parent af87b7b7e4
commit 6441c6a6c5
No known key found for this signature in database
GPG Key ID: B0076E490B71616B
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
heimdall-frontend/CMakeLists.txt
View File

@ -84,7 +84,6 @@ target_link_libraries(heimdall-frontend pit)
target_link_libraries(heimdall-frontend Qt5::Widgets)
target_link_libraries(heimdall-frontend z)
install (TARGETS heimdall-frontend
RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
BUNDLE DESTINATION /Applications)
RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
BUNDLE DESTINATION /Applications)

5
heimdall/CMakeLists.txt
View File

@ -76,6 +76,5 @@ target_compile_features(heimdall PRIVATE cxx_std_11)
target_link_libraries(heimdall PRIVATE pit)
target_link_libraries(heimdall PRIVATE ${LIBUSB_LIBRARIES})
install (TARGETS heimdall
RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})

14
heimdall/source/FlashAction.cpp
View File

@ -104,7 +104,7 @@ static bool openFiles(Arguments& arguments, vector<PartitionFile>& partitionFile
for (vector<const Argument *>::const_iterator it = arguments.GetArguments().begin(); it != arguments.GetArguments().end(); it++)
{
const string& argumentName = (*it)->GetName();
// The only way an argument could exist without being in the argument types map is if it's a wild-card.
// The "%d" wild-card refers to a partition by identifier, where as the "%s" wild-card refers to a
// partition by name.
@ -164,7 +164,7 @@ static bool sendTotalTransferSize(BridgeManager *bridgeManager, const vector<Par
}
bool success;
TotalBytesPacket *totalBytesPacket = new TotalBytesPacket(totalBytes);
success = bridgeManager->SendPacket(totalBytesPacket);
delete totalBytesPacket;
@ -251,7 +251,7 @@ static bool flashPitData(BridgeManager *bridgeManager, const PitData *pitData)
static bool flashFile(BridgeManager *bridgeManager, const PartitionFlashInfo& partitionFlashInfo)
{
if (partitionFlashInfo.pitEntry->GetBinaryType() == PitEntry::kBinaryTypeCommunicationProcessor) // Modem
{
{
Interface::Print("Uploading %s\n", partitionFlashInfo.pitEntry->GetPartitionName());
if (bridgeManager->SendFile(partitionFlashInfo.file, EndModemFileTransferPacket::kDestinationModem,
@ -459,7 +459,7 @@ int FlashAction::Execute(int argc, char **argv)
bool resume = arguments.GetArgument("resume") != nullptr;
bool verbose = arguments.GetArgument("verbose") != nullptr;
bool tflash = arguments.GetArgument("tflash") != nullptr;
if (arguments.GetArgument("stdout-errors") != nullptr)
Interface::SetStdoutErrors(true);
@ -511,7 +511,7 @@ int FlashAction::Execute(int argc, char **argv)
}
// Open files
FILE *pitFile = nullptr;
vector<PartitionFile> partitionFiles;
@ -558,7 +558,7 @@ int FlashAction::Execute(int argc, char **argv)
if (success)
{
PitData *pitData = getPitData(bridgeManager, pitFile, repartition);
if (pitData)
success = flashPartitions(bridgeManager, partitionFiles, pitData, repartition);
else
@ -571,7 +571,7 @@ int FlashAction::Execute(int argc, char **argv)
success = false;
delete bridgeManager;
closeFiles(partitionFiles, pitFile);
return (success ? 0 : 1);