summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2009-07-03 00:26:53 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2009-07-03 00:26:53 (GMT)
commite844def040da6235cf37ce7feb136720e423edb4 (patch)
treeffa88197dc99eb523162c8578af19e0bf0549c48
parentd643e648f3536f89af7b8a622c297de028eb1d7a (diff)
downloadhdf5-e844def040da6235cf37ce7feb136720e423edb4.zip
hdf5-e844def040da6235cf37ce7feb136720e423edb4.tar.gz
hdf5-e844def040da6235cf37ce7feb136720e423edb4.tar.bz2
[svn-r17152] Description:
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
-rw-r--r--src/H5Dchunk.c3
-rw-r--r--src/H5Dint.c2
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)