diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2007-09-06 15:54:22 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-09-06 15:54:22 (GMT) |
| commit | 3bed8703631cbcffb215ccd82235fcc293e14218 (patch) | |
| tree | bf56b0bcd4f41986f17138059f6349df78f0c059 /test/th5o.c | |
| parent | 3eb8c81b8046d282ced9c2d94e7132058243013e (diff) | |
| download | hdf5-3bed8703631cbcffb215ccd82235fcc293e14218.zip hdf5-3bed8703631cbcffb215ccd82235fcc293e14218.tar.gz hdf5-3bed8703631cbcffb215ccd82235fcc293e14218.tar.bz2 | |
[svn-r14136] Description:
Move H5Gget_num_objs() and several minor macros, etc. to deprecated
symbols section, replacing it with H5Gget_info().
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 5.10 (linew)
Mac OS X/32 10.4.10 (amazon)
Diffstat (limited to 'test/th5o.c')
| -rw-r--r-- | test/th5o.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/th5o.c b/test/th5o.c index 86c8c84..ff434d6 100644 --- a/test/th5o.c +++ b/test/th5o.c @@ -47,7 +47,7 @@ test_h5o_open(void) hid_t grp, dset, dtype, dspace; /* Object identifiers */ hsize_t dims[RANK]; H5I_type_t id_type; /* Type of IDs returned from H5Oopen */ - hsize_t num_objs = 0; /* Number of objects in the group */ + H5G_info_t ginfo; /* Group info struct */ H5T_class_t type_class; /* Class of the datatype */ herr_t ret; /* Value returned from API calls */ @@ -102,9 +102,9 @@ test_h5o_open(void) VERIFY(id_type, H5I_DATASET, "H5Iget_type for dataset ID"); /* Do something more complex with each of the IDs to make sure they "work" */ - ret = H5Gget_num_objs(grp, &num_objs); - CHECK(ret, FAIL, "H5Gget_num_objs"); - VERIFY(num_objs, 1, "H5Gget_num_objs"); /* There should be one object, the datatype */ + ret = H5Gget_info(grp, ".", &ginfo, H5P_DEFAULT); + CHECK(ret, FAIL, "H5Gget_info"); + VERIFY(ginfo.nlinks, 1, "H5Gget_info"); /* There should be one object, the datatype */ type_class = H5Tget_class(dtype); VERIFY(type_class, H5T_INTEGER, "H5Tget_class"); @@ -249,7 +249,7 @@ test_h5o_open_by_addr(void) haddr_t dtype_addr; hsize_t dims[RANK]; H5I_type_t id_type; /* Type of IDs returned from H5Oopen */ - hsize_t num_objs = 0; /* Number of objects in the group */ + H5G_info_t ginfo; /* Group info struct */ H5T_class_t type_class; /* Class of the datatype */ herr_t ret; /* Value returned from API calls */ @@ -315,9 +315,9 @@ test_h5o_open_by_addr(void) VERIFY(id_type, H5I_DATASET, "H5Iget_type for dataset ID"); /* Do something more complex with each of the IDs to make sure they "work" */ - ret = H5Gget_num_objs(grp, &num_objs); - CHECK(ret, FAIL, "H5Gget_num_objs"); - VERIFY(num_objs, 1, "H5Gget_num_objs"); /* There should be one object, the datatype */ + ret = H5Gget_info(grp, ".", &ginfo, H5P_DEFAULT); + CHECK(ret, FAIL, "H5Gget_info"); + VERIFY(ginfo.nlinks, 1, "H5Gget_info"); /* There should be one object, the datatype */ type_class = H5Tget_class(dtype); VERIFY(type_class, H5T_INTEGER, "H5Tget_class"); |