Skip to content

Fix nasa#144, removed assignments that are never used as detected by static code analysis #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
myc-yang wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix nasa#144, removed assignments that are never used as detected by static code analysis #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions fsw/src/cs_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) */
Expand Down Expand Up @@ -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)
{
Expand Down
4 changes: 2 additions & 2 deletions fsw/src/cs_cmds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
44 changes: 12 additions & 32 deletions fsw/src/cs_compute.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -609,22 +602,18 @@ 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;
CS_Def_App_Table_Entry_t *DefTblEntry = NULL;

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,
Expand Down Expand Up @@ -695,22 +684,18 @@ 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;
CS_Def_Tables_Table_Entry_t *DefTblEntry = NULL;

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,
Expand Down Expand Up @@ -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)
{
Expand Down
42 changes: 19 additions & 23 deletions fsw/src/cs_eeprom_cmds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions fsw/src/cs_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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;
Expand Down
50 changes: 22 additions & 28 deletions fsw/src/cs_memory_cmds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -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);
Expand Down
Loading
Loading