diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2004-09-22 19:49:32 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2004-09-22 19:49:32 (GMT) |
| commit | ace38083da1d7551eaedbc63b4a8242b721240c8 (patch) | |
| tree | e08d1ad63a9d6b54d23a978c390cdc8e55c95af3 | |
| parent | 0a69acf992053d4c665c1b1676972b98c1df13d0 (diff) | |
| download | hdf5-ace38083da1d7551eaedbc63b4a8242b721240c8.zip hdf5-ace38083da1d7551eaedbc63b4a8242b721240c8.tar.gz hdf5-ace38083da1d7551eaedbc63b4a8242b721240c8.tar.bz2 | |
[svn-r9309] Purpose:
Cleanup
Description:
Remove old hack for H5Eget_auto() which is not needed any more.
Reverse H5E_set_auto_stack(H5EDEFAULT,...) back to previous
code of H5E_set_auto(...). Same for H5E_get_auto_stack.
Platforms tested:
Only tested in Eirene PP as the change is pretty straight
forward.
Misc. update:
| -rw-r--r-- | testpar/t_dset.c | 24 | ||||
| -rw-r--r-- | testpar/testphdf5.h | 9 |
2 files changed, 12 insertions, 21 deletions
diff --git a/testpar/t_dset.c b/testpar/t_dset.c index 6bc36c0..5ff0a6e 100644 --- a/testpar/t_dset.c +++ b/testpar/t_dset.c @@ -1244,8 +1244,8 @@ extend_writeInd(void) /* Try write to dataset2 beyond its current dim sizes. Should fail. */ /* Temporary turn off auto error reporting */ - H5Eget_auto_stack(H5E_DEFAULT, &old_func, &old_client_data); - H5Eset_auto_stack(H5E_DEFAULT, NULL, NULL); + H5Eget_auto(&old_func, &old_client_data); + H5Eset_auto(NULL, NULL); /* create a file dataspace independently */ file_dataspace = H5Dget_space (dataset2); @@ -1259,7 +1259,7 @@ extend_writeInd(void) VRFY((ret < 0), "H5Dwrite failed as expected"); /* restore auto error reporting */ - H5Eset_auto_stack(H5E_DEFAULT, old_func, old_client_data); + H5Eset_auto(old_func, old_client_data); H5Sclose(file_dataspace); /* Extend dataset2 and try again. Should succeed. */ @@ -1534,8 +1534,8 @@ extend_readInd(void) /* Try extend dataset1 which is open RDONLY. Should fail. */ /* first turn off auto error reporting */ - H5Eget_auto_stack(H5E_DEFAULT, &old_func, &old_client_data); - H5Eset_auto_stack(H5E_DEFAULT, NULL, NULL); + H5Eget_auto(&old_func, &old_client_data); + H5Eset_auto(NULL, NULL); file_dataspace = H5Dget_space (dataset1); VRFY((file_dataspace >= 0), "H5Dget_space succeeded"); @@ -1546,7 +1546,7 @@ extend_readInd(void) VRFY((ret < 0), "H5Dextend failed as expected"); /* restore auto error reporting */ - H5Eset_auto_stack(H5E_DEFAULT, old_func, old_client_data); + H5Eset_auto(old_func, old_client_data); H5Sclose(file_dataspace); @@ -1831,8 +1831,8 @@ extend_writeAll(void) /* Try write to dataset2 beyond its current dim sizes. Should fail. */ /* Temporary turn off auto error reporting */ - H5Eget_auto_stack(H5E_DEFAULT, &old_func, &old_client_data); - H5Eset_auto_stack(H5E_DEFAULT, NULL, NULL); + H5Eget_auto(&old_func, &old_client_data); + H5Eset_auto(NULL, NULL); /* create a file dataspace independently */ file_dataspace = H5Dget_space (dataset2); @@ -1846,7 +1846,7 @@ extend_writeAll(void) VRFY((ret < 0), "H5Dwrite failed as expected"); /* restore auto error reporting */ - H5Eset_auto_stack(H5E_DEFAULT, old_func, old_client_data); + H5Eset_auto(old_func, old_client_data); H5Sclose(file_dataspace); /* Extend dataset2 and try again. Should succeed. */ @@ -1956,8 +1956,8 @@ extend_readAll(void) /* Try extend dataset1 which is open RDONLY. Should fail. */ /* first turn off auto error reporting */ - H5Eget_auto_stack(H5E_DEFAULT, &old_func, &old_client_data); - H5Eset_auto_stack(H5E_DEFAULT, NULL, NULL); + H5Eget_auto(&old_func, &old_client_data); + H5Eset_auto(NULL, NULL); file_dataspace = H5Dget_space (dataset1); VRFY((file_dataspace >= 0), "H5Dget_space succeeded"); @@ -1968,7 +1968,7 @@ extend_readAll(void) VRFY((ret < 0), "H5Dextend failed as expected"); /* restore auto error reporting */ - H5Eset_auto_stack(H5E_DEFAULT, old_func, old_client_data); + H5Eset_auto(old_func, old_client_data); H5Sclose(file_dataspace); diff --git a/testpar/testphdf5.h b/testpar/testphdf5.h index 2ab5047..877e88c 100644 --- a/testpar/testphdf5.h +++ b/testpar/testphdf5.h @@ -25,15 +25,6 @@ #define FALSE (!TRUE) #endif /* !FALSE */ -/* temporary fix for restoring the H5EXXX API. */ -/* An ISO compliant compiler should handle the repeated name correctly. */ -/* If it barks at it, try change the second name to something like */ -/* H5E/@@/xxx where '@' is actually '*'. */ -#ifndef H5_WANT_H5_V1_6_COMPAT -#define H5Eget_auto(func, data) H5Eget_auto(H5E_DEFAULT, func, data) -#define H5Eset_auto(func, data) H5Eset_auto(H5E_DEFAULT, func, data) -#endif - /* Define some handy debugging shorthands, routines, ... */ /* debugging tools */ |