Fix #2196, resolve static analysis errors

Resolves two uninitialized variable errors reported in the workflow, and other minor style items. Add suppressions for endian checks which are constant on a given arch.
nasa · Nov 3, 2022 · 660590b · 660590b
1 parent 7a220ae
commit 660590b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 2 deletions.
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -10,4 +10,4 @@ jobs:
  name: Run cppcheck
  uses: nasa/cFS/.github/workflows/static-analysis.yml@main
  with:
- strict-dir-list: './modules/core_api/fsw ./modules/core_private/fsw ./modules/es/fsw ./modules/evs/fsw ./modules/fs/fsw ./modules/msg/fsw ./modules/resourceid/fsw ./modules/sb/fsw ./modules/sbr/fsw ./modules/tbl/fsw ./modules/time/fsw -UCFE_PLATFORM_TIME_CFG_CLIENT -DCFE_PLATFORM_TIME_CFG_SERVER'
+ strict-dir-list: './modules/core_api/fsw ./modules/core_private/fsw ./modules/es/fsw ./modules/evs/fsw ./modules/fs/fsw ./modules/msg/fsw ./modules/resourceid/fsw ./modules/sb/fsw ./modules/sbr/fsw ./modules/tbl/fsw ./modules/time/fsw -UCFE_PLATFORM_TIME_CFG_CLIENT -DCFE_PLATFORM_TIME_CFG_SERVER'
diff --git a/modules/fs/fsw/src/cfe_fs_api.c b/modules/fs/fsw/src/cfe_fs_api.c
@@ -139,6 +139,7 @@ CFE_Status_t CFE_FS_ReadHeader(CFE_FS_Header_t *Hdr, osal_id_t FileDes)
  OsStatus = OS_read(FileDes, Hdr, sizeof(CFE_FS_Header_t));
 
  /* Determine if this processor is a little endian processor */
+ /* cppcheck-suppress knownConditionTrueFalse */
  if ((*(char *)(&EndianCheck)) == 0x04)
  {
  /* If this is a little endian processor, then convert the header data structure from */
@@ -231,6 +232,7 @@ CFE_Status_t CFE_FS_WriteHeader(osal_id_t FileDes, CFE_FS_Header_t *Hdr)
  /*
  ** Determine if this is a little endian processor
  */
+ /* cppcheck-suppress knownConditionTrueFalse */
  if ((*(char *)(&EndianCheck)) == 0x04)
  {
  /* If this is a little endian processor, then convert the header data structure from */
@@ -246,6 +248,7 @@ CFE_Status_t CFE_FS_WriteHeader(osal_id_t FileDes, CFE_FS_Header_t *Hdr)
  /*
  ** Determine if this is a little endian processor
  */
+ /* cppcheck-suppress knownConditionTrueFalse */
  if ((*(char *)(&EndianCheck)) == 0x04)
  {
  /* If this is a little endian processor, then convert the header data structure back */
@@ -290,6 +293,7 @@ CFE_Status_t CFE_FS_SetTimestamp(osal_id_t FileDes, CFE_TIME_SysTime_t NewTimest
  /*
  ** Determine if this is a little endian processor
  */
+ /* cppcheck-suppress knownConditionTrueFalse */
  if ((*(char *)(&EndianCheck)) == 0x04)
  {
  /* If this processor is a little endian processor, then convert the timestamp to a big */

diff --git a/modules/sb/fsw/src/cfe_sb_priv.h b/modules/sb/fsw/src/cfe_sb_priv.h
@@ -564,7 +564,7 @@ static inline CFE_SB_BufferLink_t *CFE_SB_TrackingListGetNext(CFE_SB_BufferLink_
 /**
  * \brief For SB buffer tracking, checks if this current position represents the end of the list
  */
-static inline bool CFE_SB_TrackingListIsEnd(CFE_SB_BufferLink_t *List, CFE_SB_BufferLink_t *Node)
+static inline bool CFE_SB_TrackingListIsEnd(const CFE_SB_BufferLink_t *List, const CFE_SB_BufferLink_t *Node)
 {
  /* Normally list nodes should never have NULL, buf if they do, do not follow it */
  return (Node == NULL || Node == List);

diff --git a/modules/tbl/fsw/src/cfe_tbl_internal.c b/modules/tbl/fsw/src/cfe_tbl_internal.c
@@ -1113,6 +1113,7 @@ int32 CFE_TBL_ReadHeaders(osal_id_t FileDescriptor, CFE_FS_Header_t *StdFileHead
  /* All "required" checks have passed and we are pointing at the data */
  Status = CFE_SUCCESS;
 
+ /* cppcheck-suppress knownConditionTrueFalse */
  if ((*(char *)&EndianCheck) == 0x04)
  {
  /* If this is a little endian processor, then the standard cFE Table Header, */

diff --git a/modules/tbl/ut-coverage/tbl_UT.c b/modules/tbl/ut-coverage/tbl_UT.c
@@ -2401,6 +2401,8 @@ void Test_CFE_TBL_ReleaseAddresses(void)
  /* Test releasing 0 then 1 addresses */
  UT_InitData();
 
+ memset(&File, 0, sizeof(File));
+
  /* a. Configure for successful file read to initialize table */
  strncpy(FileHeader.Description, "FS header description", sizeof(FileHeader.Description) - 1);
  FileHeader.Description[sizeof(FileHeader.Description) - 1] = '\0';
@@ -3057,6 +3059,8 @@ void Test_CFE_TBL_TblMod(void)
  /* b. Perform test */
  UT_ClearEventHistory();
 
+ memset(&File, 0, sizeof(File));
+
  /* Configure for successful file read to initialize table */
  strncpy(FileHeader.Description, "FS header description", sizeof(FileHeader.Description) - 1);
  FileHeader.Description[sizeof(FileHeader.Description) - 1] = '\0';