mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-11-27 07:30:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ejh_hdf5_sep_file_info

Browse Source
This commit is contained in:
Ed Hartnett 2018-07-28 08:16:26 -06:00 committed by GitHub
commit df15707488
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libhdf5/Makefile.am
View File

@ -17,6 +17,7 @@ libnchdf5_la_SOURCES = nc4hdf.c nc4info.c hdf5file.c hdf5attr.c \
hdf5dim.c hdf5grp.c hdf5type.c hdf5internal.c hdf5create.c hdf5open.c \
hdf5var.c nc4mem.c nc4memcb.c
# Package this for cmake build.
EXTRA_DIST = CMakeLists.txt

1
libhdf5/hdf5create.c
View File

@ -48,6 +48,7 @@ nc4_create_file(const char *path, int cmode, size_t initialsz,
int retval = NC_NOERR;
NC_FILE_INFO_T* nc4_info = NULL;
NC_HDF5_FILE_INFO_T *hdf5_info;
#ifdef USE_PARALLEL4
NC_MPI_INFO *mpiinfo = NULL;
MPI_Comm comm;

2
libhdf5/hdf5file.c
View File

@ -205,6 +205,7 @@ nc4_close_netcdf4_file(NC_FILE_INFO_T *h5, int abort, int extractmem)
{
dumpopenobjects(h5);
}
#endif
/* Free the HDF5-specific info. */
if (h5->format_file_info)
@ -228,6 +229,7 @@ dumpopenobjects(NC_FILE_INFO_T* h5)
hdf5_info = (NC_HDF5_FILE_INFO_T *)h5->format_file_info;
nobjs = H5Fget_obj_count(hdf5_info->hdfid, H5F_OBJ_ALL);
/* Apparently we can get an error even when nobjs == 0 */
if(nobjs < 0) {
return;