Skip to content
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.

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

cFE Integration Candidate: Caelum-rc4+dev23 #2161

Merged
merged 11 commits into from
Oct 3, 2022
Merged
9 changes: 0 additions & 9 deletions .github/workflows/codeql-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,7 @@ name: "CodeQL Analysis"

on:
push:
paths-ignore:
- '**/*.md'
- '**/*.txt'
- '**/*.dox'

pull_request:
paths-ignore:
- '**/*.md'
- '**/*.txt'
- '**/*.dox'

jobs:
codeql:
Expand Down
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ The detailed cFE user's guide can be viewed at <https://github.com/nasa/cFE/blob

## Changelog

### Development Build: v7.0.0-rc4+dev183
- Fixes issue #2144- Propagate CMAKE_EXPORT_COMPILE_COMMANDS variable
- Remove CodeQL Paths Ignore
- Duplicated Logic in CFE_SB_BroadcastBufferToRoute
- Remove 'return;' from last line of void functions.
- Remove unnecessary parentheses around return values.
- See <https://github.com/nasa/cFE/pull/2145>, <https://github.com/nasa/cFE/pull/2148>, <https://github.com/nasa/cFE/pull/2151>, <https://github.com/nasa/cFE/pull/2156>, and <https://github.com/nasa/cFE/pull/2154>

### Development Build: v7.0.0-rc4+dev171
- Resolve doxygen 1.8.17 latex make errors
- See <https://github.com/nasa/cFE/pull/2143>
Expand Down
1 change: 1 addition & 0 deletions cmake/mission_build.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions modules/cfe_testcase/src/es_task_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -89,7 +88,6 @@ void TaskExitFunction(void)
CFE_FT_Global.Count += 1;
CFE_ES_ExitChildTask();
}
return;
}

void TestCreateChild(void)
Expand Down
4 changes: 2 additions & 2 deletions modules/core_api/fsw/inc/cfe_resourceid.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/**
Expand All @@ -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);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion modules/core_api/fsw/inc/cfe_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
42 changes: 19 additions & 23 deletions modules/es/fsw/src/cfe_es_api.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

/*----------------------------------------------------------------
Expand Down Expand Up @@ -152,7 +152,7 @@ CFE_Status_t CFE_ES_ResetCFE(uint32 ResetType)
ReturnCode = CFE_ES_BAD_ARGUMENT;
}

return (ReturnCode);
return ReturnCode;
}

/*----------------------------------------------------------------
Expand Down Expand Up @@ -221,7 +221,7 @@ CFE_Status_t CFE_ES_RestartApp(CFE_ES_AppId_t AppID)

} /* end if */

return (ReturnCode);
return ReturnCode;
}

/*----------------------------------------------------------------
Expand Down Expand Up @@ -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;
}

/*----------------------------------------------------------------
Expand Down Expand Up @@ -343,7 +343,7 @@ CFE_Status_t CFE_ES_DeleteApp(CFE_ES_AppId_t AppID)
CFE_RESOURCEID_TO_ULONG(AppID));
}

return (ReturnCode);
return ReturnCode;
}

/*----------------------------------------------------------------
Expand Down Expand Up @@ -568,7 +568,7 @@ bool CFE_ES_RunLoop(uint32 *RunStatus)

CFE_ES_UnlockSharedData(__func__, __LINE__);

return (ReturnCode);
return ReturnCode;
}

/*----------------------------------------------------------------
Expand Down Expand Up @@ -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;
}

/*----------------------------------------------------------------
Expand Down Expand Up @@ -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;
}

/*----------------------------------------------------------------
Expand Down Expand Up @@ -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;
}

/*----------------------------------------------------------------
Expand Down Expand Up @@ -840,7 +840,7 @@ CFE_Status_t CFE_ES_GetAppID(CFE_ES_AppId_t *AppIdPtr)

CFE_ES_UnlockSharedData(__func__, __LINE__);

return (Result);
return Result;
}

/*----------------------------------------------------------------
Expand Down Expand Up @@ -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;
}

/*----------------------------------------------------------------
Expand Down Expand Up @@ -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;
}

/*----------------------------------------------------------------
Expand Down Expand Up @@ -1209,7 +1209,7 @@ int32 CFE_ES_GetModuleInfo(CFE_ES_AppInfo_t *ModuleInfo, CFE_ResourceId_t Resour
break;
}

return (Status);
return Status;
}

/*----------------------------------------------------------------
Expand Down Expand Up @@ -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;
}

/*----------------------------------------------------------------
Expand Down Expand Up @@ -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;
}

/*----------------------------------------------------------------
Expand Down Expand Up @@ -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;
}

/*----------------------------------------------------------------
Expand Down Expand Up @@ -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;
}

/*----------------------------------------------------------------
Expand Down Expand Up @@ -1701,7 +1701,7 @@ uint32 CFE_ES_CalculateCRC(const void *DataPtr, size_t DataLength, uint32 InputC
default:
break;
}
return (Crc);
return Crc;
}

/*----------------------------------------------------------------
Expand Down Expand Up @@ -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;
}

/*----------------------------------------------------------------
Expand Down Expand Up @@ -2255,8 +2255,6 @@ void CFE_ES_LockSharedData(const char *FunctionName, int32 LineNumber)
FunctionName, (int)LineNumber);

} /* end if */

return;
}

/*----------------------------------------------------------------
Expand All @@ -2282,8 +2280,6 @@ void CFE_ES_UnlockSharedData(const char *FunctionName, int32 LineNumber)
FunctionName, (int)LineNumber);

} /* end if */

return;
}

/*----------------------------------------------------------------
Expand Down
10 changes: 5 additions & 5 deletions modules/es/fsw/src/cfe_es_apps.c
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ int32 CFE_ES_ParseFileEntry(const char **TokenList, uint32 NumTokens)
Status = CFE_ES_ERR_APP_CREATE;
}

return (Status);
return Status;
}

/*----------------------------------------------------------------
Expand Down Expand Up @@ -545,7 +545,7 @@ int32 CFE_ES_GetTaskFunction(CFE_ES_TaskEntryFuncPtr_t *FuncPtr)
*FuncPtr = EntryFunc;
}

return (ReturnCode);
return ReturnCode;
}

/*----------------------------------------------------------------
Expand Down Expand Up @@ -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;
}

/*----------------------------------------------------------------
Expand Down Expand Up @@ -1556,7 +1556,7 @@ int32 CFE_ES_CleanUpApp(CFE_ES_AppId_t AppId)

CFE_ES_UnlockSharedData(__func__, __LINE__);

return (ReturnCode);
return ReturnCode;
}

/*
Expand Down Expand Up @@ -1739,7 +1739,7 @@ int32 CFE_ES_CleanupTaskResources(CFE_ES_TaskId_t TaskId)
Result = CFE_ES_TASK_DELETE_ERR;
}

return (Result);
return Result;
}

/*----------------------------------------------------------------
Expand Down
4 changes: 1 addition & 3 deletions modules/es/fsw/src/cfe_es_cds.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

/*----------------------------------------------------------------
Expand Down Expand Up @@ -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;
}

/*----------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion modules/es/fsw/src/cfe_es_cds.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

/*---------------------------------------------------------------------------------------*/
Expand Down
2 changes: 1 addition & 1 deletion modules/es/fsw/src/cfe_es_erlog.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

/*----------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions modules/es/fsw/src/cfe_es_generic_pool.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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;
}

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