Merge pull request nasa#1236 from skliper/fix1186-rm_useless_assignments

Fix nasa#1186, Remove useless assignments/checks
jphickey · Mar 24, 2021 · 015ac64 · 015ac64
2 parents 8807e63 + 7091426
commit 015ac64
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 5 deletions.
diff --git a/modules/es/fsw/src/cfe_es_apps.c b/modules/es/fsw/src/cfe_es_apps.c
@@ -110,7 +110,6 @@ void CFE_ES_StartApplications(uint32 ResetType, const char *StartFilePath)
         else
         {
             CFE_ES_WriteToSysLog("ES Startup: Cannot Open Volatile Startup file, Trying Nonvolatile.\n");
-            FileOpened = false;
         }
 
     } /* end if */
@@ -141,7 +140,6 @@ void CFE_ES_StartApplications(uint32 ResetType, const char *StartFilePath)
         {
             CFE_ES_WriteToSysLog("ES Startup: Error, Can't Open ES App Startup file: %s EC = 0x%08X\n", StartFilePath,
                                  (unsigned int)Status);
-            FileOpened = false;
         }
     }
 

diff --git a/modules/es/fsw/src/cfe_es_generic_pool.c b/modules/es/fsw/src/cfe_es_generic_pool.c
@@ -419,7 +419,6 @@ int32 CFE_ES_GenPoolGetBlockSize(CFE_ES_GenPoolRecord_t *PoolRecPtr, size_t *Blo
         else
         {
             *BlockSizePtr = BdPtr->ActualSize;
-            Status        = CFE_SUCCESS;
         }
     }
 

diff --git a/modules/es/fsw/src/cfe_es_mempool.c b/modules/es/fsw/src/cfe_es_mempool.c
@@ -172,7 +172,7 @@ int32 CFE_ES_PoolCreateEx(CFE_ES_MemHandle_t *PoolID, uint8 *MemPtr, size_t Size
     if (BlockSizes == NULL)
     {
         BlockSizes = CFE_ES_MemPoolDefSize;
-        if (NumBlockSizes == 0 || NumBlockSizes > CFE_PLATFORM_ES_POOL_MAX_BUCKETS)
+        if (NumBlockSizes == 0)
         {
             NumBlockSizes = CFE_PLATFORM_ES_POOL_MAX_BUCKETS;
         }

diff --git a/modules/evs/fsw/src/cfe_evs_task.c b/modules/evs/fsw/src/cfe_evs_task.c
@@ -80,7 +80,6 @@ int32 CFE_EVS_EarlyInit(void)
     /* Elements stored in the hk packet that have non-zero default values */
     CFE_EVS_Global.EVS_TlmPkt.Payload.MessageFormatMode = CFE_PLATFORM_EVS_DEFAULT_MSG_FORMAT_MODE;
     CFE_EVS_Global.EVS_TlmPkt.Payload.OutputPort        = CFE_PLATFORM_EVS_PORT_DEFAULT;
-    CFE_EVS_Global.EVS_TlmPkt.Payload.LogFullFlag       = false;
     CFE_EVS_Global.EVS_TlmPkt.Payload.LogMode           = CFE_PLATFORM_EVS_DEFAULT_LOG_MODE;
 
     /* Get a pointer to the CFE reset area from the BSP */