diff options
| author | James Laird <jlaird@hdfgroup.org> | 2006-11-13 20:41:36 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2006-11-13 20:41:36 (GMT) |
| commit | b6c317f27cd150aa7bfc4e9cf275629570c9a319 (patch) | |
| tree | 3413a54aec3bbebb821088a473f6ff425c3d39be /src/H5Olayout.c | |
| parent | 77c265f26746359cf348437702c93c162f7022f6 (diff) | |
| download | hdf5-b6c317f27cd150aa7bfc4e9cf275629570c9a319.zip hdf5-b6c317f27cd150aa7bfc4e9cf275629570c9a319.tar.gz hdf5-b6c317f27cd150aa7bfc4e9cf275629570c9a319.tar.bz2 | |
[svn-r12902] Checkin of Shared Object Header Message work.
This feature is still in progress; Shared Object Header Messages are not
complete as a feature and are not thoroughly tested. There are still
"TODO" comments in the code (comments with the word "JAMES" in them,
so as not to be confused with other TODO comments).
Hopefully this checkin will reduce the liklihood of conflicts as I finish
implementing this feature.
All current tests pass on juniper, copper (parallel), heping, kagiso, and mir.
Diffstat (limited to 'src/H5Olayout.c')
| -rw-r--r-- | src/H5Olayout.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/H5Olayout.c b/src/H5Olayout.c index 6414c37..a420301 100644 --- a/src/H5Olayout.c +++ b/src/H5Olayout.c @@ -39,8 +39,8 @@ static size_t H5O_layout_size(const H5F_t *f, const void *_mesg); static herr_t H5O_layout_reset(void *_mesg); static herr_t H5O_layout_free(void *_mesg); static herr_t H5O_layout_delete(H5F_t *f, hid_t dxpl_id, const void *_mesg, hbool_t adj_link); -static void *H5O_layout_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst, - hid_t dxpl_id, H5O_copy_t *cpy_info, void *udata); +static void *H5O_layout_copy_file(H5F_t *file_src, const H5O_msg_class_t *mesg_type, + void *mesg_src, H5F_t *file_dst, hid_t dxpl_id, H5O_copy_t *cpy_info, void *udata); static herr_t H5O_layout_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE * stream, int indent, int fwidth); @@ -59,6 +59,7 @@ const H5O_msg_class_t H5O_MSG_LAYOUT[1] = {{ NULL, /* link method */ NULL, /*get share method */ NULL, /*set share method */ + NULL, /*is shared method */ NULL, /* pre copy native value to file */ H5O_layout_copy_file, /* copy native value to file */ NULL, /* post copy native value to file */ @@ -621,8 +622,9 @@ done: *------------------------------------------------------------------------- */ static void * -H5O_layout_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst, hid_t dxpl_id, - H5O_copy_t *cpy_info, void *_udata) +H5O_layout_copy_file(H5F_t *file_src, const H5O_msg_class_t UNUSED *mesg_type, + void *mesg_src, H5F_t *file_dst, hid_t dxpl_id, H5O_copy_t *cpy_info, + void *_udata) { H5D_copy_file_ud_t *udata = (H5D_copy_file_ud_t *)_udata; /* Dataset copying user data */ H5O_layout_t *layout_src = (H5O_layout_t *) mesg_src; |