diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2006-11-30 21:38:30 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2006-11-30 21:38:30 (GMT) |
| commit | 27c0fb2220c241337bd82426ca2c178bff2e3870 (patch) | |
| tree | 95ab5672227cef811d96033f16dc2b265f0a8501 /src/H5Oshared.c | |
| parent | ce7f9328b67687756afa530885659bc2ced77539 (diff) | |
| download | hdf5-27c0fb2220c241337bd82426ca2c178bff2e3870.zip hdf5-27c0fb2220c241337bd82426ca2c178bff2e3870.tar.gz hdf5-27c0fb2220c241337bd82426ca2c178bff2e3870.tar.bz2 | |
[svn-r13002] Description:
Fix problem with copying objects when the dataset to copy has an "older"
version of the layout message and needs to compute the size of the dataset's
storage after the dataspace information is available.
Minor random cleanups also...
Tested on:
FreeBSD/32 4.11 (sleipnir)
Too minor/weird to test w/h5committest...
Diffstat (limited to 'src/H5Oshared.c')
| -rw-r--r-- | src/H5Oshared.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Oshared.c b/src/H5Oshared.c index 19c57b0..fa5f0d5 100644 --- a/src/H5Oshared.c +++ b/src/H5Oshared.c @@ -46,7 +46,7 @@ static herr_t H5O_shared_delete(H5F_t *f, hid_t dxpl_id, const void *_mesg, hbool_t adj_link); static herr_t H5O_shared_link(H5F_t *f, hid_t dxpl_id, const void *_mesg); static herr_t H5O_shared_pre_copy_file(H5F_t *file_src, const H5O_msg_class_t *type, - void *mesg_src, hbool_t *deleted, const H5O_copy_t *cpy_info, void *_udata); + const void *mesg_src, hbool_t *deleted, const H5O_copy_t *cpy_info, void *_udata); static void *H5O_shared_copy_file(H5F_t *file_src, const H5O_msg_class_t *mesg_type, void *native_src, H5F_t *file_dst, hid_t dxpl_id, H5O_copy_t *cpy_info, void *udata); static herr_t H5O_shared_debug (H5F_t*, hid_t dxpl_id, const void*, FILE*, int, int); @@ -104,7 +104,7 @@ const H5O_msg_class_t H5O_MSG_SHARED[1] = {{ *------------------------------------------------------------------------- */ void * -H5O_shared_read(H5F_t *f, hid_t dxpl_id, H5O_shared_t *shared, +H5O_shared_read(H5F_t *f, hid_t dxpl_id, const H5O_shared_t *shared, const H5O_msg_class_t *type, void *mesg) { H5HF_t *fheap = NULL; @@ -611,10 +611,10 @@ done: */ static herr_t H5O_shared_pre_copy_file(H5F_t *file_src, const H5O_msg_class_t *type, - void *native_src, hbool_t *deleted, const H5O_copy_t *cpy_info, + const void *native_src, hbool_t *deleted, const H5O_copy_t *cpy_info, void *udata) { - H5O_shared_t *shared_src = (H5O_shared_t *)native_src; + const H5O_shared_t *shared_src = (const H5O_shared_t *)native_src; void *mesg_native = NULL; herr_t ret_value = SUCCEED; /* Return value */ |