diff --git a/.github/workflows/codeql-build.yml b/.github/workflows/codeql-build.yml index 8cce99cb4..00a86762d 100644 --- a/.github/workflows/codeql-build.yml +++ b/.github/workflows/codeql-build.yml @@ -2,16 +2,7 @@ name: "CodeQL Analysis" on: push: - paths-ignore: - - '**/*.md' - - '**/*.txt' - - '**/*.dox' - pull_request: - paths-ignore: - - '**/*.md' - - '**/*.txt' - - '**/*.dox' jobs: codeql: diff --git a/README.md b/README.md index 6f058f011..320297ebc 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,14 @@ The detailed cFE user's guide can be viewed at , , , , and + ### Development Build: v7.0.0-rc4+dev171 - Resolve doxygen 1.8.17 latex make errors - See diff --git a/cmake/mission_build.cmake b/cmake/mission_build.cmake index 9fa5776f0..8dcc63f32 100644 --- a/cmake/mission_build.cmake +++ b/cmake/mission_build.cmake @@ -442,6 +442,7 @@ function(process_arch TARGETSYSTEM) -DMISSION_BINARY_DIR=${MISSION_BINARY_DIR} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} + -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=${CMAKE_EXPORT_COMPILE_COMMANDS} ${SELECTED_TOOLCHAIN_FILE} ${CFE_SOURCE_DIR} WORKING_DIRECTORY diff --git a/modules/cfe_testcase/src/es_task_test.c b/modules/cfe_testcase/src/es_task_test.c index 54349aacd..21cdf1377 100644 --- a/modules/cfe_testcase/src/es_task_test.c +++ b/modules/cfe_testcase/src/es_task_test.c @@ -36,7 +36,6 @@ void TaskFunction(void) CFE_FT_Global.Count += 1; OS_TaskDelay(100); } - return; } /* A task function that verifies the behavior of other APIs when those are called from a child task */ @@ -89,7 +88,6 @@ void TaskExitFunction(void) CFE_FT_Global.Count += 1; CFE_ES_ExitChildTask(); } - return; } void TestCreateChild(void) diff --git a/modules/core_api/fsw/inc/cfe_resourceid.h b/modules/core_api/fsw/inc/cfe_resourceid.h index 9b24a050d..58bf18899 100644 --- a/modules/core_api/fsw/inc/cfe_resourceid.h +++ b/modules/core_api/fsw/inc/cfe_resourceid.h @@ -101,7 +101,7 @@ */ static inline unsigned long CFE_ResourceId_ToInteger(CFE_ResourceId_t id) { - return ((unsigned long)CFE_RESOURCEID_UNWRAP(id)); + return (unsigned long)CFE_RESOURCEID_UNWRAP(id); } /** @@ -120,7 +120,7 @@ static inline unsigned long CFE_ResourceId_ToInteger(CFE_ResourceId_t id) */ static inline CFE_ResourceId_t CFE_ResourceId_FromInteger(unsigned long Value) { - return ((CFE_ResourceId_t)CFE_RESOURCEID_WRAP(Value)); + return (CFE_ResourceId_t)CFE_RESOURCEID_WRAP(Value); } /** diff --git a/modules/core_api/fsw/inc/cfe_version.h b/modules/core_api/fsw/inc/cfe_version.h index e9a777bee..f17236701 100644 --- a/modules/core_api/fsw/inc/cfe_version.h +++ b/modules/core_api/fsw/inc/cfe_version.h @@ -26,7 +26,7 @@ #define CFE_VERSION_H /* Development Build Macro Definitions */ -#define CFE_BUILD_NUMBER 171 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */ +#define CFE_BUILD_NUMBER 183 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */ #define CFE_BUILD_BASELINE "v7.0.0-rc4" /**< @brief Development: Reference git tag for build number */ /* See \ref cfsversions for definitions */ diff --git a/modules/es/fsw/src/cfe_es_api.c b/modules/es/fsw/src/cfe_es_api.c index 4ba158b67..359238636 100644 --- a/modules/es/fsw/src/cfe_es_api.c +++ b/modules/es/fsw/src/cfe_es_api.c @@ -55,7 +55,7 @@ int32 CFE_ES_GetResetType(uint32 *ResetSubtypePtr) *ResetSubtypePtr = CFE_ES_Global.ResetDataPtr->ResetVars.ResetSubtype; } - return (CFE_ES_Global.ResetDataPtr->ResetVars.ResetType); + return CFE_ES_Global.ResetDataPtr->ResetVars.ResetType; } /*---------------------------------------------------------------- @@ -152,7 +152,7 @@ CFE_Status_t CFE_ES_ResetCFE(uint32 ResetType) ReturnCode = CFE_ES_BAD_ARGUMENT; } - return (ReturnCode); + return ReturnCode; } /*---------------------------------------------------------------- @@ -221,7 +221,7 @@ CFE_Status_t CFE_ES_RestartApp(CFE_ES_AppId_t AppID) } /* end if */ - return (ReturnCode); + return ReturnCode; } /*---------------------------------------------------------------- @@ -290,7 +290,7 @@ CFE_Status_t CFE_ES_ReloadApp(CFE_ES_AppId_t AppID, const char *AppFileName) CFE_RESOURCEID_TO_ULONG(AppID)); } - return (ReturnCode); + return ReturnCode; } /*---------------------------------------------------------------- @@ -343,7 +343,7 @@ CFE_Status_t CFE_ES_DeleteApp(CFE_ES_AppId_t AppID) CFE_RESOURCEID_TO_ULONG(AppID)); } - return (ReturnCode); + return ReturnCode; } /*---------------------------------------------------------------- @@ -568,7 +568,7 @@ bool CFE_ES_RunLoop(uint32 *RunStatus) CFE_ES_UnlockSharedData(__func__, __LINE__); - return (ReturnCode); + return ReturnCode; } /*---------------------------------------------------------------- @@ -726,7 +726,7 @@ CFE_Status_t CFE_ES_GetAppIDByName(CFE_ES_AppId_t *AppIdPtr, const char *AppName CFE_ES_UnlockSharedData(__func__, __LINE__); - return (Result); + return Result; } /*---------------------------------------------------------------- @@ -767,7 +767,7 @@ CFE_Status_t CFE_ES_GetLibIDByName(CFE_ES_LibId_t *LibIdPtr, const char *LibName CFE_ES_UnlockSharedData(__func__, __LINE__); - return (Result); + return Result; } /*---------------------------------------------------------------- @@ -802,7 +802,7 @@ CFE_Status_t CFE_ES_GetTaskIDByName(CFE_ES_TaskId_t *TaskIdPtr, const char *Task *TaskIdPtr = CFE_ES_TASKID_UNDEFINED; } - return (Result); + return Result; } /*---------------------------------------------------------------- @@ -840,7 +840,7 @@ CFE_Status_t CFE_ES_GetAppID(CFE_ES_AppId_t *AppIdPtr) CFE_ES_UnlockSharedData(__func__, __LINE__); - return (Result); + return Result; } /*---------------------------------------------------------------- @@ -920,7 +920,7 @@ CFE_Status_t CFE_ES_GetAppName(char *AppName, CFE_ES_AppId_t AppId, size_t Buffe CFE_ES_UnlockSharedData(__func__, __LINE__); - return (Result); + return Result; } /*---------------------------------------------------------------- @@ -966,7 +966,7 @@ CFE_Status_t CFE_ES_GetLibName(char *LibName, CFE_ES_LibId_t LibId, size_t Buffe CFE_ES_UnlockSharedData(__func__, __LINE__); - return (Result); + return Result; } /*---------------------------------------------------------------- @@ -1209,7 +1209,7 @@ int32 CFE_ES_GetModuleInfo(CFE_ES_AppInfo_t *ModuleInfo, CFE_ResourceId_t Resour break; } - return (Status); + return Status; } /*---------------------------------------------------------------- @@ -1285,7 +1285,7 @@ CFE_Status_t CFE_ES_GetTaskInfo(CFE_ES_TaskInfo_t *TaskInfo, CFE_ES_TaskId_t Tas CFE_ES_UnlockSharedData(__func__, __LINE__); - return (Status); + return Status; } /*---------------------------------------------------------------- @@ -1381,7 +1381,7 @@ CFE_Status_t CFE_ES_CreateChildTask(CFE_ES_TaskId_t *TaskIdPtr, const char *Task ReturnCode = CFE_ES_StartAppTask(TaskIdPtr, TaskName, FunctionPtr, &Params, ParentAppId); } - return (ReturnCode); + return ReturnCode; } /*---------------------------------------------------------------- @@ -1528,7 +1528,7 @@ CFE_Status_t CFE_ES_DeleteChildTask(CFE_ES_TaskId_t TaskId) CFE_ES_WriteToSysLog("%s: Error: Invalid Task ID: %lu\n", __func__, CFE_RESOURCEID_TO_ULONG(TaskId)); ReturnCode = CFE_ES_ERR_RESOURCEID_NOT_VALID; } - return (ReturnCode); + return ReturnCode; } /*---------------------------------------------------------------- @@ -1623,7 +1623,7 @@ CFE_Status_t CFE_ES_WriteToSysLog(const char *SpecStringPtr, ...) /* Output the entry to the console */ OS_printf("%s", TmpString); - return (ReturnCode); + return ReturnCode; } /*---------------------------------------------------------------- @@ -1701,7 +1701,7 @@ uint32 CFE_ES_CalculateCRC(const void *DataPtr, size_t DataLength, uint32 InputC default: break; } - return (Crc); + return Crc; } /*---------------------------------------------------------------- @@ -2109,7 +2109,7 @@ CFE_Status_t CFE_ES_GetGenCounterIDByName(CFE_ES_CounterId_t *CounterIdPtr, cons CFE_ES_UnlockSharedData(__func__, __LINE__); - return (Result); + return Result; } /*---------------------------------------------------------------- @@ -2255,8 +2255,6 @@ void CFE_ES_LockSharedData(const char *FunctionName, int32 LineNumber) FunctionName, (int)LineNumber); } /* end if */ - - return; } /*---------------------------------------------------------------- @@ -2282,8 +2280,6 @@ void CFE_ES_UnlockSharedData(const char *FunctionName, int32 LineNumber) FunctionName, (int)LineNumber); } /* end if */ - - return; } /*---------------------------------------------------------------- diff --git a/modules/es/fsw/src/cfe_es_apps.c b/modules/es/fsw/src/cfe_es_apps.c index 1f7bb29ad..ebd41050e 100644 --- a/modules/es/fsw/src/cfe_es_apps.c +++ b/modules/es/fsw/src/cfe_es_apps.c @@ -387,7 +387,7 @@ int32 CFE_ES_ParseFileEntry(const char **TokenList, uint32 NumTokens) Status = CFE_ES_ERR_APP_CREATE; } - return (Status); + return Status; } /*---------------------------------------------------------------- @@ -545,7 +545,7 @@ int32 CFE_ES_GetTaskFunction(CFE_ES_TaskEntryFuncPtr_t *FuncPtr) *FuncPtr = EntryFunc; } - return (ReturnCode); + return ReturnCode; } /*---------------------------------------------------------------- @@ -976,7 +976,7 @@ int32 CFE_ES_LoadLibrary(CFE_ES_LibId_t *LibraryIdPtr, const char *LibName, cons *LibraryIdPtr = CFE_ES_LIBID_C(PendingResourceId); - return (Status); + return Status; } /*---------------------------------------------------------------- @@ -1556,7 +1556,7 @@ int32 CFE_ES_CleanUpApp(CFE_ES_AppId_t AppId) CFE_ES_UnlockSharedData(__func__, __LINE__); - return (ReturnCode); + return ReturnCode; } /* @@ -1739,7 +1739,7 @@ int32 CFE_ES_CleanupTaskResources(CFE_ES_TaskId_t TaskId) Result = CFE_ES_TASK_DELETE_ERR; } - return (Result); + return Result; } /*---------------------------------------------------------------- diff --git a/modules/es/fsw/src/cfe_es_cds.c b/modules/es/fsw/src/cfe_es_cds.c index 45d167e98..41a2997b3 100644 --- a/modules/es/fsw/src/cfe_es_cds.c +++ b/modules/es/fsw/src/cfe_es_cds.c @@ -468,7 +468,7 @@ int32 CFE_ES_RegisterCDSEx(CFE_ES_CDSHandle_t *HandlePtr, size_t UserBlockSize, *HandlePtr = CFE_ES_CDSHANDLE_C(PendingBlockId); - return (Status); + return Status; } /*---------------------------------------------------------------- @@ -688,8 +688,6 @@ void CFE_ES_FormCDSName(char *FullCDSName, const char *CDSName, CFE_ES_AppId_t T /* Complete formation of processor specific table name */ sprintf(FullCDSName, "%s.%s", AppName, CDSName); - - return; } /*---------------------------------------------------------------- diff --git a/modules/es/fsw/src/cfe_es_cds.h b/modules/es/fsw/src/cfe_es_cds.h index d54c93904..24356aa3c 100644 --- a/modules/es/fsw/src/cfe_es_cds.h +++ b/modules/es/fsw/src/cfe_es_cds.h @@ -328,7 +328,7 @@ static inline bool CFE_ES_CDSBlockRecordIsUsed(const CFE_ES_CDS_RegRec_t *CDSBlo */ static inline CFE_ES_CDSHandle_t CFE_ES_CDSBlockRecordGetID(const CFE_ES_CDS_RegRec_t *CDSBlockRecPtr) { - return (CDSBlockRecPtr->BlockID); + return CDSBlockRecPtr->BlockID; } /*---------------------------------------------------------------------------------------*/ diff --git a/modules/es/fsw/src/cfe_es_erlog.c b/modules/es/fsw/src/cfe_es_erlog.c index 18cd0b7ed..4fbbffc38 100644 --- a/modules/es/fsw/src/cfe_es_erlog.c +++ b/modules/es/fsw/src/cfe_es_erlog.c @@ -142,7 +142,7 @@ int32 CFE_ES_WriteToERLogWithContext(CFE_ES_LogEntryType_Enum_t EntryType, uint3 */ CFE_ES_UnlockSharedData(__func__, __LINE__); - return (CFE_SUCCESS); + return CFE_SUCCESS; } /*---------------------------------------------------------------- diff --git a/modules/es/fsw/src/cfe_es_generic_pool.c b/modules/es/fsw/src/cfe_es_generic_pool.c index 07ab56d35..ef4f77d69 100644 --- a/modules/es/fsw/src/cfe_es_generic_pool.c +++ b/modules/es/fsw/src/cfe_es_generic_pool.c @@ -380,7 +380,7 @@ int32 CFE_ES_GenPoolGetBlock(CFE_ES_GenPoolRecord_t *PoolRecPtr, size_t *BlockOf { CFE_ES_WriteToSysLog("%s: Err:size(%lu) > max(%lu)\n", __func__, (unsigned long)ReqSize, (unsigned long)PoolRecPtr->Buckets[PoolRecPtr->NumBuckets - 1].BlockSize); - return (CFE_ES_ERR_MEM_BLOCK_SIZE); + return CFE_ES_ERR_MEM_BLOCK_SIZE; } /* first attempt to recycle any buffers from the same bucket that were freed */ @@ -391,7 +391,7 @@ int32 CFE_ES_GenPoolGetBlock(CFE_ES_GenPoolRecord_t *PoolRecPtr, size_t *BlockOf Status = CFE_ES_GenPoolCreatePoolBlock(PoolRecPtr, BucketId, ReqSize, BlockOffsetPtr); } - return (Status); + return Status; } /*---------------------------------------------------------------- diff --git a/modules/es/fsw/src/cfe_es_mempool.c b/modules/es/fsw/src/cfe_es_mempool.c index 2720514c5..1dd2a325b 100644 --- a/modules/es/fsw/src/cfe_es_mempool.c +++ b/modules/es/fsw/src/cfe_es_mempool.c @@ -218,7 +218,7 @@ CFE_Status_t CFE_ES_PoolCreateEx(CFE_ES_MemHandle_t *PoolID, void *MemPtr, size_ { CFE_ES_WriteToSysLog("%s: Num Block Sizes (%d) greater than max (%d)\n", __func__, (int)NumBlockSizes, CFE_PLATFORM_ES_POOL_MAX_BUCKETS); - return (CFE_ES_BAD_ARGUMENT); + return CFE_ES_BAD_ARGUMENT; } /* @@ -355,7 +355,7 @@ CFE_Status_t CFE_ES_PoolCreateEx(CFE_ES_MemHandle_t *PoolID, void *MemPtr, size_ */ *PoolID = CFE_ES_MEMHANDLE_C(PendingID); - return (Status); + return Status; } /*---------------------------------------------------------------- @@ -441,7 +441,7 @@ int32 CFE_ES_GetPoolBuf(CFE_ES_MemPoolBuf_t *BufPtr, CFE_ES_MemHandle_t Handle, CFE_ES_GetAppID(&AppId); CFE_ES_WriteToSysLog("%s: Err:Bad handle(0x%08lX) AppId=%lu\n", __func__, CFE_RESOURCEID_TO_ULONG(Handle), CFE_RESOURCEID_TO_ULONG(AppId)); - return (CFE_ES_ERR_RESOURCEID_NOT_VALID); + return CFE_ES_ERR_RESOURCEID_NOT_VALID; } /* @@ -473,7 +473,7 @@ int32 CFE_ES_GetPoolBuf(CFE_ES_MemPoolBuf_t *BufPtr, CFE_ES_MemHandle_t Handle, /* If not successful, return error now */ if (Status != CFE_SUCCESS) { - return (Status); + return Status; } /* Compute the actual buffer address. */ @@ -507,7 +507,7 @@ CFE_Status_t CFE_ES_GetPoolBufInfo(CFE_ES_MemHandle_t Handle, CFE_ES_MemPoolBuf_ /* basic sanity check */ if (!CFE_ES_MemPoolRecordIsMatch(PoolRecPtr, Handle)) { - return (CFE_ES_ERR_RESOURCEID_NOT_VALID); + return CFE_ES_ERR_RESOURCEID_NOT_VALID; } /* @@ -571,7 +571,7 @@ int32 CFE_ES_PutPoolBuf(CFE_ES_MemHandle_t Handle, CFE_ES_MemPoolBuf_t BufPtr) { CFE_ES_WriteToSysLog("%s: Err:Invalid Memory Handle (0x%08lX).\n", __func__, CFE_RESOURCEID_TO_ULONG(Handle)); - return (CFE_ES_ERR_RESOURCEID_NOT_VALID); + return CFE_ES_ERR_RESOURCEID_NOT_VALID; } /* @@ -653,7 +653,7 @@ CFE_Status_t CFE_ES_GetMemPoolStats(CFE_ES_MemPoolStats_t *BufPtr, CFE_ES_MemHan CFE_ES_GetAppID(&AppId); CFE_ES_WriteToSysLog("%s: Err:Bad handle(0x%08lX) AppId=%lu\n", __func__, CFE_RESOURCEID_TO_ULONG(Handle), CFE_RESOURCEID_TO_ULONG(AppId)); - return (CFE_ES_ERR_RESOURCEID_NOT_VALID); + return CFE_ES_ERR_RESOURCEID_NOT_VALID; } /* diff --git a/modules/es/fsw/src/cfe_es_mempool.h b/modules/es/fsw/src/cfe_es_mempool.h index 82e40a3de..702381f91 100644 --- a/modules/es/fsw/src/cfe_es_mempool.h +++ b/modules/es/fsw/src/cfe_es_mempool.h @@ -158,7 +158,7 @@ static inline bool CFE_ES_MemPoolRecordIsUsed(const CFE_ES_MemPoolRecord_t *Pool */ static inline CFE_ES_MemHandle_t CFE_ES_MemPoolRecordGetID(const CFE_ES_MemPoolRecord_t *PoolRecPtr) { - return (PoolRecPtr->PoolID); + return PoolRecPtr->PoolID; } /*---------------------------------------------------------------------------------------*/ diff --git a/modules/es/fsw/src/cfe_es_resource.h b/modules/es/fsw/src/cfe_es_resource.h index b7668ecef..a0ecc3eee 100644 --- a/modules/es/fsw/src/cfe_es_resource.h +++ b/modules/es/fsw/src/cfe_es_resource.h @@ -310,7 +310,7 @@ static inline CFE_ES_LibId_t CFE_ES_LibRecordGetID(const CFE_ES_LibRecord_t *Lib * The initial implementation does not store the ID in the entry; * the ID is simply the zero-based index into the table. */ - return (LibRecPtr->LibId); + return LibRecPtr->LibId; } /*---------------------------------------------------------------------------------------*/ @@ -411,7 +411,7 @@ static inline const char *CFE_ES_LibRecordGetName(const CFE_ES_LibRecord_t *LibR */ static inline CFE_ES_TaskId_t CFE_ES_TaskRecordGetID(const CFE_ES_TaskRecord_t *TaskRecPtr) { - return (TaskRecPtr->TaskId); + return TaskRecPtr->TaskId; } /*---------------------------------------------------------------------------------------*/ diff --git a/modules/es/fsw/src/cfe_es_syslog.c b/modules/es/fsw/src/cfe_es_syslog.c index 7f1f77f45..364d585e6 100644 --- a/modules/es/fsw/src/cfe_es_syslog.c +++ b/modules/es/fsw/src/cfe_es_syslog.c @@ -248,7 +248,7 @@ int32 CFE_ES_SysLogAppend_Unsync(const char *LogString) ++CFE_ES_Global.ResetDataPtr->SystemLogEntryNum; } - return (ReturnCode); + return ReturnCode; } /*---------------------------------------------------------------- diff --git a/modules/es/fsw/src/cfe_es_task.c b/modules/es/fsw/src/cfe_es_task.c index 447cb22ba..30057c0c9 100644 --- a/modules/es/fsw/src/cfe_es_task.c +++ b/modules/es/fsw/src/cfe_es_task.c @@ -317,7 +317,7 @@ int32 CFE_ES_TaskInit(void) if (Status != CFE_SUCCESS) { CFE_ES_WriteToSysLog("%s: Call to CFE_EVS_Register Failed, RC = 0x%08X\n", __func__, (unsigned int)Status); - return (Status); + return Status; } /* @@ -345,7 +345,7 @@ int32 CFE_ES_TaskInit(void) if (Status != CFE_SUCCESS) { CFE_ES_WriteToSysLog("%s: Cannot Create SB Pipe, RC = 0x%08X\n", __func__, (unsigned int)Status); - return (Status); + return Status; } /* @@ -355,7 +355,7 @@ int32 CFE_ES_TaskInit(void) if (Status != CFE_SUCCESS) { CFE_ES_WriteToSysLog("%s: Cannot Subscribe to HK packet, RC = 0x%08X\n", __func__, (unsigned int)Status); - return (Status); + return Status; } /* @@ -366,7 +366,7 @@ int32 CFE_ES_TaskInit(void) { CFE_ES_WriteToSysLog("%s: Cannot Subscribe to ES ground commands, RC = 0x%08X\n", __func__, (unsigned int)Status); - return (Status); + return Status; } /* @@ -413,7 +413,7 @@ int32 CFE_ES_TaskInit(void) if (Status != CFE_SUCCESS) { CFE_ES_WriteToSysLog("%s: Error sending init event:RC=0x%08X\n", __func__, (unsigned int)Status); - return (Status); + return Status; } Status = @@ -424,7 +424,7 @@ int32 CFE_ES_TaskInit(void) if (Status != CFE_SUCCESS) { CFE_ES_WriteToSysLog("%s: Error sending init stats event:RC=0x%08X\n", __func__, (unsigned int)Status); - return (Status); + return Status; } /* @@ -442,10 +442,10 @@ int32 CFE_ES_TaskInit(void) if (Status != CFE_SUCCESS) { CFE_ES_WriteToSysLog("%s: Error initializing background task:RC=0x%08X\n", __func__, (unsigned int)Status); - return (Status); + return Status; } - return (CFE_SUCCESS); + return CFE_SUCCESS; } /*---------------------------------------------------------------- @@ -1760,7 +1760,7 @@ bool CFE_ES_VerifyCmdLength(CFE_MSG_Message_t *MsgPtr, size_t ExpectedLength) CFE_ES_Global.TaskData.CommandErrorCounter++; } - return (result); + return result; } /*---------------------------------------------------------------- diff --git a/modules/evs/fsw/src/cfe_evs.c b/modules/evs/fsw/src/cfe_evs.c index 6a79ab1a1..c22798881 100644 --- a/modules/evs/fsw/src/cfe_evs.c +++ b/modules/evs/fsw/src/cfe_evs.c @@ -109,7 +109,7 @@ CFE_Status_t CFE_EVS_Register(const void *Filters, uint16 NumEventFilters, uint1 } } - return (Status); + return Status; } /*---------------------------------------------------------------- @@ -161,7 +161,7 @@ CFE_Status_t CFE_EVS_SendEvent(uint16 EventID, uint16 EventType, const char *Spe } } - return (Status); + return Status; } /*---------------------------------------------------------------- @@ -260,7 +260,7 @@ CFE_Status_t CFE_EVS_SendTimedEvent(CFE_TIME_SysTime_t Time, uint16 EventID, uin } } - return (Status); + return Status; } /*---------------------------------------------------------------- @@ -301,7 +301,7 @@ int32 CFE_EVS_ResetFilter(uint16 EventID) } } - return (Status); + return Status; } /*---------------------------------------------------------------- @@ -336,5 +336,5 @@ CFE_Status_t CFE_EVS_ResetAllFilters(void) } } - return (Status); + return Status; } diff --git a/modules/evs/fsw/src/cfe_evs_log.c b/modules/evs/fsw/src/cfe_evs_log.c index 1dacc4612..8ca195657 100644 --- a/modules/evs/fsw/src/cfe_evs_log.c +++ b/modules/evs/fsw/src/cfe_evs_log.c @@ -84,8 +84,6 @@ void EVS_AddLog(CFE_EVS_LongEventTlm_t *EVS_PktPtr) } OS_MutSemGive(CFE_EVS_Global.EVS_SharedDataMutexID); - - return; } /*---------------------------------------------------------------- @@ -111,8 +109,6 @@ void EVS_ClearLog(void) memset(CFE_EVS_Global.EVS_LogPtr->LogEntry, 0, sizeof(CFE_EVS_Global.EVS_LogPtr->LogEntry)); OS_MutSemGive(CFE_EVS_Global.EVS_SharedDataMutexID); - - return; } /*---------------------------------------------------------------- @@ -232,7 +228,7 @@ int32 CFE_EVS_WriteLogDataFileCmd(const CFE_EVS_WriteLogDataFileCmd_t *data) OS_close(LogFileHandle); } - return (Result); + return Result; } /*---------------------------------------------------------------- diff --git a/modules/evs/fsw/src/cfe_evs_task.c b/modules/evs/fsw/src/cfe_evs_task.c index 6c85ef695..d5730c52d 100644 --- a/modules/evs/fsw/src/cfe_evs_task.c +++ b/modules/evs/fsw/src/cfe_evs_task.c @@ -164,7 +164,7 @@ int32 CFE_EVS_EarlyInit(void) } } - return (Status); + return Status; } /*---------------------------------------------------------------- @@ -191,7 +191,7 @@ int32 CFE_EVS_CleanUpApp(CFE_ES_AppId_t AppID) EVS_AppDataSetFree(AppDataPtr); } - return (Status); + return Status; } /*---------------------------------------------------------------- @@ -349,8 +349,6 @@ void CFE_EVS_ProcessCommandPacket(CFE_SB_Buffer_t *SBBufPtr) (unsigned int)CFE_SB_MsgIdToValue(MessageID)); break; } - - return; } /*---------------------------------------------------------------- @@ -560,8 +558,6 @@ void CFE_EVS_ProcessGroundCommand(CFE_SB_Buffer_t *SBBufPtr, CFE_SB_MsgId_t MsgI { CFE_EVS_Global.EVS_TlmPkt.Payload.CommandErrorCounter++; } - - return; } /*---------------------------------------------------------------- @@ -598,7 +594,7 @@ bool CFE_EVS_VerifyCmdLength(CFE_MSG_Message_t *MsgPtr, size_t ExpectedLength) result = false; } - return (result); + return result; } /*---------------------------------------------------------------- @@ -1657,5 +1653,5 @@ int32 CFE_EVS_WriteAppDataFileCmd(const CFE_EVS_WriteAppDataFileCmd_t *data) OS_close(FileHandle); } - return (Result); + return Result; } diff --git a/modules/evs/fsw/src/cfe_evs_utils.c b/modules/evs/fsw/src/cfe_evs_utils.c index 3eb2af47a..3fefb7e96 100644 --- a/modules/evs/fsw/src/cfe_evs_utils.c +++ b/modules/evs/fsw/src/cfe_evs_utils.c @@ -64,7 +64,7 @@ EVS_AppData_t *EVS_GetAppDataByID(CFE_ES_AppId_t AppID) AppDataPtr = NULL; } - return (AppDataPtr); + return AppDataPtr; } /*---------------------------------------------------------------- @@ -186,7 +186,7 @@ int32 EVS_NotRegistered(EVS_AppData_t *AppDataPtr, CFE_ES_AppId_t CallerID) AppName); } - return (CFE_EVS_APP_NOT_REGISTERED); + return CFE_EVS_APP_NOT_REGISTERED; } /*---------------------------------------------------------------- @@ -286,7 +286,7 @@ bool EVS_IsFiltered(EVS_AppData_t *AppDataPtr, uint16 EventID, uint16 EventType) } } - return (Filtered); + return Filtered; } /*---------------------------------------------------------------- @@ -425,11 +425,11 @@ EVS_BinFilter_t *EVS_FindEventID(uint16 EventID, EVS_BinFilter_t *FilterArray) { if (FilterArray[i].EventID == EventID) { - return (&FilterArray[i]); + return &FilterArray[i]; } } - return ((EVS_BinFilter_t *)NULL); + return (EVS_BinFilter_t *)NULL; } /*---------------------------------------------------------------- @@ -693,5 +693,5 @@ int32 EVS_SendEvent(uint16 EventID, uint16 EventType, const char *Spec, ...) va_end(Ptr); } - return (CFE_SUCCESS); + return CFE_SUCCESS; } diff --git a/modules/evs/fsw/src/cfe_evs_utils.h b/modules/evs/fsw/src/cfe_evs_utils.h index be4457dff..866b51e79 100644 --- a/modules/evs/fsw/src/cfe_evs_utils.h +++ b/modules/evs/fsw/src/cfe_evs_utils.h @@ -111,7 +111,7 @@ static inline CFE_ES_AppId_t EVS_AppDataGetID(EVS_AppData_t *AppDataPtr) * The initial implementation does not store the ID in the entry; * the ID is simply the zero-based index into the table. */ - return (AppDataPtr->AppID); + return AppDataPtr->AppID; } /*---------------------------------------------------------------------------------------*/ diff --git a/modules/fs/fsw/src/cfe_fs_api.c b/modules/fs/fsw/src/cfe_fs_api.c index 81f3fcb05..ed59e9157 100644 --- a/modules/fs/fsw/src/cfe_fs_api.c +++ b/modules/fs/fsw/src/cfe_fs_api.c @@ -163,7 +163,7 @@ CFE_Status_t CFE_FS_ReadHeader(CFE_FS_Header_t *Hdr, osal_id_t FileDes) Result = CFE_STATUS_EXTERNAL_RESOURCE_FAIL; } - return (Result); + return Result; } /*---------------------------------------------------------------- @@ -274,7 +274,7 @@ CFE_Status_t CFE_FS_WriteHeader(osal_id_t FileDes, CFE_FS_Header_t *Hdr) Result = CFE_STATUS_EXTERNAL_RESOURCE_FAIL; } - return (Result); + return Result; } /*---------------------------------------------------------------- @@ -329,7 +329,7 @@ CFE_Status_t CFE_FS_SetTimestamp(osal_id_t FileDes, CFE_TIME_SysTime_t NewTimest Result = CFE_STATUS_EXTERNAL_RESOURCE_FAIL; } - return (Result); + return Result; } /*---------------------------------------------------------------- @@ -680,7 +680,7 @@ CFE_Status_t CFE_FS_ExtractFilenameFromPath(const char *OriginalPath, char *File } } - return (ReturnCode); + return ReturnCode; } /*---------------------------------------------------------------- diff --git a/modules/fs/fsw/src/cfe_fs_priv.c b/modules/fs/fsw/src/cfe_fs_priv.c index 4767c281e..96bc94615 100644 --- a/modules/fs/fsw/src/cfe_fs_priv.c +++ b/modules/fs/fsw/src/cfe_fs_priv.c @@ -85,8 +85,6 @@ void CFE_FS_LockSharedData(const char *FunctionName) CFE_RESOURCEID_TO_ULONG(AppId), FunctionName); } /* end if */ - - return; } /*---------------------------------------------------------------- @@ -110,5 +108,4 @@ void CFE_FS_UnlockSharedData(const char *FunctionName) CFE_RESOURCEID_TO_ULONG(AppId), FunctionName); } /* end if */ - return; } diff --git a/modules/sb/fsw/src/cfe_sb_api.c b/modules/sb/fsw/src/cfe_sb_api.c index 9cd2382ae..7f22a34de 100644 --- a/modules/sb/fsw/src/cfe_sb_api.c +++ b/modules/sb/fsw/src/cfe_sb_api.c @@ -1658,22 +1658,22 @@ void CFE_SB_BroadcastBufferToRoute(CFE_SB_BufferD_t *BufDscPtr, CFE_SBR_RouteId_ PipeDscPtr->PeakQueueDepth = PipeDscPtr->CurrentQueueDepth; } } - else if (OsStatus == OS_QUEUE_FULL) - { - SBSndErr.EvtBuf[SBSndErr.EvtsToSnd].PipeId = DestPtr->PipeId; - SBSndErr.EvtBuf[SBSndErr.EvtsToSnd].EventId = CFE_SB_Q_FULL_ERR_EID; - SBSndErr.EvtsToSnd++; - CFE_SB_Global.HKTlmMsg.Payload.PipeOverflowErrorCounter++; - PipeDscPtr->SendErrors++; - } else { - /* Unexpected error while writing to queue. */ - SBSndErr.EvtBuf[SBSndErr.EvtsToSnd].PipeId = DestPtr->PipeId; - SBSndErr.EvtBuf[SBSndErr.EvtsToSnd].EventId = CFE_SB_Q_WR_ERR_EID; - SBSndErr.EvtBuf[SBSndErr.EvtsToSnd].OsStatus = OsStatus; + SBSndErr.EvtBuf[SBSndErr.EvtsToSnd].PipeId = DestPtr->PipeId; + if (OsStatus == OS_QUEUE_FULL) + { + SBSndErr.EvtBuf[SBSndErr.EvtsToSnd].EventId = CFE_SB_Q_FULL_ERR_EID; + CFE_SB_Global.HKTlmMsg.Payload.PipeOverflowErrorCounter++; + } + else + { + /* Unexpected error while writing to queue. */ + SBSndErr.EvtBuf[SBSndErr.EvtsToSnd].EventId = CFE_SB_Q_WR_ERR_EID; + SBSndErr.EvtBuf[SBSndErr.EvtsToSnd].OsStatus = OsStatus; + CFE_SB_Global.HKTlmMsg.Payload.InternalErrorCounter++; + } SBSndErr.EvtsToSnd++; - CFE_SB_Global.HKTlmMsg.Payload.InternalErrorCounter++; PipeDscPtr->SendErrors++; } /*end if */ diff --git a/modules/sb/fsw/src/cfe_sb_priv.c b/modules/sb/fsw/src/cfe_sb_priv.c index 6e473f718..5456cbca9 100644 --- a/modules/sb/fsw/src/cfe_sb_priv.c +++ b/modules/sb/fsw/src/cfe_sb_priv.c @@ -143,8 +143,6 @@ void CFE_SB_LockSharedData(const char *FuncName, int32 LineNumber) (long)OsStatus, CFE_RESOURCEID_TO_ULONG(AppId), FuncName, (int)LineNumber); } /* end if */ - - return; } /*---------------------------------------------------------------- @@ -168,8 +166,6 @@ void CFE_SB_UnlockSharedData(const char *FuncName, int32 LineNumber) (long)OsStatus, CFE_RESOURCEID_TO_ULONG(AppId), FuncName, (int)LineNumber); } /* end if */ - - return; } /*---------------------------------------------------------------- diff --git a/modules/sb/fsw/src/cfe_sb_task.c b/modules/sb/fsw/src/cfe_sb_task.c index d62f3ad51..9423d9df3 100644 --- a/modules/sb/fsw/src/cfe_sb_task.c +++ b/modules/sb/fsw/src/cfe_sb_task.c @@ -316,7 +316,7 @@ bool CFE_SB_VerifyCmdLength(CFE_MSG_Message_t *MsgPtr, size_t ExpectedLength) ++CFE_SB_Global.HKTlmMsg.Payload.CommandErrorCounter; } - return (result); + return result; } /*---------------------------------------------------------------- diff --git a/modules/tbl/fsw/src/cfe_tbl_internal.c b/modules/tbl/fsw/src/cfe_tbl_internal.c index 318aa4594..779a0e280 100644 --- a/modules/tbl/fsw/src/cfe_tbl_internal.c +++ b/modules/tbl/fsw/src/cfe_tbl_internal.c @@ -602,8 +602,6 @@ void CFE_TBL_FormTableName(char *FullTblName, const char *TblName, CFE_ES_AppId_ /* Complete formation of application specific table name */ sprintf(FullTblName, "%s.%s", AppName, TblName); - - return; } /*---------------------------------------------------------------- diff --git a/modules/tbl/fsw/src/cfe_tbl_task.c b/modules/tbl/fsw/src/cfe_tbl_task.c index 47b07a221..8ebf25fa1 100644 --- a/modules/tbl/fsw/src/cfe_tbl_task.c +++ b/modules/tbl/fsw/src/cfe_tbl_task.c @@ -323,8 +323,6 @@ void CFE_TBL_TaskPipe(CFE_SB_Buffer_t *SBBufPtr) */ } } - - return; } /*---------------------------------------------------------------- diff --git a/modules/time/fsw/src/cfe_time_api.c b/modules/time/fsw/src/cfe_time_api.c index 2f935da67..de92b28dc 100644 --- a/modules/time/fsw/src/cfe_time_api.c +++ b/modules/time/fsw/src/cfe_time_api.c @@ -56,7 +56,7 @@ CFE_TIME_SysTime_t CFE_TIME_GetTime(void) #endif - return (CurrentTime); + return CurrentTime; } /*---------------------------------------------------------------- @@ -87,7 +87,7 @@ CFE_TIME_SysTime_t CFE_TIME_GetTAI(void) */ tai = CFE_TIME_CalculateTAI(&Reference); - return (tai); + return tai; } /*---------------------------------------------------------------- @@ -117,7 +117,7 @@ CFE_TIME_SysTime_t CFE_TIME_GetUTC(void) */ utc = CFE_TIME_CalculateUTC(&Reference); - return (utc); + return utc; } /*---------------------------------------------------------------- @@ -158,7 +158,7 @@ CFE_TIME_SysTime_t CFE_TIME_MET2SCTime(CFE_TIME_SysTime_t METTime) #endif - return (ReturnTime); + return ReturnTime; } /*---------------------------------------------------------------- @@ -188,7 +188,7 @@ CFE_TIME_ClockState_Enum_t CFE_TIME_GetClockState(void) */ state = (CFE_TIME_ClockState_Enum_t)CFE_TIME_CalculateState(&Reference); - return (state); + return state; } /*---------------------------------------------------------------- @@ -290,7 +290,7 @@ uint16 CFE_TIME_GetClockInfo(void) StateFlags |= CFE_TIME_FLAG_REFERR; } - return (StateFlags); + return StateFlags; } /*---------------------------------------------------------------- @@ -315,7 +315,7 @@ int16 CFE_TIME_GetLeapSeconds(void) */ CFE_TIME_GetReference(&Reference); - return (Reference.AtToneLeapSeconds); + return Reference.AtToneLeapSeconds; } /*---------------------------------------------------------------- @@ -340,7 +340,7 @@ CFE_TIME_SysTime_t CFE_TIME_GetSTCF(void) */ CFE_TIME_GetReference(&Reference); - return (Reference.AtToneSTCF); + return Reference.AtToneSTCF; } /*---------------------------------------------------------------- @@ -365,7 +365,7 @@ CFE_TIME_SysTime_t CFE_TIME_GetMET(void) */ CFE_TIME_GetReference(&Reference); - return (Reference.CurrentMET); + return Reference.CurrentMET; } /*---------------------------------------------------------------- @@ -390,7 +390,7 @@ uint32 CFE_TIME_GetMETseconds(void) */ CFE_TIME_GetReference(&Reference); - return (Reference.CurrentMET.Seconds); + return Reference.CurrentMET.Seconds; } /*---------------------------------------------------------------- @@ -415,7 +415,7 @@ uint32 CFE_TIME_GetMETsubsecs(void) */ CFE_TIME_GetReference(&Reference); - return (Reference.CurrentMET.Subseconds); + return Reference.CurrentMET.Subseconds; } /*---------------------------------------------------------------- @@ -444,7 +444,7 @@ CFE_TIME_SysTime_t CFE_TIME_Add(CFE_TIME_SysTime_t Time1, CFE_TIME_SysTime_t Tim Result.Seconds = Time1.Seconds + Time2.Seconds; } - return (Result); + return Result; } /*---------------------------------------------------------------- @@ -470,7 +470,7 @@ CFE_TIME_SysTime_t CFE_TIME_Subtract(CFE_TIME_SysTime_t Time1, CFE_TIME_SysTime_ Result.Seconds = Time1.Seconds - Time2.Seconds; } - return (Result); + return Result; } /*---------------------------------------------------------------- @@ -532,7 +532,7 @@ CFE_TIME_Compare_t CFE_TIME_Compare(CFE_TIME_SysTime_t TimeA, CFE_TIME_SysTime_t } } - return (Result); + return Result; } /*---------------------------------------------------------------- @@ -587,7 +587,7 @@ uint32 CFE_TIME_Micro2SubSecs(uint32 MicroSeconds) SubSeconds = OS_TimeGetSubsecondsPart(tm); } - return (SubSeconds); + return SubSeconds; } /*---------------------------------------------------------------- @@ -742,8 +742,6 @@ void CFE_TIME_Print(char *PrintBuffer, CFE_TIME_SysTime_t TimeToPrint) *PrintBuffer++ = '0' + (char)(NumberOfMicros / 10); *PrintBuffer++ = '0' + (char)(NumberOfMicros % 10); *PrintBuffer++ = '\0'; - - return; } /*---------------------------------------------------------------- @@ -760,8 +758,6 @@ void CFE_TIME_ExternalTone(void) ** Call tone signal ISR (OK if called from non-ISR context)... */ CFE_TIME_Tone1HzISR(); - - return; } /*---------------------------------------------------------------- @@ -863,8 +859,6 @@ void CFE_TIME_ExternalMET(CFE_TIME_SysTime_t NewMET) ** Process external MET data... */ CFE_TIME_ToneSendMET(NewMET); - - return; } #endif /* CFE_PLATFORM_TIME_CFG_SRC_MET */ @@ -883,8 +877,6 @@ void CFE_TIME_ExternalGPS(CFE_TIME_SysTime_t NewTime, int16 NewLeaps) ** Process external GPS time data... */ CFE_TIME_ToneSendGPS(NewTime, NewLeaps); - - return; } #endif /* CFE_PLATFORM_TIME_CFG_SRC_GPS */ @@ -903,7 +895,5 @@ void CFE_TIME_ExternalTime(CFE_TIME_SysTime_t NewTime) ** Process external time data... */ CFE_TIME_ToneSendTime(NewTime); - - return; } #endif /* CFE_PLATFORM_TIME_CFG_SRC_TIME */ diff --git a/modules/time/fsw/src/cfe_time_task.c b/modules/time/fsw/src/cfe_time_task.c index fa36e1a7a..bbc4e94ff 100644 --- a/modules/time/fsw/src/cfe_time_task.c +++ b/modules/time/fsw/src/cfe_time_task.c @@ -54,7 +54,7 @@ int32 CFE_TIME_EarlyInit(void) */ CFE_TIME_InitData(); - return (CFE_SUCCESS); + return CFE_SUCCESS; } /*---------------------------------------------------------------- @@ -346,7 +346,7 @@ bool CFE_TIME_VerifyCmdLength(CFE_MSG_Message_t *MsgPtr, size_t ExpectedLength) ++CFE_TIME_Global.CommandErrorCounter; } - return (result); + return result; } /*---------------------------------------------------------------- @@ -550,8 +550,6 @@ void CFE_TIME_TaskPipe(CFE_SB_Buffer_t *SBBufPtr) break; } /* switch (message ID) */ - - return; } /*---------------------------------------------------------------- diff --git a/modules/time/fsw/src/cfe_time_tone.c b/modules/time/fsw/src/cfe_time_tone.c index dcb91cdfa..9cc4eb536 100644 --- a/modules/time/fsw/src/cfe_time_tone.c +++ b/modules/time/fsw/src/cfe_time_tone.c @@ -158,8 +158,6 @@ void CFE_TIME_ToneSend(void) ** Count of "time at the tone" commands sent with internal data... */ CFE_TIME_Global.InternalCount++; - - return; } #endif /* CFE_PLATFORM_TIME_CFG_SERVER */ @@ -292,7 +290,7 @@ int32 CFE_TIME_ToneSendMET(CFE_TIME_SysTime_t NewMET) /* Exit performance monitoring */ CFE_ES_PerfLogExit(CFE_MISSION_TIME_SENDMET_PERF_ID); - return (Result); + return Result; } #endif /* CFE_PLATFORM_TIME_CFG_SRC_MET */ @@ -432,7 +430,7 @@ int32 CFE_TIME_ToneSendGPS(CFE_TIME_SysTime_t NewTime, int16 NewLeaps) } } - return (Result); + return Result; } #endif /* CFE_PLATFORM_TIME_CFG_SRC_GPS */ @@ -574,7 +572,7 @@ int32 CFE_TIME_ToneSendTime(CFE_TIME_SysTime_t NewTime) } } - return (Result); + return Result; } #endif /* CFE_PLATFORM_TIME_CFG_SRC_TIME */ @@ -646,8 +644,6 @@ void CFE_TIME_ToneData(const CFE_TIME_ToneDataCmd_Payload_t *ToneDataCmd) ** Maintain a count of tone data packets... */ CFE_TIME_Global.ToneDataCounter++; - - return; } /*---------------------------------------------------------------- @@ -689,8 +685,6 @@ void CFE_TIME_ToneSignal(void) ** Maintain a count of tone signal packets... */ CFE_TIME_Global.ToneSignalCounter++; - - return; } /*---------------------------------------------------------------- @@ -774,8 +768,6 @@ void CFE_TIME_ToneVerify(CFE_TIME_SysTime_t Time1, CFE_TIME_SysTime_t Time2) PrevTime1 = Time1; PrevTime2 = Time2; - - return; } /*---------------------------------------------------------------- @@ -965,8 +957,6 @@ void CFE_TIME_ToneUpdate(void) { CFE_EVS_SendEvent(CFE_TIME_FLY_OFF_EID, CFE_EVS_EventType_INFORMATION, "Stop FLYWHEEL"); } - - return; } /*---------------------------------------------------------------- @@ -1087,8 +1077,6 @@ void CFE_TIME_Tone1HzISR(void) /* Exit performance monitoring */ CFE_ES_PerfLogExit(CFE_MISSION_TIME_TONE1HZISR_PERF_ID); - - return; } /*---------------------------------------------------------------- @@ -1147,7 +1135,6 @@ void CFE_TIME_Tone1HzTask(void) ** This should never happen - but during development we ** had an error in the creation of the semaphore. */ - return; } /*---------------------------------------------------------------- @@ -1285,8 +1272,6 @@ void CFE_TIME_Local1HzISR(void) ** Enable 1Hz task (we can't send a SB message from here)... */ OS_BinSemGive(CFE_TIME_Global.LocalSemaphore); - - return; } /*---------------------------------------------------------------- @@ -1346,7 +1331,6 @@ void CFE_TIME_Local1HzTask(void) ** This should never happen - but during development we had an ** error in the creation of the semaphore. */ - return; } /*---------------------------------------------------------------- @@ -1380,6 +1364,4 @@ void CFE_TIME_NotifyTimeSynchApps(void) } } } - - return; } diff --git a/modules/time/fsw/src/cfe_time_utils.c b/modules/time/fsw/src/cfe_time_utils.c index 756675484..793cc3643 100644 --- a/modules/time/fsw/src/cfe_time_utils.c +++ b/modules/time/fsw/src/cfe_time_utils.c @@ -99,7 +99,7 @@ CFE_TIME_SysTime_t CFE_TIME_LatchClock(void) LatchTime.Seconds = OS_TimeGetTotalSeconds(LocalTime); LatchTime.Subseconds = OS_TimeGetSubsecondsPart(LocalTime); - return (LatchTime); + return LatchTime; } /*---------------------------------------------------------------- @@ -188,8 +188,6 @@ void CFE_TIME_QueryResetVars(void) } CFE_TIME_FinishReferenceUpdate(RefState); - - return; } /*---------------------------------------------------------------- @@ -232,8 +230,6 @@ void CFE_TIME_UpdateResetVars(const CFE_TIME_Reference_t *Reference) CFE_TIME_ResetDataPtr->TimeResetVars = LocalResetVars; } } - - return; } /*---------------------------------------------------------------- @@ -369,8 +365,6 @@ void CFE_TIME_InitData(void) */ CFE_MSG_Init(CFE_MSG_PTR(CFE_TIME_Global.Local1HzCmd.CommandHeader), CFE_SB_ValueToMsgId(CFE_TIME_1HZ_CMD_MID), sizeof(CFE_TIME_Global.Local1HzCmd)); - - return; } /*---------------------------------------------------------------- @@ -429,8 +423,6 @@ void CFE_TIME_GetHkData(const CFE_TIME_Reference_t *Reference) CFE_TIME_Global.HkPacket.Payload.SecondsDelay = Reference->AtToneDelay.Seconds; CFE_TIME_Global.HkPacket.Payload.SubsecsDelay = Reference->AtToneDelay.Subseconds; #endif - - return; } /*---------------------------------------------------------------- @@ -551,8 +543,6 @@ void CFE_TIME_GetDiagData(void) ** Reset Area access status... */ CFE_TIME_Global.DiagPacket.Payload.DataStoreStatus = CFE_TIME_Global.DataStoreStatus; - - return; } /*---------------------------------------------------------------- @@ -681,8 +671,6 @@ void CFE_TIME_GetReference(CFE_TIME_Reference_t *Reference) #endif Reference->CurrentMET = CurrentMET; - - return; } /*---------------------------------------------------------------- @@ -699,7 +687,7 @@ CFE_TIME_SysTime_t CFE_TIME_CalculateTAI(const CFE_TIME_Reference_t *Reference) TimeAsTAI = CFE_TIME_Add(Reference->CurrentMET, Reference->AtToneSTCF); - return (TimeAsTAI); + return TimeAsTAI; } /*---------------------------------------------------------------- @@ -717,7 +705,7 @@ CFE_TIME_SysTime_t CFE_TIME_CalculateUTC(const CFE_TIME_Reference_t *Reference) TimeAsUTC = CFE_TIME_Add(Reference->CurrentMET, Reference->AtToneSTCF); TimeAsUTC.Seconds -= Reference->AtToneLeapSeconds; - return (TimeAsUTC); + return TimeAsUTC; } /*---------------------------------------------------------------- @@ -771,7 +759,7 @@ CFE_TIME_ClockState_Enum_t CFE_TIME_CalculateState(const CFE_TIME_Reference_t *R ClockState = CFE_TIME_ClockState_INVALID; } - return (ClockState); + return ClockState; } /*---------------------------------------------------------------- @@ -816,8 +804,6 @@ void CFE_TIME_SetState(CFE_TIME_ClockState_Enum_t NewState) ** Time has changed, force anyone reading time to retry... */ CFE_TIME_FinishReferenceUpdate(RefState); - - return; } /*---------------------------------------------------------------- @@ -875,8 +861,6 @@ void CFE_TIME_SetDelay(CFE_TIME_SysTime_t NewDelay, int16 Direction) ** Time has changed, force anyone reading time to retry... */ CFE_TIME_FinishReferenceUpdate(RefState); - - return; } #endif /* CFE_PLATFORM_TIME_CFG_CLIENT */ @@ -926,8 +910,6 @@ void CFE_TIME_SetTime(CFE_TIME_SysTime_t NewTime) ** Time has changed, force anyone reading time to retry... */ CFE_TIME_FinishReferenceUpdate(RefState); - - return; } #endif /* CFE_PLATFORM_TIME_CFG_SERVER */ @@ -964,8 +946,6 @@ void CFE_TIME_SetMET(CFE_TIME_SysTime_t NewMET) ** Time has changed, force anyone reading time to retry... */ CFE_TIME_FinishReferenceUpdate(RefState); - - return; } #endif /* CFE_PLATFORM_TIME_CFG_SERVER */ @@ -990,8 +970,6 @@ void CFE_TIME_SetSTCF(CFE_TIME_SysTime_t NewSTCF) ** Time has changed, force anyone reading time to retry... */ CFE_TIME_FinishReferenceUpdate(RefState); - - return; } #endif /* CFE_PLATFORM_TIME_CFG_SERVER */ @@ -1016,8 +994,6 @@ void CFE_TIME_SetLeapSeconds(int16 NewLeaps) ** Time has changed, force anyone reading time to retry... */ CFE_TIME_FinishReferenceUpdate(RefState); - - return; } #endif /* CFE_PLATFORM_TIME_CFG_SERVER */ @@ -1055,8 +1031,6 @@ void CFE_TIME_SetAdjust(CFE_TIME_SysTime_t NewAdjust, int16 Direction) ** Time has changed, force anyone reading time to retry... */ CFE_TIME_FinishReferenceUpdate(RefState); - - return; } #endif /* CFE_PLATFORM_TIME_CFG_SERVER */