diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-27 22:40:05 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-27 22:40:05 (GMT) |
commit | 2ad138dbb941e02c5811f0962d3a0ca6f01aa7f3 (patch) | |
tree | e9c2128e6cc2cc90b73f53445e95288fe1879a07 /src/H5Olayout.c | |
parent | 53f5793d38fe137cd32fec38f8686bd21452d46f (diff) | |
download | hdf5-2ad138dbb941e02c5811f0962d3a0ca6f01aa7f3.zip hdf5-2ad138dbb941e02c5811f0962d3a0ca6f01aa7f3.tar.gz hdf5-2ad138dbb941e02c5811f0962d3a0ca6f01aa7f3.tar.bz2 |
[svn-r18652] Description:
Bring r18650 from trunk to 1.8 branch:
Bring back various minor tweaks & cleanups from the revise_chunks
branch.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
(h5committested on trunk)
Diffstat (limited to 'src/H5Olayout.c')
-rw-r--r-- | src/H5Olayout.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/H5Olayout.c b/src/H5Olayout.c index a34dcc2..67dbf4d 100644 --- a/src/H5Olayout.c +++ b/src/H5Olayout.c @@ -58,15 +58,15 @@ const H5O_msg_class_t H5O_MSG_LAYOUT[1] = {{ H5O_layout_encode, /*encode message */ H5O_layout_copy, /*copy the native value */ H5O_layout_size, /*size of message on disk */ - H5O_layout_reset, /*reset method */ + H5O_layout_reset, /*reset method */ H5O_layout_free, /*free the struct */ H5O_layout_delete, /* file delete method */ NULL, /* link method */ NULL, /*set share method */ NULL, /*can share method */ NULL, /* pre copy native value to file */ - H5O_layout_copy_file, /* copy native value to file */ - NULL, /* post copy native value to file */ + H5O_layout_copy_file, /* copy native value to file */ + NULL, /* post copy native value to file */ NULL, /* get creation index */ NULL, /* set creation index */ H5O_layout_debug /*debug the message */ @@ -589,6 +589,7 @@ H5O_layout_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst, FUNC_ENTER_NOAPI_NOINIT(H5O_layout_copy_file) /* check args */ + HDassert(file_src); HDassert(layout_src); HDassert(file_dst); |