diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 1999-07-03 10:31:26 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 1999-07-03 10:31:26 (GMT) |
| commit | 650e29cff6b23b99318f70699af08cfdb57ea924 (patch) | |
| tree | e37bc1ece43cbbad2504adbea63a5ef9241d2453 /src/H5Odtype.c | |
| parent | 1b20703c2048cf176df2d5c792de56da92ae03e2 (diff) | |
| download | hdf5-650e29cff6b23b99318f70699af08cfdb57ea924.zip hdf5-650e29cff6b23b99318f70699af08cfdb57ea924.tar.gz hdf5-650e29cff6b23b99318f70699af08cfdb57ea924.tar.bz2 | |
[svn-r1418] Modified H5Tconvert to require a dataset transfer property list ID as the
final parameter (so that VL datatypes have a way to pass in the custom memory
allocation routines).
Fixed a conversion bug when VL fields were part of a compound datatype that
was causing the no-op conversion routine to be used instead of the vlen routine.
Added the H5Pset_vlen_mem_manager and H5Pget_vlen_mem_manager routines to
allow users to provide their own custom memory allocation routines for VL data
read in from the file and reclaimed with H5Dvlen_reclaim.
Finished coding on H5Dvlen_reclaim so it works now.
Diffstat (limited to 'src/H5Odtype.c')
| -rw-r--r-- | src/H5Odtype.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/H5Odtype.c b/src/H5Odtype.c index 14f2840..72253a7 100644 --- a/src/H5Odtype.c +++ b/src/H5Odtype.c @@ -235,6 +235,13 @@ H5O_dtype_decode_helper(H5F_t *f, const uint8_t **pp, H5T_t *dt) HRETURN_ERROR(H5E_DATATYPE, H5E_CANTDECODE, FAIL, "unable to decode member type"); } + + /* + * Set the "force conversion" flag if VL datatype fields exist in this + * type or any component types + */ + if(dt->u.compnd.memb[i].type->type==H5T_VLEN || dt->u.compnd.memb[i].type->force_conv==TRUE) + dt->force_conv=TRUE; /* Total member size */ dt->u.compnd.memb[i].size = dt->u.compnd.memb[i].type->size; @@ -295,8 +302,9 @@ H5O_dtype_decode_helper(H5F_t *f, const uint8_t **pp, H5T_t *dt) HRETURN_ERROR(H5E_DATATYPE, H5E_CANTDECODE, FAIL, "unable to decode VL parent type"); } + dt->force_conv=TRUE; /* Mark this type as on disk */ - if (H5T_vlen_set_loc(dt, f, H5T_VLEN_DISK)<0) { + if (H5T_vlen_mark(dt, f, H5T_VLEN_DISK)<0) { HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "invalid VL location"); } break; |