diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2012-03-21 15:10:17 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2012-03-21 15:10:17 (GMT) |
| commit | eb89d7b53ab95623ab454186a602e1cafc7391f0 (patch) | |
| tree | ceafe458b3011e38853e765352d3c7e59bbecce1 /src/H5Ostorage.c | |
| parent | 3e468e6ff65d540a439e99ea568a6bff7add7cea (diff) | |
| download | hdf5-eb89d7b53ab95623ab454186a602e1cafc7391f0.zip hdf5-eb89d7b53ab95623ab454186a602e1cafc7391f0.tar.gz hdf5-eb89d7b53ab95623ab454186a602e1cafc7391f0.tar.bz2 | |
[svn-r22105] Description:
Bring r20557:22085 from trunk to this branch, also fixing some other
issues/failures in the branch simultaneously. The h5repack tests are still
failing, but Neil will be checking into those, so the branch can be fully
functional again.
Tested on:
Mac OSX/64 10.7.3 (amazon) w/debug
Diffstat (limited to 'src/H5Ostorage.c')
| -rw-r--r-- | src/H5Ostorage.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/H5Ostorage.c b/src/H5Ostorage.c index 41b16bc..c23b54b 100644 --- a/src/H5Ostorage.c +++ b/src/H5Ostorage.c @@ -113,7 +113,7 @@ H5O_storage_decode(H5F_t *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh, uint8_t version; /* Version of message decoded */ void *ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5O_storage_decode) + FUNC_ENTER_NOAPI_NOINIT /* check args */ HDassert(f); @@ -238,7 +238,7 @@ H5O_storage_encode(H5F_t *f, hbool_t UNUSED disable_shared, uint8_t *p, const H5O_storage_t *mesg = (const H5O_storage_t *) _mesg; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5O_storage_encode) + FUNC_ENTER_NOAPI_NOINIT /* check args */ HDassert(f); @@ -318,7 +318,7 @@ H5O_storage_copy(const void *_mesg, void *_dest) H5O_storage_t *dest = (H5O_storage_t *) _dest; void *ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5O_storage_copy) + FUNC_ENTER_NOAPI_NOINIT /* check args */ HDassert(mesg); @@ -375,7 +375,7 @@ H5O_storage_size(const H5F_t *f, hbool_t UNUSED disable_shared, const void *_mes const H5O_storage_t *mesg = (const H5O_storage_t *) _mesg; size_t ret_value; - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_storage_size) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* check args */ HDassert(f); @@ -407,7 +407,7 @@ H5O_storage_reset(void *_mesg) { H5O_storage_t *mesg = (H5O_storage_t *)_mesg; - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_storage_reset) + FUNC_ENTER_NOAPI_NOINIT_NOERR if(mesg) { /* Free the compact storage buffer */ @@ -440,7 +440,7 @@ H5O_storage_free(void *_mesg) H5O_storage_t *mesg = (H5O_storage_t *) _mesg; herr_t ret_value = SUCCEED; - FUNC_ENTER_NOAPI_NOINIT(H5O_storage_free) + FUNC_ENTER_NOAPI_NOINIT HDassert(mesg); @@ -473,7 +473,7 @@ H5O_storage_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg) H5O_storage_t *mesg = (H5O_storage_t *) _mesg; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5O_storage_delete) + FUNC_ENTER_NOAPI_NOINIT /* check args */ HDassert(f); @@ -530,7 +530,7 @@ H5O_storage_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst, H5O_storage_t *storage_dst = NULL; void *ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5O_storage_copy_file) + FUNC_ENTER_NOAPI_NOINIT /* check args */ HDassert(file_src); @@ -616,7 +616,7 @@ H5O_storage_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, { const H5O_storage_t *mesg = (const H5O_storage_t *) _mesg; - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_storage_debug) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* check args */ HDassert(f); @@ -715,7 +715,7 @@ H5O_storage_meta_size(const H5F_t *f, const H5O_storage_t *storage, { size_t ret_value; - FUNC_ENTER_NOAPI_NOINIT(H5O_storage_meta_size) + FUNC_ENTER_NOAPI_NOINIT /* check args */ HDassert(f); |