diff --git a/fsw/src/cs_app.c b/fsw/src/cs_app.c index d4429ff..1bba32d 100644 --- a/fsw/src/cs_app.c +++ b/fsw/src/cs_app.c @@ -58,7 +58,7 @@ CS_AppData_t CS_AppData; /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ void CS_AppMain(void) { - CFE_Status_t Result = 0; + CFE_Status_t Result; CFE_SB_Buffer_t *BufPtr = NULL; /* Performance Log (start time counter) */ @@ -153,10 +153,8 @@ void CS_AppMain(void) /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ CFE_Status_t CS_AppInit(void) { - CFE_Status_t Result = CFE_SUCCESS; - /* Register for event services */ - Result = CFE_EVS_Register(NULL, 0, 0); + CFE_Status_t Result = CFE_EVS_Register(NULL, 0, 0); if (Result != CFE_SUCCESS) { diff --git a/fsw/src/cs_cmds.c b/fsw/src/cs_cmds.c index 0439255..b74db01 100644 --- a/fsw/src/cs_cmds.c +++ b/fsw/src/cs_cmds.c @@ -108,8 +108,8 @@ CFE_Status_t CS_ResetCountersCmd(const CS_ResetCountersCmd_t *CmdPtr) CFE_Status_t CS_BackgroundCheckCycleCmd(const CS_BackgroundCheckCycleCmd_t *CmdPtr) { /* command verification variables */ - bool DoneWithCycle = false; - bool EndOfList = false; + bool DoneWithCycle; + bool EndOfList; if (CS_AppData.HkPacket.Payload.ChecksumState == CS_ChecksumState_ENABLED) { diff --git a/fsw/src/cs_compute.c b/fsw/src/cs_compute.c index 71b05f6..c3b7b64 100644 --- a/fsw/src/cs_compute.c +++ b/fsw/src/cs_compute.c @@ -363,8 +363,6 @@ CS_ComputeEepromMemory(CS_Res_EepromMemory_Table_Entry_t *ResultsEntry, uint32 * CFE_Status_t Status; CS_LocalChecksumState_t State; - Status = CFE_SUCCESS; - memset(&State, 0, sizeof(State)); State.BufferAddr = CFE_ES_MEMADDRESS_TO_PTR(ResultsEntry->StartAddress); @@ -476,8 +474,6 @@ CFE_Status_t CS_ComputeApp(CS_Res_App_Table_Entry_t *ResultsEntry, uint32 *Compu CFE_Status_t Status; CS_LocalChecksumState_t State; - Status = CFE_SUCCESS; - memset(&State, 0, sizeof(State)); State.BufferAddr = CFE_ES_MEMADDRESS_TO_PTR(ResultsEntry->StartAddress); @@ -525,21 +521,18 @@ CFE_Status_t CS_ComputeApp(CS_Res_App_Table_Entry_t *ResultsEntry, uint32 *Compu void CS_RecomputeEepromMemoryChildTask(void) { uint32 NewChecksumValue = 0; - CS_Res_EepromMemory_Table_Entry_t *ResultsEntry = NULL; - uint16 EntryID = 0; - CS_ChecksumState_Enum_t PreviousState = CS_ChecksumState_EMPTY; + CS_Res_EepromMemory_Table_Entry_t *ResultsEntry = CS_AppData.RecomputeEepromMemoryEntryPtr; + uint16 EntryID = CS_AppData.ChildTaskEntryID; + CS_ChecksumState_Enum_t PreviousState = ResultsEntry->State; bool DoneWithEntry = false; CS_ChecksumState_Enum_t PreviousDefState = CS_ChecksumState_EMPTY; CS_Def_EepromMemory_Table_Entry_t *DefEntry = NULL; CS_TableWrapper_t *tw; - tw = &CS_AppData.Tbl[CS_AppData.ChildTaskTable]; - EntryID = CS_AppData.ChildTaskEntryID; - ResultsEntry = CS_AppData.RecomputeEepromMemoryEntryPtr; + tw = &CS_AppData.Tbl[CS_AppData.ChildTaskTable]; /* we want to make sure that the entry isn't being checksummed in the background at the same time we are recomputing */ - PreviousState = ResultsEntry->State; ResultsEntry->State = CS_ChecksumState_DISABLED; /* Set entry as if this is the first time we are computing the checksum, @@ -609,8 +602,8 @@ void CS_RecomputeEepromMemoryChildTask(void) void CS_RecomputeAppChildTask(void) { uint32 NewChecksumValue = 0; - CS_Res_App_Table_Entry_t *ResultsEntry = NULL; - CS_ChecksumState_Enum_t PreviousState = CS_ChecksumState_EMPTY; + CS_Res_App_Table_Entry_t *ResultsEntry = CS_AppData.RecomputeAppEntryPtr; + CS_ChecksumState_Enum_t PreviousState = ResultsEntry->State; bool DoneWithEntry = false; CFE_Status_t Status = CS_ERROR; CS_ChecksumState_Enum_t PreviousDefState = CS_ChecksumState_EMPTY; @@ -618,13 +611,9 @@ void CS_RecomputeAppChildTask(void) CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_APP_TABLE]; - /* Get the variables to use from the global data */ - ResultsEntry = CS_AppData.RecomputeAppEntryPtr; - /* we want to make sure that the entry isn't being checksummed in the background at the same time we are recomputing */ - PreviousState = ResultsEntry->State; ResultsEntry->State = CS_ChecksumState_DISABLED; /* Set entry as if this is the first time we are computing the checksum, @@ -695,8 +684,8 @@ void CS_RecomputeAppChildTask(void) void CS_RecomputeTablesChildTask(void) { uint32 NewChecksumValue = 0; - CS_Res_Tables_Table_Entry_t *ResultsEntry = NULL; - CS_ChecksumState_Enum_t PreviousState = CS_ChecksumState_EMPTY; + CS_Res_Tables_Table_Entry_t *ResultsEntry = CS_AppData.RecomputeTablesEntryPtr; + CS_ChecksumState_Enum_t PreviousState = ResultsEntry->State; bool DoneWithEntry = false; CFE_Status_t Status = CS_ERROR; CS_ChecksumState_Enum_t PreviousDefState = CS_ChecksumState_EMPTY; @@ -704,13 +693,9 @@ void CS_RecomputeTablesChildTask(void) CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_TABLES_TABLE]; - /* Get the variables to use from the global data */ - ResultsEntry = CS_AppData.RecomputeTablesEntryPtr; - /* we want to make sure that the entry isn't being checksummed in the background at the same time we are recomputing */ - PreviousState = ResultsEntry->State; ResultsEntry->State = CS_ChecksumState_DISABLED; /* Set entry as if this is the first time we are computing the checksum, @@ -779,15 +764,10 @@ void CS_RecomputeTablesChildTask(void) void CS_OneShotChildTask(void) { uint32 NewChecksumValue = 0; - size_t NumBytesRemainingCycles = 0; - size_t NumBytesThisCycle = 0; - cpuaddr FirstAddrThisCycle = 0; - size_t MaxBytesPerCycle = 0; - - NewChecksumValue = 0; - NumBytesRemainingCycles = CS_AppData.HkPacket.Payload.LastOneShotSize; - FirstAddrThisCycle = CS_AppData.HkPacket.Payload.LastOneShotAddress; - MaxBytesPerCycle = CS_AppData.HkPacket.Payload.LastOneShotMaxBytesPerCycle; + size_t NumBytesRemainingCycles = CS_AppData.HkPacket.Payload.LastOneShotSize; + size_t NumBytesThisCycle; + cpuaddr FirstAddrThisCycle = CS_AppData.HkPacket.Payload.LastOneShotAddress; + size_t MaxBytesPerCycle = CS_AppData.HkPacket.Payload.LastOneShotMaxBytesPerCycle; while (NumBytesRemainingCycles > 0) { diff --git a/fsw/src/cs_eeprom_cmds.c b/fsw/src/cs_eeprom_cmds.c index 96a55f4..d167347 100644 --- a/fsw/src/cs_eeprom_cmds.c +++ b/fsw/src/cs_eeprom_cmds.c @@ -97,13 +97,10 @@ CFE_Status_t CS_EnableEepromCmd(const CS_EnableEepromCmd_t *CmdPtr) CFE_Status_t CS_ReportBaselineEntryIDEepromCmd(const CS_ReportBaselineEntryIDEepromCmd_t *CmdPtr) { /* command verification variables */ - uint32 Baseline = 0; - uint16 EntryID = 0; - CS_ChecksumState_Enum_t State = CS_ChecksumState_EMPTY; - CS_Res_EepromMemory_Table_Entry_t *ResultsEntry = NULL; - - EntryID = CmdPtr->Payload.EntryID; - ResultsEntry = CS_GetEepromResEntry(EntryID); + uint32 Baseline; + uint16 EntryID = CmdPtr->Payload.EntryID; + CS_ChecksumState_Enum_t State; + CS_Res_EepromMemory_Table_Entry_t *ResultsEntry = CS_GetEepromResEntry(EntryID); if (ResultsEntry == NULL) { @@ -159,11 +156,11 @@ CFE_Status_t CS_ReportBaselineEntryIDEepromCmd(const CS_ReportBaselineEntryIDEep CFE_Status_t CS_RecomputeBaselineEepromCmd(const CS_RecomputeBaselineEepromCmd_t *CmdPtr) { /* command verification variables */ - CFE_ES_TaskId_t ChildTaskID = CFE_ES_TASKID_UNDEFINED; - CFE_Status_t Status = CS_ERROR; - uint16 EntryID = 0; - CS_ChecksumState_Enum_t State = CS_ChecksumState_EMPTY; - CS_Res_EepromMemory_Table_Entry_t *ResultsEntry = NULL; + CFE_ES_TaskId_t ChildTaskID = CFE_ES_TASKID_UNDEFINED; + CFE_Status_t Status; + uint16 EntryID = 0; + CS_ChecksumState_Enum_t State; + CS_Res_EepromMemory_Table_Entry_t *ResultsEntry; if (CS_AppData.HkPacket.Payload.RecomputeInProgress == false && CS_AppData.HkPacket.Payload.OneShotInProgress == false) @@ -251,11 +248,11 @@ CFE_Status_t CS_RecomputeBaselineEepromCmd(const CS_RecomputeBaselineEepromCmd_t CFE_Status_t CS_EnableEntryIDEepromCmd(const CS_EnableEntryIDEepromCmd_t *CmdPtr) { /* command verification variables */ - CS_Res_EepromMemory_Table_Entry_t *ResultsEntry = NULL; - CS_Def_EepromMemory_Table_Entry_t *DefEntry = NULL; - CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_EEPROM_TABLE]; - uint16 EntryID = 0; - CS_ChecksumState_Enum_t State = CS_ChecksumState_EMPTY; + CS_Res_EepromMemory_Table_Entry_t *ResultsEntry; + CS_Def_EepromMemory_Table_Entry_t *DefEntry; + CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_EEPROM_TABLE]; + uint16 EntryID; + CS_ChecksumState_Enum_t State; if (CS_CheckRecomputeOneshot() == false) { @@ -317,11 +314,11 @@ CFE_Status_t CS_EnableEntryIDEepromCmd(const CS_EnableEntryIDEepromCmd_t *CmdPtr CFE_Status_t CS_DisableEntryIDEepromCmd(const CS_DisableEntryIDEepromCmd_t *CmdPtr) { /* command verification variables */ - CS_Res_EepromMemory_Table_Entry_t *ResultsEntry = NULL; - CS_Def_EepromMemory_Table_Entry_t *DefEntry = NULL; - CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_EEPROM_TABLE]; - uint16 EntryID = 0; - CS_ChecksumState_Enum_t State = CS_ChecksumState_EMPTY; + CS_Res_EepromMemory_Table_Entry_t *ResultsEntry; + CS_Def_EepromMemory_Table_Entry_t *DefEntry; + CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_EEPROM_TABLE]; + uint16 EntryID; + CS_ChecksumState_Enum_t State; if (CS_CheckRecomputeOneshot() == false) { @@ -390,7 +387,6 @@ CFE_Status_t CS_GetEntryIDEepromCmd(const CS_GetEntryIDEepromCmd_t *CmdPtr) bool EntryFound = false; CS_Res_EepromMemory_Table_Entry_t *ResultsEntry; - Loop = 0; while (true) { ResultsEntry = CS_GetEepromResEntry(Loop); diff --git a/fsw/src/cs_init.c b/fsw/src/cs_init.c index 8045c5a..602925e 100644 --- a/fsw/src/cs_init.c +++ b/fsw/src/cs_init.c @@ -39,7 +39,7 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ CFE_Status_t CS_SbInit(void) { - CFE_Status_t Result = CFE_SUCCESS; + CFE_Status_t Result; /* Initialize housekeeping packet */ CFE_MSG_Init(CFE_MSG_PTR(CS_AppData.HkPacket.TelemetryHeader), @@ -239,7 +239,7 @@ CFE_Status_t CS_InitAllTables(void) /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ void CS_InitSegments(void) { - int32 ResultSegment = OS_SUCCESS; + int32 ResultSegment; uint32 CFESize; cpuaddr CFEAddress; uint32 KernelSize; diff --git a/fsw/src/cs_memory_cmds.c b/fsw/src/cs_memory_cmds.c index f509c76..b2a6a97 100644 --- a/fsw/src/cs_memory_cmds.c +++ b/fsw/src/cs_memory_cmds.c @@ -97,13 +97,10 @@ CFE_Status_t CS_EnableMemoryCmd(const CS_EnableMemoryCmd_t *CmdPtr) CFE_Status_t CS_ReportBaselineEntryIDMemoryCmd(const CS_ReportBaselineEntryIDMemoryCmd_t *CmdPtr) { /* command verification variables */ - CS_Res_EepromMemory_Table_Entry_t *ResultsEntry = NULL; - uint32 Baseline = 0; - uint16 EntryID = 0; - CS_ChecksumState_Enum_t State = CS_ChecksumState_EMPTY; - - EntryID = CmdPtr->Payload.EntryID; - ResultsEntry = CS_GetMemoryResEntry(EntryID); + uint16 EntryID = CmdPtr->Payload.EntryID; + CS_Res_EepromMemory_Table_Entry_t *ResultsEntry = CS_GetMemoryResEntry(EntryID); + uint32 Baseline; + CS_ChecksumState_Enum_t State; if (ResultsEntry == NULL) { @@ -157,13 +154,11 @@ CFE_Status_t CS_ReportBaselineEntryIDMemoryCmd(const CS_ReportBaselineEntryIDMem CFE_Status_t CS_RecomputeBaselineMemoryCmd(const CS_RecomputeBaselineMemoryCmd_t *CmdPtr) { /* command verification variables */ - CS_Res_EepromMemory_Table_Entry_t *ResultsEntry = NULL; - CFE_ES_TaskId_t ChildTaskID = CFE_ES_TASKID_UNDEFINED; - CFE_Status_t Status = CS_ERROR; - uint16 EntryID = 0; - CS_ChecksumState_Enum_t State = CS_ChecksumState_EMPTY; - - EntryID = CmdPtr->Payload.EntryID; + CS_Res_EepromMemory_Table_Entry_t *ResultsEntry; + CFE_ES_TaskId_t ChildTaskID = CFE_ES_TASKID_UNDEFINED; + CFE_Status_t Status; + uint16 EntryID = CmdPtr->Payload.EntryID; + CS_ChecksumState_Enum_t State; if (CS_AppData.HkPacket.Payload.RecomputeInProgress == false && CS_AppData.HkPacket.Payload.OneShotInProgress == false) @@ -250,11 +245,11 @@ CFE_Status_t CS_RecomputeBaselineMemoryCmd(const CS_RecomputeBaselineMemoryCmd_t CFE_Status_t CS_EnableEntryIDMemoryCmd(const CS_EnableEntryIDMemoryCmd_t *CmdPtr) { /* command verification variables */ - CS_Res_EepromMemory_Table_Entry_t *ResultsEntry = NULL; - CS_Def_EepromMemory_Table_Entry_t *DefEntry = NULL; - CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_MEMORY_TABLE]; - uint16 EntryID = 0; - CS_ChecksumState_Enum_t State = CS_ChecksumState_EMPTY; + CS_Res_EepromMemory_Table_Entry_t *ResultsEntry; + CS_Def_EepromMemory_Table_Entry_t *DefEntry; + CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_MEMORY_TABLE]; + uint16 EntryID; + CS_ChecksumState_Enum_t State; if (CS_CheckRecomputeOneshot() == false) { @@ -315,11 +310,11 @@ CFE_Status_t CS_EnableEntryIDMemoryCmd(const CS_EnableEntryIDMemoryCmd_t *CmdPtr CFE_Status_t CS_DisableEntryIDMemoryCmd(const CS_DisableEntryIDMemoryCmd_t *CmdPtr) { /* command verification variables */ - CS_Res_EepromMemory_Table_Entry_t *ResultsEntry = NULL; - CS_Def_EepromMemory_Table_Entry_t *DefEntry = NULL; - CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_MEMORY_TABLE]; - uint16 EntryID = 0; - CS_ChecksumState_Enum_t State = CS_ChecksumState_EMPTY; + CS_Res_EepromMemory_Table_Entry_t *ResultsEntry; + CS_Def_EepromMemory_Table_Entry_t *DefEntry; + CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_MEMORY_TABLE]; + uint16 EntryID; + CS_ChecksumState_Enum_t State; if (CS_CheckRecomputeOneshot() == false) { @@ -384,11 +379,10 @@ CFE_Status_t CS_DisableEntryIDMemoryCmd(const CS_DisableEntryIDMemoryCmd_t *CmdP CFE_Status_t CS_GetEntryIDMemoryCmd(const CS_GetEntryIDMemoryCmd_t *CmdPtr) { /* command verification variables */ - CS_Res_EepromMemory_Table_Entry_t *ResultsEntry = NULL; - uint16 Loop = 0; - bool EntryFound = false; + CS_Res_EepromMemory_Table_Entry_t *ResultsEntry; + uint16 Loop = 0; + bool EntryFound = false; - Loop = 0; while (true) { ResultsEntry = CS_GetMemoryResEntry(Loop); diff --git a/fsw/src/cs_table_processing.c b/fsw/src/cs_table_processing.c index e0f651a..f780000 100644 --- a/fsw/src/cs_table_processing.c +++ b/fsw/src/cs_table_processing.c @@ -419,7 +419,7 @@ CFE_Status_t CS_ValidateTablesChecksumDefinitionTable(void *TblPtr) [CS_ValidationError_DUPLICATE] = CS_VAL_TABLES_DEF_TBL_DUPL_ERR_EID, }; - CS_Def_Tables_Table_Entry_t *Entry = NULL; + CS_Def_Tables_Table_Entry_t *Entry; CS_ValidationMetrics_t Metrics; memset(&Metrics, 0, sizeof(Metrics)); @@ -497,8 +497,8 @@ CFE_Status_t CS_ValidateAppChecksumDefinitionTable(void *TblPtr) /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ void CS_ProcessNewEepromMemoryDefinitionTable(CS_TableWrapper_t *tw) { - const CS_Def_EepromMemory_Table_Entry_t *DefEntry = NULL; - CS_Res_EepromMemory_Table_Entry_t *ResultsEntry = NULL; + const CS_Def_EepromMemory_Table_Entry_t *DefEntry; + CS_Res_EepromMemory_Table_Entry_t *ResultsEntry; uint16 Loop = 0; uint16 NumRegionsInTable = 0; CS_ChecksumState_Enum_t PreviousState = CS_ChecksumState_EMPTY; @@ -510,7 +510,6 @@ void CS_ProcessNewEepromMemoryDefinitionTable(CS_TableWrapper_t *tw) *tw->GlobalState = CS_ChecksumState_DISABLED; } - Loop = 0; while (true) { ResultsEntry = CS_GetResEntryAddr(tw, Loop); @@ -610,14 +609,14 @@ void CS_ExtractNames(const CS_Def_Tables_Table_Entry_t *DefEntry, /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ void CS_ProcessNewTablesDefinitionTable(CS_TableWrapper_t *tw) { - const CS_Def_Tables_Table_Entry_t *DefEntry = NULL; - CS_Res_Tables_Table_Entry_t *ResultsEntry = NULL; + const CS_Def_Tables_Table_Entry_t *DefEntry; + CS_Res_Tables_Table_Entry_t *ResultsEntry; uint16 Loop = 0; uint16 NumRegionsInTable = 0; - CS_ChecksumState_Enum_t PreviousState = CS_ChecksumState_EMPTY; - CFE_ES_AppId_t AppID = CFE_ES_APPID_UNDEFINED; - CFE_TBL_Handle_t TableHandle = CFE_TBL_BAD_TABLE_HANDLE; - bool Owned = false; + CS_ChecksumState_Enum_t PreviousState; + CFE_ES_AppId_t AppID = CFE_ES_APPID_UNDEFINED; + CFE_TBL_Handle_t TableHandle; + bool Owned; char AppName[OS_MAX_API_NAME]; char TableAppName[OS_MAX_API_NAME]; char TableTableName[CFE_MISSION_TBL_MAX_NAME_LENGTH]; @@ -636,7 +635,6 @@ void CS_ProcessNewTablesDefinitionTable(CS_TableWrapper_t *tw) CS_AppData.Tbl[TableId].ResTblPtr = NULL; } - Loop = 0; while (true) { DefEntry = CS_GetDefEntryAddr(tw, Loop); @@ -718,18 +716,16 @@ void CS_ProcessNewTablesDefinitionTable(CS_TableWrapper_t *tw) /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ void CS_ProcessNewAppDefinitionTable(CS_TableWrapper_t *tw) { - const CS_Def_App_Table_Entry_t *DefEntry = NULL; - CS_Res_App_Table_Entry_t *ResultsEntry = NULL; + const CS_Def_App_Table_Entry_t *DefEntry; + CS_Res_App_Table_Entry_t *ResultsEntry; uint16 Loop = 0; uint16 NumRegionsInTable = 0; - CS_ChecksumState_Enum_t PreviousState = CS_ChecksumState_EMPTY; + CS_ChecksumState_Enum_t PreviousState = CS_AppData.HkPacket.Payload.AppCSState; /* We don't want to be doing chekcksums while changing the table out */ - PreviousState = CS_AppData.HkPacket.Payload.AppCSState; CS_AppData.HkPacket.Payload.AppCSState = CS_ChecksumState_DISABLED; - Loop = 0; while (true) { DefEntry = CS_GetDefEntryAddr(tw, Loop); @@ -898,14 +894,14 @@ CS_TableInit(CS_TableWrapper_t *tw, const char *DefinitionTableFileName, CFE_TBL /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ CFE_Status_t CS_HandleTableUpdate(CS_TableWrapper_t *tw) { - CFE_Status_t ReleaseResult1 = CFE_SUCCESS; - CFE_Status_t ManageResult1 = CFE_SUCCESS; - CFE_Status_t GetResult1 = CFE_SUCCESS; - CFE_Status_t ReleaseResult2 = CFE_SUCCESS; - CFE_Status_t ManageResult2 = CFE_SUCCESS; - CFE_Status_t GetResult2 = CFE_SUCCESS; - CFE_Status_t Result = CFE_SUCCESS; - int32 Loop = 0; + CFE_Status_t ReleaseResult1; + CFE_Status_t ManageResult1; + CFE_Status_t GetResult1; + CFE_Status_t ReleaseResult2; + CFE_Status_t ManageResult2; + CFE_Status_t GetResult2 = CFE_SUCCESS; + CFE_Status_t Result; + int32 Loop; CFE_TBL_Handle_t LocalHandle; CS_Res_Tables_Table_Entry_t *ResTablesTblPtr; diff --git a/fsw/src/cs_utils.c b/fsw/src/cs_utils.c index d5ff96f..aa40ec3 100644 --- a/fsw/src/cs_utils.c +++ b/fsw/src/cs_utils.c @@ -87,7 +87,7 @@ bool CS_CheckResTableNameMatch(const char *Name, uint16 TableId) *-----------------------------------------------------------------*/ void *CS_GetDefEntryAddr(CS_TableWrapper_t *tw, uint16 EntryId) { - uint8 *EntryAddr = tw->DefAddr; + uint8 *EntryAddr; if (tw->DefAddr != NULL && EntryId < tw->NumEntries) { @@ -420,11 +420,10 @@ void CS_GoToNextTable(void) /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ bool CS_GetTableResTblEntryByName(CS_Res_Tables_Table_Entry_t **EntryPtr, const char *Name) { - CS_Res_Tables_Table_Entry_t *ResultsEntry = NULL; - int32 Loop; + CS_Res_Tables_Table_Entry_t *ResultsEntry; + int32 Loop = 0; bool Status = false; - Loop = 0; while (true) { ResultsEntry = CS_GetTablesResEntry(Loop); @@ -453,11 +452,10 @@ bool CS_GetTableResTblEntryByName(CS_Res_Tables_Table_Entry_t **EntryPtr, const /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ bool CS_GetTableDefTblEntryByName(CS_Def_Tables_Table_Entry_t **EntryPtr, const char *Name) { - CS_Def_Tables_Table_Entry_t *DefinitionEntry = NULL; - int32 Loop; + CS_Def_Tables_Table_Entry_t *DefinitionEntry; + int32 Loop = 0; bool Status = false; - Loop = 0; while (true) { DefinitionEntry = CS_GetTablesDefEntry(Loop); @@ -486,11 +484,10 @@ bool CS_GetTableDefTblEntryByName(CS_Def_Tables_Table_Entry_t **EntryPtr, const /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ bool CS_GetAppResTblEntryByName(CS_Res_App_Table_Entry_t **EntryPtr, const char *Name) { - CS_Res_App_Table_Entry_t *ResultsEntry = NULL; - int32 Loop; + CS_Res_App_Table_Entry_t *ResultsEntry; + int32 Loop = 0; bool Status = false; - Loop = 0; while (true) { ResultsEntry = CS_GetAppResEntry(Loop); @@ -518,11 +515,10 @@ bool CS_GetAppResTblEntryByName(CS_Res_App_Table_Entry_t **EntryPtr, const char /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ bool CS_GetAppDefTblEntryByName(CS_Def_App_Table_Entry_t **EntryPtr, const char *Name) { - CS_Def_App_Table_Entry_t *DefinitionEntry = NULL; - int32 Loop; + CS_Def_App_Table_Entry_t *DefinitionEntry; + int32 Loop = 0; bool Status = false; - Loop = 0; while (true) { DefinitionEntry = CS_GetAppDefEntry(Loop); @@ -550,7 +546,7 @@ bool CS_GetAppDefTblEntryByName(CS_Def_App_Table_Entry_t **EntryPtr, const char /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ CS_Res_EepromMemory_Table_Entry_t *CS_FindEnabledEepromEntry(void) { - CS_Res_EepromMemory_Table_Entry_t *ResultsEntry = NULL; + CS_Res_EepromMemory_Table_Entry_t *ResultsEntry; while (true) { @@ -573,7 +569,7 @@ CS_Res_EepromMemory_Table_Entry_t *CS_FindEnabledEepromEntry(void) /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ CS_Res_EepromMemory_Table_Entry_t *CS_FindEnabledMemoryEntry(void) { - CS_Res_EepromMemory_Table_Entry_t *ResultsEntry = NULL; + CS_Res_EepromMemory_Table_Entry_t *ResultsEntry; while (true) { @@ -596,7 +592,7 @@ CS_Res_EepromMemory_Table_Entry_t *CS_FindEnabledMemoryEntry(void) /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ CS_Res_Tables_Table_Entry_t *CS_FindEnabledTablesEntry(void) { - CS_Res_Tables_Table_Entry_t *ResultsEntry = NULL; + CS_Res_Tables_Table_Entry_t *ResultsEntry; while (true) { @@ -618,7 +614,7 @@ CS_Res_Tables_Table_Entry_t *CS_FindEnabledTablesEntry(void) /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ CS_Res_App_Table_Entry_t *CS_FindEnabledAppEntry(void) { - CS_Res_App_Table_Entry_t *ResultsEntry = NULL; + CS_Res_App_Table_Entry_t *ResultsEntry; while (true) { @@ -1085,7 +1081,7 @@ void CS_ResetTablesTblResultEntry(CS_Res_Tables_Table_Entry_t *TablesTblResultEn /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ CFE_Status_t CS_HandleRoutineTableUpdates(void) { - CFE_Status_t Result = CFE_SUCCESS; + CFE_Status_t Result; uint16 TableId; CS_TableWrapper_t *tw; bool ShouldProcess;