diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-17 22:38:50 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-17 22:38:50 (GMT) |
| commit | 80385ab8dd171a8410bd8e7dfce0e6b679c3fc97 (patch) | |
| tree | f3ed5401e74382b5f316a7057c091d6c336ef0a1 /src/H5Tcset.c | |
| parent | 0db6255d805b625f3fbbbb0b0893032af229d234 (diff) | |
| download | hdf5-80385ab8dd171a8410bd8e7dfce0e6b679c3fc97.zip hdf5-80385ab8dd171a8410bd8e7dfce0e6b679c3fc97.tar.gz hdf5-80385ab8dd171a8410bd8e7dfce0e6b679c3fc97.tar.bz2 | |
[svn-r18032] Description:
Bring r18031 from trunk to 1.8 branch:
Bring r18030 from merge_metadata_journaling branch to trunk:
Bring "brush clearing" changes (whitespace & style issues, mostly) from
metadata_journaling branch to the "merging" branch, to converge the trunk and
the metadata_journaling branch.
Also, some other minor cleanups along the way.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
(h5committested on trunk)
Diffstat (limited to 'src/H5Tcset.c')
| -rw-r--r-- | src/H5Tcset.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Tcset.c b/src/H5Tcset.c index c938cd2..4ec58ab 100644 --- a/src/H5Tcset.c +++ b/src/H5Tcset.c @@ -75,14 +75,14 @@ H5T_init_cset_interface(void) H5T_cset_t H5Tget_cset(hid_t type_id) { - H5T_t *dt = NULL; + H5T_t *dt; H5T_cset_t ret_value; 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))) + if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id,H5I_DATATYPE))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5T_CSET_ERROR, "not a data type") while (dt->shared->parent && !H5T_IS_STRING(dt->shared)) dt = dt->shared->parent; /*defer to parent*/ @@ -121,14 +121,14 @@ done: herr_t H5Tset_cset(hid_t type_id, H5T_cset_t cset) { - H5T_t *dt = NULL; + H5T_t *dt; herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Tset_cset, FAIL) H5TRACE2("e", "iTc", type_id, cset); /* Check args */ - if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) + if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id,H5I_DATATYPE))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type") if (H5T_STATE_TRANSIENT!=dt->shared->state) HGOTO_ERROR(H5E_ARGS, H5E_CANTINIT, FAIL, "data type is read-only") |