Merge pull request #1231 from skliper/fix1204-alter_with_mask

Fix #1204, Use mask instead of cast to alter value
nasa · Mar 18, 2021 · 63f4eb2 · 63f4eb2
2 parents cab1e18 + ba29f16
commit 63f4eb2
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/modules/msg/fsw/src/cfe_msg_msgid_v1.c b/modules/msg/fsw/src/cfe_msg_msgid_v1.c
@@ -65,8 +65,9 @@ int32 CFE_MSG_SetMsgId(CFE_MSG_Message_t *MsgPtr, CFE_SB_MsgId_t MsgId)
         return CFE_MSG_BAD_ARGUMENT;
     }
 
-    MsgPtr->CCSDS.Pri.StreamId[0] = (uint8)(msgidval >> 8);
-    MsgPtr->CCSDS.Pri.StreamId[1] = (uint8)(msgidval);
+    /* Shift and mask bytes to be endian agnostic */
+    MsgPtr->CCSDS.Pri.StreamId[0] = (msgidval >> 8) & 0xFF;
+    MsgPtr->CCSDS.Pri.StreamId[1] = msgidval & 0xFF;
 
     return CFE_SUCCESS;
 }