diff options
| author | M. Scot Breitenfeld <brtnfld@hdfgroup.org> | 2018-05-08 22:17:45 (GMT) |
|---|---|---|
| committer | M. Scot Breitenfeld <brtnfld@hdfgroup.org> | 2018-05-08 22:17:45 (GMT) |
| commit | b69bd0771eba5810db3db25217d5f32dc479185e (patch) | |
| tree | c783a54f7cd8ef2ff504299749f5e18486a0363d /src/H5Fcwfs.c | |
| parent | 525b9f40e5c112b777a28d207ccb6fd454f156fc (diff) | |
| parent | 0cc480d952e2e215f006fc172485fcbabc0f599f (diff) | |
| download | hdf5-b69bd0771eba5810db3db25217d5f32dc479185e.zip hdf5-b69bd0771eba5810db3db25217d5f32dc479185e.tar.gz hdf5-b69bd0771eba5810db3db25217d5f32dc479185e.tar.bz2 | |
Merge branch 'develop' into hdf5_1_10.sync
Diffstat (limited to 'src/H5Fcwfs.c')
| -rw-r--r-- | src/H5Fcwfs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Fcwfs.c b/src/H5Fcwfs.c index 04b86d2..aa5f8ab 100644 --- a/src/H5Fcwfs.c +++ b/src/H5Fcwfs.c @@ -159,7 +159,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5F_cwfs_find_free_heap(H5F_t *f, hid_t dxpl_id, size_t need, haddr_t *addr) +H5F_cwfs_find_free_heap(H5F_t *f, size_t need, haddr_t *addr) { unsigned cwfsno; /* Local index for iterating over collections */ hbool_t found = FALSE; /* Flag to indicate a heap with enough space was found */ @@ -210,11 +210,11 @@ H5F_cwfs_find_free_heap(H5F_t *f, hid_t dxpl_id, size_t need, haddr_t *addr) if((H5HG_SIZE(f->shared->cwfs[cwfsno]) + new_need) <= H5HG_MAXSIZE) { htri_t was_extended; /* Whether the heap was extended */ - was_extended = H5MF_try_extend(f, dxpl_id, H5FD_MEM_GHEAP, H5HG_ADDR(f->shared->cwfs[cwfsno]), (hsize_t)H5HG_SIZE(f->shared->cwfs[cwfsno]), (hsize_t)new_need); + was_extended = H5MF_try_extend(f, H5FD_MEM_GHEAP, H5HG_ADDR(f->shared->cwfs[cwfsno]), (hsize_t)H5HG_SIZE(f->shared->cwfs[cwfsno]), (hsize_t)new_need); if(was_extended < 0) HGOTO_ERROR(H5E_HEAP, H5E_CANTEXTEND, FAIL, "error trying to extend heap") else if(was_extended == TRUE) { - if(H5HG_extend(f, dxpl_id, H5HG_ADDR(f->shared->cwfs[cwfsno]), new_need) < 0) + if(H5HG_extend(f, H5HG_ADDR(f->shared->cwfs[cwfsno]), new_need) < 0) HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, FAIL, "unable to extend global heap collection") *addr = H5HG_ADDR(f->shared->cwfs[cwfsno]); found = TRUE; |