diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-19 05:45:56 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-19 05:45:56 (GMT) |
| commit | cccd3d26d61348db189ec262548fab26f062a427 (patch) | |
| tree | ae599a7ab23d0330d1d92e85551c058ec42ba0cd /src/H5Dtest.c | |
| parent | 856b2e2c259e94516c9b04e57368018fd44f58cf (diff) | |
| download | hdf5-cccd3d26d61348db189ec262548fab26f062a427.zip hdf5-cccd3d26d61348db189ec262548fab26f062a427.tar.gz hdf5-cccd3d26d61348db189ec262548fab26f062a427.tar.bz2 | |
[svn-r18038] Description:
Bring r18037 from trunk to 1.8 branch:
Bring r18035 from merge_metadata_journaling branch to trunk:
More "brush clearing" convergence between metadata_journaling branch
and the trunk.
Tested on:
Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
(h5committested on trunk)
Diffstat (limited to 'src/H5Dtest.c')
| -rw-r--r-- | src/H5Dtest.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Dtest.c b/src/H5Dtest.c index 34ef8fb..a933c88 100644 --- a/src/H5Dtest.c +++ b/src/H5Dtest.c @@ -84,14 +84,14 @@ herr_t H5D_layout_version_test(hid_t did, unsigned *version) { - H5D_t *dset; /* Pointer to dataset to query */ - herr_t ret_value = SUCCEED; /* return value */ + H5D_t *dset; /* Pointer to dataset to query */ + herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_NOAPI(H5D_layout_version_test, FAIL) /* Check args */ if(NULL == (dset = (H5D_t *)H5I_object_verify(did, H5I_DATASET))) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset") + HGOTO_ERROR(H5E_DATASET, H5E_BADTYPE, FAIL, "not a dataset") if(version) *version = dset->shared->layout.version; @@ -130,7 +130,7 @@ H5D_layout_contig_size_test(hid_t did, hsize_t *size) /* Check args */ if(NULL == (dset = (H5D_t *)H5I_object_verify(did, H5I_DATASET))) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset") + HGOTO_ERROR(H5E_DATASET, H5E_BADTYPE, FAIL, "not a dataset") if(size) { HDassert(dset->shared->layout.type == H5D_CONTIGUOUS); |