diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-12-11 19:29:44 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-12-11 19:29:44 (GMT) |
| commit | 40dac44efe5a2abc3cce34d2b08a211621bcf85c (patch) | |
| tree | 8f36905deb5719e371e280f68104251488453547 /src/H5Obtreek.c | |
| parent | 09ef5a6ef93e074e190ae7ef36abc5333b3f6260 (diff) | |
| download | hdf5-40dac44efe5a2abc3cce34d2b08a211621bcf85c.zip hdf5-40dac44efe5a2abc3cce34d2b08a211621bcf85c.tar.gz hdf5-40dac44efe5a2abc3cce34d2b08a211621bcf85c.tar.bz2 | |
[svn-r16182] Description:
Rename internal routines, variables, macros, typedefs, etc. for chunked
dataset storage from "istore" to some variant of "chunk" or "btree".
Tested on:
Mac OS X/32 10.5.5 (amazon) in debug mode
Mac OS X/32 10.5.5 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'src/H5Obtreek.c')
| -rw-r--r-- | src/H5Obtreek.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Obtreek.c b/src/H5Obtreek.c index 2311212..36e4c1a 100644 --- a/src/H5Obtreek.c +++ b/src/H5Obtreek.c @@ -100,7 +100,7 @@ H5O_btreek_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, unsigned UNUSED mesg_fl HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for v1 B-tree 'K' message") /* Retrieve non-default B-tree 'K' values */ - UINT16DECODE(p, mesg->btree_k[H5B_ISTORE_ID]); + UINT16DECODE(p, mesg->btree_k[H5B_CHUNK_ID]); UINT16DECODE(p, mesg->btree_k[H5B_SNODE_ID]); UINT16DECODE(p, mesg->sym_leaf_k); @@ -138,7 +138,7 @@ H5O_btreek_encode(H5F_t UNUSED *f, hbool_t UNUSED disable_shared, uint8_t *p, co /* Store version and non-default v1 B-tree 'K' values */ *p++ = H5O_BTREEK_VERSION; - UINT16ENCODE(p, mesg->btree_k[H5B_ISTORE_ID]); + UINT16ENCODE(p, mesg->btree_k[H5B_CHUNK_ID]); UINT16ENCODE(p, mesg->btree_k[H5B_SNODE_ID]); UINT16ENCODE(p, mesg->sym_leaf_k); @@ -211,7 +211,7 @@ H5O_btreek_size(const H5F_t UNUSED *f, hbool_t UNUSED disable_shared, const void HDassert(f); ret_value = 1 + /* Version number */ - 2 + /* Indexed storage internal B-tree 'K' value */ + 2 + /* Chunked storage internal B-tree 'K' value */ 2 + /* Symbol table node internal B-tree 'K' value */ 2; /* Symbol table node leaf 'K' value */ @@ -247,7 +247,7 @@ H5O_btreek_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE HDassert(fwidth >= 0); HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, - "Indexed storage internal B-tree 'K' value:", mesg->btree_k[H5B_ISTORE_ID]); + "Chunked storage internal B-tree 'K' value:", mesg->btree_k[H5B_CHUNK_ID]); HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Symbol table node internal B-tree 'K' value:", mesg->btree_k[H5B_SNODE_ID]); HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, |