Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Combination of 11 outstanding non-controversial PRs #788

Closed

Conversation

edhartnett
Copy link
Contributor

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! ;-)

wkliao and others added 30 commits August 20, 2017 13:53
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
@WardF
Copy link
Member

WardF commented Jan 19, 2018

This pull request introduces 2 alerts - view on lgtm.com

new alerts:

  • 1 for Duplicate include guard
  • 1 for Missing return statement

Comment posted by lgtm.com

@WardF
Copy link
Member

WardF commented Jan 19, 2018

Won't have time to investigate or check this across the board until next week, but a quick test returned 7 failures on OSX:

@edhartnett
Copy link
Contributor Author

OK, these are ncgen failures. I will try a less ambitious merge and see how it goes...

@edhartnett edhartnett closed this Jan 20, 2018
@edhartnett
Copy link
Contributor Author

@WardF does the experimental CDash testing happen on all PRs? Or do you manually submit it?

@edhartnett edhartnett deleted the ejh_develop_2 branch January 30, 2018 16:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants