From b57f3b955f297d4f99ead2efa4ee6a41a5501e97 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Fri, 23 Apr 2004 22:24:54 -0500 Subject: [svn-r8415] Purpose: Code cleanup Description: Reduce # of warnings with PC-Lint Platforms tested: PC-LINT Too minor to require h5committest --- src/H5Tcset.c | 24 ++++++++++++------------ src/hdf5.lnt | 1 + 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/H5Tcset.c b/src/H5Tcset.c index c02bec1..373b088 100644 --- a/src/H5Tcset.c +++ b/src/H5Tcset.c @@ -48,9 +48,9 @@ DESCRIPTION static herr_t H5T_init_cset_interface(void) { - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_cset_interface); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_cset_interface) - FUNC_LEAVE_NOAPI(H5T_init()); + FUNC_LEAVE_NOAPI(H5T_init()) } /* H5T_init_cset_interface() */ @@ -80,16 +80,16 @@ H5Tget_cset(hid_t type_id) H5T_t *dt = NULL; H5T_cset_t ret_value; - FUNC_ENTER_API(H5Tget_cset, H5T_CSET_ERROR); + FUNC_ENTER_API(H5Tget_cset, H5T_CSET_ERROR) H5TRACE1("Tc","i",type_id); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5T_CSET_ERROR, "not a data type"); + HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5T_CSET_ERROR, "not a data type") while (dt->parent && !H5T_IS_STRING(dt)) dt = dt->parent; /*defer to parent*/ if (!H5T_IS_STRING(dt)) - HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, H5T_CSET_ERROR, "operation not defined for data type class"); + HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, H5T_CSET_ERROR, "operation not defined for data type class") /* result */ if(H5T_IS_FIXED_STRING(dt)) @@ -98,7 +98,7 @@ H5Tget_cset(hid_t type_id) ret_value = dt->u.vlen.cset; done: - FUNC_LEAVE_API(ret_value); + FUNC_LEAVE_API(ret_value) } @@ -126,20 +126,20 @@ H5Tset_cset(hid_t type_id, H5T_cset_t cset) H5T_t *dt = NULL; herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Tset_cset, FAIL); + FUNC_ENTER_API(H5Tset_cset, FAIL) H5TRACE2("e","iTc",type_id,cset); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type"); + HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type") if (H5T_STATE_TRANSIENT!=dt->state) - HGOTO_ERROR(H5E_ARGS, H5E_CANTINIT, FAIL, "data type is read-only"); + HGOTO_ERROR(H5E_ARGS, H5E_CANTINIT, FAIL, "data type is read-only") if (cset < 0 || cset >= H5T_NCSET) - HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "illegal character set type"); + HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "illegal character set type") while (dt->parent && !H5T_IS_STRING(dt)) dt = dt->parent; /*defer to parent*/ if (!H5T_IS_STRING(dt)) - HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "operation not defined for data type class"); + HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "operation not defined for data type class") /* Commit */ if(H5T_IS_FIXED_STRING(dt)) @@ -148,6 +148,6 @@ H5Tset_cset(hid_t type_id, H5T_cset_t cset) dt->u.vlen.cset = cset; done: - FUNC_LEAVE_API(ret_value); + FUNC_LEAVE_API(ret_value) } diff --git a/src/hdf5.lnt b/src/hdf5.lnt index 72d29b0..0c39404 100755 --- a/src/hdf5.lnt +++ b/src/hdf5.lnt @@ -94,6 +94,7 @@ H5FL.c H5FO.c + H5Tcset.c H5Tenum.c H5Tfields.c H5Tfixed.c -- cgit v0.12