Merge pull request #50 from thnkslprpt/fix-49-variables-declared-mid-…

…function Fix #49, Move variables declared mid-function to the top
nasa · May 4, 2023 · 40f9480 · 40f9480
2 parents 17987cc + 6049cf3
commit 40f9480
Show file tree

Hide file tree

Showing 5 changed files with 115 additions and 150 deletions.
diff --git a/unit-test/lc_action_tests.c b/unit-test/lc_action_tests.c
@@ -1686,12 +1686,13 @@ void LC_ValidateRPN_Test_StackDepthZero2(void)
 
 void LC_ValidateRPN_Test_MaxRPNSize(void)
 {
+    int   i;
     uint8 Result;
 
     int32 IndexValue      = 0;
     int32 StackDepthValue = 0;
 
-    for (int i = 0; i < LC_MAX_RPN_EQU_SIZE; i++)
+    for (i = 0; i < LC_MAX_RPN_EQU_SIZE; i++)
     {
         LC_OperData.ADTPtr[0].RPNEquation[i] = LC_MAX_WATCHPOINTS - 1;
     }

diff --git a/unit-test/lc_app_tests.c b/unit-test/lc_app_tests.c
@@ -1345,12 +1345,11 @@ void LC_CreateTaskCDS_Test_Nominal(void)
 void LC_CreateTaskCDS_Test_WRTRegisterCDSError(void)
 {
     int32 Result;
-
-    UT_SetDeferredRetcode(UT_KEY(CFE_ES_RegisterCDS), 1, -1);
-
     int32 strCmpResult;
     char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
+    UT_SetDeferredRetcode(UT_KEY(CFE_ES_RegisterCDS), 1, -1);
+
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Error registering WRT CDS Area, RC=0x%%08X");
 
     Result = LC_CreateTaskCDS();
@@ -1369,12 +1368,11 @@ void LC_CreateTaskCDS_Test_WRTRegisterCDSError(void)
 void LC_CreateTaskCDS_Test_ARTRegisterCDSError(void)
 {
     int32 Result;
-
-    UT_SetDeferredRetcode(UT_KEY(CFE_ES_RegisterCDS), 2, -1);
-
     int32 strCmpResult;
     char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
+    UT_SetDeferredRetcode(UT_KEY(CFE_ES_RegisterCDS), 2, -1);
+
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Error registering ART CDS Area, RC=0x%%08X");
 
     Result = LC_CreateTaskCDS();
@@ -1393,12 +1391,11 @@ void LC_CreateTaskCDS_Test_ARTRegisterCDSError(void)
 void LC_CreateTaskCDS_Test_AppDataRegisterCDSError(void)
 {
     int32 Result;
-
-    UT_SetDeferredRetcode(UT_KEY(CFE_ES_RegisterCDS), 3, -1);
-
     int32 strCmpResult;
     char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
+    UT_SetDeferredRetcode(UT_KEY(CFE_ES_RegisterCDS), 3, -1);
+
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH,
              "Error registering application data CDS Area, RC=0x%%08X");