diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2012-04-06 02:57:06 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2012-04-06 02:57:06 (GMT) |
| commit | d5a62239587f7cc5de301fa5c6b0919807689818 (patch) | |
| tree | 40a36d60dd8ac2d10a45886869cc53d3fdc9181e /src/H5Ptest.c | |
| parent | ebf3d99b955c705217227fb7f8ae4405e941399a (diff) | |
| download | hdf5-d5a62239587f7cc5de301fa5c6b0919807689818.zip hdf5-d5a62239587f7cc5de301fa5c6b0919807689818.tar.gz hdf5-d5a62239587f7cc5de301fa5c6b0919807689818.tar.bz2 | |
[svn-r22254] Description:
Bring r22085:22251 from trunk to revise_chunks branch.
Also tackle some testing issues in test/objcopy.c test and clean up
some warnings.
Tested on:
FreeBSD/32 8.2 (loyalty) w/gcc4.6, w/C++ & FORTRAN, in debug mode
FreeBSD/64 8.2 (freedom) w/gcc4.6, w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-amd64 2.6 (koala) w/Intel compilers, w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, w/threadsafe, in production mode
Linux/PPC 2.6 (ostrich) w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-ia64 2.6 (ember) w/Intel compilers, w/paralle, C++ & FORTRAN,
in production mode
Mac OS X/32 10.7.3 (amazon) in debug mode
Mac OS X/32 10.7.3 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Mac OS X/32 10.7.3 (amazon) w/parallel, in debug mode
Diffstat (limited to 'src/H5Ptest.c')
| -rw-r--r-- | src/H5Ptest.c | 52 |
1 files changed, 51 insertions, 1 deletions
diff --git a/src/H5Ptest.c b/src/H5Ptest.c index b36da6a..0463299 100644 --- a/src/H5Ptest.c +++ b/src/H5Ptest.c @@ -165,9 +165,59 @@ H5P_reset_external_file_test(hid_t dcpl_id) /* set external file list */ if(H5P_set(plist, H5D_CRT_EXT_FILE_LIST_NAME, &efl) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get external file list") + HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set external file list") done: FUNC_LEAVE_NOAPI(ret_value) } /* H5P_reset_external_file_test() */ + +/*-------------------------------------------------------------------------- + NAME + H5P_reset_layout_test + PURPOSE + Routine to reset layout message + USAGE + herr_t H5P_reset_layout_test(plist) + hid_t dcpl_id; IN: the property list + + RETURNS + Non-negative on success/Negative on failure + + PROGRAMMER + Quincey Koziol + April 5, 2012 +--------------------------------------------------------------------------*/ +herr_t +H5P_reset_layout_test(hid_t dcpl_id) +{ + H5O_layout_t layout; /* Layout message */ + H5P_genplist_t *plist; /* Property list */ + herr_t ret_value = SUCCEED; /* Return value */ + + FUNC_ENTER_NOAPI(FAIL) + + /* Check arguments */ + if(NULL == (plist = (H5P_genplist_t *)H5I_object(dcpl_id))) + HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset creation property list") + + /* Get layout message */ + if(H5P_get(plist, H5D_CRT_LAYOUT_NAME, &layout) < 0) + HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get layout") + + /* Clean up any values set for the layout */ + if(H5O_msg_reset(H5O_LAYOUT_ID, &layout) < 0) + HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "can't release layout info") + + /* Set layout message */ + if(H5P_set(plist, H5D_CRT_LAYOUT_NAME, &layout) < 0) + HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set layout") + + /* Remove layout message */ + if(H5P_remove(dcpl_id, plist, H5D_CRT_LAYOUT_NAME) < 0) + HGOTO_ERROR(H5E_PLIST, H5E_CANTDELETE, FAIL, "can't delete layout message property") + +done: + FUNC_LEAVE_NOAPI(ret_value) +} /* H5P_reset_layout_test() */ + |