summaryrefslogtreecommitdiffstats
path: root/src/H5Toffset.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2012-03-21 15:10:17 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2012-03-21 15:10:17 (GMT)
commiteb89d7b53ab95623ab454186a602e1cafc7391f0 (patch)
treeceafe458b3011e38853e765352d3c7e59bbecce1 /src/H5Toffset.c
parent3e468e6ff65d540a439e99ea568a6bff7add7cea (diff)
downloadhdf5-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/H5Toffset.c')
-rw-r--r--src/H5Toffset.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5Toffset.c b/src/H5Toffset.c
index 17351f4..bea8d2b 100644
--- a/src/H5Toffset.c
+++ b/src/H5Toffset.c
@@ -49,7 +49,7 @@ DESCRIPTION
static herr_t
H5T_init_offset_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_offset_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5T_init())
} /* H5T_init_offset_interface() */
@@ -90,7 +90,7 @@ H5Tget_offset(hid_t type_id)
H5T_t *dt;
int ret_value;
- FUNC_ENTER_API(H5Tget_offset, -1)
+ FUNC_ENTER_API(-1)
H5TRACE1("Is", "i", type_id);
/* Check args */
@@ -140,7 +140,7 @@ H5T_get_offset(const H5T_t *dt)
{
int ret_value;
- FUNC_ENTER_NOAPI(H5T_get_offset, -1)
+ FUNC_ENTER_NOAPI(-1)
/* Defer to parent*/
while(dt->shared->parent)
@@ -201,7 +201,7 @@ H5Tset_offset(hid_t type_id, size_t offset)
H5T_t *dt;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Tset_offset, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iz", type_id, offset);
/* Check args */
@@ -269,7 +269,7 @@ H5T_set_offset(const H5T_t *dt, size_t offset)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_set_offset, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
assert(dt);