diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-09-14 10:28:53 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-09-14 10:28:53 (GMT) |
| commit | ab8cc1c511492133cfb80f2618d703672d655eb1 (patch) | |
| tree | 59f7c27ccef5f0c1a863fe5fd2fef3679222a6d0 /src/H5Dlayout.c | |
| parent | ae7d45d612db414c8f9f8d21d732974ab33bb651 (diff) | |
| download | hdf5-ab8cc1c511492133cfb80f2618d703672d655eb1.zip hdf5-ab8cc1c511492133cfb80f2618d703672d655eb1.tar.gz hdf5-ab8cc1c511492133cfb80f2618d703672d655eb1.tar.bz2 | |
[svn-r19380] Description:
Minor code cleanups.
Tested on:
Mac OS X/32 10.6.4 (amazon) w/debug & production
(h5committest not required on this branch)
Diffstat (limited to 'src/H5Dlayout.c')
| -rw-r--r-- | src/H5Dlayout.c | 35 |
1 files changed, 11 insertions, 24 deletions
diff --git a/src/H5Dlayout.c b/src/H5Dlayout.c index bc3a77f..2c222a9 100644 --- a/src/H5Dlayout.c +++ b/src/H5Dlayout.c @@ -71,9 +71,6 @@ * Programmer: Quincey Koziol * Thursday, March 20, 2008 * - * Modifications: - * Vailin Choi; August 2010 - * Added v2 B-tree indexing. *------------------------------------------------------------------------- */ herr_t @@ -104,10 +101,6 @@ H5D_layout_set_io_ops(const H5D_t *dataset) dataset->shared->layout.storage.u.chunk.ops = H5D_COPS_BTREE; break; - case H5D_CHUNK_IDX_BT2: - dataset->shared->layout.storage.u.chunk.ops = H5D_COPS_BT2; - break; - case H5D_CHUNK_IDX_FARRAY: dataset->shared->layout.storage.u.chunk.ops = H5D_COPS_FARRAY; break; @@ -116,6 +109,10 @@ H5D_layout_set_io_ops(const H5D_t *dataset) dataset->shared->layout.storage.u.chunk.ops = H5D_COPS_EARRAY; break; + case H5D_CHUNK_IDX_BT2: + dataset->shared->layout.storage.u.chunk.ops = H5D_COPS_BT2; + break; + default: HDassert(0 && "Unknown chunk index method!"); HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "unknown chunk index method") @@ -150,10 +147,6 @@ done: * Programmer: Raymond Lu * August 14, 2002 * - * Modifications: - * Vailin Choi; August 2010 - * Added v2 B-tree indexing. - * Removed v1 B-tree support for layout message version >= 4. *------------------------------------------------------------------------- */ size_t @@ -220,11 +213,6 @@ H5D_layout_meta_size(const H5F_t *f, const H5O_layout_t *layout, hbool_t include ret_value++; switch(layout->u.chunk.idx_type) { - case H5D_CHUNK_IDX_BT2: - /* v2 B-tree creation parameters */ - ret_value += H5D_BT2_CREATE_PARAM_SIZE; - break; - case H5D_CHUNK_IDX_FARRAY: /* Fixed array creation parameters */ ret_value += H5D_FARRAY_CREATE_PARAM_SIZE; @@ -235,6 +223,11 @@ H5D_layout_meta_size(const H5F_t *f, const H5O_layout_t *layout, hbool_t include ret_value += H5D_EARRAY_CREATE_PARAM_SIZE; break; + case H5D_CHUNK_IDX_BT2: + /* v2 B-tree creation parameters */ + ret_value += H5D_BT2_CREATE_PARAM_SIZE; + break; + default: HGOTO_ERROR(H5E_OHDR, H5E_CANTENCODE, 0, "Invalid chunk index type") } /* end switch */ @@ -280,7 +273,8 @@ H5D_layout_set_latest_version(H5O_layout_t *layout, const H5S_t *space) layout->version = H5O_LAYOUT_VERSION_LATEST; /* Set the latest indexing type for the layout message */ - ret_value = H5D_layout_set_latest_indexing(layout, space); + if(H5D_layout_set_latest_indexing(layout, space) < 0) + HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "can't set latest indexing type") done: FUNC_LEAVE_NOAPI(ret_value) @@ -298,13 +292,6 @@ done: * Programmer: Quincey Koziol * Thursday, January 15, 2009 * - * Modifications: - * Vailin Choi; June 2010 - * Modified to use Fixed Array indexing for extendible chunked dataset. - * (fixed max. dim. setting but exclude H5S_UNLIMITED) - * - * Vailin Choi; August 2010 - * Added v2 B-tree indexing for chunked dataset >1 unlimited dimensions. *------------------------------------------------------------------------- */ herr_t |