Merge pull request #1263 from skliper/fix1261-redundant_check

Fix #1261, Remove redundant checks in CFE_EVS_EarlyInit
nasa · Mar 29, 2021 · b239365 · b239365
2 parents fddf17c + 0905f87
commit b239365
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/modules/evs/fsw/src/cfe_evs_task.c b/modules/evs/fsw/src/cfe_evs_task.c
@@ -109,11 +109,6 @@ int32 CFE_EVS_EarlyInit(void)
         CFE_PSP_Panic(CFE_PSP_PANIC_MEMORY_ALLOC);
     }
     else
-    {
-        Status = CFE_SUCCESS;
-    }
-
-    if (Status == CFE_SUCCESS)
     {
         CFE_EVS_ResetDataPtr = (CFE_ES_ResetData_t *)resetAreaAddr;
         /* Save pointer to the EVS portion of the CFE reset area */
@@ -133,12 +128,9 @@ int32 CFE_EVS_EarlyInit(void)
         }
         else
         {
+            /* Convert to CFE success type */
             Status = CFE_SUCCESS;
         }
-    }
-
-    if (Status == CFE_SUCCESS)
-    {
 
         /* Report log as enabled */
         CFE_EVS_Global.EVS_TlmPkt.Payload.LogEnabled = true;