mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-04-18 17:40:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r17182] In my last round of checkin (r17177), I forgot to clean up some code. I'm checking in

Browse Source 
the fix now.  Another minor fix - The way that H5Tset_size checks whether the datatype 
is a string wasn't correct.  I changed it to use the macro H5T_IS_STRING.

Tested on jam, smirom, and linew.
This commit is contained in:
Raymond Lu 2009-07-14 12:04:04 -05:00
parent 2228b81fa2
commit a739b62ecc
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/H5Odtype.c
View File

@ -520,15 +520,10 @@ H5O_dtype_decode_helper(H5F_t *f, unsigned *ioflags/*in,out*/, const uint8_t **p
dt->shared->force_conv=TRUE;
#ifdef TMP
/* Mark location this type as undefined for now. The caller function should
* decide the location. */
if(H5T_set_loc(dt, f, H5T_LOC_BADLOC) < 0)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "invalid datatype location")
else
if(H5T_set_loc(dt, NULL, H5T_LOC_MEMORY) < 0)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "invalid datatype location")
#endif
break;
case H5T_ARRAY: /* Array datatypes */

2
src/H5T.c
View File

@ -2120,7 +2120,7 @@ H5Tset_size(hid_t type_id, size_t size)
HGOTO_ERROR(H5E_ARGS, H5E_CANTINIT, FAIL, "datatype is read-only")
if(size <= 0 && size != H5T_VARIABLE)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "size must be positive")
if(size == H5T_VARIABLE && dt->shared->type != H5T_STRING)
if(size == H5T_VARIABLE && !H5T_IS_STRING(dt->shared))
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "only strings may be variable length")
if(H5T_ENUM == dt->shared->type && dt->shared->u.enumer.nmembs > 0)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "operation not allowed after members are defined")