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 #104, Convert int32 return codes and variables to CFE_Status_t #105

Merged
merged 1 commit into from
May 18, 2023
Merged

Fix #104, Convert int32 return codes and variables to CFE_Status_t #105

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/ds_table.c
@@ -44,13 +44,13 @@
/* */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

int32 DS_TableInit(void)
CFE_Status_t DS_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/ds_table.c
@@ -869,12 +869,12 @@
/* */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

int32 DS_TableCreateCDS(void)
CFE_Status_t DS_TableCreateCDS(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/ds_table.c
@@ -510,10 +510,10 @@
/* */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

int32 DS_TableVerifyFilter(const void *TableData)
CFE_Status_t DS_TableVerifyFilter(const void *TableData)

Check notice

Code scanning / CodeQL

Long function without assertion

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

int32 DS_TableVerifyDestFile(const void *TableData)
CFE_Status_t DS_TableVerifyDestFile(const void *TableData)

Check notice

Code scanning / CodeQL

Long function without assertion

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

int32 DS_AppInitialize(void)
CFE_Status_t DS_AppInitialize(void)

Check notice

Code scanning / CodeQL

Function too long

DS_AppInitialize has too many lines (95, while 60 are allowed).
fsw/src/ds_table.c
@@ -44,13 +44,13 @@
/* */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

int32 DS_TableInit(void)
CFE_Status_t DS_TableInit(void)

Check notice

Code scanning / CodeQL

Function too long

DS_TableInit has too many lines (131, while 60 are allowed).
fsw/src/ds_table.c
@@ -869,12 +869,12 @@
/* */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

int32 DS_TableCreateCDS(void)
CFE_Status_t DS_TableCreateCDS(void)

Check notice

Code scanning / CodeQL

Function too long

DS_TableCreateCDS has too many lines (64, while 60 are allowed).
fsw/src/ds_app.c
@@ -173,10 +173,10 @@
/* */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

int32 DS_AppInitialize(void)
CFE_Status_t DS_AppInitialize(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:35
chillfig
chillfig requested changes May 11, 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.

Why not update the return type in the function prototype?

DS/fsw/src/ds_table.h

Line 75 in 6418e20

int32 DS_TableInit(void);

DS/fsw/src/ds_table.h

Line 188 in 6418e20

int32 DS_TableVerifyFilter(const void *TableData);

DS/fsw/src/ds_table.h

Line 142 in 6418e20

int32 DS_TableVerifyDestFile(const void *TableData);

DS/fsw/src/ds_table.h

Line 455 in 6418e20

int32 DS_TableCreateCDS(void);

@thnkslprpt thnkslprpt force-pushed the fix-104-convert-int32-return-codes-to-CFE_Status_t branch from 1c93153 to cd3aec2 Compare May 11, 2023 20:06
@thnkslprpt thnkslprpt requested a review from chillfig May 11, 2023 20:06
@thnkslprpt
Copy link
Contributor Author

Why not update the return type in the function prototype?
...

Woops - missed them.
Updated now.

@chillfig
Copy link
Contributor

Why not update the return type in the function prototype?
...

Woops - missed them. Updated now.

Looks good. Thank you!

@dzbaker dzbaker merged commit 704fd2b into nasa:main May 18, 2023
@thnkslprpt thnkslprpt deleted the fix-104-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.

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