Fix nasa#711, Squashed cppcheck issues

skliper · Jun 9, 2020 · 57aeb8f · 57aeb8f
1 parent 644242c
commit 57aeb8f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/fsw/cfe-core/src/msg/src/cfe_msg_ccsdspri.c b/fsw/cfe-core/src/msg/src/cfe_msg_ccsdspri.c
@@ -133,7 +133,7 @@ int32 CFE_MSG_SetType(CFE_MSG_Message_t *MsgPtr, CFE_MSG_Type_t Type)
     }
     else
     {
-        MsgPtr->CCSDS.Pri.StreamId[0] &= ~CFE_MSG_TYPE_MASK >> 8;
+        MsgPtr->CCSDS.Pri.StreamId[0] &= ~(CFE_MSG_TYPE_MASK >> 8);
     }
 
     return CFE_SUCCESS;
@@ -171,7 +171,7 @@ int32 CFE_MSG_SetHasSecondaryHeader(CFE_MSG_Message_t *MsgPtr, bool HasSecondary
     }
     else
     {
-        MsgPtr->CCSDS.Pri.StreamId[0] &= ~CFE_MSG_SHDR_MASK >> 8;
+        MsgPtr->CCSDS.Pri.StreamId[0] &= ~(CFE_MSG_SHDR_MASK >> 8);
     }
 
     return CFE_SUCCESS;

diff --git a/fsw/cfe-core/src/msg/src/cfe_msg_sechdr_checksum.c b/fsw/cfe-core/src/msg/src/cfe_msg_sechdr_checksum.c
@@ -79,7 +79,7 @@ int32 CFE_MSG_GenerateChecksum(CFE_MSG_Message_t *MsgPtr)
     cmd->Sec.Checksum = 0;
 
     /* Compute and set */
-    cmd->Sec.Checksum = CFE_MSG_ComputeCheckSum(MsgPtr);
+    cmd->Sec.Checksum = CFE_MSG_ComputeCheckSum((CFE_MSG_Message_t *)cmd);
 
     return CFE_SUCCESS;
 }