diff options
| author | Jacob Smith <jake.smith@hdfgroup.org> | 2019-10-11 21:26:24 (GMT) |
|---|---|---|
| committer | Jacob Smith <jake.smith@hdfgroup.org> | 2019-10-11 21:26:24 (GMT) |
| commit | a34ff89763ddf4998f6b1b8cfbfa38aa3d58468e (patch) | |
| tree | 0cf682df6376db930f2fb86e99bf6eb39ccee868 /src/H5Dcontig.c | |
| parent | 72560d7ccd796aa9e378e78c06829159eb7832ba (diff) | |
| parent | 1fa1ec619011a1ba13935a5c68f217e60f20c0a7 (diff) | |
| download | hdf5-a34ff89763ddf4998f6b1b8cfbfa38aa3d58468e.zip hdf5-a34ff89763ddf4998f6b1b8cfbfa38aa3d58468e.tar.gz hdf5-a34ff89763ddf4998f6b1b8cfbfa38aa3d58468e.tar.bz2 | |
Merge branch 'hdf5_1_12' of https://bitbucket.hdfgroup.org/scm/~jake.smith/hdf5 into hdf5_1_12
Diffstat (limited to 'src/H5Dcontig.c')
| -rw-r--r-- | src/H5Dcontig.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c index c9f9fc2..0be7364 100644 --- a/src/H5Dcontig.c +++ b/src/H5Dcontig.c @@ -1543,19 +1543,14 @@ H5D__contig_copy(H5F_t *f_src, const H5O_storage_contig_t *storage_src, HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "datatype conversion failed") /* Reclaim space from variable length data */ - if(H5D_vlen_reclaim(tid_mem, buf_space, reclaim_buf) < 0) + if(H5T_reclaim(tid_mem, buf_space, reclaim_buf) < 0) HGOTO_ERROR(H5E_DATASET, H5E_BADITER, FAIL, "unable to reclaim variable-length data") } /* end if */ else if(fix_ref) { /* Check for expanding references */ if(cpy_info->expand_ref) { - size_t ref_count; - - /* Determine # of reference elements to copy */ - ref_count = src_nbytes / H5T_get_size(dt_src); - /* Copy the reference elements */ - if(H5O_copy_expand_ref(f_src, buf, f_dst, bkg, ref_count, H5T_get_ref_type(dt_src), cpy_info) < 0) + if(H5O_copy_expand_ref(f_src, tid_src, dt_src, buf, buf_size, f_dst, bkg, cpy_info) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTCOPY, FAIL, "unable to copy reference attribute") /* After fix ref, copy the new reference elements to the buffer to write out */ |