Merge pull request #1446 from nasa/integration-candidate

osal Integration candidate: Equuleus-rc1+dev3
nasa · Jan 31, 2024 · 403ebba · 403ebba
2 parents fed9ead + a26584e
commit 403ebba
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/standalone-build.yml b/.github/workflows/standalone-build.yml
@@ -10,7 +10,7 @@ defaults:
 
 env:
   allowed_ncov_lines: 0
-  allowed_ncov_branches: 4
+  allowed_ncov_branches: 2
   allowed_ncov_functions: 0
 
 jobs:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: equuleus-rc1+dev41
+- Remove unreachable branch (superfluous if condition)
+- See <https://github.com/nasa/osal/pull/1368>
+
 ## Development Build: equuleus-rc1+dev37
 - Fix pointer error in OS_GetErrorName
 - See <https://github.com/nasa/osal/pull/1436>

diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h
@@ -34,7 +34,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define OS_BUILD_NUMBER     37
+#define OS_BUILD_NUMBER     41
 #define OS_BUILD_BASELINE   "equuleus-rc1"
 #define OS_BUILD_DEV_CYCLE  "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
 #define OS_BUILD_CODENAME   "Equuleus" /**< @brief: Development: Code name for the current build */

diff --git a/src/os/shared/src/osapi-filesys.c b/src/os/shared/src/osapi-filesys.c
@@ -172,9 +172,8 @@ int32 OS_FileSys_Initialize(char *address, const char *fsdevname, const char *fs
          * contains the string "RAM" then it is a RAM disk. Otherwise
          * leave the type as UNKNOWN and let the implementation decide.
          */
-        if (filesys->fstype == OS_FILESYS_TYPE_UNKNOWN &&
-            (filesys->address != NULL || strncmp(filesys->volume_name, OS_FILESYS_RAMDISK_VOLNAME_PREFIX,
-                                                 sizeof(OS_FILESYS_RAMDISK_VOLNAME_PREFIX) - 1) == 0))
+        if (filesys->address != NULL || strncmp(filesys->volume_name, OS_FILESYS_RAMDISK_VOLNAME_PREFIX,
+                                                sizeof(OS_FILESYS_RAMDISK_VOLNAME_PREFIX) - 1) == 0)
         {
             filesys->fstype = OS_FILESYS_TYPE_VOLATILE_DISK;
         }