This repository was archived by the owner on Jan 30, 2020. It is now read-only.
registry,fleetctl: fix bugs regarding shadowed error variables#1685
Merged
dongsupark merged 2 commits intocoreos:masterfrom Sep 21, 2016
Merged
registry,fleetctl: fix bugs regarding shadowed error variables#1685dongsupark merged 2 commits intocoreos:masterfrom
dongsupark merged 2 commits intocoreos:masterfrom
Conversation
Contributor
|
lgtm thanks @dongsupark , don't know why or if golang is supposed to warn about a local variable that shadows another local variable. |
added 2 commits
September 21, 2016 10:44
When marshal() returns a non-nil error 'err', which shadows the pre-defined 'err', we should explicitly return the second error returned from marshal(). Otherwise it will always return nil. To fix other potential bugs, let's just return err explicitly. This was discovered by running go tool vet: $ go tool vet --shadow ./registry registry/job.go:316: declaration of "err" shadows declaration at registry/job.go:315
In matchLocalFileAndUnit(), if os.Stat() returns nil and getUnitFromFile() returns non-nil error, then in the end matchLocalFileAndUnit() will return (false, nil). That's not the expected result. It should have returned the second error that came from getUnitFromFile(). To avoid further potential bugs, let's follow the idiomatic coding style: first check err != nil, and fail-fast. This issue was discoverd by running go tools vet.
dongsupark
force-pushed
the
dongsu/fix-shadow-error-vars
branch
from
3da1508 to
3df18ae
Compare
Author
|
@tixxdz Merged. Thanks for the review! |
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 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.
CreateUnit()explicitly return error: When
marshal()returns a non-nil error'err', which shadows the pre-defined'err', we should explicitly return the second error returned frommarshal(). Otherwise it will always returnnil. To fix other potential errors, let's just returnerrexplicitly. This was discovered by running "go tool vet":matchLocalFileAndUnit(): In
matchLocalFileAndUnit(), ifos.Stat()returns nil andgetUnitFromFile()returns non-nil error, then in the endmatchLocalFileAndUnit()will return(false, nil). That's not the expected result. It should have returned the second error that came fromgetUnitFromFile(). To avoid further potential bugs, let's follow the idiomatic coding style: first check "err != nil", and fail-fast. This issue was discovered by running "go tool vet".