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.

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

Jump to bottom

Fix #99, Convert int32 return codes and variables to CFE_Status_t #100

Merged
merged 1 commit into from
May 18, 2023
Merged

Fix #99, Convert int32 return codes and variables to CFE_Status_t #100

merged 1 commit into from
May 18, 2023

Conversation

thnkslprpt
Copy link
Contributor

Checklist

Describe the contribution

Testing performed
GitHub CI actions all passing successfully.

Expected behavior changes
No change to behavior.
CFE_Status_t is more expressive and improves consistency with cFE/cFS.

Contributor Info
Avi Weiss @thnkslprpt

github-advanced-security[bot]
github-advanced-security bot found potential problems Apr 22, 2023
View reviewed changes
fsw/src/fm_cmd_utils.c
@@ -563,13 +563,13 @@
/* */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

int32 FM_GetDirectorySpaceEstimate(const char *Directory, uint64 *BlockCount, uint64 *ByteCount)
CFE_Status_t FM_GetDirectorySpaceEstimate(const char *Directory, uint64 *BlockCount, uint64 *ByteCount)

Check notice

Code scanning / CodeQL

Function too long

FM_GetDirectorySpaceEstimate has too many lines (72, while 60 are allowed).
fsw/src/fm_cmd_utils.c
@@ -531,11 +531,11 @@
/* */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

int32 FM_GetVolumeFreeSpace(const char *FileSys, uint64 *BlockCount, uint64 *ByteCount)
CFE_Status_t FM_GetVolumeFreeSpace(const char *FileSys, uint64 *BlockCount, uint64 *ByteCount)

Check notice

Code scanning / CodeQL

Long function without assertion

All functions of more than 10 lines should have at least one assertion.
fsw/src/fm_tbl.c
@@ -38,9 +38,9 @@
/* */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

int32 FM_TableInit(void)
CFE_Status_t FM_TableInit(void)

Check notice

Code scanning / CodeQL

Long function without assertion

All functions of more than 10 lines should have at least one assertion.
fsw/src/fm_cmd_utils.c
@@ -563,13 +563,13 @@
/* */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

int32 FM_GetDirectorySpaceEstimate(const char *Directory, uint64 *BlockCount, uint64 *ByteCount)
CFE_Status_t FM_GetDirectorySpaceEstimate(const char *Directory, uint64 *BlockCount, uint64 *ByteCount)

Check notice

Code scanning / CodeQL

Long function without assertion

All functions of more than 10 lines should have at least one assertion.
fsw/src/fm_tbl.c
@@ -68,11 +68,11 @@
/* */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

int32 FM_ValidateTable(FM_MonitorTable_t *TablePtr)
CFE_Status_t FM_ValidateTable(FM_MonitorTable_t *TablePtr)

Check notice

Code scanning / CodeQL

Function too long

FM_ValidateTable has too many lines (114, while 60 are allowed).
fsw/src/fm_app.c
@@ -165,10 +165,10 @@
/* */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

int32 FM_AppInit(void)
CFE_Status_t FM_AppInit(void)

Check notice

Code scanning / CodeQL

Function too long

FM_AppInit has too many lines (75, while 60 are allowed).
fsw/src/fm_tbl.c
@@ -68,11 +68,11 @@
/* */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

int32 FM_ValidateTable(FM_MonitorTable_t *TablePtr)
CFE_Status_t FM_ValidateTable(FM_MonitorTable_t *TablePtr)

Check notice

Code scanning / CodeQL

Long function without assertion

All functions of more than 10 lines should have at least one assertion.
fsw/src/fm_app.c
@@ -165,10 +165,10 @@
/* */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

int32 FM_AppInit(void)
CFE_Status_t FM_AppInit(void)

Check notice

Code scanning / CodeQL

Long function without assertion

All functions of more than 10 lines should have at least one assertion.
fsw/src/fm_child.c
@@ -54,12 +54,12 @@
/* */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

int32 FM_ChildInit(void)
CFE_Status_t FM_ChildInit(void)

Check notice

Code scanning / CodeQL

Long function without assertion

All functions of more than 10 lines should have at least one assertion.
@dzbaker dzbaker requested a review from chillfig April 27, 2023 18:36
@thnkslprpt thnkslprpt force-pushed the fix-99-convert-int32-return-codes-to-CFE_Status_t branch from 6cedde4 to fdef479 Compare May 5, 2023 03:38
chillfig
chillfig approved these changes May 18, 2023
View reviewed changes
Copy link
Contributor

@chillfig chillfig left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@dzbaker dzbaker merged commit 406dd9d into nasa:main May 18, 2023
@thnkslprpt thnkslprpt deleted the fix-99-convert-int32-return-codes-to-CFE_Status_t branch May 18, 2023 21:18
@dmknutsen dmknutsen added this to the Equuleus milestone May 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chillfig chillfig chillfig approved these changes

Assignees
No one assigned
Labels
CCB:Approved enhancement Equuleus-rc1
Projects
None yet
Milestone
Equuleus
Development

Successfully merging this pull request may close these issues.

FM int32 return codes and variables should be converted to CFE_Status_t
4 participants
@thnkslprpt @chillfig @dzbaker @dmknutsen