diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-29 23:38:26 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-29 23:38:26 (GMT) |
| commit | 03d1221bd821c397bb4a2222e3c7b49fa93fd96e (patch) | |
| tree | f17b4e8b59e40b186ec366baf6df1dd24dccd44b /src/H5Olayout.c | |
| parent | ded93bd0c4842f7941e0468411db4cfc325a5095 (diff) | |
| download | hdf5-03d1221bd821c397bb4a2222e3c7b49fa93fd96e.zip hdf5-03d1221bd821c397bb4a2222e3c7b49fa93fd96e.tar.gz hdf5-03d1221bd821c397bb4a2222e3c7b49fa93fd96e.tar.bz2 | |
[svn-r17265] Description:
Bring r17264 from trunk to 1.8 branch:
Refine how we store the chunk index address in the layout storage
structure.
Tested on:
FreeBSD/32 6.3 (duty) debug
Mac OS X/32 10.5.7 (amazon) debug & production
Too minor to require h5committest
Diffstat (limited to 'src/H5Olayout.c')
| -rw-r--r-- | src/H5Olayout.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Olayout.c b/src/H5Olayout.c index 9eb005d..0f9370a 100644 --- a/src/H5Olayout.c +++ b/src/H5Olayout.c @@ -137,7 +137,7 @@ H5O_layout_decode(H5F_t *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh, mesg->ops = H5D_LOPS_CONTIG; } /* end if */ else if(mesg->type == H5D_CHUNKED) { - H5F_addr_decode(f, &p, &(mesg->store.u.chunk.u.btree.addr)); + H5F_addr_decode(f, &p, &(mesg->store.u.chunk.idx_addr)); /* Set the layout operations */ mesg->ops = H5D_LOPS_CHUNK; @@ -219,7 +219,7 @@ H5O_layout_decode(H5F_t *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh, HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "dimensionality is too large") /* B-tree address */ - H5F_addr_decode(f, &p, &(mesg->store.u.chunk.u.btree.addr)); + H5F_addr_decode(f, &p, &(mesg->store.u.chunk.idx_addr)); /* Chunk dimensions */ for(u = 0; u < mesg->u.chunk.ndims; u++) @@ -332,7 +332,7 @@ H5O_layout_encode(H5F_t *f, hbool_t UNUSED disable_shared, uint8_t *p, const voi *p++ = (uint8_t)mesg->u.chunk.ndims; /* B-tree address */ - H5F_addr_encode(f, &p, mesg->store.u.chunk.u.btree.addr); + H5F_addr_encode(f, &p, mesg->store.u.chunk.idx_addr); /* Dimension sizes */ for(u = 0; u < mesg->u.chunk.ndims; u++) @@ -705,7 +705,7 @@ H5O_layout_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Index Type:", "v1 B-tree"); HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth, - "B-tree address:", mesg->store.u.chunk.u.btree.addr); + "B-tree address:", mesg->store.u.chunk.idx_addr); break; default: |