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

Merge pull request #1892 from DennisHeimbigner/httpfield.dmh

Browse Source 
Enforce that !ENABLE_BYTERANGE => !ENABLE_HDF5_ROS3
This commit is contained in:
Ward Fisher 2020-11-30 11:48:28 -07:00 committed by GitHub
commit 3953fc2d8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -1206,7 +1206,7 @@ if test "x$enable_hdf5" = xyes; then
# See if hdf5 library supports Read-Only S3 (byte-range) driver
AC_SEARCH_LIBS([H5Pset_fapl_ros3],[hdf5_hldll hdf5_hl], [has_ros3=yes], [has_ros3=no])
if test "x$has_ros3" = xyes; then
if test "x$has_ros3" = xyes && test "x$enable_byterange" = xyes; then
AC_DEFINE([ENABLE_HDF5_ROS3], [1], [if true, support byte-range using hdf5 virtual file driver.])
fi

2
libhdf5/hdf5file.c
View File

@ -223,9 +223,11 @@ nc4_close_netcdf4_file(NC_FILE_INFO_T *h5, int abort, NC_memio *memio)
* hidden attribute. */
NC4_clear_provenance(&h5->provenance);
#if defined(ENABLE_BYTERANGE) || defined(ENABLE_HDF5_ROS3) || defined(ENABLE_S3_SDK)
/* Free the http info */
ncurifree(hdf5_info->http.uri);
NC_authfree(hdf5_info->http.auth);
#endif
/* Close hdf file. It may not be open, since this function is also
* called by NC_create() when a file opening is aborted. */