Fix #623, Replace OS_FS_* return codes with common definitions#624
Merged
astrogeco merged 2 commits intonasa:integration-candidatefrom Apr 29, 2020
Merged
Fix #623, Replace OS_FS_* return codes with common definitions#624astrogeco merged 2 commits intonasa:integration-candidatefrom
astrogeco merged 2 commits intonasa:integration-candidatefrom
Conversation
skliper
suggested changes
Apr 17, 2020
fsw/cfe-core/src/inc/cfe_error.h
Outdated
| #define CFE_OS_SEM_UNAVAILABLE (OS_SEM_UNAVAILABLE) /**< @brief This doesn't actually exist */ | ||
| #define CFE_OS_FS_ERROR (OS_FS_ERROR) /**< @copydoc OS_FS_ERROR */ | ||
| #define CFE_OS_FS_ERR_INVALID_POINTER (OS_FS_ERR_INVALID_POINTER) /**< @copydoc OS_FS_ERR_INVALID_POINTER */ | ||
| #define CFE_OS_ERROR (OS_ERROR) /**< @copydoc OS_ERROR */ |
Contributor
There was a problem hiding this comment.
Leave as CFE_OS_FS_ERROR, this whole group is deprecated in #582 but need to deprecate before removing. Same for CFE_OS_FS_ERR_INVALID_POINTER.
dmknutsen
changed the title
dmknutsen
changed the title
skliper
approved these changes
Apr 21, 2020
skliper
added
the
CCB:Ready
Contributor
|
CCB 20200422 - APPROVED |
astrogeco
added
CCB - 20200422
CCB:Approved
Contributor
|
@dmknutsen check conflicts, might want to rebase |
jphickey
added a commit
that referenced
this pull request
Apr 29, 2020
Fix #623, Replace OS_FS_* return codes with common definitions Merged manually to resolve conflicts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Describe the contribution
Removed 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
Fixes #623
Used sed to perform a bulk find/replace on each one to swap with common definitions.
Testing performed
Steps taken to test the contribution:
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