diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-22 22:07:35 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-22 22:07:35 (GMT) |
| commit | 40c757d48b5fcdf0c217ae6392fb111b1a4acc91 (patch) | |
| tree | 47e0f8d65be066d01c93ea7701d0632768aa8673 /src/H5Ddeprec.c | |
| parent | 683d60460a94869225094b4efc824258c5b0dcd3 (diff) | |
| download | hdf5-40c757d48b5fcdf0c217ae6392fb111b1a4acc91.zip hdf5-40c757d48b5fcdf0c217ae6392fb111b1a4acc91.tar.gz hdf5-40c757d48b5fcdf0c217ae6392fb111b1a4acc91.tar.bz2 | |
[svn-r18619] Description:
Bring r18618 from trunk to 1.8 branch:
Add new internal object header routines to query the header chunk that
a message is in, and to lock/unlock a message into a chunk (so it doesn't get
moved into another chunk during allocation/free events).
Also, move dataspace message to beginning of object header messages
added to a dataset's object header, so it can be locked into chunk #0 (when
performing SWMR operations).
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/H5Ddeprec.c')
| -rw-r--r-- | src/H5Ddeprec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/H5Ddeprec.c b/src/H5Ddeprec.c index e208910..cecf4a2 100644 --- a/src/H5Ddeprec.c +++ b/src/H5Ddeprec.c @@ -166,8 +166,7 @@ H5Dcreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset create property list ID") /* Build and open the new dataset */ - if(NULL == (dset = H5D_create_named(&loc, name, type_id, space, - H5P_LINK_CREATE_DEFAULT, dcpl_id, H5P_DATASET_ACCESS_DEFAULT, H5AC_dxpl_id))) + if(NULL == (dset = H5D_create_named(&loc, name, type_id, space, H5P_LINK_CREATE_DEFAULT, dcpl_id, H5P_DATASET_ACCESS_DEFAULT, H5AC_dxpl_id))) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create dataset") /* Register the new dataset to get an ID for it */ @@ -240,7 +239,7 @@ H5Dopen1(hid_t loc_id, const char *name) HGOTO_ERROR(H5E_DATASET, H5E_BADTYPE, FAIL, "not a dataset") /* Open the dataset */ - if((dset = H5D_open(&dset_loc, dapl_id, dxpl_id)) == NULL) + if(NULL == (dset = H5D_open(&dset_loc, dapl_id, dxpl_id))) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't open dataset") /* Register an atom for the dataset */ |