diff options
| author | Raymond Lu <songyulu@hdfgroup.org> | 2009-07-13 16:26:24 (GMT) |
|---|---|---|
| committer | Raymond Lu <songyulu@hdfgroup.org> | 2009-07-13 16:26:24 (GMT) |
| commit | 8a56b4d081a9804f07878f1fe3578f5e2e1b7ef5 (patch) | |
| tree | 89b912ff750a20ae63bd8f8d31801f69f7379504 /src/H5Dint.c | |
| parent | 39ad4fae0f60e34d09a4fff4322fb3767eea2e56 (diff) | |
| download | hdf5-8a56b4d081a9804f07878f1fe3578f5e2e1b7ef5.zip hdf5-8a56b4d081a9804f07878f1fe3578f5e2e1b7ef5.tar.gz hdf5-8a56b4d081a9804f07878f1fe3578f5e2e1b7ef5.tar.bz2 | |
[svn-r17177] In H5Odtype.c, the decoding function used to mark the datatype as on disk (see bug
#1585). I changed it to undefined and let the caller functions decide the location
of the datatype. For H5Tdecode, it should mark the datatype as in memory. For other
callers like H5Dopen or H5Aopen, they should makr it as on disk.
Tested it on jam, smirom, linew.
Diffstat (limited to 'src/H5Dint.c')
| -rw-r--r-- | src/H5Dint.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/H5Dint.c b/src/H5Dint.c index 196ff04..d36dc95 100644 --- a/src/H5Dint.c +++ b/src/H5Dint.c @@ -1345,6 +1345,10 @@ H5D_open_oid(H5D_t *dataset, hid_t dapl_id, hid_t dxpl_id) /* Get the type and space */ if(NULL == (dataset->shared->type = (H5T_t *)H5O_msg_read(&(dataset->oloc), H5O_DTYPE_ID, NULL, dxpl_id))) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to load type info from dataset header") + + if(H5T_set_loc(dataset->shared->type, dataset->oloc.file, H5T_LOC_DISK) < 0) + HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "invalid datatype location") + if(NULL == (dataset->shared->space = H5S_read(&(dataset->oloc), dxpl_id))) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to load dataspace info from dataset header") |