Tests on equalp are always true #1276
Merged
Conversation
This file contains 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
If `equalp` is NULL, then the function returns early, so all subsequent tests on `equalp` are not needed.
edhartnett
reviewed
Jan 5, 2019
| @@ -52,20 +52,17 @@ NC4_inq_type_equal(int ncid1, nc_type typeid1, int ncid2, | |||
| if ((typeid1 <= NC_STRING && typeid2 > NC_STRING) || | |||
| (typeid2 <= NC_STRING && typeid1 > NC_STRING)) | |||
| { | |||
| if (equalp) *equalp = 0; | |||
There was a problem hiding this comment.
This is a good catch, thanks!
I would actually rewrite this so that a NULL equalp does not return NC_NOERR immediately. That's not how our other inq functions work. Normally, even if the user provides a NULL where we would put the answer, we still go through all the work before not doing anything. ;-)
That is, for this function, I would expect that even if I provided NULL, I would get NC_EBADTYPE if one of the types is not found.
The way to do this is to have a local variable "equal" and then, at the end of the function, set equalp if it was provided.
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.
If
equalpis NULL, then the function returns early, so all subsequent tests onequalpare not needed.