Fix#711, Applied formatting

nasa · Aug 7, 2020 · 6c4958f · 6c4958f
1 parent a782f4f
commit 6c4958f
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 35 deletions.
diff --git a/modules/msg/unit-test-coverage/test_cfe_msg_ccsdsext.c b/modules/msg/unit-test-coverage/test_cfe_msg_ccsdsext.c
@@ -40,9 +40,9 @@
 /*
  * Defines
  */
-#define TEST_EDSVER_MAX  0x1F   /* Maximum value for EDS Version field */
-#define TEST_SUBSYS_MAX  0x1FF  /* Maximum value for Subsystem field */
-#define TEST_SYSTEM_MAX  0xFFFF /* Maximum value for System field */
+#define TEST_EDSVER_MAX 0x1F   /* Maximum value for EDS Version field */
+#define TEST_SUBSYS_MAX 0x1FF  /* Maximum value for Subsystem field */
+#define TEST_SYSTEM_MAX 0xFFFF /* Maximum value for System field */
 
 #define TEST_DEFAULT_SUBSYS_MASK 0x100 /* Bits that can be set by default subsys if msgid V2 */
 
@@ -70,7 +70,7 @@ void Test_MSG_Init_Ext(void)
     ASSERT_EQ(CFE_MSG_Init(&msg, CFE_SB_ValueToMsgId(msgidval_exp), sizeof(msg), true), CFE_SUCCESS);
     Test_MSG_PrintMsg(&msg, 0);
 
-     /* Default EDS version check */
+    /* Default EDS version check */
     ASSERT_EQ(CFE_MSG_GetEDSVersion(&msg, &edsver), CFE_SUCCESS);
     ASSERT_EQ(edsver, CFE_PLATFORM_EDSVER);
 
