Skip to content

Commit

Permalink
Fix nasa#54, Remove unnecessary parentheses around return values
Browse files Browse the repository at this point in the history
  • Loading branch information
@thnkslprpt
thnkslprpt committed Mar 13, 2023
1 parent 487169b commit ff27b9c
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 45 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ predetermined times. SC supports both Absolute Time tagged command Sequences
(ATSs) and multiple Relative Time tagged command Sequences (RTSs). The
purpose of ATS commands is to be able to specify commands to be executed at a
specific time. The purpose of Relative Time Sequence commands is to be able
to specify commands to be executed at a relative times.
to specify commands to be executed at a relative time.

The SC application is written in C and depends on the cFS Operating System
Abstraction Layer (OSAL) and cFE components. There is additional SC application
Expand Down
2 changes: 1 addition & 1 deletion fsw/inc/sc_platform_cfg.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
* The number of RTS's allowed in the system
*
* \par Limits:
* This parameter can't be larger than 999.This parameter will dicate the size of
* This parameter can't be larger than 999.This parameter will dictate the size of
* The RTS Info Table.
*/
#define SC_NUMBER_OF_RTS 64
Expand Down
54 changes: 27 additions & 27 deletions fsw/src/sc_app.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ int32 SC_AppInit(void)
if (Result != CFE_SUCCESS)
{
CFE_ES_WriteToSysLog("Event Services Register returned: 0x%08X\n", (unsigned int)Result);
return (Result);
return Result;
}

/* Must be able to create Software Bus message pipe */
Expand All @@ -182,7 +182,7 @@ int32 SC_AppInit(void)
{
CFE_EVS_SendEvent(SC_INIT_SB_CREATE_ERR_EID, CFE_EVS_EventType_ERROR,
"Software Bus Create Pipe returned: 0x%08X", (unsigned int)Result);
return (Result);
return Result;
}

/* Must be able to subscribe to HK request command */
Expand All @@ -191,7 +191,7 @@ int32 SC_AppInit(void)
{
CFE_EVS_SendEvent(SC_INIT_SB_SUBSCRIBE_HK_ERR_EID, CFE_EVS_EventType_ERROR,
"Software Bus subscribe to housekeeping returned: 0x%08X", (unsigned int)Result);
return (Result);
return Result;
}

/* Must be able to subscribe to 1Hz wakeup command */
Expand All @@ -200,7 +200,7 @@ int32 SC_AppInit(void)
{
CFE_EVS_SendEvent(SC_INIT_SB_SUBSCRIBE_1HZ_ERR_EID, CFE_EVS_EventType_ERROR,
"Software Bus subscribe to 1 Hz cycle returned: 0x%08X", (unsigned int)Result);
return (Result);
return Result;
}

/* Must be able to subscribe to SC commands */
Expand All @@ -209,21 +209,21 @@ int32 SC_AppInit(void)
{
CFE_EVS_SendEvent(SC_INIT_SB_SUBSCRIBE_CMD_ERR_EID, CFE_EVS_EventType_ERROR,
"Software Bus subscribe to command returned: 0x%08X", (unsigned int)Result);
return (Result);
return Result;
}

/* Must be able to create and initialize tables */
Result = SC_InitTables();
if (Result != CFE_SUCCESS)
{
return (Result);
return Result;
}

/* Send application startup event */
CFE_EVS_SendEvent(SC_INIT_INF_EID, CFE_EVS_EventType_INFORMATION, "SC Initialized. Version %d.%d.%d.%d",
SC_MAJOR_VERSION, SC_MINOR_VERSION, SC_REVISION, SC_MISSION_REV);

return (CFE_SUCCESS);
return CFE_SUCCESS;
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand All @@ -242,14 +242,14 @@ int32 SC_InitTables(void)
Result = SC_RegisterAllTables();
if (Result != CFE_SUCCESS)
{
return (Result);
return Result;
}

/* Must be able to get dump only table pointers */
Result = SC_GetDumpTablePointers();
if (Result != CFE_SUCCESS)
{
return (Result);
return Result;
}

/* ATP control block status table */
Expand Down Expand Up @@ -286,13 +286,13 @@ int32 SC_InitTables(void)
Result = SC_GetLoadTablePointers();
if (Result != CFE_SUCCESS)
{
return (Result);
return Result;
}

