diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2007-09-13 18:26:12 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-09-13 18:26:12 (GMT) |
| commit | 27a1a10fbb6101a071ddb4f5f29e3bcaeb9ef8d0 (patch) | |
| tree | dc5e01059a3f849f448403a23a62a55ff2bc45f7 /test/trefer.c | |
| parent | 095762a736c3125c0190409b7c3ca01c42605ad7 (diff) | |
| download | hdf5-27a1a10fbb6101a071ddb4f5f29e3bcaeb9ef8d0.zip hdf5-27a1a10fbb6101a071ddb4f5f29e3bcaeb9ef8d0.tar.gz hdf5-27a1a10fbb6101a071ddb4f5f29e3bcaeb9ef8d0.tar.bz2 | |
[svn-r14146] Description:
Move H5Gget_objtype_by_idx() to deprecated symbols section, replacing
with H5Oget_info_by_idx()
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/trefer.c')
| -rw-r--r-- | test/trefer.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/test/trefer.c b/test/trefer.c index 802ab79..aff967a 100644 --- a/test/trefer.c +++ b/test/trefer.c @@ -937,7 +937,7 @@ test_reference_obj_deleted(void) ** ****************************************************************/ static herr_t -test_deref_iter_op(hid_t UNUSED group, const char *name, const H5L_info_t *info, +test_deref_iter_op(hid_t UNUSED group, const char *name, const H5L_info_t UNUSED *info, void *op_data) { int *count = (int *)op_data; /* Pointer to name counter */ @@ -987,7 +987,7 @@ test_reference_group(void) hobj_ref_t rref; /* Reference to read */ H5G_info_t ginfo; /* Group info struct */ char objname[NAME_SIZE]; /* Buffer to store name */ - H5G_obj_t objtype; /* Object type */ + H5O_info_t oinfo; /* Object info struct */ int count = 0; /* Count within iterated group */ herr_t ret; @@ -1073,8 +1073,9 @@ test_reference_group(void) CHECK(ret, FAIL, "H5Lget_name_by_idx"); VERIFY_STR(objname, DSETNAME2, "H5Lget_name_by_idx"); - objtype = H5Gget_objtype_by_idx(gid, (hsize_t)0); - VERIFY(objtype, H5G_DATASET, "H5Gget_objtype_by_idx"); + ret = H5Oget_info_by_idx(gid, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)0, &oinfo, H5P_DEFAULT); + CHECK(ret, FAIL, "H5Oget_info_by_idx"); + VERIFY(oinfo.type, H5O_TYPE_DATASET, "H5Oget_info_by_idx"); /* Unlink one of the objects in the dereferenced group */ ret = H5Ldelete(gid, GROUPNAME2, H5P_DEFAULT); |