FSFW Update #28

Merged
jgerhards merged 782 commits from fsfw_update into develop 2023-05-28 23:43:22 +02:00
943 changed files with 17176 additions and 12213 deletions
Showing only changes of commit 23d3812fe3 - Show all commits

View File

@@ -20,7 +20,7 @@ UioMapper::UioMapper(std::string uioFile, int mapNum) : mapNum(mapNum) {
if (S_ISLNK(buf.st_mode)) { if (S_ISLNK(buf.st_mode)) {
char* res = realpath(uioFile.c_str(), nullptr); char* res = realpath(uioFile.c_str(), nullptr);
if (res) { if (res) {
uioFile = res; this->uioFile = res;
free(res); free(res);
} else { } else {
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
@@ -28,7 +28,7 @@ UioMapper::UioMapper(std::string uioFile, int mapNum) : mapNum(mapNum) {
#endif #endif
} }
} else { } else {
uioFile = std::move(uioFile); this->uioFile = std::move(uioFile);
} }
} }