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 #262, Deprecates OS_FS_* defines that aren't unique to FS #421

Closed
wants to merge 1 commit into from

Conversation

dmknutsen
Copy link
Contributor

@dmknutsen dmknutsen commented Apr 17, 2020

Describe the contribution
Fix #262
Deprecates the following OS_FS* defines from osapi-os-filesys.h:
OS_FS_SUCCESS, OS_FS_ERROR , OS_FS_ERR_INVALID_POINTER, OS_FS_ERR_NO_FREE_FDS , OS_FS_ERR_INVALID_FD, and OS_FS_UNIMPLEMENTED

Used sed to perform a bulk find/replace on each one to swap with common definitions.

Testing performed
Steps taken to test the contribution:

  1. Ran unit tests.

Expected behavior changes
None

System(s) tested on
Oracle VM VirtualBox
OS: ubuntu-19.10
Versions: cFE 6.7.12.0, OSAL 5.0.11.0, PSP 1.4.7.0

**Contributor Info **
Dan Knutsen
NASA/Goddard

@dmknutsen dmknutsen changed the title Fix #262, Deprecates OS_FS_* defines that aren't unique to FS Fix #262, Removes OS_FS_* defines that aren't unique to FS Apr 17, 2020
src/os/inc/osapi-os-filesys.h Outdated Show resolved Hide resolved
@skliper skliper added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Apr 20, 2020
@skliper
Copy link
Contributor

skliper commented Apr 21, 2020

Rebased on master and removed conflicts

@dmknutsen dmknutsen changed the title Fix #262, Removes OS_FS_* defines that aren't unique to FS Fix #262, Deprecates OS_FS_* defines that aren't unique to FS Apr 22, 2020
@skliper skliper added CCB:Approved Indicates code review and approval by community CCB CCB - 20200422 and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Apr 22, 2020
@astrogeco astrogeco changed the base branch from master to integration-candidate April 27, 2020 23:00
@astrogeco
Copy link
Contributor

@dmknutsen check conflicts might need to rebase. Also beware of #427

@skliper
Copy link
Contributor

skliper commented Apr 28, 2020

No need to fix this... already merged deconflicted changes as part of #423

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 duplicate
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Move OS_FS_ERR_* defines to common os error definitions
3 participants