diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2003-07-07 19:02:46 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2003-07-07 19:02:46 (GMT) |
| commit | 4e23c807585ed705173f32e374884a46e4a4f2dd (patch) | |
| tree | df458773252f84a19720b4d8b3588db955f4b6d1 /test/titerate.c | |
| parent | 2d5f8835fd9851c65d8e33a9c4bbe5da64d5427e (diff) | |
| download | hdf5-4e23c807585ed705173f32e374884a46e4a4f2dd.zip hdf5-4e23c807585ed705173f32e374884a46e4a4f2dd.tar.gz hdf5-4e23c807585ed705173f32e374884a46e4a4f2dd.tar.bz2 | |
[svn-r7181] Purpose:
Version update
Description:
Removed 1.4 compatibility code in the library.
Platforms tested:
FreeBSD 4.8 (sleipnir)
h5committest
Diffstat (limited to 'test/titerate.c')
| -rw-r--r-- | test/titerate.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/test/titerate.c b/test/titerate.c index a64bfbb..e8d0e3a 100644 --- a/test/titerate.c +++ b/test/titerate.c @@ -197,11 +197,13 @@ static void test_iter_group(void) VERIFY(num_membs,NDATASETS+2,"H5Gget_num_objs"); for(i=0; i< (int)num_membs; i++) { + H5G_obj_t obj_type; /* Type of object in file */ + ret = H5Gget_objname_by_idx(root_group, (hsize_t)i, dataset_name, 32); CHECK(ret, FAIL, "H5Gget_objsname_by_idx"); - ret = (herr_t)H5Gget_objtype_by_idx(root_group, (hsize_t)i); - CHECK(ret, FAIL, "H5Gget_objsname_by_idx"); + obj_type = H5Gget_objtype_by_idx(root_group, (hsize_t)i); + CHECK(obj_type, H5G_UNKNOWN, "H5Gget_objsname_by_idx"); } H5E_BEGIN_TRY { @@ -780,22 +782,24 @@ static void test_grp_memb_funcs(void) VERIFY(num_membs,NDATASETS+2,"H5Gget_num_objs"); for(i=0; i< (int)num_membs; i++) { - ret = (herr_t)H5Gget_objname_by_idx(root_group, (hsize_t)i, dataset_name, 32); + H5G_obj_t obj_type; /* Type of object in file */ + + ret = H5Gget_objname_by_idx(root_group, (hsize_t)i, dataset_name, 32); CHECK(ret, FAIL, "H5Gget_objsname_by_idx"); /* Keep a copy of the dataset names around for later */ obj_names[i]=HDstrdup(dataset_name); CHECK(dnames[i], NULL, "strdup"); - ret = (herr_t)H5Gget_objtype_by_idx(root_group, (hsize_t)i); - CHECK(ret, FAIL, "H5Gget_objsname_by_idx"); + obj_type = H5Gget_objtype_by_idx(root_group, (hsize_t)i); + CHECK(obj_type, H5G_UNKNOWN, "H5Gget_objsname_by_idx"); if(!HDstrcmp(dataset_name, "grp")) - VERIFY(ret, H5G_GROUP, "H5Gget_objsname_by_idx"); + VERIFY(obj_type, H5G_GROUP, "H5Gget_objsname_by_idx"); if(!HDstrcmp(dataset_name, "dtype")) - VERIFY(ret, H5G_TYPE, "H5Gget_objsname_by_idx"); + VERIFY(obj_type, H5G_TYPE, "H5Gget_objsname_by_idx"); if(!HDstrncmp(dataset_name, "Dataset", 7)) - VERIFY(ret, H5G_DATASET, "H5Gget_objsname_by_idx"); + VERIFY(obj_type, H5G_DATASET, "H5Gget_objsname_by_idx"); } H5E_BEGIN_TRY { |