Skip to content

Fix #48, Remove 'return;' from last line of void functions. #49

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

Merged
merged 1 commit into from
Oct 3, 2022
Merged

Fix #48, Remove 'return;' from last line of void functions. #49

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
5 changes: 0 additions & 5 deletions fsw/src/cs_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,8 +566,6 @@ void CS_HousekeepingCmd(const CS_NoArgsCmd_t *CmdPtr)
CFE_SB_TimeStampMsg(&CS_AppData.HkPacket.TlmHeader.Msg);
CFE_SB_TransmitMsg(&CS_AppData.HkPacket.TlmHeader.Msg, true);
}

return;
} /* End of CS_HousekeepingCmd () */

#if (CS_PRESERVE_STATES_ON_PROCESSOR_RESET == true)
Expand Down Expand Up @@ -710,9 +708,6 @@ void CS_UpdateCDS(void)
CS_AppData.DataStoreHandle = CFE_ES_CDS_BAD_HANDLE;
}
}

return;

} /* End of CS_UpdateCDS() */
#endif /* #if (CS_PRESERVE_STATES_ON_PROCESSOR_RESET == true ) */

Expand Down
6 changes: 0 additions & 6 deletions fsw/src/cs_app_cmds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ void CS_DisableAppCmd(const CS_NoArgsCmd_t *CmdPtr)
CS_AppData.HkPacket.CmdCounter++;
}
}
return;
} /* End of CS_DisableAppCmd () */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -97,7 +96,6 @@ void CS_EnableAppCmd(const CS_NoArgsCmd_t *CmdPtr)
CS_AppData.HkPacket.CmdCounter++;
}
}
return;
} /* End of CS_EnableAppCmd () */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -142,7 +140,6 @@ void CS_ReportBaselineAppCmd(const CS_AppNameCmd_t *CmdPtr)
CS_AppData.HkPacket.CmdErrCounter++;
}
}
return;
} /* End of CS_ReportBaselineAppCmd () */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -212,7 +209,6 @@ void CS_RecomputeBaselineAppCmd(const CS_AppNameCmd_t *CmdPtr)
CS_AppData.HkPacket.CmdErrCounter++;
}
}
return;
} /* end CS_RecomputeBaselineAppCmd */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -270,7 +266,6 @@ void CS_DisableNameAppCmd(const CS_AppNameCmd_t *CmdPtr)
}
} /* end InProgress if */
}
return;
} /* End of CS_DisableNameAppCmd () */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -324,7 +319,6 @@ void CS_EnableNameAppCmd(const CS_AppNameCmd_t *CmdPtr)
}
} /* end InProgress if */
}
return;
} /* End of CS_EnableNameAppCmd () */

/************************/
Expand Down
17 changes: 0 additions & 17 deletions fsw/src/cs_cmds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ void CS_NoopCmd(const CS_NoArgsCmd_t *CmdPtr)
CFE_EVS_SendEvent(CS_NOOP_INF_EID, CFE_EVS_EventType_INFORMATION, "No-op command. Version %d.%d.%d.%d",
CS_MAJOR_VERSION, CS_MINOR_VERSION, CS_REVISION, CS_MISSION_REV);
}
return;
} /* End of CS_NoopCmd () */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -88,7 +87,6 @@ void CS_ResetCmd(const CS_NoArgsCmd_t *CmdPtr)

CFE_EVS_SendEvent(CS_RESET_DBG_EID, CFE_EVS_EventType_DEBUG, "Reset Counters command recieved");
}
return;
} /* End of CS_ResetCmd () */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -198,7 +196,6 @@ void CS_BackgroundCheckCycle(const CS_NoArgsCmd_t *CmdPtr)
/* CS is disabled, Application-wide */
}
}
return;
} /* End of CS_BackgroundCheckCycle () */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -230,7 +227,6 @@ void CS_DisableAllCSCmd(const CS_NoArgsCmd_t *CmdPtr)

CFE_EVS_SendEvent(CS_DISABLE_ALL_INF_EID, CFE_EVS_EventType_INFORMATION, "Background Checksumming Disabled");
}
return;
} /* End of CS_DisableAllCSCmd () */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand All @@ -252,7 +248,6 @@ void CS_EnableAllCSCmd(const CS_NoArgsCmd_t *CmdPtr)

