diff options
| author | Neil Fortner <nfortne2@hdfgroup.org> | 2019-05-09 17:46:10 (GMT) |
|---|---|---|
| committer | Neil Fortner <nfortne2@hdfgroup.org> | 2019-05-09 17:46:10 (GMT) |
| commit | 7ce0e7d8fedac0f3de0241b74df8fe167de13c9d (patch) | |
| tree | fd8d01dae3b08348938b5dd2029f7524e73685e7 | |
| parent | 16f94d39078965a2c5977885d4fb112c12f18ad1 (diff) | |
| download | hdf5-7ce0e7d8fedac0f3de0241b74df8fe167de13c9d.zip hdf5-7ce0e7d8fedac0f3de0241b74df8fe167de13c9d.tar.gz hdf5-7ce0e7d8fedac0f3de0241b74df8fe167de13c9d.tar.bz2 | |
Add fixes that were mistakenly omitted from merge of pull request 1594
to 1.8 branch.
| -rw-r--r-- | hl/test/test_dset_opt.c | 4 | ||||
| -rw-r--r-- | src/H5Olayout.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hl/test/test_dset_opt.c b/hl/test/test_dset_opt.c index f2ad57e..fac2e89 100644 --- a/hl/test/test_dset_opt.c +++ b/hl/test/test_dset_opt.c @@ -2048,7 +2048,7 @@ test_single_chunk(unsigned config) if(config & CONFIG_DIRECT_WRITE) { /* Write the data directly to the dataset */ - if(H5Dwrite_chunk(did, H5P_DEFAULT, 0, offset, CHUNK0*CHUNK1*4, (void *)wdata) < 0) + if(H5DOwrite_chunk(did, H5P_DEFAULT, 0, offset, CHUNK0*CHUNK1*4, (void *)wdata) < 0) goto error; } /* end if */ else @@ -2086,7 +2086,7 @@ test_single_chunk(unsigned config) if(config & CONFIG_DIRECT_READ) { /* Read the data directly */ - if(H5Dread_chunk(did, H5P_DEFAULT, offset, &filters, rdata) < 0) + if(H5DOread_chunk(did, H5P_DEFAULT, offset, &filters, rdata) < 0) goto error; /* Verify returned filter mask */ diff --git a/src/H5Olayout.c b/src/H5Olayout.c index c22a1ba..131b4bf 100644 --- a/src/H5Olayout.c +++ b/src/H5Olayout.c @@ -641,7 +641,7 @@ H5O_layout_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst, case H5D_CHUNKED: if(H5D__chunk_is_space_alloc(&layout_src->storage) - || (cpy_info->shared_fo && H5D__chunk_is_data_cached((const H5D_shared_t *)cpy_info->shared_fo))) + || (cpy_info->shared_fo && H5D__chunk_is_data_cached((const H5D_shared_t *)cpy_info->shared_fo))) { /* Create chunked layout */ if(H5D__chunk_copy(file_src, &layout_src->storage.u.chunk, &layout_src->u.chunk, file_dst, &layout_dst->storage.u.chunk, udata->src_space_extent, udata->src_dtype, udata->common.src_pline, cpy_info, dxpl_id) < 0) HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, NULL, "unable to copy chunked storage") |