diff options
author | James Laird <jlaird@hdfgroup.org> | 2007-01-11 19:19:40 (GMT) |
---|---|---|
committer | James Laird <jlaird@hdfgroup.org> | 2007-01-11 19:19:40 (GMT) |
commit | d8e4fcc4104953c58f6dbc0f92992b3684f70c90 (patch) | |
tree | 2c2f9d257a08faeae7c26384ca47bdcafcfebe02 /src/H5Ocopy.c | |
parent | ba14f838467f787fd4d42185a7e65fc529f84af8 (diff) | |
download | hdf5-d8e4fcc4104953c58f6dbc0f92992b3684f70c90.zip hdf5-d8e4fcc4104953c58f6dbc0f92992b3684f70c90.tar.gz hdf5-d8e4fcc4104953c58f6dbc0f92992b3684f70c90.tar.bz2 |
[svn-r13135] Continuing code cleanup.
Moved SOHM table version out of table encoding and completely into superblock.
This is a file format change.
Added test that extends shared dataspaces. Dynamically allocate arrays in
shared message cache code. Clean up comments.
Tested on windows, kagiso, smirom.
Diffstat (limited to 'src/H5Ocopy.c')
-rw-r--r-- | src/H5Ocopy.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c index df8fe01..4e457ac 100644 --- a/src/H5Ocopy.c +++ b/src/H5Ocopy.c @@ -579,22 +579,19 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out */, current_pos = oh_dst->chunk[0].image; - /* Copy the message header. Most of this will be overwritten when - * the header is flushed to disk, but later versions have a - * magic number that isn't. + /* Copy the header. Most of this (number of messages, etc.) will be + * overwritten when the header is flushed to disk, but later versions have + * a magic number that isn't. */ HDmemcpy(current_pos, oh_src->chunk[0].image, (size_t)(H5O_SIZEOF_HDR_OH(oh_dst) - H5O_SIZEOF_CHKSUM_OH(oh_dst))); current_pos += H5O_SIZEOF_HDR_OH(oh_dst) - H5O_SIZEOF_CHKSUM_OH(oh_dst); - /* JAMES: include this in loop above? Doesn't take deleted messages - * into account - */ /* Copy each message that wasn't dirtied above */ null_msgs = 0; for(mesgno = 0; mesgno < oh_dst->nmesgs; mesgno++) { /* Skip any deleted or NULL messages in the source unless the - * preserve_null flag is set + * preserve_null flag is set. */ if(FALSE == cpy_info->preserve_null) { while(deleted[mesgno + null_msgs]) { |