diff options
author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2018-05-23 22:16:16 (GMT) |
---|---|---|
committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2018-05-23 22:16:16 (GMT) |
commit | 2e5fece9077102d712a9fa9ec32d3be870ebee19 (patch) | |
tree | 1fa1d6a4b06379431de750ef49436d94310cb515 /src/H5Defl.c | |
parent | 73a21358a99357e1b5728b5732f951c5018ba548 (diff) | |
parent | e8eb130ce6f031a3b8ea50dae491b101d92e9c80 (diff) | |
download | hdf5-2e5fece9077102d712a9fa9ec32d3be870ebee19.zip hdf5-2e5fece9077102d712a9fa9ec32d3be870ebee19.tar.gz hdf5-2e5fece9077102d712a9fa9ec32d3be870ebee19.tar.bz2 |
Merge pull request #1050 in HDFFV/hdf5 from hdf5_1_10.sync to hdf5_1_10
* commit 'e8eb130ce6f031a3b8ea50dae491b101d92e9c80': (117 commits)
Put back CTRL-L chars
Update support link
Update text
Valgrind fixed by checking for prefix_len of 0
HDFFV-9739 only executes H5E tests in production
Remove link flag from compile command
fix typo
Add release note
Correct attribute location
HDFFV-9739 fix copy testfiles command
HDFFV-9739 remove obsolete test files
HDFFV-9739 dup test file for concurrent tests
HDFFV-9739 Fix autotools script
HDFFV-9739 Change autotools test scripts
Fix for HDFFV-10469: set to latest format for virtual layout encoding.
Fix typo
HDFFV-9739 Update test reference
Update current windows test machines
HDFFV-9739 Grab err number before API call
HDFFV-9739 Add release note
...
Diffstat (limited to 'src/H5Defl.c')
-rw-r--r-- | src/H5Defl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Defl.c b/src/H5Defl.c index ebe7689..b2f9b29 100644 --- a/src/H5Defl.c +++ b/src/H5Defl.c @@ -143,7 +143,7 @@ H5D__efl_construct(H5F_t *f, H5D_t *dset) /* * The maximum size of the dataset cannot exceed the storage size. - * Also, only the slowest varying dimension of a simple data space + * Also, only the slowest varying dimension of a simple dataspace * can be extendible (currently only for external data storage). */ @@ -597,7 +597,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5D__efl_bh_info(H5F_t *f, hid_t dxpl_id, H5O_efl_t *efl, hsize_t *heap_size) +H5D__efl_bh_info(H5F_t *f, H5O_efl_t *efl, hsize_t *heap_size) { herr_t ret_value = SUCCEED; /* Return value */ @@ -610,7 +610,7 @@ H5D__efl_bh_info(H5F_t *f, hid_t dxpl_id, H5O_efl_t *efl, hsize_t *heap_size) HDassert(heap_size); /* Get the size of the local heap for EFL's file list */ - if(H5HL_heapsize(f, dxpl_id, efl->heap_addr, heap_size) < 0) + if(H5HL_heapsize(f, efl->heap_addr, heap_size) < 0) HGOTO_ERROR(H5E_EFL, H5E_CANTINIT, FAIL, "unable to retrieve local heap info") done: |