mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-02-17 16:50:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into DAOS

Browse Source
This commit is contained in:
Scot Breitenfeld 2020-07-30 22:24:25 +00:00
commit 146ddcb370
5 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -35,8 +35,9 @@ SET(netCDF_LIB_VERSION 18)
SET(netCDF_SO_VERSION 18)
SET(PACKAGE_VERSION ${VERSION})
# Version of the dispatch table, in case we change it.
SET(NC_DISPATCH_VERSION 1)
# Version of the dispatch table. This must match the value in
# configure.ac.
SET(NC_DISPATCH_VERSION 2)
# Get system configuration, Use it to determine osname, os release, cpu. These
# will be used when committing to CDash.

1
RELEASE_NOTES.md
View File

@ -7,6 +7,7 @@ This file contains a high-level description of this package's evolution. Release
## 4.8.0 - TBD
* [Bug Fix] Fixed byte-range support with cURL > 7.69. See [https://github.com/Unidata/netcdf-c/pull/1798].
* [Enhancement] Added new test for using compression with parallel I/O: nc_test4/tst_h_par_compress.c. See [https://github.com/Unidata/netcdf-c/pull/1784].
* [Bug Fix] Don't return error for extra calls to nc_redef() for netCDF/HDF5 files, unless classic model is in use. See [https://github.com/Unidata/netcdf-c/issues/1779].
* [Enhancement] Added new parallel I/O benchmark program to mimic NOAA UFS data writes, built when --enable-benchmarks is in configure. See [https://github.com/Unidata/netcdf-c/pull/1777].

6
configure.ac
View File

@ -1620,6 +1620,12 @@ AX_SET_META([NC_HAS_PAR_FILTERS], [$hdf5_supports_par_filters],[yes])
AX_SET_META([NC_HAS_BYTERANGE],[$enable_byterange],[yes])
AX_SET_META([NC_HAS_NCZARR],[$enable_nczarr],[yes])
AX_SET_META([NC_HAS_NCZARR_S3],[$enable_s3_sdk],[yes])
# This is the version of the dispatch table. If the dispatch table is
# changed, this should be incremented, so that user-defined format
# applications like PIO can determine whether they have an appropriate
# dispatch table to submit. If this is changed, make sure the value in
# CMakeLists.txt also changes to match.
AC_SUBST([NC_DISPATCH_VERSION], [2])
#####

2
libdispatch/dhttp.c
View File

@ -377,7 +377,7 @@ execute(NC_HTTP_STATE* state, int headcmd)
if(cstat != CURLE_OK) state->httpcode = 0;
if(headcmd) {
cstat = CURLERR(curl_easy_setopt(state->curl, CURLOPT_NOBODY, 0L));
cstat = CURLERR(curl_easy_setopt(state->curl, CURLOPT_HTTPGET, 1L));
if(cstat != CURLE_OK) goto fail;
}

14
ncdump/dumplib.c
View File

@ -189,7 +189,7 @@ sbuf_cat(safebuf_t *sb, const char *s2) {
assert(SAFEBUF_CHECK(sb));
s2len = strlen(s2);
sbuf_grow(sb, 1 + sb->cl + s2len);
res = strlcat(sb->buf + sb->cl, s2, sb->len);
res = strlcat(sb->buf + sb->cl, s2, sb->len - sb->cl);
assert( res < sb->len );
sb->cl += s2len;
assert(SAFEBUF_CHECK(sb));
@ -205,7 +205,7 @@ sbuf_catb(safebuf_t *s1, const safebuf_t *s2) {
assert(SAFEBUF_CHECK(s2));
s2len = sbuf_len(s2);
sbuf_grow(s1, 1 + s1->cl + s2len);
res = strlcat(s1->buf + s1->cl, s2->buf, s1->len);
res = strlcat(s1->buf + s1->cl, s2->buf, s1->len - s1->cl);
assert( res < s1->len );
s1->cl += s2len;
assert(SAFEBUF_CHECK(s1));
@ -239,19 +239,19 @@ void
set_formats(int float_digits, int double_digits)
{
int res;
res = snprintf(float_var_fmt, strlen(float_var_fmt) + 1, "%%.%dg",
res = snprintf(float_var_fmt, sizeof float_var_fmt, "%%.%dg",
float_digits) + 1;
assert(res <= sizeof(float_var_fmt));
res = snprintf(double_var_fmt, strlen(double_var_fmt) + 1, "%%.%dg",
res = snprintf(double_var_fmt, sizeof double_var_fmt, "%%.%dg",
double_digits) + 1;
assert(res <= sizeof(double_var_fmt));
res = snprintf(float_att_fmt, strlen(float_att_fmt) + 1, "%%#.%dgf",
res = snprintf(float_att_fmt, sizeof float_att_fmt, "%%#.%dgf",
float_digits) + 1;
assert(res <= sizeof(float_att_fmt));
res = snprintf(float_attx_fmt, strlen(float_attx_fmt) + 1, "%%#.%dg",
res = snprintf(float_attx_fmt, sizeof float_attx_fmt, "%%#.%dg",
float_digits) + 1;
assert(res <= sizeof(float_attx_fmt));
res = snprintf(double_att_fmt, strlen(double_att_fmt) + 1, "%%#.%dg",
res = snprintf(double_att_fmt, sizeof double_att_fmt, "%%#.%dg",
double_digits) + 1;
assert(res <= sizeof(double_att_fmt));
}