Skip to content

Commit

Permalink
Merge pull request nasa#1236 from skliper/fix1186-rm_useless_assignments
Browse files Browse the repository at this point in the history
Fix nasa#1186, Remove useless assignments/checks
  • Loading branch information
astrogeco authored Mar 24, 2021
2 parents 8807e63 + 7091426 commit 015ac64
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 5 deletions.
2 changes: 0 additions & 2 deletions modules/es/fsw/src/cfe_es_apps.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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;
}
}

Expand Down
1 change: 0 additions & 1 deletion modules/es/fsw/src/cfe_es_generic_pool.c
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,6 @@ int32 CFE_ES_GenPoolGetBlockSize(CFE_ES_GenPoolRecord_t *PoolRecPtr, size_t *Blo
else
{
*BlockSizePtr = BdPtr->ActualSize;
Status = CFE_SUCCESS;
}
}

Expand Down
2 changes: 1 addition & 1 deletion modules/es/fsw/src/cfe_es_mempool.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
1 change: 0 additions & 1 deletion modules/evs/fsw/src/cfe_evs_task.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 015ac64

Please sign in to comment.