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/H5Odrvinfo.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/H5Odrvinfo.c')
-rw-r--r-- | src/H5Odrvinfo.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/H5Odrvinfo.c b/src/H5Odrvinfo.c index 864fe9e..005b74a 100644 --- a/src/H5Odrvinfo.c +++ b/src/H5Odrvinfo.c @@ -86,7 +86,7 @@ H5O_drvinfo_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh, H5O_drvinfo_t *mesg; /* Native message */ void *ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5O_drvinfo_decode) + FUNC_ENTER_NOAPI_NOINIT /* Sanity check */ HDassert(f); @@ -143,7 +143,7 @@ H5O_drvinfo_encode(H5F_t UNUSED *f, hbool_t UNUSED disable_shared, uint8_t *p, c { const H5O_drvinfo_t *mesg = (const H5O_drvinfo_t *)_mesg; - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_drvinfo_encode) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* Sanity check */ HDassert(f); @@ -183,7 +183,7 @@ H5O_drvinfo_copy(const void *_mesg, void *_dest) H5O_drvinfo_t *dest = (H5O_drvinfo_t *)_dest; void *ret_value; - FUNC_ENTER_NOAPI_NOINIT(H5O_drvinfo_copy) + FUNC_ENTER_NOAPI_NOINIT /* Sanity check */ HDassert(mesg); @@ -230,7 +230,7 @@ H5O_drvinfo_size(const H5F_t UNUSED *f, hbool_t UNUSED disable_shared, const voi const H5O_drvinfo_t *mesg = (const H5O_drvinfo_t *)_mesg; size_t ret_value; - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_drvinfo_size) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* Sanity check */ HDassert(f); @@ -264,7 +264,7 @@ H5O_drvinfo_reset(void *_mesg) { H5O_drvinfo_t *mesg = (H5O_drvinfo_t *) _mesg; - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_drvinfo_reset) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* check args */ HDassert(mesg); @@ -294,7 +294,7 @@ H5O_drvinfo_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE { const H5O_drvinfo_t *mesg = (const H5O_drvinfo_t *)_mesg; - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_drvinfo_debug) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* Sanity check */ HDassert(f); |