diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2007-09-13 15:44:56 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-09-13 15:44:56 (GMT) |
| commit | 579284f422b6ed25b7a5f4a518c19740fff297c8 (patch) | |
| tree | 564b2a7b4c13854a19ffaf465f94e6abd52d6340 /test/tsohm.c | |
| parent | 15d118faedd8e61e8ec2a715cf8fcea5b1afab35 (diff) | |
| download | hdf5-579284f422b6ed25b7a5f4a518c19740fff297c8.zip hdf5-579284f422b6ed25b7a5f4a518c19740fff297c8.tar.gz hdf5-579284f422b6ed25b7a5f4a518c19740fff297c8.tar.bz2 | |
[svn-r14144] Description:
Move H5Gget_objinfo() to deprecated symbols section and retarget
internal usage to H5Lget_info()/H5Oget_info().
Misc. other code cleanups...
Tested on:
FreeBSD/32 6.2 (duty)
FreeBSD/64 6.2 (liberty)
Linux/32 2.6 (kagiso)
Linux/64 2.6 (smirom)
AIX/32 5.3 (copper)
Solaris/32 2.10 (linew)
Mac OS X/32 10.4.10 (amazon)
Diffstat (limited to 'test/tsohm.c')
| -rw-r--r-- | test/tsohm.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/test/tsohm.c b/test/tsohm.c index 16acf71..f5b5235 100644 --- a/test/tsohm.c +++ b/test/tsohm.c @@ -735,7 +735,7 @@ static void test_sohm_size1(void) h5_stat_size_t norm_final_filesize2; h5_stat_size_t sohm_final_filesize2; h5_stat_size_t sohm_btree_final_filesize2; - H5G_stat_t statbuf; + H5O_info_t oinfo; unsigned num_indexes = 1; unsigned index_flags = H5O_MESG_DTYPE_FLAG; unsigned min_mesg_size = 50; @@ -776,11 +776,11 @@ static void test_sohm_size1(void) CHECK_I(file, "size1_helper"); /* Get the size of a dataset object header */ - ret = H5Gget_objinfo(file, DSETNAME[0], 0, &statbuf); - CHECK_I(ret, "H5Gget_objinfo"); + ret = H5Oget_info(file, DSETNAME[0], &oinfo, H5P_DEFAULT); + CHECK_I(ret, "H5Oget_info"); ret = H5Fclose(file); CHECK_I(ret, "H5Fclose"); - norm_oh_size = statbuf.ohdr.size; + norm_oh_size = oinfo.hdr.space.total; /* Get the new file size */ norm_final_filesize = h5_get_file_size(FILENAME); @@ -832,11 +832,11 @@ static void test_sohm_size1(void) CHECK_I(file, "size1_helper"); /* Get the size of a dataset object header */ - ret = H5Gget_objinfo(file, DSETNAME[0], 0, &statbuf); - CHECK_I(ret, "H5Gget_objinfo"); + ret = H5Oget_info(file, DSETNAME[0], &oinfo, H5P_DEFAULT); + CHECK_I(ret, "H5Oget_info"); ret = H5Fclose(file); CHECK_I(ret, "H5Fclose"); - sohm_oh_size = statbuf.ohdr.size; + sohm_oh_size = oinfo.hdr.space.total; /* Get the new file size */ sohm_final_filesize = h5_get_file_size(FILENAME); @@ -887,11 +887,11 @@ static void test_sohm_size1(void) CHECK_I(file, "size1_helper"); /* Get the size of a dataset object header */ - ret = H5Gget_objinfo(file, DSETNAME[0], 0, &statbuf); - CHECK_I(ret, "H5Gget_objinfo"); + ret = H5Oget_info(file, DSETNAME[0], &oinfo, H5P_DEFAULT); + CHECK_I(ret, "H5Oget_info"); ret = H5Fclose(file); CHECK_I(ret, "H5Fclose"); - sohm_btree_oh_size = statbuf.ohdr.size; + sohm_btree_oh_size = oinfo.hdr.space.total; /* Get the new file size */ sohm_btree_final_filesize = h5_get_file_size(FILENAME); @@ -924,10 +924,10 @@ static void test_sohm_size1(void) * continuation message and a NULL message. if(sohm_oh_size >= norm_oh_size) - VERIFY(sohm_oh_size, 1, "H5Gget_objinfo"); + VERIFY(sohm_oh_size, 1, "H5Oget_info"); */ if(sohm_oh_size != sohm_btree_oh_size) - VERIFY(sohm_btree_oh_size, 1, "H5Gget_objinfo"); + VERIFY(sohm_btree_oh_size, 1, "H5Oget_info"); /* Both sohm files should be bigger than a normal file when empty. * It's hard to say whether a B-tree with no nodes allocated should be |