New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cFE Integration candidate: Equuleus-rc1+dev8 #2533

Merged

dzbaker merged 6 commits into main from integration-candidate

Mar 21, 2024

Collaborator

dzbaker commented Mar 21, 2024 •

edited

Loading

Checklist (Please check before submitting)

I reviewed the Contributing Guide.
I signed and emailed the appropriate Contributor License Agreement to [email protected] and copied [email protected].

Describe the contribution

PR Fix #2386, Split up and simplify control flow in CFE_TBL_Register() #2387. Addresses Issue Split up and simplify control flow in CFE_TBL_Register() #2386
PR Fix #2530, naming convention for SendHkCmd #2531. Addresses Issue Correct SendHk command naming mismatches #2530

Testing performed
cFS Bundle Checks
cFE Checks

Expected behavior changes
See PRs

System(s) tested on
Ubuntu 20.04

Additional context
Add any other context about the contribution here.

Third party code
If included, identify any third party code and provide text file of license

Contributor Info - All information REQUIRED for consideration of pull request
@jphickey
@thnkslprpt

thnkslprpt and others added 6 commits

March 12, 2024 22:32


Fix #2386, Split up and simplify control flow in CFE_TBL_Register()

368cdc4


Fix #2387, update for unit test coverage

8962f47

Corrects some missed branches and lines in the unit test


Fix #2530, naming convention for SendHkCmd

6087d45

Corrects name mismatches in the "SendHkCmd" implementations.
ES, EVS, and TBL modules had variations on what this command
was named internally in the code.


Merge pull request #2387 from thnkslprpt:fix-2386-split-up-cfe-tbl-re…

d1c9d7d

…gister

Fix #2386, Split up and simplify control flow in CFE_TBL_Register()


Merge pull request #2531 from jphickey:fix-2530-sendhk-naming

239b224

Fix #2530, naming convention for SendHkCmd


Updating documentation and version numbers for equuleus-rc1+dev114

c794cdb

github-advanced-security bot found potential problems

View reviewed changes

modules/tbl/ut-coverage/tbl_UT.c

@@ @@ -3198,14 +3198,14 @@ @@
  UtAssert_StrnCmp(TblInfo1.LastFileLoaded, MyFilename, sizeof(TblInfo1.LastFileLoaded) - 4, "%s == %s, %ld",
  TblInfo1.LastFileLoaded, MyFilename, (long)sizeof(TblInfo1.LastFileLoaded) - 4);
- if(maxPathLenDiff >= 0)
+ if (maxPathLenDiff >= 0)

Check warning

Code scanning / CodeQL-security

Comparison result is always the same Warning

Comparison is always true because maxPathLenDiff >= 0.

github-advanced-security bot found potential problems

View reviewed changes

modules/tbl/fsw/src/cfe_tbl_internal.c

Comment on lines +1538 to +1550

+ while ((AccessIndex != CFE_TBL_END_OF_LIST) && (*TblHandlePtr == CFE_TBL_BAD_TABLE_HANDLE))
+ {
+ if ((CFE_TBL_Global.Handles[AccessIndex].UsedFlag == true) &&
+ CFE_RESOURCEID_TEST_EQUAL(CFE_TBL_Global.Handles[AccessIndex].AppId, ThisAppId) &&
+ (CFE_TBL_Global.Handles[AccessIndex].RegIndex == *RegIndxPtr))
+ {
+ *TblHandlePtr = AccessIndex;
+ }
+ else
+ {
+ AccessIndex = CFE_TBL_Global.Handles[AccessIndex].NextLink;
+ }
+ }

Check warning

Code scanning / CodeQL-coding-standard

Unbounded loop Warning

This loop does not have a fixed bound.

modules/tbl/fsw/src/cfe_tbl_internal.c

