Merge pull request nasa#2614 from nasa/integration-candidate

cFE Integration candidate: Equuleus-rc1+dev20
thnkslprpt · Nov 5, 2024 · f87ab0e · f87ab0e
2 parents 78b8fd7 + 69cb844
commit f87ab0e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git 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 <https://github.com/nasa/cFE/pull/2329>
+
 ## 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
@@ -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 */

diff --git 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)