Fix nasa#131, Rename CommandCode variable to FcnCode

thnkslprpt · Oct 20, 2022 · 80d5903 · 80d5903
1 parent 9e2ad8c
commit 80d5903
Showing 1 changed file with 20 additions and 18 deletions.
diff --git a/fsw/src/to_lab_app.c b/fsw/src/to_lab_app.c
@@ -157,8 +157,8 @@ int32 TO_LAB_init(void)
 
     if (status != CFE_SUCCESS)
     {
-        CFE_EVS_SendEvent(TO_LAB_TBL_ERR_EID, CFE_EVS_EventType_ERROR, "L%d TO Can't register table status %i", __LINE__,
-                          (int)status);
+        CFE_EVS_SendEvent(TO_LAB_TBL_ERR_EID, CFE_EVS_EventType_ERROR, "L%d TO Can't register table status %i",
+                          __LINE__, (int)status);
         return status;
     }
 
@@ -175,8 +175,8 @@ int32 TO_LAB_init(void)
 
     if (status != CFE_SUCCESS && status != CFE_TBL_INFO_UPDATED)
     {
-        CFE_EVS_SendEvent(TO_LAB_TBL_ERR_EID, CFE_EVS_EventType_ERROR, "L%d TO Can't get table addr status %i", __LINE__,
-                          (int)status);
+        CFE_EVS_SendEvent(TO_LAB_TBL_ERR_EID, CFE_EVS_EventType_ERROR, "L%d TO Can't get table addr status %i",
+                          __LINE__, (int)status);
         return status;
     }
 
@@ -224,8 +224,8 @@ int32 TO_LAB_init(void)
     */
     OS_TaskInstallDeleteHandler(&TO_LAB_delete_callback);
 
-    CFE_EVS_SendEvent(TO_LAB_INIT_INF_EID, CFE_EVS_EventType_INFORMATION, "TO Lab Initialized.%s, Awaiting enable command.",
-                      TO_LAB_VERSION_STRING);
+    CFE_EVS_SendEvent(TO_LAB_INIT_INF_EID, CFE_EVS_EventType_INFORMATION,
+                      "TO Lab Initialized.%s, Awaiting enable command.", TO_LAB_VERSION_STRING);
 
     return CFE_SUCCESS;
 }
@@ -285,8 +285,9 @@ void TO_LAB_process_commands(void)
                         break;
 
                     default:
-                        CFE_EVS_SendEvent(TO_LAB_MSGID_ERR_EID, CFE_EVS_EventType_ERROR, "L%d TO: Invalid Msg ID Rcvd 0x%x",
-                                          __LINE__, (unsigned int)CFE_SB_MsgIdToValue(MsgId));
+                        CFE_EVS_SendEvent(TO_LAB_MSGID_ERR_EID, CFE_EVS_EventType_ERROR,
+                                          "L%d TO: Invalid Msg ID Rcvd 0x%x", __LINE__,
+                                          (unsigned int)CFE_SB_MsgIdToValue(MsgId));
                         break;
                 }
                 break;
@@ -304,11 +305,11 @@ void TO_LAB_process_commands(void)
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 void TO_LAB_exec_local_command(CFE_SB_Buffer_t *SBBufPtr)
 {
-    CFE_MSG_FcnCode_t CommandCode = 0;
+    CFE_MSG_FcnCode_t FcnCode = 0;
 
-    CFE_MSG_GetFcnCode(&SBBufPtr->Msg, &CommandCode);
+    CFE_MSG_GetFcnCode(&SBBufPtr->Msg, &FcnCode);
 
-    switch (CommandCode)
+    switch (FcnCode)
     {
         case TO_LAB_NOOP_CC:
             TO_LAB_Noop((const TO_LAB_NoopCmd_t *)SBBufPtr);
@@ -341,7 +342,7 @@ void TO_LAB_exec_local_command(CFE_SB_Buffer_t *SBBufPtr)
         default:
             CFE_EVS_SendEvent(TO_LAB_FNCODE_ERR_EID, CFE_EVS_EventType_ERROR,
                               "L%d TO: Invalid Function Code Rcvd In Ground Command 0x%x", __LINE__,
-                              (unsigned int)CommandCode);
+                              (unsigned int)FcnCode);
             ++TO_LAB_Global.HkTlm.Payload.CommandErrorCounter;
     }
 }
@@ -445,8 +446,8 @@ void TO_LAB_openTLM(void)
     status = OS_SocketOpen(&TO_LAB_Global.TLMsockid, OS_SocketDomain_INET, OS_SocketType_DATAGRAM);
     if (status != OS_SUCCESS)
     {
-        CFE_EVS_SendEvent(TO_LAB_TLMOUTSOCKET_ERR_EID, CFE_EVS_EventType_ERROR, "L%d, TO TLM socket error: %d", __LINE__,
-                          (int)status);
+        CFE_EVS_SendEvent(TO_LAB_TLMOUTSOCKET_ERR_EID, CFE_EVS_EventType_ERROR, "L%d, TO TLM socket error: %d",
+                          __LINE__, (int)status);
     }
 
     /*---------------- Add static arp entries ----------------*/
@@ -465,11 +466,12 @@ int32 TO_LAB_AddPacket(const TO_LAB_AddPacketCmd_t *data)
     status = CFE_SB_SubscribeEx(pCmd->Stream, TO_LAB_Global.Tlm_pipe, pCmd->Flags, pCmd->BufLimit);
 
     if (status != CFE_SUCCESS)
-        CFE_EVS_SendEvent(TO_LAB_ADDPKT_ERR_EID, CFE_EVS_EventType_ERROR, "L%d TO Can't subscribe 0x%x status %i", __LINE__,
-                          (unsigned int)CFE_SB_MsgIdToValue(pCmd->Stream), (int)status);
+        CFE_EVS_SendEvent(TO_LAB_ADDPKT_ERR_EID, CFE_EVS_EventType_ERROR, "L%d TO Can't subscribe 0x%x status %i",
+                          __LINE__, (unsigned int)CFE_SB_MsgIdToValue(pCmd->Stream), (int)status);
     else
-        CFE_EVS_SendEvent(TO_LAB_ADDPKT_INF_EID, CFE_EVS_EventType_INFORMATION, "L%d TO AddPkt 0x%x, QoS %d.%d, limit %d",
-                          __LINE__, (unsigned int)CFE_SB_MsgIdToValue(pCmd->Stream), pCmd->Flags.Priority,
+        CFE_EVS_SendEvent(TO_LAB_ADDPKT_INF_EID, CFE_EVS_EventType_INFORMATION,
+                          "L%d TO AddPkt 0x%x, QoS %d.%d, limit %d", __LINE__,
+                          (unsigned int)CFE_SB_MsgIdToValue(pCmd->Stream), pCmd->Flags.Priority,
                           pCmd->Flags.Reliability, pCmd->BufLimit);
 
     ++TO_LAB_Global.HkTlm.Payload.CommandCounter;