From 5f9eb01d943d8eed610d395aa3f0c6017ea1c58f Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sat, 18 Feb 2023 13:46:51 +0100 Subject: [PATCH] better naming --- src/fsfw_hal/linux/UnixFileGuard.cpp | 4 ++-- src/fsfw_hal/linux/UnixFileGuard.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/fsfw_hal/linux/UnixFileGuard.cpp b/src/fsfw_hal/linux/UnixFileGuard.cpp index fb8493ca..0a44e445 100644 --- a/src/fsfw_hal/linux/UnixFileGuard.cpp +++ b/src/fsfw_hal/linux/UnixFileGuard.cpp @@ -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; } diff --git a/src/fsfw_hal/linux/UnixFileGuard.h b/src/fsfw_hal/linux/UnixFileGuard.h index 19da5f4a..25386aa3 100644 --- a/src/fsfw_hal/linux/UnixFileGuard.h +++ b/src/fsfw_hal/linux/UnixFileGuard.h @@ -31,7 +31,7 @@ class UnixFileGuard { ReturnValue_t getOpenResult() const; private: - int fileDescriptor = 0; + int cachedFd = 0; ReturnValue_t openStatus = returnvalue::OK; };