Merge pull request #2139 from nasa/integration-candidate

cFE Integration Candidate: Caelum-rc4+dev19
nasa · Aug 25, 2022 · 9ebdf2e · 9ebdf2e
2 parents 318f345 + 0186dcf
commit 9ebdf2e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -10,6 +10,10 @@ The detailed cFE user's guide can be viewed at <https://github.com/nasa/cFE/blob
 
 ## Changelog
 
+### Development Build: v7.0.0-rc4+dev167
+- Squash uninit var static analysis warnings
+- See <https://github.com/nasa/cFE/pull/2138>
+
 ### Development Build: v7.0.0-rc4+dev163
 - Increase event burst credit to not squelch at startup in CI
 - Grammatical/format updates to EVS flooding requirements

diff --git a/modules/cfe_testcase/src/sb_sendrecv_test.c b/modules/cfe_testcase/src/sb_sendrecv_test.c
@@ -226,7 +226,7 @@ void TestMsgBroadcast(void)
  CFE_SB_PipeId_t PipeId3 = CFE_SB_INVALID_PIPE;
  CFE_SB_PipeId_t PipeId4 = CFE_SB_INVALID_PIPE;
  CFE_FT_TestCmdMessage_t CmdMsg;
- CFE_SB_MsgId_t MsgId;
+ CFE_SB_MsgId_t MsgId = CFE_SB_INVALID_MSG_ID;
  CFE_SB_Buffer_t * MsgBuf1;
  CFE_SB_Buffer_t * MsgBuf2;
  CFE_SB_Buffer_t * MsgBuf3;

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 163 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
+#define CFE_BUILD_NUMBER 167 /**< @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 */

diff --git a/modules/evs/fsw/src/cfe_evs_utils.c b/modules/evs/fsw/src/cfe_evs_utils.c
@@ -301,7 +301,7 @@ bool EVS_CheckAndIncrementSquelchTokens(EVS_AppData_t *AppDataPtr)
 {
  bool NotSquelched = true;
  bool SendSquelchEvent = false;
- OS_time_t CurrentTime;
+ OS_time_t CurrentTime = {0};
  int64 DeltaTimeMs;
  int64 CreditCount;
  char AppName[OS_MAX_API_NAME];

diff --git a/modules/evs/ut-coverage/evs_UT.c b/modules/evs/ut-coverage/evs_UT.c
@@ -267,6 +267,9 @@ void Test_Init(void)
 
  UtPrintf("Begin Test Init");
 
+ memset(&bitmaskcmd, 0, sizeof(bitmaskcmd));
+ memset(&appbitcmd, 0, sizeof(appbitcmd));
+
  strncpy(appbitcmd.Payload.AppName, "ut_cfe_evs", sizeof(appbitcmd.Payload.AppName) - 1);
  appbitcmd.Payload.AppName[sizeof(appbitcmd.Payload.AppName) - 1] = '\0';