Combination of 9 outstanding non-controversial PRs #789
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
Fix Unidata#299 The conditions to make this error are the following: * Two variables with different chunk sizes * Both variables write on the same unlimited dimension * The first variable has already written data when the second variable is created
I realize strncat is being eliminated, but in case the elimination isn't done prior to release, this patch should be applied.
Eliminate this warning from clang:
```
TPL/netcdf/netcdf-c/libdispatch/ncuri.c:914:31: warning: for loop has empty body [-Wempty-body]
for(p=sp,q=sp+1;(*p++=*q++););
^
TPL/netcdf/netcdf-c/libdispatch/ncuri.c:914:31: note: put the semicolon on a separate line to silence this warning
1 warning generated.
```
Make it clear that NC_MAX_DIMS, NC_MAX_VARS, and NC_MAX_ATTRS limits are not enforced after netcdf-4.5.0 to avoid confusion
…fined types, fixed check of return value
edhartnett
changed the title
|
@WardF and @DennisHeimbigner if you guys are close to merging the outstanding filter PR, I suggest you do that before we merge this PR. There are a lot of files involved in that one, and I don't want to perturb anything just when you have resolved most of the issues... |
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.
OK, my last attempt was too ambitious. Hubris!!
This PR does not include Denis' PRs.
This includes:
@wkliao PR #466
@gdsjaar #764, #765, #766
@Lnaden PR #760.
And from me, #763, #769, #780, #786.
After this has passed through testing @WardF will merge it and close the PRs listed above.
After this merge we will take another pass through the remaining PRs to see what can be merged.
From PR #760
Fix #299
From PR #786
Fixes #785.
Fixes #784.
Fixes #783.
Fixes #782
From PR #780:
Part of #701.
Fixes #779.
Fixes #777.
Fixes #776.
Fixes #775.
Fixes #774.
From PR #769
Part of #441.
From PR #763
Part of #597.
Fixes #741.
Fixes #746.
Fixes #749.
Thanks to all for your contributions to netCDF.