diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2007-08-28 15:02:54 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-08-28 15:02:54 (GMT) |
| commit | ea343ef85416b42f68f28fb1024702c6726f7eea (patch) | |
| tree | d5c401bf83f7f5578df06c54f9fd9fb198732ed2 /test/th5o.c | |
| parent | eb16d8bc2b2f37c7a1d75fe7bf5258eba21515b2 (diff) | |
| download | hdf5-ea343ef85416b42f68f28fb1024702c6726f7eea.zip hdf5-ea343ef85416b42f68f28fb1024702c6726f7eea.tar.gz hdf5-ea343ef85416b42f68f28fb1024702c6726f7eea.tar.bz2 | |
[svn-r14115] Description:
Remove all plain calls to H5Gopen() from source, replacing them with
either H5Gopen2().
Add test for H5Gopen1().
Reformatted several pieces of code, to clean them up.
Tested on:
FreeBSD/32 6.2 (duty)
FreeBSD/64 6.2 (liberty)
Linux/32 2.6 (kagiso)
Linux/64 2.6 (smirom)
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 | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/test/th5o.c b/test/th5o.c index e83b920..86c8c84 100644 --- a/test/th5o.c +++ b/test/th5o.c @@ -213,8 +213,8 @@ test_h5o_close(void) CHECK(ret, FAIL, "H5Oclose"); /* Make sure H5Oclose can close objects opened with H5*open */ - grp = H5Gopen(fid, "group"); - CHECK(grp, FAIL, "H5Gopen"); + grp = H5Gopen2(fid, "group", H5P_DEFAULT); + CHECK(grp, FAIL, "H5Gopen2"); dtype = H5Topen(fid, "group/datatype"); CHECK(dtype, FAIL, "H5Topen"); dset = H5Dopen(fid, "dataset"); @@ -478,12 +478,12 @@ test_h5o_refcount(void) fid = H5Fopen(TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT); CHECK(fid, FAIL, "H5Fopen"); - grp = H5Gopen(fid, "group"); - CHECK(grp, FAIL, "H5Gopen"); + grp = H5Gopen2(fid, "group", H5P_DEFAULT); + CHECK(grp, FAIL, "H5Gopen2"); dtype = H5Topen(fid, "datatype"); - CHECK(dtype, FAIL, "H5Gopen"); + CHECK(dtype, FAIL, "H5Topen"); dset = H5Dopen(fid, "dataset"); - CHECK(dset, FAIL, "H5Gopen"); + CHECK(dset, FAIL, "H5Dopen"); ret = H5Gget_objinfo(fid, "group", FALSE, &sb); CHECK(ret, FAIL, "H5Gget_objinfo"); @@ -516,12 +516,12 @@ test_h5o_refcount(void) fid = H5Fopen(TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT); CHECK(fid, FAIL, "H5Fopen"); - grp = H5Gopen(fid, "group"); - CHECK(grp, FAIL, "H5Gopen"); + grp = H5Gopen2(fid, "group", H5P_DEFAULT); + CHECK(grp, FAIL, "H5Gopen2"); dtype = H5Topen(fid, "datatype"); - CHECK(dtype, FAIL, "H5Gopen"); + CHECK(dtype, FAIL, "H5Topen"); dset = H5Dopen(fid, "dataset"); - CHECK(dset, FAIL, "H5Gopen"); + CHECK(dset, FAIL, "H5Dopen"); ret = H5Gget_objinfo(fid, "group", FALSE, &sb); CHECK(ret, FAIL, "H5Gget_objinfo"); @@ -706,8 +706,8 @@ test_h5o_plist(void) CHECK(fid, FAIL, "H5Fopen"); /* Re-open objects */ - grp = H5Gopen(fid, "group"); - CHECK(grp, FAIL, "H5Gopen"); + grp = H5Gopen2(fid, "group", H5P_DEFAULT); + CHECK(grp, FAIL, "H5Gopen2"); dtype = H5Topen(fid, "datatype"); CHECK(dtype, FAIL, "H5Topen"); dset = H5Dopen(fid, "dataset"); |