From ea2faf788394aceaf8e62e6ae210e3ff2fe34ffb Mon Sep 17 00:00:00 2001 From: Avi Date: Wed, 15 Feb 2023 17:46:57 +1000 Subject: [PATCH 1/2] Fix #1107, Remove dead branch (superfluous if condition) --- .github/workflows/standalone-build.yml | 2 +- src/os/shared/src/osapi-filesys.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/standalone-build.yml b/.github/workflows/standalone-build.yml index c66564a8b..d186a25e8 100644 --- 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/src/os/shared/src/osapi-filesys.c b/src/os/shared/src/osapi-filesys.c index 74fe269a4..3817f5a9c 100644 --- 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; } From a26584ec7723b2fdd3baf158554200f7bd44294f Mon Sep 17 00:00:00 2001 From: Dylan Date: Wed, 31 Jan 2024 13:32:11 -0500 Subject: [PATCH 2/2] Updating documentation and version numbers for equuleus-rc1+dev41 --- CHANGELOG.md | 4 ++++ src/os/inc/osapi-version.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cead73fa7..6d474548d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## Development Build: equuleus-rc1+dev41 +- Remove unreachable branch (superfluous if condition) +- See + ## Development Build: equuleus-rc1+dev37 - Fix pointer error in OS_GetErrorName - See diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h index 94f66958a..8fb218689 100644 --- 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 */