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/H5Ofill.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/H5Ofill.c')
| -rw-r--r-- | src/H5Ofill.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/src/H5Ofill.c b/src/H5Ofill.c index 22e0ae1..c9e1a4c 100644 --- a/src/H5Ofill.c +++ b/src/H5Ofill.c @@ -45,9 +45,9 @@ static void *H5O_fill_copy(const void *_mesg, void *_dest, unsigned update_flag static size_t H5O_fill_size(const H5F_t *f, const void *_mesg); static herr_t H5O_fill_reset(void *_mesg); static herr_t H5O_fill_free(void *_mesg); -static herr_t H5O_fill_new_get_share (H5F_t *f, const void *_mesg, +static herr_t H5O_fill_new_get_share(H5F_t *f, const void *_mesg, H5O_shared_t *sh); -static herr_t H5O_fill_new_set_share (H5F_t *f, void *_mesg, +static herr_t H5O_fill_new_set_share(H5F_t *f, void *_mesg, const H5O_shared_t *sh); static htri_t H5O_fill_new_is_shared(const void *_mesg); static herr_t H5O_fill_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, @@ -688,9 +688,10 @@ static herr_t H5O_fill_new_get_share(H5F_t UNUSED *f, const void *_mesg, H5O_shared_t *sh /*out*/) { - H5O_fill_new_t *mesg = (H5O_fill_new_t *)_mesg; + const H5O_fill_new_t *mesg = (const H5O_fill_new_t *)_mesg; herr_t ret_value = SUCCEED; - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_fill_new_get_share); + + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_fill_new_get_share) HDassert (mesg); HDassert (sh); @@ -698,7 +699,7 @@ H5O_fill_new_get_share(H5F_t UNUSED *f, const void *_mesg, if(NULL == H5O_copy(H5O_SHARED_ID, &(mesg->sh_loc), sh)) ret_value = FAIL; - FUNC_LEAVE_NOAPI(ret_value); + FUNC_LEAVE_NOAPI(ret_value) } /* end H5O_fill_new_get_share() */ @@ -722,7 +723,8 @@ H5O_fill_new_set_share(H5F_t UNUSED *f, void *_mesg/*in,out*/, { H5O_fill_new_t *mesg = (H5O_fill_new_t *)_mesg; herr_t ret_value = SUCCEED; - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_fill_new_set_share); + + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_fill_new_set_share) HDassert (mesg); HDassert (sh); @@ -730,8 +732,9 @@ H5O_fill_new_set_share(H5F_t UNUSED *f, void *_mesg/*in,out*/, if(NULL == H5O_copy(H5O_SHARED_ID, sh, &(mesg->sh_loc))) ret_value = FAIL; - FUNC_LEAVE_NOAPI(ret_value); -} + FUNC_LEAVE_NOAPI(ret_value) +} /* end H5O_fill_new_set_share() */ + /*------------------------------------------------------------------------- * Function: H5O_fill_new_is_shared @@ -751,8 +754,9 @@ H5O_fill_new_set_share(H5F_t UNUSED *f, void *_mesg/*in,out*/, static htri_t H5O_fill_new_is_shared(const void *_mesg) { - H5O_fill_new_t *mesg = (H5O_fill_new_t *)_mesg; + const H5O_fill_new_t *mesg = (const H5O_fill_new_t *)_mesg; htri_t ret_value; + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_fill_new_is_shared) HDassert(mesg); @@ -767,8 +771,8 @@ H5O_fill_new_is_shared(const void *_mesg) ret_value = FALSE; FUNC_LEAVE_NOAPI(ret_value) - } /* end H5O_fill_new_is_shared */ + /*------------------------------------------------------------------------- * Function: H5O_fill_new_debug |