summaryrefslogtreecommitdiffstats
path: root/src/H5Olayout.c
diff options
context:
space:
mode:
authorNeil Fortner <nfortne2@hdfgroup.org>2015-02-20 21:53:35 (GMT)
committerNeil Fortner <nfortne2@hdfgroup.org>2015-02-20 21:53:35 (GMT)
commit88b7d8d34cd1c645c22197d440115c05435c816a (patch)
treea9bd6c3e425bbf6a8a5e25094b2c0d07e2b8b25b /src/H5Olayout.c
parenta5460b731d7f98296a8f76fcca293e6cc9521eb1 (diff)
downloadhdf5-88b7d8d34cd1c645c22197d440115c05435c816a.zip
hdf5-88b7d8d34cd1c645c22197d440115c05435c816a.tar.gz
hdf5-88b7d8d34cd1c645c22197d440115c05435c816a.tar.bz2
[svn-r26261] Commit working but incomplete prototype. Does not perform I/O.
Tested: ummon
Diffstat (limited to 'src/H5Olayout.c')
-rw-r--r--src/H5Olayout.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/H5Olayout.c b/src/H5Olayout.c
index 0e43824..9d4fff7 100644
--- a/src/H5Olayout.c
+++ b/src/H5Olayout.c
@@ -317,6 +317,9 @@ H5O_layout_decode(H5F_t *f, hid_t dxpl_id, H5O_t UNUSED *open_oh,
HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, NULL, "incorrect heap block size")
} /* end if */
+ /* Set the layout operations */
+ mesg->ops = H5D_LOPS_VIRTUAL;
+
break;
case H5D_LAYOUT_ERROR:
@@ -333,7 +336,7 @@ done:
if(ret_value == NULL)
if(mesg) {
if(mesg->type == H5D_VIRTUAL)
- if(H5D_virtual_reset_layout(mesg) < 0)
+ if(H5D__virtual_reset_layout(mesg) < 0)
HDONE_ERROR(H5E_OHDR, H5E_CANTFREE, NULL, "unable to reset virtual layout")
mesg = H5FL_FREE(H5O_layout_t, mesg);
} /* end if */
@@ -596,11 +599,9 @@ H5O_layout_copy(const void *_mesg, void *_dest)
H5D_chunk_idx_reset(&dest->storage.u.chunk, FALSE);
/* Deep copy the entry list for virtual datasets */
- if(mesg->type == H5D_VIRTUAL) {
- HDassert((mesg->storage.u.virt.list_nused > 0) && "checking code coverage...");//VDSINC
- if(H5D_virtual_copy_layout(dest) < 0)
+ if(mesg->type == H5D_VIRTUAL)
+ if(H5D__virtual_copy_layout(dest) < 0)
HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, NULL, "unable to copy virtual layout")
- } //VDSINC
/* Set return value */
ret_value = dest;
@@ -677,7 +678,7 @@ H5O_layout_reset(void *_mesg)
mesg->storage.u.compact.buf = H5MM_xfree(mesg->storage.u.compact.buf);
else if(H5D_VIRTUAL == mesg->type)
/* Free the virtual entry list */
- if(H5D_virtual_reset_layout(mesg) < 0)
+ if(H5D__virtual_reset_layout(mesg) < 0)
HGOTO_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to reset virtual layout")
/* Reset the message */
@@ -768,7 +769,7 @@ H5O_layout_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg)
case H5D_VIRTUAL: /* Virtual dataset */
HDassert(0 && "checking code coverage...");//VDSINC
/* Free the file space virtual dataset */
- if(H5D_virtual_delete(f, dxpl_id, &mesg->storage) < 0)
+ if(H5D__virtual_delete(f, dxpl_id, &mesg->storage) < 0)
HGOTO_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to free raw data")
break;