summaryrefslogtreecommitdiffstats
path: root/src/H5Tcset.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/H5Tcset.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/H5Tcset.c')
-rw-r--r--src/H5Tcset.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Tcset.c b/src/H5Tcset.c
index 4ec58ab..33fb32a 100644
--- a/src/H5Tcset.c
+++ b/src/H5Tcset.c
@@ -46,7 +46,7 @@ DESCRIPTION
static herr_t
H5T_init_cset_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_cset_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5T_init())
} /* H5T_init_cset_interface() */
@@ -78,7 +78,7 @@ H5Tget_cset(hid_t type_id)
H5T_t *dt;
H5T_cset_t ret_value;
- FUNC_ENTER_API(H5Tget_cset, H5T_CSET_ERROR)
+ FUNC_ENTER_API(H5T_CSET_ERROR)
H5TRACE1("Tc", "i", type_id);
/* Check args */
@@ -124,7 +124,7 @@ H5Tset_cset(hid_t type_id, H5T_cset_t cset)
H5T_t *dt;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Tset_cset, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iTc", type_id, cset);
/* Check args */