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/titerate.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/titerate.c')
-rw-r--r-- | test/titerate.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/titerate.c b/test/titerate.c index 99f099c..bbb57b3 100644 --- a/test/titerate.c +++ b/test/titerate.c @@ -54,7 +54,7 @@ typedef enum { /* Custom group iteration callback data */ typedef struct { char name[NAMELEN]; /* The name of the object */ - int type; /* The type of the object */ + H5O_type_t type; /* The type of the object */ iter_enum command; /* The type of return value */ } iter_info; @@ -547,7 +547,7 @@ liter_cb2(hid_t loc_id, const char *name, const H5L_info_t UNUSED *link_info, void *opdata) { const iter_info *test_info = (const iter_info *)opdata; - H5G_stat_t statbuf; + H5O_info_t oinfo; herr_t ret; /* Generic return value */ if(HDstrcmp(name, test_info->name)) { @@ -558,11 +558,11 @@ liter_cb2(hid_t loc_id, const char *name, const H5L_info_t UNUSED *link_info, /* * Get type of the object and check it. */ - ret = H5Gget_objinfo(loc_id, name, FALSE, &statbuf); - CHECK(ret, FAIL, "H5Gget_objinfo"); + ret = H5Oget_info(loc_id, name, &oinfo, H5P_DEFAULT); + CHECK(ret, FAIL, "H5Oget_info"); - if(test_info->type != statbuf.type) { - TestErrPrintf("test_info->type = %d, statbuf.type = %d\n", test_info->type, statbuf.type); + if(test_info->type != oinfo.type) { + TestErrPrintf("test_info->type = %d, oinfo.type = %d\n", test_info->type, (int)oinfo.type); return(H5_ITER_ERROR); } /* end if */ |