+ *
+ *-----------------------------------------------------------------*/
+CFE_Status_t CFE_TBL_RestoreTableDataFromCDS(CFE_TBL_RegistryRec_t *RegRecPtr, const char *AppName, const char *Name,

Check notice

Code scanning / CodeQL-coding-standard

Function too long Note

CFE_TBL_RestoreTableDataFromCDS has too many lines (81, while 60 are allowed).

modules/tbl/fsw/src/cfe_tbl_internal.c

+ * See description in header file for argument/return detail
+ *
+ *-----------------------------------------------------------------*/
+CFE_Status_t CFE_TBL_CheckForDuplicateRegistration(int16 *RegIndxPtr, const char *TblName,

Check notice

Code scanning / CodeQL-coding-standard

Function too long Note

CFE_TBL_CheckForDuplicateRegistration has too many lines (77, while 60 are allowed).

modules/tbl/fsw/src/cfe_tbl_internal.c

+ * See description in header file for argument/return detail
+ *
+ *-----------------------------------------------------------------*/
+void CFE_TBL_RegisterWithCriticalTableRegistry(CFE_TBL_CritRegRec_t *CritRegRecPtr, CFE_TBL_RegistryRec_t *RegRecPtr,

Check notice

Code scanning / CodeQL-coding-standard

Long function without assertion Note

All functions of more than 10 lines should have at least one assertion.

modules/tbl/fsw/src/cfe_tbl_internal.c

+ *
+ *-----------------------------------------------------------------*/
+CFE_Status_t CFE_TBL_RestoreTableDataFromCDS(CFE_TBL_RegistryRec_t *RegRecPtr, const char *AppName, const char *Name,

Check notice

Code scanning / CodeQL-coding-standard

Long function without assertion Note

All functions of more than 10 lines should have at least one assertion.

modules/tbl/fsw/src/cfe_tbl_task_cmds.c

@@ -42,7 +42,7 @@

 * See description in header file for argument/return detail

 *

 *-----------------------------------------------------------------*/

int32 CFE_TBL_HousekeepingCmd(const CFE_MSG_CommandHeader_t *data)

int32 CFE_TBL_SendHkCmd(const CFE_TBL_SendHkCmd_t *data)

Check notice

Code scanning / CodeQL-coding-standard

Long function without assertion Note

All functions of more than 10 lines should have at least one assertion.

modules/tbl/ut-coverage/tbl_UT.c

@@ @@ -1319,7 +1319,7 @@ @@
 /*
 ** Test the function that processes housekeeping request message
 */
-void Test_CFE_TBL_HousekeepingCmd(void)
+void Test_CFE_TBL_SendHkCmd(void)

Check notice

Code scanning / CodeQL-coding-standard

Long function without assertion Note

All functions of more than 10 lines should have at least one assertion.

modules/es/fsw/src/cfe_es_task.c

@@ @@ -443,7 +443,7 @@ @@
  * See description in header file for argument/return detail
  *
  *-----------------------------------------------------------------*/
-int32 CFE_ES_HousekeepingCmd(const CFE_ES_SendHkCmd_t *data)
+int32 CFE_ES_SendHkCmd(const CFE_ES_SendHkCmd_t *data)

Check notice

Code scanning / CodeQL-coding-standard

Function too long Note

CFE_ES_SendHkCmd has too many lines (106, while 60 are allowed).

modules/tbl/fsw/src/cfe_tbl_task_cmds.c

@@ -42,7 +42,7 @@

 * See description in header file for argument/return detail

 *

 *-----------------------------------------------------------------*/

int32 CFE_TBL_HousekeepingCmd(const CFE_MSG_CommandHeader_t *data)

int32 CFE_TBL_SendHkCmd(const CFE_TBL_SendHkCmd_t *data)

Check notice

Code scanning / CodeQL-coding-standard

Function too long Note

CFE_TBL_SendHkCmd has too many lines (90, while 60 are allowed).

modules/tbl/ut-coverage/tbl_UT.c

@@ @@ -1319,7 +1319,7 @@ @@
 /*
 ** Test the function that processes housekeeping request message
 */
-void Test_CFE_TBL_HousekeepingCmd(void)
+void Test_CFE_TBL_SendHkCmd(void)

Check notice

Code scanning / CodeQL-coding-standard

Function too long Note

Test_CFE_TBL_SendHkCmd has too many lines (78, while 60 are allowed).

dzbaker merged commit ed1faf4 into main

40 of 41 checks passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment