eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

fixed impact of windows fixes on other builds

Browse Source
This commit is contained in:
Ulrich Mohr
2023-01-26 12:33:39 +01:00
parent 81c5b2ec95
commit 70fd9ff3e5
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/fsfw/osal/host/TaskFactory.cpp
View File

@ -50,6 +50,6 @@ void TaskFactory::printMissedDeadline() {
#if FSFW_CPP_OSTREAM_ENABLED == 1
sif::warning << "TaskFactory::printMissedDeadline: " << name << std::endl;
#else
sif::printWarning("TaskFactory::printMissedDeadline: %s\n", name);
sif::printWarning("TaskFactory::printMissedDeadline: %s\n", name.c_str());
#endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */
}

6
src/fsfw_hal/linux/CommandExecutor.cpp
View File

@ -67,7 +67,7 @@ void CommandExecutor::printLastError(std::string funcName) const {
sif::warning << funcName << " pclose failed with code " << lastError << ": "
<< strerror(lastError) << std::endl;
#else
sif::printError("%s pclose failed with code %d: %s\n", funcName, lastError,
sif::printError("%s pclose failed with code %d: %s\n", funcName.c_str(), lastError,
strerror(lastError));
#endif
}
@ -119,7 +119,7 @@ ReturnValue_t CommandExecutor::check(bool& replyReceived) {
#if FSFW_CPP_OSTREAM_ENABLED == 1
sif::info << currentCmd << " | " << readVec.data();
#else
sif::printInfo("%s | %s", currentCmd, readVec.data());
sif::printInfo("%s | %s", currentCmd.c_str(), readVec.data());
#endif
}
if (ringBuffer != nullptr) {
@ -188,7 +188,7 @@ ReturnValue_t CommandExecutor::executeBlocking() {
#if FSFW_CPP_OSTREAM_ENABLED == 1
sif::info << currentCmd << " | " << output;
#else
sif::printInfo("%s | %s", currentCmd, output);
sif::printInfo("%s | %s", currentCmd.c_str(), output.c_str());
#endif
}
if (ringBuffer != nullptr) {