diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2007-08-21 21:47:41 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-08-21 21:47:41 (GMT) |
| commit | 10dcf4b0e1efd406d1aab563313908dc5c152d49 (patch) | |
| tree | f9b3dbfde6bf115569e8c8c38551980a13060708 | |
| parent | cdd4606430edbb9b322c1abd55b2a4cdff936088 (diff) | |
| download | hdf5-10dcf4b0e1efd406d1aab563313908dc5c152d49.zip hdf5-10dcf4b0e1efd406d1aab563313908dc5c152d49.tar.gz hdf5-10dcf4b0e1efd406d1aab563313908dc5c152d49.tar.bz2 | |
[svn-r14098] Description:
Clean up a few remaining API compatibility issues in the H5E API for
parallel configurations
Tested on:
FreeBSD/64 6.2 (liberty) w/parallel
| -rw-r--r-- | testpar/t_dset.c | 24 | ||||
| -rw-r--r-- | testpar/testphdf5.c | 2 | ||||
| -rw-r--r-- | testpar/testphdf5.h | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/testpar/t_dset.c b/testpar/t_dset.c index 91349fc..40c7e0c 100644 --- a/testpar/t_dset.c +++ b/testpar/t_dset.c @@ -1277,8 +1277,8 @@ extend_writeInd(void) /* Try write to dataset2 beyond its current dim sizes. Should fail. */ /* Temporary turn off auto error reporting */ - H5Eget_auto(&old_func, &old_client_data); - H5Eset_auto(NULL, NULL); + H5Eget_auto2(H5E_DEFAULT, &old_func, &old_client_data); + H5Eset_auto2(H5E_DEFAULT, NULL, NULL); /* create a file dataspace independently */ file_dataspace = H5Dget_space (dataset2); @@ -1292,7 +1292,7 @@ extend_writeInd(void) VRFY((ret < 0), "H5Dwrite failed as expected"); /* restore auto error reporting */ - H5Eset_auto(old_func, old_client_data); + H5Eset_auto2(H5E_DEFAULT, old_func, old_client_data); H5Sclose(file_dataspace); /* Extend dataset2 and try again. Should succeed. */ @@ -1567,8 +1567,8 @@ extend_readInd(void) /* Try extend dataset1 which is open RDONLY. Should fail. */ /* first turn off auto error reporting */ - H5Eget_auto(&old_func, &old_client_data); - H5Eset_auto(NULL, NULL); + H5Eget_auto2(H5E_DEFAULT, &old_func, &old_client_data); + H5Eset_auto2(H5E_DEFAULT, NULL, NULL); file_dataspace = H5Dget_space (dataset1); VRFY((file_dataspace >= 0), "H5Dget_space succeeded"); @@ -1579,7 +1579,7 @@ extend_readInd(void) VRFY((ret < 0), "H5Dextend failed as expected"); /* restore auto error reporting */ - H5Eset_auto(old_func, old_client_data); + H5Eset_auto2(H5E_DEFAULT, old_func, old_client_data); H5Sclose(file_dataspace); @@ -1874,8 +1874,8 @@ extend_writeAll(void) /* Try write to dataset2 beyond its current dim sizes. Should fail. */ /* Temporary turn off auto error reporting */ - H5Eget_auto(&old_func, &old_client_data); - H5Eset_auto(NULL, NULL); + H5Eget_auto2(H5E_DEFAULT, &old_func, &old_client_data); + H5Eset_auto2(H5E_DEFAULT, NULL, NULL); /* create a file dataspace independently */ file_dataspace = H5Dget_space (dataset2); @@ -1889,7 +1889,7 @@ extend_writeAll(void) VRFY((ret < 0), "H5Dwrite failed as expected"); /* restore auto error reporting */ - H5Eset_auto(old_func, old_client_data); + H5Eset_auto2(H5E_DEFAULT, old_func, old_client_data); H5Sclose(file_dataspace); /* Extend dataset2 and try again. Should succeed. */ @@ -1999,8 +1999,8 @@ extend_readAll(void) /* Try extend dataset1 which is open RDONLY. Should fail. */ /* first turn off auto error reporting */ - H5Eget_auto(&old_func, &old_client_data); - H5Eset_auto(NULL, NULL); + H5Eget_auto2(H5E_DEFAULT, &old_func, &old_client_data); + H5Eset_auto2(H5E_DEFAULT, NULL, NULL); file_dataspace = H5Dget_space (dataset1); VRFY((file_dataspace >= 0), "H5Dget_space succeeded"); @@ -2011,7 +2011,7 @@ extend_readAll(void) VRFY((ret < 0), "H5Dextend failed as expected"); /* restore auto error reporting */ - H5Eset_auto(old_func, old_client_data); + H5Eset_auto2(H5E_DEFAULT, old_func, old_client_data); H5Sclose(file_dataspace); diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c index 11ffcb0..2f74221 100644 --- a/testpar/testphdf5.c +++ b/testpar/testphdf5.c @@ -35,7 +35,7 @@ int ngroups = 512; /* number of groups to create in root int facc_type = FACC_MPIO; /*Test file access type */ int dxfer_coll_type = DXFER_COLLECTIVE_IO; -H5E_auto_t old_func; /* previous error handler */ +H5E_auto2_t old_func; /* previous error handler */ void *old_client_data; /* previous error handler arg.*/ /* other option flags */ diff --git a/testpar/testphdf5.h b/testpar/testphdf5.h index 8a6d897..81ad0f5 100644 --- a/testpar/testphdf5.h +++ b/testpar/testphdf5.h @@ -188,7 +188,7 @@ typedef int DATATYPE; extern int dim0, dim1; /*Dataset dimensions */ extern int chunkdim0, chunkdim1; /*Chunk dimensions */ extern int nerrors; /*errors count */ -extern H5E_auto_t old_func; /* previous error handler */ +extern H5E_auto2_t old_func; /* previous error handler */ extern void *old_client_data; /*previous error handler arg.*/ extern int facc_type; /*Test file access type */ extern int dxfer_coll_type; |