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

Fix #1901, remove else statement that was unreachable by unit tests #2303

Merged
merged 1 commit into from
Apr 28, 2023

Conversation

havencarlson
Copy link
Contributor

Checklist (Please check before submitting)

Describe the contribution
Fixes #1901. CFE_TBL_GetWorkingBuffer() could only ever return CFE_SUCCESS or CFE_TBL_ERR_NO_BUFFER_AVAIL. Removed else statement that would never be able to be reached.

Testing performed
Unit tests

Expected behavior changes
No impact to behavior

System(s) tested on

  • OS: Ubuntu 18.04

Contributor Info - All information REQUIRED for consideration of pull request
Haven Carlson - NASA

Copy link
Contributor

@skliper skliper left a comment

Choose a reason for hiding this comment

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

I think this is the only place CFE_TBL_INTERNAL_ERROR_ERR_EID is used, should it also go away?

@havencarlson
Copy link
Contributor Author

@skliper Good catch! Do you think I should move up all of the event id numbers?

@skliper
Copy link
Contributor

skliper commented Apr 25, 2023

@havencarlson - I've typically just left the gap, those numbers are cheap :)

@dzbaker dzbaker added the CCB:Approved Indicates code review and approval by community CCB label Apr 27, 2023
dzbaker added a commit to nasa/cFS that referenced this pull request Apr 28, 2023
*Combines:*

cFE v7.0.0-rc4+dev287

**Includes:**

*cFE*
- nasa/cFE#2306
- nasa/cFE#2295
- nasa/cFE#2303
- nasa/cFE#2312

Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
Co-authored by: Jacob Hageman  <skliper@users.noreply.github.com>
Co-authored by: Haven Carlson <havencarlson@users.noreply.github.com>
@dzbaker dzbaker merged commit 8721d21 into nasa:main Apr 28, 2023
21 checks passed
dzbaker added a commit to nasa/cFS that referenced this pull request Apr 28, 2023
*Combines:*

cFE v7.0.0-rc4+dev287

**Includes:**

*cFE*
- nasa/cFE#2306
- nasa/cFE#2295
- nasa/cFE#2303
- nasa/cFE#2312

Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
Co-authored by: Jacob Hageman  <skliper@users.noreply.github.com>
Co-authored by: Haven Carlson <havencarlson@users.noreply.github.com>
@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
Labels
CCB:Approved Indicates code review and approval by community CCB Equuleus-rc1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

TBL uncovered lines in CFE_TBL_LoadCmd, no alternative error codes from CFE_TBL_GetWorkingBuffer
4 participants