Merge pull request #2207 from nasa/integration-candidate

cFE Integration candidate: Caelum-rc4+dev28

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: v7.0.0-rc4+dev205
+- resolve static analysis errors in tbl_UT.c
+- See <https://github.com/nasa/cFE/pull/2197>
+
 ## Development Build: v7.0.0-rc4+dev201
 - use osal_public_api header targets in doc
 - See <https://github.com/nasa/cFE/pull/2184>

modules/core_api/fsw/inc/cfe_version.h

@@ -26,7 +26,7 @@
 #define CFE_VERSION_H
 
 /* Development Build Macro Definitions */
-#define CFE_BUILD_NUMBER   201 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
+#define CFE_BUILD_NUMBER   205 /**< @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 */

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 */

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);

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,   */

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';