diff --git a/modules/core_api/ut-stubs/src/cfe_es_stubs.c b/modules/core_api/ut-stubs/src/cfe_es_stubs.c index 9f36afda0..5a1a75c2c 100644 --- a/modules/core_api/ut-stubs/src/cfe_es_stubs.c +++ b/modules/core_api/ut-stubs/src/cfe_es_stubs.c @@ -29,22 +29,22 @@ #include "cfe_es.h" #include "utgenstub.h" -extern void UT_DefaultHandler_CFE_ES_AppID_ToIndex(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_ES_CopyToCDS(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_ES_ExitApp(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_ES_GetAppID(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_ES_GetAppIDByName(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_ES_GetAppName(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_ES_GetPoolBuf(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_ES_GetResetType(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_ES_GetTaskID(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_ES_GetTaskInfo(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_ES_PoolCreate(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_ES_PoolCreateNoSem(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_ES_RestoreFromCDS(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_ES_RunLoop(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_ES_TaskID_ToIndex(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_ES_WriteToSysLog(void *, UT_EntryKey_t, const UT_StubContext_t *, va_list); +void UT_DefaultHandler_CFE_ES_AppID_ToIndex(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_ES_CopyToCDS(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_ES_ExitApp(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_ES_GetAppID(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_ES_GetAppIDByName(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_ES_GetAppName(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_ES_GetPoolBuf(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_ES_GetResetType(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_ES_GetTaskID(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_ES_GetTaskInfo(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_ES_PoolCreate(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_ES_PoolCreateNoSem(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_ES_RestoreFromCDS(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_ES_RunLoop(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_ES_TaskID_ToIndex(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_ES_WriteToSysLog(void *, UT_EntryKey_t, const UT_StubContext_t *, va_list); /* * ---------------------------------------------------- diff --git a/modules/core_api/ut-stubs/src/cfe_evs_stubs.c b/modules/core_api/ut-stubs/src/cfe_evs_stubs.c index d3c4560f2..e71bf88de 100644 --- a/modules/core_api/ut-stubs/src/cfe_evs_stubs.c +++ b/modules/core_api/ut-stubs/src/cfe_evs_stubs.c @@ -29,9 +29,9 @@ #include "cfe_evs.h" #include "utgenstub.h" -extern void UT_DefaultHandler_CFE_EVS_SendEvent(void *, UT_EntryKey_t, const UT_StubContext_t *, va_list); -extern void UT_DefaultHandler_CFE_EVS_SendEventWithAppID(void *, UT_EntryKey_t, const UT_StubContext_t *, va_list); -extern void UT_DefaultHandler_CFE_EVS_SendTimedEvent(void *, UT_EntryKey_t, const UT_StubContext_t *, va_list); +void UT_DefaultHandler_CFE_EVS_SendEvent(void *, UT_EntryKey_t, const UT_StubContext_t *, va_list); +void UT_DefaultHandler_CFE_EVS_SendEventWithAppID(void *, UT_EntryKey_t, const UT_StubContext_t *, va_list); +void UT_DefaultHandler_CFE_EVS_SendTimedEvent(void *, UT_EntryKey_t, const UT_StubContext_t *, va_list); /* * ---------------------------------------------------- diff --git a/modules/core_api/ut-stubs/src/cfe_fs_stubs.c b/modules/core_api/ut-stubs/src/cfe_fs_stubs.c index 7e447664e..3485b325b 100644 --- a/modules/core_api/ut-stubs/src/cfe_fs_stubs.c +++ b/modules/core_api/ut-stubs/src/cfe_fs_stubs.c @@ -27,15 +27,15 @@ #include "cfe_fs.h" #include "utgenstub.h" -extern void UT_DefaultHandler_CFE_FS_BackgroundFileDumpIsPending(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_FS_BackgroundFileDumpRequest(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_FS_ExtractFilenameFromPath(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_FS_GetDefaultExtension(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_FS_GetDefaultMountPoint(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_FS_ParseInputFileName(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_FS_ParseInputFileNameEx(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_FS_ReadHeader(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_FS_WriteHeader(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_FS_BackgroundFileDumpIsPending(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_FS_BackgroundFileDumpRequest(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_FS_ExtractFilenameFromPath(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_FS_GetDefaultExtension(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_FS_GetDefaultMountPoint(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_FS_ParseInputFileName(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_FS_ParseInputFileNameEx(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_FS_ReadHeader(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_FS_WriteHeader(void *, UT_EntryKey_t, const UT_StubContext_t *); /* * ---------------------------------------------------- diff --git a/modules/core_api/ut-stubs/src/cfe_msg_stubs.c b/modules/core_api/ut-stubs/src/cfe_msg_stubs.c index 1c5b6059f..6168f7bbe 100644 --- a/modules/core_api/ut-stubs/src/cfe_msg_stubs.c +++ b/modules/core_api/ut-stubs/src/cfe_msg_stubs.c @@ -27,24 +27,24 @@ #include "cfe_msg.h" #include "utgenstub.h" -extern void UT_DefaultHandler_CFE_MSG_GetApId(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_MSG_GetEDSVersion(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_MSG_GetEndian(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_MSG_GetFcnCode(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_MSG_GetHasSecondaryHeader(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_MSG_GetHeaderVersion(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_MSG_GetMsgId(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_MSG_GetMsgTime(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_MSG_GetNextSequenceCount(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_MSG_GetPlaybackFlag(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_MSG_GetSegmentationFlag(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_MSG_GetSequenceCount(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_MSG_GetSize(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_MSG_GetSubsystem(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_MSG_GetSystem(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_MSG_GetType(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_MSG_GetTypeFromMsgId(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_MSG_ValidateChecksum(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_MSG_GetApId(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_MSG_GetEDSVersion(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_MSG_GetEndian(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_MSG_GetFcnCode(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_MSG_GetHasSecondaryHeader(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_MSG_GetHeaderVersion(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_MSG_GetMsgId(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_MSG_GetMsgTime(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_MSG_GetNextSequenceCount(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_MSG_GetPlaybackFlag(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_MSG_GetSegmentationFlag(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_MSG_GetSequenceCount(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_MSG_GetSize(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_MSG_GetSubsystem(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_MSG_GetSystem(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_MSG_GetType(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_MSG_GetTypeFromMsgId(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_MSG_ValidateChecksum(void *, UT_EntryKey_t, const UT_StubContext_t *); /* * ---------------------------------------------------- diff --git a/modules/core_api/ut-stubs/src/cfe_resourceid_stubs.c b/modules/core_api/ut-stubs/src/cfe_resourceid_stubs.c index 7eb1c7c7b..f565a79f3 100644 --- a/modules/core_api/ut-stubs/src/cfe_resourceid_stubs.c +++ b/modules/core_api/ut-stubs/src/cfe_resourceid_stubs.c @@ -27,10 +27,10 @@ #include "cfe_resourceid.h" #include "utgenstub.h" -extern void UT_DefaultHandler_CFE_ResourceId_FindNext(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_ResourceId_GetBase(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_ResourceId_GetSerial(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_ResourceId_ToIndex(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_ResourceId_FindNext(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_ResourceId_GetBase(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_ResourceId_GetSerial(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_ResourceId_ToIndex(void *, UT_EntryKey_t, const UT_StubContext_t *); /* * ---------------------------------------------------- diff --git a/modules/core_api/ut-stubs/src/cfe_sb_stubs.c b/modules/core_api/ut-stubs/src/cfe_sb_stubs.c index 711cb8a85..005099647 100644 --- a/modules/core_api/ut-stubs/src/cfe_sb_stubs.c +++ b/modules/core_api/ut-stubs/src/cfe_sb_stubs.c @@ -27,21 +27,21 @@ #include "cfe_sb.h" #include "utgenstub.h" -extern void UT_DefaultHandler_CFE_SB_AllocateMessageBuffer(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_SB_CreatePipe(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_SB_DeletePipe(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_SB_GetPipeIdByName(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_SB_GetPipeName(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_SB_GetUserData(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_SB_GetUserDataLength(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_SB_IsValidMsgId(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_SB_MessageStringGet(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_SB_MessageStringSet(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_SB_ReceiveBuffer(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_SB_SetUserDataLength(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_SB_TimeStampMsg(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_SB_TransmitBuffer(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_SB_TransmitMsg(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_SB_AllocateMessageBuffer(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_SB_CreatePipe(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_SB_DeletePipe(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_SB_GetPipeIdByName(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_SB_GetPipeName(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_SB_GetUserData(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_SB_GetUserDataLength(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_SB_IsValidMsgId(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_SB_MessageStringGet(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_SB_MessageStringSet(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_SB_ReceiveBuffer(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_SB_SetUserDataLength(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_SB_TimeStampMsg(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_SB_TransmitBuffer(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_SB_TransmitMsg(void *, UT_EntryKey_t, const UT_StubContext_t *); /* * ---------------------------------------------------- diff --git a/modules/core_api/ut-stubs/src/cfe_tbl_stubs.c b/modules/core_api/ut-stubs/src/cfe_tbl_stubs.c index c0c28d727..d063d91cb 100644 --- a/modules/core_api/ut-stubs/src/cfe_tbl_stubs.c +++ b/modules/core_api/ut-stubs/src/cfe_tbl_stubs.c @@ -27,9 +27,9 @@ #include "cfe_tbl.h" #include "utgenstub.h" -extern void UT_DefaultHandler_CFE_TBL_GetAddress(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_TBL_GetInfo(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_TBL_Register(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_TBL_GetAddress(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_TBL_GetInfo(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_TBL_Register(void *, UT_EntryKey_t, const UT_StubContext_t *); /* * ---------------------------------------------------- diff --git a/modules/core_api/ut-stubs/src/cfe_time_stubs.c b/modules/core_api/ut-stubs/src/cfe_time_stubs.c index 722a176e2..dc436599a 100644 --- a/modules/core_api/ut-stubs/src/cfe_time_stubs.c +++ b/modules/core_api/ut-stubs/src/cfe_time_stubs.c @@ -27,15 +27,15 @@ #include "cfe_time.h" #include "utgenstub.h" -extern void UT_DefaultHandler_CFE_TIME_Add(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_TIME_GetMET(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_TIME_GetSTCF(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_TIME_GetTAI(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_TIME_GetTime(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_TIME_GetUTC(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_TIME_MET2SCTime(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_TIME_Print(void *, UT_EntryKey_t, const UT_StubContext_t *); -extern void UT_DefaultHandler_CFE_TIME_Subtract(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_TIME_Add(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_TIME_GetMET(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_TIME_GetSTCF(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_TIME_GetTAI(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_TIME_GetTime(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_TIME_GetUTC(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_TIME_MET2SCTime(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_TIME_Print(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_TIME_Subtract(void *, UT_EntryKey_t, const UT_StubContext_t *); /* * ---------------------------------------------------- diff --git a/modules/core_private/fsw/inc/cfe_es_core_internal.h b/modules/core_private/fsw/inc/cfe_es_core_internal.h index 257c7d24f..86237f229 100644 --- a/modules/core_private/fsw/inc/cfe_es_core_internal.h +++ b/modules/core_private/fsw/inc/cfe_es_core_internal.h @@ -59,7 +59,7 @@ ** None ** ******************************************************************************/ -extern void CFE_ES_TaskMain(void); +void CFE_ES_TaskMain(void); /*****************************************************************************/ /** @@ -72,7 +72,7 @@ extern void CFE_ES_TaskMain(void); ** -# This function MUST be called before any module API's are called. ** ******************************************************************************/ -extern int32 CFE_ES_CDS_EarlyInit(void); +int32 CFE_ES_CDS_EarlyInit(void); /*****************************************************************************/ /** diff --git a/modules/core_private/fsw/inc/cfe_evs_core_internal.h b/modules/core_private/fsw/inc/cfe_evs_core_internal.h index 694833da3..712f96baf 100644 --- a/modules/core_private/fsw/inc/cfe_evs_core_internal.h +++ b/modules/core_private/fsw/inc/cfe_evs_core_internal.h @@ -59,7 +59,7 @@ ** None ** ******************************************************************************/ -extern void CFE_EVS_TaskMain(void); +void CFE_EVS_TaskMain(void); /*****************************************************************************/ /** @@ -72,7 +72,7 @@ extern void CFE_EVS_TaskMain(void); ** -# This function MUST be called before any module API's are called. ** ******************************************************************************/ -extern int32 CFE_EVS_EarlyInit(void); +int32 CFE_EVS_EarlyInit(void); /*****************************************************************************/ /** @@ -84,7 +84,7 @@ extern int32 CFE_EVS_EarlyInit(void); ** that have been allocated to the specified Application. ** ******************************************************************************/ -extern int32 CFE_EVS_CleanUpApp(CFE_ES_AppId_t AppId); +int32 CFE_EVS_CleanUpApp(CFE_ES_AppId_t AppId); /**@}*/ diff --git a/modules/core_private/fsw/inc/cfe_fs_core_internal.h b/modules/core_private/fsw/inc/cfe_fs_core_internal.h index 2a1d11b1f..2533fcedd 100644 --- a/modules/core_private/fsw/inc/cfe_fs_core_internal.h +++ b/modules/core_private/fsw/inc/cfe_fs_core_internal.h @@ -53,7 +53,7 @@ ** -# This function MUST be called before any module API's are called. ** ******************************************************************************/ -extern int32 CFE_FS_EarlyInit(void); +int32 CFE_FS_EarlyInit(void); /*****************************************************************************/ /** diff --git a/modules/core_private/fsw/inc/cfe_sb_core_internal.h b/modules/core_private/fsw/inc/cfe_sb_core_internal.h index 25ee96929..673fe7510 100644 --- a/modules/core_private/fsw/inc/cfe_sb_core_internal.h +++ b/modules/core_private/fsw/inc/cfe_sb_core_internal.h @@ -56,7 +56,7 @@ ** None ** ******************************************************************************/ -extern void CFE_SB_TaskMain(void); +void CFE_SB_TaskMain(void); /*****************************************************************************/ /** @@ -69,7 +69,7 @@ extern void CFE_SB_TaskMain(void); ** -# This function MUST be called before any module API's are called. ** ******************************************************************************/ -extern int32 CFE_SB_EarlyInit(void); +int32 CFE_SB_EarlyInit(void); /*****************************************************************************/ /** @@ -81,7 +81,7 @@ extern int32 CFE_SB_EarlyInit(void); ** that have been allocated to the specified Application. ** ******************************************************************************/ -extern int32 CFE_SB_CleanUpApp(CFE_ES_AppId_t AppId); +int32 CFE_SB_CleanUpApp(CFE_ES_AppId_t AppId); /**@}*/ diff --git a/modules/core_private/fsw/inc/cfe_tbl_core_internal.h b/modules/core_private/fsw/inc/cfe_tbl_core_internal.h index b298b2054..36a0a8da6 100644 --- a/modules/core_private/fsw/inc/cfe_tbl_core_internal.h +++ b/modules/core_private/fsw/inc/cfe_tbl_core_internal.h @@ -64,7 +64,7 @@ ** None ** ******************************************************************************/ -extern void CFE_TBL_TaskMain(void); +void CFE_TBL_TaskMain(void); /*****************************************************************************/ /** @@ -77,7 +77,7 @@ extern void CFE_TBL_TaskMain(void); ** -# This function MUST be called before any TBL API's are called. ** ******************************************************************************/ -extern int32 CFE_TBL_EarlyInit(void); +int32 CFE_TBL_EarlyInit(void); /*****************************************************************************/ /** @@ -93,7 +93,7 @@ extern int32 CFE_TBL_EarlyInit(void); ** the specified application from the Critical Data Store. ** ******************************************************************************/ -extern int32 CFE_TBL_CleanUpApp(CFE_ES_AppId_t AppId); +int32 CFE_TBL_CleanUpApp(CFE_ES_AppId_t AppId); /**@}*/ diff --git a/modules/core_private/fsw/inc/cfe_time_core_internal.h b/modules/core_private/fsw/inc/cfe_time_core_internal.h index 0c0fc5839..c883eb65c 100644 --- a/modules/core_private/fsw/inc/cfe_time_core_internal.h +++ b/modules/core_private/fsw/inc/cfe_time_core_internal.h @@ -56,7 +56,7 @@ ** None ** ******************************************************************************/ -extern void CFE_TIME_TaskMain(void); +void CFE_TIME_TaskMain(void); /*****************************************************************************/ /** @@ -69,7 +69,7 @@ extern void CFE_TIME_TaskMain(void); ** -# This function MUST be called before any module API's are called. ** ******************************************************************************/ -extern int32 CFE_TIME_EarlyInit(void); +int32 CFE_TIME_EarlyInit(void); /*****************************************************************************/ /** @@ -81,7 +81,7 @@ extern int32 CFE_TIME_EarlyInit(void); ** that have been allocated to the specified Application. ** ******************************************************************************/ -extern int32 CFE_TIME_CleanUpApp(CFE_ES_AppId_t AppId); +int32 CFE_TIME_CleanUpApp(CFE_ES_AppId_t AppId); /**@}*/ diff --git a/modules/core_private/ut-stubs/src/cfe_es_core_internal_stubs.c b/modules/core_private/ut-stubs/src/cfe_es_core_internal_stubs.c index c3f75ef0f..ff53a95da 100644 --- a/modules/core_private/ut-stubs/src/cfe_es_core_internal_stubs.c +++ b/modules/core_private/ut-stubs/src/cfe_es_core_internal_stubs.c @@ -27,7 +27,7 @@ #include "cfe_es_core_internal.h" #include "utgenstub.h" -extern void UT_DefaultHandler_CFE_ES_RegisterCDSEx(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_ES_RegisterCDSEx(void *, UT_EntryKey_t, const UT_StubContext_t *); /* * ---------------------------------------------------- diff --git a/modules/core_private/ut-stubs/src/cfe_fs_core_internal_stubs.c b/modules/core_private/ut-stubs/src/cfe_fs_core_internal_stubs.c index 8b4c3e176..f9540e6a1 100644 --- a/modules/core_private/ut-stubs/src/cfe_fs_core_internal_stubs.c +++ b/modules/core_private/ut-stubs/src/cfe_fs_core_internal_stubs.c @@ -27,7 +27,7 @@ #include "cfe_fs_core_internal.h" #include "utgenstub.h" -extern void UT_DefaultHandler_CFE_FS_RunBackgroundFileDump(void *, UT_EntryKey_t, const UT_StubContext_t *); +void UT_DefaultHandler_CFE_FS_RunBackgroundFileDump(void *, UT_EntryKey_t, const UT_StubContext_t *); /* * ---------------------------------------------------- diff --git a/modules/core_private/ut-stubs/src/ut_support.c b/modules/core_private/ut-stubs/src/ut_support.c index c9eec791d..f38ca3823 100644 --- a/modules/core_private/ut-stubs/src/ut_support.c +++ b/modules/core_private/ut-stubs/src/ut_support.c @@ -69,7 +69,7 @@ static uint16 UT_SendEventHistory[UT_EVENT_HISTORY_SIZE]; static uint16 UT_SendTimedEventHistory[UT_EVENT_HISTORY_SIZE]; static uint16 UT_SendEventAppIDHistory[UT_EVENT_HISTORY_SIZE * 10]; -extern int32 dummy_function(void); +int32 dummy_function(void); /* ** Functions diff --git a/modules/es/fsw/src/cfe_es_global.h b/modules/es/fsw/src/cfe_es_global.h index c522ac0a5..c3794ac50 100644 --- a/modules/es/fsw/src/cfe_es_global.h +++ b/modules/es/fsw/src/cfe_es_global.h @@ -240,7 +240,7 @@ extern CFE_ES_Global_t CFE_ES_Global; * @param FunctionName the name of the function/caller * @param LineNumber the line number of the caller */ -extern void CFE_ES_LockSharedData(const char *FunctionName, int32 LineNumber); +void CFE_ES_LockSharedData(const char *FunctionName, int32 LineNumber); /*---------------------------------------------------------------------------------------*/ /** @@ -252,6 +252,6 @@ extern void CFE_ES_LockSharedData(const char *FunctionName, int32 LineNumber); * @param FunctionName the name of the function/caller * @param LineNumber the line number of the caller */ -extern void CFE_ES_UnlockSharedData(const char *FunctionName, int32 LineNumber); +void CFE_ES_UnlockSharedData(const char *FunctionName, int32 LineNumber); #endif /* CFE_ES_GLOBAL_H */ diff --git a/modules/es/fsw/src/cfe_es_resource.h b/modules/es/fsw/src/cfe_es_resource.h index ec35beedd..a4b4605b0 100644 --- a/modules/es/fsw/src/cfe_es_resource.h +++ b/modules/es/fsw/src/cfe_es_resource.h @@ -64,7 +64,7 @@ * @param[in] AppID the app ID to locate * @return pointer to App Table entry for the given app ID, or NULL if out of range */ -extern CFE_ES_AppRecord_t *CFE_ES_LocateAppRecordByID(CFE_ES_AppId_t AppID); +CFE_ES_AppRecord_t *CFE_ES_LocateAppRecordByID(CFE_ES_AppId_t AppID); /*---------------------------------------------------------------------------------------*/ /** @@ -92,7 +92,7 @@ extern CFE_ES_AppRecord_t *CFE_ES_LocateAppRecordByID(CFE_ES_AppId_t AppID); * @param[in] LibID the Lib ID to locate * @return pointer to Library Table entry for the given Lib ID, or NULL if out of range */ -extern CFE_ES_LibRecord_t *CFE_ES_LocateLibRecordByID(CFE_ES_LibId_t LibID); +CFE_ES_LibRecord_t *CFE_ES_LocateLibRecordByID(CFE_ES_LibId_t LibID); /*---------------------------------------------------------------------------------------*/ /** @@ -120,7 +120,7 @@ extern CFE_ES_LibRecord_t *CFE_ES_LocateLibRecordByID(CFE_ES_LibId_t LibID); * @param[in] TaskID the task ID to locate * @return pointer to Task Table entry for the given task ID, or NULL if out of range */ -extern CFE_ES_TaskRecord_t *CFE_ES_LocateTaskRecordByID(CFE_ES_TaskId_t TaskID); +CFE_ES_TaskRecord_t *CFE_ES_LocateTaskRecordByID(CFE_ES_TaskId_t TaskID); /*---------------------------------------------------------------------------------------*/ /** @@ -148,7 +148,7 @@ extern CFE_ES_TaskRecord_t *CFE_ES_LocateTaskRecordByID(CFE_ES_TaskId_t TaskID); * @param[in] CounterID the Counter ID to locate * @return pointer to Counter Table entry for the given Counter ID, or NULL if out of range */ -extern CFE_ES_GenCounterRecord_t *CFE_ES_LocateCounterRecordByID(CFE_ES_CounterId_t CounterID); +CFE_ES_GenCounterRecord_t *CFE_ES_LocateCounterRecordByID(CFE_ES_CounterId_t CounterID); /*---------------------------------------------------------------------------------------*/ /** @@ -659,7 +659,7 @@ static inline const char *CFE_ES_CounterRecordGetName(const CFE_ES_GenCounterRec * * The global data lock should be obtained prior to invoking this function. */ -extern CFE_ES_AppRecord_t *CFE_ES_GetAppRecordByContext(void); +CFE_ES_AppRecord_t *CFE_ES_GetAppRecordByContext(void); /*---------------------------------------------------------------------------------------*/ /** @@ -672,7 +672,7 @@ extern CFE_ES_AppRecord_t *CFE_ES_GetAppRecordByContext(void); * * The global data lock should be obtained prior to invoking this function. */ -extern CFE_ES_TaskRecord_t *CFE_ES_GetTaskRecordByContext(void); +CFE_ES_TaskRecord_t *CFE_ES_GetTaskRecordByContext(void); /* * OSAL <-> CFE task ID conversion @@ -706,7 +706,7 @@ extern CFE_ES_TaskRecord_t *CFE_ES_GetTaskRecordByContext(void); * @param[in] id The CFE task ID * @returns The OSAL task ID */ -extern osal_id_t CFE_ES_TaskId_ToOSAL(CFE_ES_TaskId_t id); +osal_id_t CFE_ES_TaskId_ToOSAL(CFE_ES_TaskId_t id); /*---------------------------------------------------------------------------------------*/ /** @@ -727,7 +727,7 @@ extern osal_id_t CFE_ES_TaskId_ToOSAL(CFE_ES_TaskId_t id); * @param[in] id The OSAL task ID * @returns The CFE task ID */ -extern CFE_ES_TaskId_t CFE_ES_TaskId_FromOSAL(osal_id_t id); +CFE_ES_TaskId_t CFE_ES_TaskId_FromOSAL(osal_id_t id); /* * Internal functions to perform name based resource lookups diff --git a/modules/es/fsw/src/cfe_es_start.h b/modules/es/fsw/src/cfe_es_start.h index cae467ac1..c0d01efb6 100644 --- a/modules/es/fsw/src/cfe_es_start.h +++ b/modules/es/fsw/src/cfe_es_start.h @@ -89,7 +89,7 @@ extern CFE_ES_ObjectTable_t CFE_ES_ObjectTable[CFE_PLATFORM_ES_OBJECT_TABLE_SIZE * Purpose: This function reads the es_object_table and performs all of the * application layer initialization. */ -extern void CFE_ES_CreateObjects(void); +void CFE_ES_CreateObjects(void); /* * Name: CFE_ES_SetupResetVariables @@ -99,7 +99,7 @@ extern void CFE_ES_CreateObjects(void); * have happened. * */ -extern void CFE_ES_SetupResetVariables(uint32 StartType, uint32 StartSubtype, uint32 BootSource); +void CFE_ES_SetupResetVariables(uint32 StartType, uint32 StartSubtype, uint32 BootSource); /* * Name: CFE_ES_InitializeFileSystems @@ -107,7 +107,7 @@ extern void CFE_ES_SetupResetVariables(uint32 StartType, uint32 StartSubtype, ui * Purpose: This function initializes the file systems used in the cFE core. * */ -extern void CFE_ES_InitializeFileSystems(uint32 StartType); +void CFE_ES_InitializeFileSystems(uint32 StartType); /* * Name: CFE_ES_SetupPerfVariables @@ -118,6 +118,6 @@ extern void CFE_ES_InitializeFileSystems(uint32 StartType); * This code must be called before any other task or code that would use * CFE_ES_PerfLogEntry() / CFE_ES_PerfLogExit() functions */ -extern void CFE_ES_SetupPerfVariables(uint32 ResetType); +void CFE_ES_SetupPerfVariables(uint32 ResetType); #endif /* CFE_ES_START_H */ diff --git a/modules/es/ut-coverage/es_UT.c b/modules/es/ut-coverage/es_UT.c index 70e645c78..640f7883d 100644 --- a/modules/es/ut-coverage/es_UT.c +++ b/modules/es/ut-coverage/es_UT.c @@ -57,7 +57,7 @@ extern CFE_ES_Global_t CFE_ES_Global; -extern int32 dummy_function(void); +int32 dummy_function(void); /* ** Global variables diff --git a/modules/evs/fsw/src/cfe_evs_task.h b/modules/evs/fsw/src/cfe_evs_task.h index ed750014c..13bac811e 100644 --- a/modules/evs/fsw/src/cfe_evs_task.h +++ b/modules/evs/fsw/src/cfe_evs_task.h @@ -139,7 +139,7 @@ extern CFE_EVS_Global_t CFE_EVS_Global; * * This function performs any necessary EVS task initialization. */ -extern int32 CFE_EVS_TaskInit(void); +int32 CFE_EVS_TaskInit(void); /*---------------------------------------------------------------------------------------*/ /** @@ -147,7 +147,7 @@ extern int32 CFE_EVS_TaskInit(void); * * This function processes packets received on the EVS command pipe. */ -extern void CFE_EVS_ProcessCommandPacket(CFE_SB_Buffer_t *SBBufPtr); +void CFE_EVS_ProcessCommandPacket(CFE_SB_Buffer_t *SBBufPtr); /* * EVS Message Handler Functions diff --git a/modules/fs/fsw/src/cfe_fs_priv.h b/modules/fs/fsw/src/cfe_fs_priv.h index 376b65802..11ad51ea9 100644 --- a/modules/fs/fsw/src/cfe_fs_priv.h +++ b/modules/fs/fsw/src/cfe_fs_priv.h @@ -154,7 +154,7 @@ extern CFE_FS_Global_t CFE_FS_Global; * * @param FunctionName The name of the calling function */ -extern void CFE_FS_LockSharedData(const char *FunctionName); +void CFE_FS_LockSharedData(const char *FunctionName); /*---------------------------------------------------------------------------------------*/ /** @@ -162,7 +162,7 @@ extern void CFE_FS_LockSharedData(const char *FunctionName); * * @param FunctionName The name of the calling function */ -extern void CFE_FS_UnlockSharedData(const char *FunctionName); +void CFE_FS_UnlockSharedData(const char *FunctionName); /*---------------------------------------------------------------------------------------*/ /** @@ -170,7 +170,7 @@ extern void CFE_FS_UnlockSharedData(const char *FunctionName); * * @param Hdr The object to byte swap */ -extern void CFE_FS_ByteSwapCFEHeader(CFE_FS_Header_t *Hdr); +void CFE_FS_ByteSwapCFEHeader(CFE_FS_Header_t *Hdr); /*---------------------------------------------------------------------------------------*/ /** @@ -178,6 +178,6 @@ extern void CFE_FS_ByteSwapCFEHeader(CFE_FS_Header_t *Hdr); * * @param Uint32ToSwapPtr The buffer to byte swap */ -extern void CFE_FS_ByteSwapUint32(uint32 *Uint32ToSwapPtr); +void CFE_FS_ByteSwapUint32(uint32 *Uint32ToSwapPtr); #endif /* CFE_FS_PRIV_H */ diff --git a/modules/sb/fsw/src/cfe_sb_priv.h b/modules/sb/fsw/src/cfe_sb_priv.h index 1e781f83e..f46669726 100644 --- a/modules/sb/fsw/src/cfe_sb_priv.h +++ b/modules/sb/fsw/src/cfe_sb_priv.h @@ -922,7 +922,7 @@ int32 CFE_SB_SendPrevSubsCmd(const CFE_SB_SendPrevSubsCmd_t *data); * @param[in] PipeId the Pipe ID to locate * @return pointer to Pipe Table entry for the given Pipe ID */ -extern CFE_SB_PipeD_t *CFE_SB_LocatePipeDescByID(CFE_SB_PipeId_t PipeId); +CFE_SB_PipeD_t *CFE_SB_LocatePipeDescByID(CFE_SB_PipeId_t PipeId); /*---------------------------------------------------------------------------------------*/ /** diff --git a/modules/tbl/fsw/src/cfe_tbl_internal.h b/modules/tbl/fsw/src/cfe_tbl_internal.h index 545599bfb..d9d84cec7 100644 --- a/modules/tbl/fsw/src/cfe_tbl_internal.h +++ b/modules/tbl/fsw/src/cfe_tbl_internal.h @@ -550,7 +550,7 @@ int32 CFE_TBL_SendNotificationMsg(CFE_TBL_RegistryRec_t *RegRecPtr); ** \param[in, out] Uint32ToSwapPtr Pointer to uint32 value to be swapped. *Uint32ToSwapPtr is the swapped uint32 value ** */ -extern void CFE_TBL_ByteSwapUint32(uint32 *Uint32ToSwapPtr); +void CFE_TBL_ByteSwapUint32(uint32 *Uint32ToSwapPtr); /* * Internal helper functions for Table Registry dump diff --git a/modules/tbl/fsw/src/cfe_tbl_task.h b/modules/tbl/fsw/src/cfe_tbl_task.h index fde831dab..ed0fb49ea 100644 --- a/modules/tbl/fsw/src/cfe_tbl_task.h +++ b/modules/tbl/fsw/src/cfe_tbl_task.h @@ -370,7 +370,7 @@ typedef struct ** \retval #CFE_TBL_BAD_MSG_ID \copydoc CFE_TBL_BAD_MSG_ID ** */ -extern int16 CFE_TBL_SearchCmdHndlrTbl(CFE_SB_MsgId_t MessageID, uint16 CommandCode); +int16 CFE_TBL_SearchCmdHndlrTbl(CFE_SB_MsgId_t MessageID, uint16 CommandCode); /*---------------------------------------------------------------------------------------*/ /** diff --git a/modules/tbl/fsw/src/cfe_tbl_task_cmds.h b/modules/tbl/fsw/src/cfe_tbl_task_cmds.h index 959a54777..c8b2c8594 100644 --- a/modules/tbl/fsw/src/cfe_tbl_task_cmds.h +++ b/modules/tbl/fsw/src/cfe_tbl_task_cmds.h @@ -101,7 +101,7 @@ typedef struct ** None ** */ -extern void CFE_TBL_GetHkData(void); +void CFE_TBL_GetHkData(void); /*---------------------------------------------------------------------------------------*/ /** @@ -117,7 +117,7 @@ extern void CFE_TBL_GetHkData(void); ** the Table Registry. ** */ -extern void CFE_TBL_GetTblRegData(void); +void CFE_TBL_GetTblRegData(void); /*---------------------------------------------------------------------------------------*/ /** @@ -336,8 +336,8 @@ int32 CFE_TBL_AbortLoadCmd(const CFE_TBL_AbortLoadCmd_t *data); ** \retval #CFE_TBL_INC_ERR_CTR \copydoc CFE_TBL_INC_ERR_CTR ** \retval #CFE_TBL_INC_CMD_CTR \copydoc CFE_TBL_INC_CMD_CTR */ -extern CFE_TBL_CmdProcRet_t CFE_TBL_DumpToFile(const char *DumpFilename, const char *TableName, - const void *DumpDataAddr, size_t TblSizeInBytes); +CFE_TBL_CmdProcRet_t CFE_TBL_DumpToFile(const char *DumpFilename, const char *TableName, const void *DumpDataAddr, + size_t TblSizeInBytes); /*---------------------------------------------------------------------------------------*/ /**