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

Enforce that !ENABLE_BYTERANGE => !ENABLE_HDF5_ROS3 #1892

Merged
merged 7 commits into from
Nov 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions libhdf5/hdf5file.c
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down