@@ -235,10 +235,10 @@ void Test_MSG_Endian(void)
 
 void Test_MSG_PlaybackFlag(void)
 {
-    CFE_MSG_Message_t msg;
-    CFE_MSG_PlaybackFlag_t  input[] = {CFE_MSG_PlayFlag_Original, CFE_MSG_PlayFlag_Playback};
-    CFE_MSG_PlaybackFlag_t  actual  = 0;
-    int               i;
+    CFE_MSG_Message_t      msg;
+    CFE_MSG_PlaybackFlag_t input[] = {CFE_MSG_PlayFlag_Original, CFE_MSG_PlayFlag_Playback};
+    CFE_MSG_PlaybackFlag_t actual  = 0;
+    int                    i;
 
     UT_Text("Bad parameter tests, Null pointers and invalid (CFE_MSG_PlayFlag_Invalid, CFE_MSG_PlayFlag_Playback + 1");
     memset(&msg, 0, sizeof(msg));
@@ -295,10 +295,10 @@ void Test_MSG_PlaybackFlag(void)
 
 void Test_MSG_Subsystem(void)
 {
-    CFE_MSG_Message_t       msg;
+    CFE_MSG_Message_t   msg;
     CFE_MSG_Subsystem_t input[] = {0, TEST_SUBSYS_MAX / 2, TEST_SUBSYS_MAX};
     CFE_MSG_Subsystem_t actual  = TEST_SUBSYS_MAX;
-    int                     i;
+    int                 i;
 
     UT_Text("Bad parameter tests, Null pointers and invalid (max valid + 1, max)");
     memset(&msg, 0, sizeof(msg));

diff --git a/modules/msg/unit-test-coverage/test_cfe_msg_checksum.c b/modules/msg/unit-test-coverage/test_cfe_msg_checksum.c
@@ -36,9 +36,9 @@
 
 void Test_MSG_Checksum(void)
 {
-    CFE_SB_CmdHdr_t   cmd;
+    CFE_SB_CmdHdr_t    cmd;
     CFE_MSG_Message_t *msgptr = (CFE_MSG_Message_t *)&cmd;
-    bool              actual;
+    bool               actual;
 
     UT_Text("Bad parameter tests, Null pointers");
     memset(&cmd, 0, sizeof(cmd));
@@ -87,5 +87,4 @@ void Test_MSG_Checksum(void)
     ASSERT_EQ(CFE_MSG_ValidateChecksum(msgptr, &actual), CFE_SUCCESS);
     ASSERT_EQ(actual, true);
     ASSERT_EQ(Test_MSG_NotZero(msgptr), MSG_LENGTH_FLAG | MSG_HASSEC_FLAG | MSG_TYPE_FLAG);
-
 }
diff --git a/modules/msg/unit-test-coverage/test_cfe_msg_fc.c b/modules/msg/unit-test-coverage/test_cfe_msg_fc.c
@@ -41,11 +41,11 @@
 
 void Test_MSG_FcnCode(void)
 {
-    CFE_SB_CmdHdr_t      cmd;
-    CFE_MSG_Message_t *msgptr = (CFE_MSG_Message_t *)&cmd;
-    CFE_MSG_FcnCode_t input[] = {0, TEST_FCNCODE_MAX / 2, TEST_FCNCODE_MAX};
-    CFE_MSG_FcnCode_t actual  = TEST_FCNCODE_MAX;
-    int               i;
+    CFE_SB_CmdHdr_t    cmd;
+    CFE_MSG_Message_t *msgptr  = (CFE_MSG_Message_t *)&cmd;
+    CFE_MSG_FcnCode_t  input[] = {0, TEST_FCNCODE_MAX / 2, TEST_FCNCODE_MAX};
+    CFE_MSG_FcnCode_t  actual  = TEST_FCNCODE_MAX;
+    int                i;
 
     UT_Text("Bad parameter tests, Null pointers, invalid (max valid + 1, max)");
     memset(&cmd, 0, sizeof(cmd));

diff --git a/modules/msg/unit-test-coverage/test_cfe_msg_init.c b/modules/msg/unit-test-coverage/test_cfe_msg_init.c
@@ -86,11 +86,11 @@ void Test_MSG_Init(void)
     UT_Text("Set to all F's, msgid value = 0, and run with clearing");
     memset(&msg, 0xFF, sizeof(msg));
     msgidval_exp = 0;
-    
+
     ASSERT_EQ(CFE_MSG_Init(&msg, CFE_SB_ValueToMsgId(msgidval_exp), sizeof(msg), true), CFE_SUCCESS);
     Test_MSG_PrintMsg(&msg, 0);
     ASSERT_EQ(CFE_MSG_GetMsgId(&msg, &msgid_act), CFE_SUCCESS);
-    ASSERT_EQ(CFE_SB_MsgIdToValue(msgid_act), msgidval_exp );
+    ASSERT_EQ(CFE_SB_MsgIdToValue(msgid_act), msgidval_exp);
     ASSERT_EQ(CFE_MSG_GetSize(&msg, &size), CFE_SUCCESS);
     ASSERT_EQ(size, sizeof(msg));
     ASSERT_EQ(CFE_MSG_GetSegmentationFlag(&msg, &segflag), CFE_SUCCESS);
@@ -111,7 +111,7 @@ void Test_MSG_Init(void)
         ASSERT_EQ(hdrver, 0);
         ASSERT_EQ(hassec, false);
     }
-          
+
     /* Confirm the rest of the fields not already explicitly checked */
     ASSERT_EQ(Test_MSG_Pri_NotZero(&msg) & ~(MSG_APID_FLAG | MSG_HDRVER_FLAG | MSG_HASSEC_FLAG),
               MSG_LENGTH_FLAG | MSG_SEGMENT_FLAG);

diff --git a/modules/msg/unit-test-coverage/test_cfe_msg_msgid_v1.c b/modules/msg/unit-test-coverage/test_cfe_msg_msgid_v1.c
@@ -35,11 +35,11 @@
 
 void Test_MSG_MsgId(void)
 {
-    CFE_MSG_Message_t   msg;
-    CFE_SB_MsgId_t      msgid = CFE_SB_ValueToMsgId(1);
-    CFE_MSG_Type_t      type;
-    CFE_MSG_ApId_t      apid;
-    bool                hassec;
+    CFE_MSG_Message_t msg;
+    CFE_SB_MsgId_t    msgid = CFE_SB_ValueToMsgId(1);
+    CFE_MSG_Type_t    type;
+    CFE_MSG_ApId_t    apid;
+    bool              hassec;
 
     UT_Text("Bad parameter tests, Null pointers and invalid (max valid + 1)");
     memset(&msg, 0, sizeof(msg));

diff --git a/modules/msg/unit-test-coverage/test_cfe_msg_time.c b/modules/msg/unit-test-coverage/test_cfe_msg_time.c
@@ -37,7 +37,7 @@
 void Test_MSG_Time(void)
 {
     CFE_SB_TlmHdr_t    tlm;
-    CFE_MSG_Message_t  *msgptr = (CFE_MSG_Message_t *)&tlm;
+    CFE_MSG_Message_t *msgptr  = (CFE_MSG_Message_t *)&tlm;
     CFE_TIME_SysTime_t input[] = {{0, 0}, {0x12345678, 0xABCDEF12}, {0xFFFFFFFF, 0xFFFFFFFF}};
     CFE_TIME_SysTime_t actual  = {0xFFFFFFFF, 0xFFFFFFFF};
     int                i;

diff --git a/modules/msg/unit-test-coverage/test_msg_ext_not.c b/modules/msg/unit-test-coverage/test_msg_ext_not.c
@@ -58,7 +58,7 @@ unsigned int Test_MSG_Ext_NotZero(const CFE_MSG_Message_t *MsgPtr)
 
 unsigned int Test_MSG_Ext_NotF(const CFE_MSG_Message_t *MsgPtr)
 {
-    unsigned int               bits = 0;
+    unsigned int           bits = 0;
     CFE_MSG_EDSVersion_t   edsver;
     CFE_MSG_Endian_t       endian;
     CFE_MSG_PlaybackFlag_t playflag;

diff --git a/modules/msg/unit-test-coverage/test_msg_not.c b/modules/msg/unit-test-coverage/test_msg_not.c
@@ -30,7 +30,7 @@
 
 unsigned int Test_MSG_NotZero(const CFE_MSG_Message_t *MsgPtr)
 {
-    unsigned int       bits = 0;
+    unsigned int bits = 0;
 
     /* Primary */
     bits |= Test_MSG_Pri_NotZero(MsgPtr);
@@ -43,7 +43,7 @@ unsigned int Test_MSG_NotZero(const CFE_MSG_Message_t *MsgPtr)
 
 unsigned int Test_MSG_NotF(const CFE_MSG_Message_t *MsgPtr)
 {
-    unsigned int       bits = 0;
+    unsigned int bits = 0;
 
     /* Primary */
     bits |= Test_MSG_Pri_NotF(MsgPtr);

diff --git a/modules/msg/unit-test-coverage/test_msg_prionly.c b/modules/msg/unit-test-coverage/test_msg_prionly.c
@@ -39,4 +39,4 @@ unsigned int Test_MSG_Ext_NotF(const CFE_MSG_Message_t *MsgPtr)
     return 0;
 }
 
-void Test_MSG_CCSDSExt(void){}
+void Test_MSG_CCSDSExt(void) {}
diff --git a/modules/msg/unit-test-coverage/test_msg_utils.c b/modules/msg/unit-test-coverage/test_msg_utils.c
@@ -32,23 +32,23 @@
 void Test_MSG_PrintMsg(const CFE_MSG_Message_t *MsgPtr, CFE_MSG_Size_t Size)
 {
 
-    int i;
+    int  i;
     char sbuf[121] = {0};
-    char wbuf[6] = {0};
+    char wbuf[6]   = {0};
 
     if (Size == 0)
     {
         CFE_MSG_GetSize(MsgPtr, &Size);
     }
 
-    for (i = 0; i < Size/2; i++)
+    for (i = 0; i < Size / 2; i++)
     {
         sprintf(wbuf, "%02X%02X ", MsgPtr->Byte[i * 2], MsgPtr->Byte[(i * 2) + 1]);
         strcat(sbuf, wbuf);
 
         /* Make sure string buffer doesn't overflow */
         if (sizeof(sbuf) < (strlen(sbuf) + 6))
-          break;
+            break;
     }
 
     UtAssert_Message(UTASSERT_CASETYPE_INFO, __FILE__, __LINE__, "Message: %s", sbuf);