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/stab.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/stab.c')
| -rw-r--r-- | test/stab.c | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/test/stab.c b/test/stab.c index e3cfa57..368e00e 100644 --- a/test/stab.c +++ b/test/stab.c @@ -325,7 +325,7 @@ lifecycle(hid_t fapl2) unsigned est_num_entries; /* Estimated # of entries in group */ unsigned est_name_len; /* Estimated length of entry name */ unsigned nmsgs; /* Number of messages in group's header */ - H5G_stat_t obj_stat; /* Object info */ + H5O_info_t oinfo; /* Object info */ char objname[NAME_BUF_SIZE]; /* Object name */ char filename[NAME_BUF_SIZE]; h5_stat_size_t empty_size; /* Size of an empty file */ @@ -416,15 +416,11 @@ lifecycle(hid_t fapl2) if(H5G_is_new_dense_test(gid) != FALSE) TEST_ERROR /* Check that the object header is only one chunk and the space has been allocated correctly */ - if(H5Gget_objinfo(gid, ".", FALSE, &obj_stat) < 0) TEST_ERROR -#ifdef H5_HAVE_LARGE_HSIZET - if(obj_stat.ohdr.size != 151) TEST_ERROR -#else /* H5_HAVE_LARGE_HSIZET */ - if(obj_stat.ohdr.size != 131) TEST_ERROR -#endif /* H5_HAVE_LARGE_HSIZET */ - if(obj_stat.ohdr.free != 0) TEST_ERROR - if(obj_stat.ohdr.nmesgs != 6) TEST_ERROR - if(obj_stat.ohdr.nchunks != 1) TEST_ERROR + if(H5Oget_info(gid, ".", &oinfo, H5P_DEFAULT) < 0) TEST_ERROR + if(oinfo.hdr.space.total != 151) TEST_ERROR + if(oinfo.hdr.space.free != 0) TEST_ERROR + if(oinfo.hdr.nmesgs != 6) TEST_ERROR + if(oinfo.hdr.nchunks != 1) TEST_ERROR /* Create one more "bottom" group, which should push top group into using a symbol table */ sprintf(objname, LIFECYCLE_BOTTOM_GROUP, u); @@ -442,15 +438,11 @@ lifecycle(hid_t fapl2) if(H5G_is_new_dense_test(gid) != TRUE) TEST_ERROR /* Check that the object header is still one chunk and the space has been allocated correctly */ - if(H5Gget_objinfo(gid, ".", FALSE, &obj_stat) < 0) TEST_ERROR -#ifdef H5_HAVE_LARGE_HSIZET - if(obj_stat.ohdr.size != 151) TEST_ERROR -#else /* H5_HAVE_LARGE_HSIZET */ - if(obj_stat.ohdr.size != 131) TEST_ERROR -#endif /* H5_HAVE_LARGE_HSIZET */ - if(obj_stat.ohdr.free != 92) TEST_ERROR - if(obj_stat.ohdr.nmesgs != 3) TEST_ERROR - if(obj_stat.ohdr.nchunks != 1) TEST_ERROR + if(H5Oget_info(gid, ".", &oinfo, H5P_DEFAULT) < 0) TEST_ERROR + if(oinfo.hdr.space.total != 151) TEST_ERROR + if(oinfo.hdr.space.free != 92) TEST_ERROR + if(oinfo.hdr.nmesgs != 3) TEST_ERROR + if(oinfo.hdr.nchunks != 1) TEST_ERROR /* Unlink objects from top group */ while(u >= LIFECYCLE_MIN_DENSE) { |