diff options
| author | James Laird <jlaird@hdfgroup.org> | 2006-12-15 21:28:17 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2006-12-15 21:28:17 (GMT) |
| commit | 9236c9a148aaf206294be0554cf78e7ab769bd51 (patch) | |
| tree | afa397f1439fd0b6a45592cfc062102ea160d479 /src/H5Osdspace.c | |
| parent | aa646b5b43361597e547cea18af1825b43ad8ecb (diff) | |
| download | hdf5-9236c9a148aaf206294be0554cf78e7ab769bd51.zip hdf5-9236c9a148aaf206294be0554cf78e7ab769bd51.tar.gz hdf5-9236c9a148aaf206294be0554cf78e7ab769bd51.tar.bz2 | |
[svn-r13065] Added support for copying shared messages (including turning unshared
messages to shared messages and vice versa).
Extended objcopy test to test all "permutations" of shared/unshared and
new/old group format. If this proves to take a long time to test, I'll
go back and have it run fewer tests when HDF5_TEST_EXPRESS is enabled.
Tested on smirom, kagiso, copper, and Windows.
Diffstat (limited to 'src/H5Osdspace.c')
| -rw-r--r-- | src/H5Osdspace.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/H5Osdspace.c b/src/H5Osdspace.c index 9b4c473..e5af3a6 100644 --- a/src/H5Osdspace.c +++ b/src/H5Osdspace.c @@ -31,7 +31,7 @@ static void *H5O_sdspace_copy(const void *_mesg, void *_dest); static size_t H5O_sdspace_size(const H5F_t *f, const void *_mesg); static herr_t H5O_sdspace_reset(void *_mesg); static herr_t H5O_sdspace_free (void *_mesg); -static herr_t H5O_sdspace_get_share(const void *_mesg, H5O_shared_t *sh); +static void *H5O_sdspace_get_share(const void *_mesg, H5O_shared_t *sh); static herr_t H5O_sdspace_set_share(void *_mesg, const H5O_shared_t *sh); static htri_t H5O_sdspace_is_shared(const void *_mesg); static herr_t H5O_sdspace_pre_copy_file(H5F_t *file_src, const H5O_msg_class_t *type, @@ -452,26 +452,24 @@ H5O_sdspace_free (void *mesg) * * Purpose: Gets sharing information from the message * - * Return: Non-negative on success/Negative on failure + * Return: Shared message on success/NULL on failure * * Programmer: James Laird * Tuesday, October 10, 2006 * *------------------------------------------------------------------------- */ -static herr_t +static void * H5O_sdspace_get_share(const void *_mesg, H5O_shared_t *sh /*out*/) { const H5S_extent_t *mesg = (const H5S_extent_t *)_mesg; - herr_t ret_value = SUCCEED; + void *ret_value = NULL; FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_sdspace_get_share) HDassert (mesg); - HDassert (sh); - if(NULL == H5O_msg_copy(H5O_SHARED_ID, &(mesg->sh_loc), sh)) - ret_value = FAIL; + ret_value = H5O_msg_copy(H5O_SHARED_ID, &(mesg->sh_loc), sh); FUNC_LEAVE_NOAPI(ret_value) } /* end H5O_sdspace_get_share() */ |