diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-12-11 19:34:27 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-12-11 19:34:27 (GMT) |
| commit | 796f5a9f4c889296d8bae1913c7e86107755100b (patch) | |
| tree | 1b8abbcc8c7fad874ed0f440904a44b1076fdc5d /src/H5Obtreek.c | |
| parent | 4168cf3af65596824715ee7d4dd989d8578a95c0 (diff) | |
| download | hdf5-796f5a9f4c889296d8bae1913c7e86107755100b.zip hdf5-796f5a9f4c889296d8bae1913c7e86107755100b.tar.gz hdf5-796f5a9f4c889296d8bae1913c7e86107755100b.tar.bz2 | |
[svn-r16183] Description:
Bring r16182 back from trunk:
Rename internal routines, variables, macros, typedefs, etc. for chunked
dataset storage from "istore" to some variant of "chunk" or "btree".
Tested on:
FreeBSD/32 6.3 (duty) in debug 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, |