From 5236e5602666a06033c2a2323ddd3daccd64acdf Mon Sep 17 00:00:00 2001 From: Avi Weiss Date: Sat, 6 May 2023 10:42:53 +1000 Subject: [PATCH 1/2] Fix #1929, Remove redundant status check in `CFE_ES_RegisterCDSEx()` --- modules/es/fsw/src/cfe_es_cds.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/modules/es/fsw/src/cfe_es_cds.c b/modules/es/fsw/src/cfe_es_cds.c index e8326efb3..7c9c3c67a 100644 --- a/modules/es/fsw/src/cfe_es_cds.c +++ b/modules/es/fsw/src/cfe_es_cds.c @@ -427,14 +427,7 @@ int32 CFE_ES_RegisterCDSEx(CFE_ES_CDSHandle_t *HandlePtr, size_t UserBlockSize, CFE_ES_WriteToSysLog("%s: Failed to update CDS Registry (Stat=0x%08X)\n", __func__, (unsigned int)RegUpdateStatus); - /* - * Return failure only if this was the primary error, - * do not overwrite a preexisting error. - */ - if (Status == CFE_SUCCESS) - { - Status = RegUpdateStatus; - } + Status = RegUpdateStatus; } if (Status == CFE_SUCCESS && !IsNewOffset) From 69cb8443c5671e542f8a16f793626799a9dd8ea5 Mon Sep 17 00:00:00 2001 From: Dylan Date: Tue, 5 Nov 2024 09:31:55 -0500 Subject: [PATCH 2/2] Updating documentation and version numbers for equuleus-rc1+dev209 --- CHANGELOG.md | 4 ++++ modules/core_api/fsw/inc/cfe_version.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c43c54e68..9be002c0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## Development Build: equuleus-rc1+dev209 +- Remove redundant status check in CFE_ES_RegisterCDSEx() +- See + ## Development Build: equuleus-rc1+dev205 - fix sb coverage test failure - Pass the CMAKE_PREFIX_PATH to targets diff --git a/modules/core_api/fsw/inc/cfe_version.h b/modules/core_api/fsw/inc/cfe_version.h index f809f4153..1c0d3e0ef 100644 --- a/modules/core_api/fsw/inc/cfe_version.h +++ b/modules/core_api/fsw/inc/cfe_version.h @@ -26,7 +26,7 @@ #define CFE_VERSION_H /* Development Build Macro Definitions */ -#define CFE_BUILD_NUMBER 205 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */ +#define CFE_BUILD_NUMBER 209 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */ #define CFE_BUILD_BASELINE "equuleus-rc1" /**< @brief Development: Reference git tag for build number */ #define CFE_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */ #define CFE_BUILD_CODENAME "Equuleus" /**< @brief: Development: Code name for the current build */