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

EIVE upstream #29

Merged
muellerr merged 693 commits from use-eive-upstream into develop 2023-06-30 15:44:39 +02:00
Conversation 0 Commits 693 Files Changed 188 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5f9eb01d94 - Show all commits

4
src/fsfw_hal/linux/UnixFileGuard.cpp
View File

@ -8,7 +8,7 @@
UnixFileGuard::UnixFileGuard(const std::string& device, int& fileDescriptor, int flags,
std::string diagnosticPrefix)
: fileDescriptor(fileDescriptor) {
: cachedFd(fileDescriptor) {
fileDescriptor = open(device.c_str(), flags);
if (fileDescriptor < 0) {
#if FSFW_VERBOSE_LEVEL >= 1
@ -24,6 +24,6 @@ UnixFileGuard::UnixFileGuard(const std::string& device, int& fileDescriptor, int
}
}
UnixFileGuard::~UnixFileGuard() { close(fileDescriptor); }
UnixFileGuard::~UnixFileGuard() { close(cachedFd); }
ReturnValue_t UnixFileGuard::getOpenResult() const { return openStatus; }

2
src/fsfw_hal/linux/UnixFileGuard.h
View File

@ -31,7 +31,7 @@ class UnixFileGuard {
ReturnValue_t getOpenResult() const;
private:
int fileDescriptor = 0;
int cachedFd = 0;
ReturnValue_t openStatus = returnvalue::OK;
};