diff options
author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-03-12 21:50:25 (GMT) |
---|---|---|
committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-03-12 21:50:25 (GMT) |
commit | 90ec386c958859b73bc050eafa7d525df9dd618c (patch) | |
tree | cee070045fb0d2b1d0dacb9be421ca4198e27592 /test/ohdr.c | |
parent | c7b3e19329bb9f417b397d945c20b27c56a7420f (diff) | |
download | hdf5-90ec386c958859b73bc050eafa7d525df9dd618c.zip hdf5-90ec386c958859b73bc050eafa7d525df9dd618c.tar.gz hdf5-90ec386c958859b73bc050eafa7d525df9dd618c.tar.bz2 |
[svn-r22056] - fix several bugs in id management
- update test cases that get the H5F_t struct to use H5I_object_verify instead of H5I_object because of the higher user level ID that is introduced
- add some workarounds to take into consideration that the high level ID is not used everywhere at the moment
- add a routine that translates from low level ids to high level ids
Diffstat (limited to 'test/ohdr.c')
-rw-r--r-- | test/ohdr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/ohdr.c b/test/ohdr.c index 502a8b1..8c1a4b1 100644 --- a/test/ohdr.c +++ b/test/ohdr.c @@ -73,7 +73,7 @@ test_cont(char *filename, hid_t fapl) /* Create the file to operate on */ if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR - if(NULL == (f = (H5F_t *)H5I_object(file))) FAIL_STACK_ERROR + if(NULL == (f = (H5F_t *)H5I_object_verify(file, H5I_FILE))) FAIL_STACK_ERROR if (H5AC_ignore_tags(f) < 0) { H5_FAILED(); H5Eprint2(H5E_DEFAULT, stdout); @@ -200,7 +200,7 @@ test_ohdr_cache(char *filename, hid_t fapl) FAIL_STACK_ERROR if(H5Pclose(my_fapl) < 0) FAIL_STACK_ERROR - if(NULL == (f = (H5F_t *)H5I_object(file))) + if(NULL == (f = (H5F_t *)H5I_object_verify(file, H5I_FILE))) FAIL_STACK_ERROR if(H5AC_ignore_tags(f) < 0) FAIL_STACK_ERROR @@ -348,7 +348,7 @@ main(void) /* Create the file to operate on */ if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR - if(NULL == (f = (H5F_t *)H5I_object(file))) + if(NULL == (f = (H5F_t *)H5I_object_verify(file, H5I_FILE))) FAIL_STACK_ERROR if (H5AC_ignore_tags(f) < 0) { H5_FAILED(); @@ -449,7 +449,7 @@ main(void) FAIL_STACK_ERROR if((file = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) FAIL_STACK_ERROR - if(NULL == (f = (H5F_t *)H5I_object(file))) + if(NULL == (f = (H5F_t *)H5I_object_verify(file, H5I_FILE))) FAIL_STACK_ERROR if (H5AC_ignore_tags(f) < 0) FAIL_STACK_ERROR |