Combination of 11 outstanding non-controversial PRs #788
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
Merge with master to keep uptodate
Some parameters like stringlength actually affect a dimension named maxStrlen. So, add some aliasing so maxstrlen can be specified as a parameter and as an alias for stringlength. The affected parameters (case insensitive): stringlength has alias maxstrlen stringlength_<varname> has alias maxstrlen_<varname> Also: 1. added a test case in ncdap_test/testurl.sh 2. added note to documentation
From that issue, fix the identified errors in the following files: libdap4/d4file.c libdap4/d4read.c ncgen/genc.c ncgen/ncgen.l ncgen/ncgen.y
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
This was referenced Jan 19, 2018
This was referenced Jan 19, 2018
|
This pull request introduces 2 alerts - view on lgtm.com new alerts:
Comment posted by lgtm.com |
|
Won't have time to investigate or check this across the board until next week, but a quick test returned 7 failures on OSX: |
|
OK, these are ncgen failures. I will try a less ambitious merge and see how it goes... |
|
@WardF does the experimental CDash testing happen on all PRs? Or do you manually submit it? |
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.
This PR is a merge of a bunch of non-controversial PRs that are currently in the PR list. This is part of an effort by @WardF and me to clear the PR backlog.
There were some minor conflicts that I resolved. @DennisHeimbigner I changed some of your .sh test code to use tmp directory and file spefic to the test. (That is, /tmp_TEST_NAME vs. /tmp). This is helpful now that we are using parallel builds.
This includes:
@wkliao PR #466
@DennisHeimbigner PRs #558, #619, #703.
@gdsjaar #764, #765, #766
And from me, #763, #769, #780, #786.
After this has passed through testing @WardF will merge it and close the PRs listed above. (I will close mine now).
After this merge we will take another pass through the remaining PRs to see what can be merged.
Thanks to all for your contributions to netCDF. Some of us do it as a job, some of use because we are billionaires who program netCDF in our spare time from our private space station. But we all agree that it is worth improving! ;-)