/* Register for table update notification commands */
SC_RegisterManageCmds();

return (CFE_SUCCESS);
return CFE_SUCCESS;
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand All @@ -308,16 +308,16 @@ int32 SC_RegisterAllTables(void)
Result = SC_RegisterDumpOnlyTables();
if (Result != CFE_SUCCESS)
{
return (Result);
return Result;
}

Result = SC_RegisterLoadableTables();
if (Result != CFE_SUCCESS)
{
return (Result);
return Result;
}

return (CFE_SUCCESS);
return CFE_SUCCESS;
}

int32 SC_RegisterDumpOnlyTables(void)
Expand Down Expand Up @@ -345,7 +345,7 @@ int32 SC_RegisterDumpOnlyTables(void)
{
CFE_EVS_SendEvent(EventID[i], CFE_EVS_EventType_ERROR, "%s table register failed, returned: 0x%08X",
Spec[i], (unsigned int)Result);
return (Result);
return Result;
}
}

Expand All @@ -361,11 +361,11 @@ int32 SC_RegisterDumpOnlyTables(void)
CFE_EVS_SendEvent(SC_REGISTER_ATS_CMD_STATUS_TABLE_ERR_EID, CFE_EVS_EventType_ERROR,
"ATS command status table register failed for ATS %d, returned: 0x%08X", i + 1,
(unsigned int)Result);
return (Result);
return Result;
}
}

return (CFE_SUCCESS);
return CFE_SUCCESS;
}

int32 SC_RegisterLoadableTables(void)
Expand Down Expand Up @@ -397,7 +397,7 @@ int32 SC_RegisterLoadableTables(void)
CFE_EVS_SendEvent(EventID[i], CFE_EVS_EventType_ERROR,
"Table Registration Failed for %s %d, returned: 0x%08X", Spec[i], j + 1,
(unsigned int)Result);
return (Result);
return Result;
}
}
}
Expand All @@ -409,10 +409,10 @@ int32 SC_RegisterLoadableTables(void)
{
CFE_EVS_SendEvent(SC_REGISTER_APPEND_TBL_ERR_EID, CFE_EVS_EventType_ERROR,
"Append ATS Table Registration Failed, returned: 0x%08X", (unsigned int)Result);
return (Result);
return Result;
}

return (CFE_SUCCESS);
return CFE_SUCCESS;
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -440,7 +440,7 @@ int32 SC_GetDumpTablePointers(void)
{
CFE_EVS_SendEvent(EventID[i], CFE_EVS_EventType_ERROR, "Table failed Getting Address, returned: 0x%08X",
(unsigned int)Result);
return (Result);
return Result;
}
}

Expand All @@ -453,11 +453,11 @@ int32 SC_GetDumpTablePointers(void)
CFE_EVS_SendEvent(SC_GET_ADDRESS_ATS_CMD_STAT_ERR_EID, CFE_EVS_EventType_ERROR,
"ATS Cmd Status table for ATS %d failed Getting Address, returned: 0x%08X", i + 1,
(unsigned int)Result);
return (Result);
return Result;
}
}

return (CFE_SUCCESS);
return CFE_SUCCESS;
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand All @@ -480,7 +480,7 @@ int32 SC_GetLoadTablePointers(void)
{
CFE_EVS_SendEvent(SC_GET_ADDRESS_ATS_ERR_EID, CFE_EVS_EventType_ERROR,
"ATS table %d failed Getting Address, returned: 0x%08X", i + 1, (unsigned int)Result);
return (Result);
return Result;
}
}

Expand All @@ -491,7 +491,7 @@ int32 SC_GetLoadTablePointers(void)
{
CFE_EVS_SendEvent(SC_GET_ADDRESS_APPEND_ERR_EID, CFE_EVS_EventType_ERROR,
"Append ATS table failed Getting Address, returned: 0x%08X", (unsigned int)Result);
return (Result);
return Result;
}

/* Get buffer address for loadable RTS tables */
Expand All @@ -503,7 +503,7 @@ int32 SC_GetLoadTablePointers(void)
{
CFE_EVS_SendEvent(SC_GET_ADDRESS_RTS_ERR_EID, CFE_EVS_EventType_ERROR,
"RTS table %d failed Getting Address, returned: 0x%08X", i + 1, (unsigned int)Result);
return (Result);
return Result;
}

