diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-03 00:33:15 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-03 00:33:15 (GMT) |
| commit | 27c6981c41dfff7c7c151e0bebd325128bc6b34b (patch) | |
| tree | b0a50f29affeba2a9d4da04a93f5f9e7dcaa454a /src | |
| parent | 856a80b949ba7f980487a7a3185afbfd7c77a724 (diff) | |
| download | hdf5-27c6981c41dfff7c7c151e0bebd325128bc6b34b.zip hdf5-27c6981c41dfff7c7c151e0bebd325128bc6b34b.tar.gz hdf5-27c6981c41dfff7c7c151e0bebd325128bc6b34b.tar.bz2 | |
[svn-r17153] Description:
Bring r17152 from trunk to 1.8 branch:
Clean up some minor formatting and misc. errors noticed while working on
fixed array code merge.
Tested on:
Mac OS X/32 10.5.7 (amazon)
Too minor to require h5committest
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Dchunk.c | 3 | ||||
| -rw-r--r-- | src/H5Dint.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index d210f6d..fe05de2 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -422,7 +422,7 @@ H5D_chunk_construct(H5F_t *f, H5D_t *dset) /* Reset address and pointer of the array struct for the chunked storage index */ if(H5D_chunk_idx_reset(&dset->shared->layout, TRUE) < 0) - HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to reset chunked storage index") + HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to reset chunked storage index") done: FUNC_LEAVE_NOAPI(ret_value) @@ -3899,6 +3899,7 @@ H5D_chunk_addrmap(const H5D_io_info_t *io_info, haddr_t chunk_addr[]) /* Compose chunked index info struct */ idx_info.f = dset->oloc.file; idx_info.dxpl_id = io_info->dxpl_id; + idx_info.pline = &dset->shared->dcpl_cache.pline; idx_info.layout = &dset->shared->layout; /* Iterate over chunks to build mapping of chunk addresses */ diff --git a/src/H5Dint.c b/src/H5Dint.c index 5e47856..196ff04 100644 --- a/src/H5Dint.c +++ b/src/H5Dint.c @@ -2324,7 +2324,7 @@ H5D_set_extent(H5D_t *dset, const hsize_t *size, hid_t dxpl_id) /* Check if we are allowed to modify this file */ if(0 == (H5F_INTENT(dset->oloc.file) & H5F_ACC_RDWR)) - HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "no write intent on file") + HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "no write intent on file") /* Check if we are allowed to modify the space; only datasets with chunked and external storage are allowed to be modified */ if(H5D_COMPACT == dset->shared->layout.type) |