CFE_EVS_SendEvent(CS_ENABLE_ALL_INF_EID, CFE_EVS_EventType_INFORMATION, "Background Checksumming Enabled");
}
return;
} /* End of CS_EnableAllCSCmd () */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -280,7 +275,6 @@ void CS_DisableCfeCoreCmd(const CS_NoArgsCmd_t *CmdPtr)

CS_AppData.HkPacket.CmdCounter++;
}
return;
} /* End of CS_DisableCfeCoreCmd () */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand All @@ -307,9 +301,6 @@ void CS_EnableCfeCoreCmd(const CS_NoArgsCmd_t *CmdPtr)

CS_AppData.HkPacket.CmdCounter++;
}

return;

} /* End of CS_EnableCfeCoreCmd () */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -337,7 +328,6 @@ void CS_DisableOSCmd(const CS_NoArgsCmd_t *CmdPtr)

CS_AppData.HkPacket.CmdCounter++;
}
return;
} /* End of CS_DisableOSCmd () */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand All @@ -364,7 +354,6 @@ void CS_EnableOSCmd(const CS_NoArgsCmd_t *CmdPtr)

CS_AppData.HkPacket.CmdCounter++;
}
return;
} /* End of CS_OSEnableCmd () */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -393,7 +382,6 @@ void CS_ReportBaselineCfeCoreCmd(const CS_NoArgsCmd_t *CmdPtr)
}
CS_AppData.HkPacket.CmdCounter++;
}
return;
} /* End of CS_ReportBaselineCfeCoreCmd () */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -422,7 +410,6 @@ void CS_ReportBaselineOSCmd(const CS_NoArgsCmd_t *CmdPtr)
}
CS_AppData.HkPacket.CmdCounter++;
}
return;
} /* End of CS_ReportBaselineOSCmd () */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -477,7 +464,6 @@ void CS_RecomputeBaselineCfeCoreCmd(const CS_NoArgsCmd_t *CmdPtr)
CS_AppData.HkPacket.CmdErrCounter++;
}
}
return;
} /* end CS_RecomputeBaselineCfeCoreCmd */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -530,7 +516,6 @@ void CS_RecomputeBaselineOSCmd(const CS_NoArgsCmd_t *CmdPtr)
CS_AppData.HkPacket.CmdErrCounter++;
}
}
return;
} /* end CS_RecomputeBaselineOSCmd */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -613,7 +598,6 @@ void CS_OneShotCmd(const CS_OneShotCmd_t *CmdPtr)
CS_AppData.HkPacket.CmdErrCounter++;
}
}
return;
} /* end CS_OneShotCmd */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -659,7 +643,6 @@ void CS_CancelOneShotCmd(const CS_NoArgsCmd_t *CmdPtr)
CS_AppData.HkPacket.CmdErrCounter++;
}
}
return;
} /* end CS_CancelOneShotCmd */

/************************/
Expand Down
7 changes: 0 additions & 7 deletions fsw/src/cs_compute.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,8 +564,6 @@ void CS_RecomputeEepromMemoryChildTask(void)

CS_AppData.HkPacket.RecomputeInProgress = false;
CFE_ES_ExitChildTask();

return;
} /* end CS_RecomputeEepromMemoryChildTask */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -672,8 +670,6 @@ void CS_RecomputeAppChildTask(void)

CS_AppData.HkPacket.RecomputeInProgress = false;
CFE_ES_ExitChildTask();

return;
} /* end CS_RecomputeAppChildTask */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -780,8 +776,6 @@ void CS_RecomputeTablesChildTask(void)

CS_AppData.HkPacket.RecomputeInProgress = false;
CFE_ES_ExitChildTask();

return;
} /* end CS_RecomputeTablesChildTask */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -832,7 +826,6 @@ void CS_OneShotChildTask(void)
CS_AppData.ChildTaskID = CFE_ES_TASKID_UNDEFINED;

CFE_ES_ExitChildTask();
return;
} /* end CS_OneShotChildTask */

