From a89fdd9bfe6e7512b113119a5ec3fd6892b3548b Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Fri, 8 Jul 2022 13:40:17 -0400 Subject: [PATCH 1/2] Fix #2121, remove commented out code Clean up old code which was commented out --- modules/core_api/ut-stubs/src/cfe_tbl_handlers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core_api/ut-stubs/src/cfe_tbl_handlers.c b/modules/core_api/ut-stubs/src/cfe_tbl_handlers.c index 09f55f86b..4a7ed1195 100644 --- a/modules/core_api/ut-stubs/src/cfe_tbl_handlers.c +++ b/modules/core_api/ut-stubs/src/cfe_tbl_handlers.c @@ -58,7 +58,7 @@ void UT_DefaultHandler_CFE_TBL_GetAddress(void *UserObj, UT_EntryKey_t FuncKey, int32 status; UT_Stub_GetInt32StatusCode(Context, &status); - if (status >= 0 /* JPHFIX: && !UT_Stub_CheckDefaultReturnValue(UT_KEY(CFE_TBL_GetAddress), &ForceValue) */) + if (status >= 0) { UT_Stub_CopyToLocal(UT_KEY(CFE_TBL_GetAddress), (uint8 *)TblPtr, sizeof(void *)); } From 7caa9a15b24edd9cb2f5430681ac19123e70ab36 Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 14 Jul 2022 07:42:26 -0400 Subject: [PATCH 2/2] Bump to v7.0.0-rc4+dev145 --- README.md | 5 +++++ modules/core_api/fsw/inc/cfe_version.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 95bd2e78e..a38fddc99 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,11 @@ The detailed cFE user's guide can be viewed at + ### Development Build: v7.0.0-rc4+dev143 - Endian macro mask before shift to avoid shift overflow warning diff --git a/modules/core_api/fsw/inc/cfe_version.h b/modules/core_api/fsw/inc/cfe_version.h index 2ea84d338..84d3d62c3 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 143 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */ +#define CFE_BUILD_NUMBER 145 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */ #define CFE_BUILD_BASELINE "v7.0.0-rc4" /**< @brief Development: Reference git tag for build number */ /* See \ref cfsversions for definitions */