/* Process new RTS table data */
Expand All @@ -513,7 +513,7 @@ int32 SC_GetLoadTablePointers(void)
}
}

return (CFE_SUCCESS);
return CFE_SUCCESS;
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down
14 changes: 7 additions & 7 deletions fsw/src/sc_atsrq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,11 @@ void SC_StopAtsCmd(const CFE_SB_Buffer_t *BufPtr)
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
bool SC_BeginAts(uint16 AtsIndex, uint16 TimeOffset)
{
SC_AtsEntryHeader_t *Entry; /* ATS table entry pointer */
int32 EntryIndex; /* ATS entry location in table */
SC_AbsTimeTag_t ListCmdTime; /* list entry execution time */
int32 TimeIndex; /* the current time buffer index */
int32 CmdIndex; /* ATS command index (cmd num - 1) */
SC_AtsEntryHeader_t *Entry; /* ATS table entry pointer */
int32 EntryIndex; /* ATS entry location in table */
SC_AbsTimeTag_t ListCmdTime = 0; /* list entry execution time */
int32 TimeIndex; /* the current time buffer index */
int32 CmdIndex; /* ATS command index (cmd num - 1) */
bool ReturnCode;
SC_AbsTimeTag_t TimeToStartAts; /* the REAL time to start the ATS */
uint16 CmdsSkipped = 0;
Expand Down Expand Up @@ -268,7 +268,7 @@ bool SC_BeginAts(uint16 AtsIndex, uint16 TimeOffset)

} /* end if */

return (ReturnCode);
return ReturnCode;
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -483,7 +483,7 @@ bool SC_InlineSwitch(void)
/* clear out the global ground-switch pend flag */
SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag = false;

return (ReturnCode);
return ReturnCode;
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down
12 changes: 6 additions & 6 deletions fsw/src/sc_loads.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ int32 SC_ValidateAts(void *TableData)
/* Common ATS table verify function needs size of this table */
Result = SC_VerifyAtsTable((uint32 *)TableData, SC_ATS_BUFF_SIZE32);

return (Result);
return Result;
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -480,7 +480,7 @@ bool SC_ParseRts(uint32 Buffer32[])
*/

/* If Error was true , then SC_ParseRts must return false */
return (!Error);
return !Error;
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand All @@ -505,7 +505,7 @@ int32 SC_ValidateRts(void *TableData)
Result = SC_ERROR;
}

return (Result);
return Result;
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand All @@ -520,7 +520,7 @@ int32 SC_ValidateAppend(void *TableData)
/* Common ATS table verify function needs size of this table */
Result = SC_VerifyAtsTable((uint32 *)TableData, SC_APPEND_BUFF_SIZE32);

return (Result);
return Result;
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -730,7 +730,7 @@ int32 SC_VerifyAtsTable(uint32 *Buffer32, int32 BufferWords)
}
}

return (Result);
return Result;
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -838,5 +838,5 @@ int32 SC_VerifyAtsEntry(uint32 *Buffer32, int32 EntryIndex, int32 BufferWords)
}
}

return (Result);
return Result;
}
2 changes: 1 addition & 1 deletion fsw/src/sc_rtsrq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ void SC_KillRts(uint16 RtsIndex)

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* */
/* Start an RTS on initilization */
/* Start an RTS on Initialization */
/* */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
void SC_AutoStartRts(uint16 RtsNumber)
Expand Down
4 changes: 2 additions & 2 deletions fsw/src/sc_utils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ SC_AbsTimeTag_t SC_ComputeAbsTime(SC_RelTimeTag_t RelTime)
ResultTimeWSubs = CFE_TIME_Add(AbsoluteTimeWSubs, RelTimeWSubs);

/* We don't need subseconds */
return (ResultTimeWSubs.Seconds);
return ResultTimeWSubs.Seconds;
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -172,7 +172,7 @@ bool SC_VerifyCmdLength(const CFE_MSG_Message_t *Msg, size_t ExpectedLength)
SC_OperData.HkPacket.CmdErrCtr++;
}
}
return (Result);
return Result;
}

uint16 SC_ToggleAtsIndex(void)
Expand Down

0 comments on commit ff27b9c

Please sign in to comment.