Merge remote-tracking branch 'upstream/development' into container_additional_assert

CHANGELOG.md

@@ -10,10 +10,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Fixes
 
-- Linux OSAL `getUptime` fix: Check validity of `/proc/uptime` file before reading uptime.
 - PUS Health Service: Size check for set health command.
 - PUS Health Service: Perform operation completion for announce health command.
 
+## Changed
+
+- Assert that `FixedArrayList` is larger than 0 at compile time.
+
 # [v6.0.0] 2023-02-10
 
 ## Fixes

src/fsfw/container/FixedArrayList.h

@@ -12,6 +12,7 @@ template <typename T, size_t MAX_SIZE, typename count_t = uint8_t>
 class FixedArrayList : public ArrayList<T, count_t> {
   static_assert(MAX_SIZE <= std::numeric_limits<count_t>::max(),
                 "count_t is not large enough to hold MAX_SIZE");
+  static_assert(MAX_SIZE > 0, "MAX_SIZE is 0");
 
  private:
   T data[MAX_SIZE];

src/fsfw/osal/linux/Clock.cpp

@@ -76,17 +76,14 @@ timeval Clock::getUptime() {
 }
 
 ReturnValue_t Clock::getUptime(timeval* uptime) {
+  // TODO This is not posix compatible and delivers only seconds precision
+  //  Linux specific file read but more precise.
   double uptimeSeconds;
-  std::ifstream ifile("/proc/uptime");
-  if (ifile.bad()) {
-    return returnvalue::FAILED;
-  }
-  if (ifile >> uptimeSeconds) {
+  if (std::ifstream("/proc/uptime", std::ios::in) >> uptimeSeconds) {
     uptime->tv_sec = uptimeSeconds;
     uptime->tv_usec = uptimeSeconds * (double)1e6 - (uptime->tv_sec * 1e6);
-    return returnvalue::OK;
   }
-  return returnvalue::FAILED;
+  return returnvalue::OK;
 }
 
 // Wait for new FSFW Clock function delivering seconds uptime.