diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2003-08-31 01:48:01 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2003-08-31 01:48:01 (GMT) |
| commit | f92d7f73df1846f4489fb6e2c2dd857b636b4deb (patch) | |
| tree | 74d28cd355a39d0d9f8dc0c96484380b6b12628e /src/H5Tcset.c | |
| parent | bd3510bea3638d5f4281bf9a6bbfe4c4a8b3ca9a (diff) | |
| download | hdf5-f92d7f73df1846f4489fb6e2c2dd857b636b4deb.zip hdf5-f92d7f73df1846f4489fb6e2c2dd857b636b4deb.tar.gz hdf5-f92d7f73df1846f4489fb6e2c2dd857b636b4deb.tar.bz2 | |
[svn-r7434] Purpose:
Bug Fix and code cleanup
Description:
Correct error in H5T_detect_class that was causing nested compound datatypes
with to not detect the datatype class of fields correctly, which caused errors
with fill-values, variable-length datatypes and chunks later on.
Return the rank of the array datatype from H5Tget_array_dims(), like
H5Sget_dims().
Lots of cleanups to datatype code, to make the handling of arrays, compound
types, variable-length strings and sequences and enumerated types more
consistent and robust.
Platforms tested:
FreeBSD 4.9 (sleipnir)
h5committest
Diffstat (limited to 'src/H5Tcset.c')
| -rw-r--r-- | src/H5Tcset.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/H5Tcset.c b/src/H5Tcset.c index cb58afb..6814b9b 100644 --- a/src/H5Tcset.c +++ b/src/H5Tcset.c @@ -61,7 +61,7 @@ H5T_init_cset_interface(void) * different nationalities and to convert between them to the * extent possible. * - * Return: Success: The character set of an H5T_STRING type. + * Return: Success: The character set of a string type. * * Failure: H5T_CSET_ERROR (Negative) * @@ -86,10 +86,9 @@ H5Tget_cset(hid_t 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"); - /* Don't see any reason for this. Causes problem for variable-length - * string. -SLU (& QAK) */ - /*if (dt->parent) dt = dt->parent;*/ /*defer to parent*/ - if (!(H5T_STRING == dt->type || (H5T_VLEN == dt->type && H5T_VLEN_STRING == dt->u.vlen.type))) + while (dt->parent && !H5T_IS_STRING(dt)) + dt = dt->parent; /*defer to parent*/ + if (!H5T_IS_STRING(dt)) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, H5T_CSET_ERROR, "operation not defined for data type class"); /* result */ @@ -139,10 +138,9 @@ H5Tset_cset(hid_t type_id, H5T_cset_t cset) 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"); - /* Don't see any reason for this. Causes problem for variable-length - * string. -SLU (& QAK) */ - /*if (dt->parent) dt = dt->parent;*/ /*defer to parent*/ - if (!(H5T_STRING == dt->type || (H5T_VLEN == dt->type && H5T_VLEN_STRING == dt->u.vlen.type))) + while (dt->parent && !H5T_IS_STRING(dt)) + dt = dt->parent; /*defer to parent*/ + if (!H5T_IS_STRING(dt)) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "operation not defined for data type class"); /* Commit */ |