Fix #1102, Correct return value bug in VxWorks OS_ShellOutputToFile_Impl#1390
Open
thnkslprpt wants to merge 1 commit intonasa:mainfrom
Open
Conversation
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
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.
Checklist
Describe the contribution
OS_ObjectIdGetByIdfails in vxworksOS_ShellOutputToFile_Impl#1102ReturnCode(instead ofReturn) to hold result ofOS_OpenCreate()OS_ObjectIdGetById()out before theifto make code clearer (and remove the side-effect from theifcondition)if (Result == OK)to inside the block, immediately after the one and only assignment to theResultvariable (this check being outside that block was part of what caused the mixed-up OSAL/VxWorks returns previously)ReturnCodetoOS_ERRORifshellGenericInit()does not returnOK- thus correcting the behavior of the function (and the coverage test) to actually return an error if that call failsOS_SUCCESStoOS_ERRORwhenOS_ObjectIdGetById()is seeded with an error returnTesting performed
GitHub CI actions all passing successfully (incl. Build + Run, Unit/Coverage Tests etc.).
Expected behavior changes
OS_ShellOutputToFile_Impl()will actually return an error on all failure cases now.Function logic and flow is clearer now - easing future maintenance.
Contributor Info
Avi Weiss @thnkslprpt