/************************/
Expand Down
7 changes: 0 additions & 7 deletions fsw/src/cs_eeprom_cmds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ void CS_DisableEepromCmd(const CS_NoArgsCmd_t *CmdPtr)
CS_AppData.HkPacket.CmdCounter++;
}
}
return;
} /* End of CS_DisableEepromCmd () */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -103,7 +102,6 @@ void CS_EnableEepromCmd(const CS_NoArgsCmd_t *CmdPtr)
CS_AppData.HkPacket.CmdCounter++;
}
}
return;
} /* End of CS_EnableEepromCmd () */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -162,7 +160,6 @@ void CS_ReportBaselineEntryIDEepromCmd(const CS_EntryCmd_t *CmdPtr)
CS_AppData.HkPacket.CmdErrCounter++;
}
}
return;
} /* End of CS_ReportBaselineEntryIDCmd () */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -247,7 +244,6 @@ void CS_RecomputeBaselineEepromCmd(const CS_EntryCmd_t *CmdPtr)
CS_AppData.HkPacket.CmdErrCounter++;
}
}
return;
} /* end CS_RecomputeBaselineEepromCmd */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -316,7 +312,6 @@ void CS_EnableEntryIDEepromCmd(const CS_EntryCmd_t *CmdPtr)
}
} /* end InProgress if */
}
return;
} /* End of CS_EnableCSEntryIDEepromCmd () */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -387,7 +382,6 @@ void CS_DisableEntryIDEepromCmd(const CS_EntryCmd_t *CmdPtr)
}
} /* end InProgress if */
}
return;
} /* End of CS_DisableCSEntryIDEepromCmd () */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -432,7 +426,6 @@ void CS_GetEntryIDEepromCmd(const CS_GetEntryIDCmd_t *CmdPtr)
}
CS_AppData.HkPacket.CmdCounter++;
}
return;
} /* End of CS_GetEntryIDEepromCmd () */

/************************/
Expand Down
6 changes: 3 additions & 3 deletions fsw/src/cs_events.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1257,7 +1257,7 @@
* \par Cause:
*
* This event message is issued when a recompute entry for Eeprom or Memory
* has finished sucesessfully.
* has finished succesessfully.
*/
#define CS_RECOMPUTE_FINISH_EEPROM_MEMORY_INF_EID 95

Expand Down Expand Up @@ -1293,7 +1293,7 @@
* \par Cause:
*
* This event message is issued when a recompute entry for a Table
* has finished sucesessfully.
* has finished succesessfully.
*
* For the CS Table Definitions Table only, the checksum
* value will be incorrect. This is because all entries in this
Expand All @@ -1312,7 +1312,7 @@
* \par Cause:
*
* This event message is issued when a recompute entry for an app
* has finished sucesessfully.
* has finished succesessfully.
*/
#define CS_RECOMPUTE_FINISH_APP_INF_EID 99

Expand Down
8 changes: 0 additions & 8 deletions fsw/src/cs_memory_cmds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ void CS_DisableMemoryCmd(const CS_NoArgsCmd_t *CmdPtr)
CS_AppData.HkPacket.CmdCounter++;
}
}
return;
} /* End of CS_DisableMemoryCmd () */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -102,7 +101,6 @@ void CS_EnableMemoryCmd(const CS_NoArgsCmd_t *CmdPtr)
CS_AppData.HkPacket.CmdCounter++;
}
}
return;
} /* End of CS_EnableMemoryCmd () */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -160,7 +158,6 @@ void CS_ReportBaselineEntryIDMemoryCmd(const CS_EntryCmd_t *CmdPtr)
CS_AppData.HkPacket.CmdErrCounter++;
}
}
return;
} /* End of CS_ReportBaselineEntryIDCmd () */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -245,7 +242,6 @@ void CS_RecomputeBaselineMemoryCmd(const CS_EntryCmd_t *CmdPtr)
CS_AppData.HkPacket.CmdErrCounter++;
}
}
return;
} /* end CS_RecomputeBaselineMemoryCmd */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -311,7 +307,6 @@ void CS_EnableEntryIDMemoryCmd(const CS_EntryCmd_t *CmdPtr)
}
} /* end InProgress if */
}
return;
} /* End of CS_EnableCSEntryIDMemoryCmd () */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -381,7 +376,6 @@ void CS_DisableEntryIDMemoryCmd(const CS_EntryCmd_t *CmdPtr)
}
} /* end InProgress if */
}
return;
} /* End of CS_DisableCSEntryIDMemoryCmd () */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -425,8 +419,6 @@ void CS_GetEntryIDMemoryCmd(const CS_GetEntryIDCmd_t *CmdPtr)
}
CS_AppData.HkPacket.CmdCounter++;
}
return;

} /* End of CS_GetEntryIDMemoryCmd () */

/************************/
Expand Down
Loading