summaryrefslogtreecommitdiffstats
path: root/test/tmisc.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2007-10-31 13:13:40 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2007-10-31 13:13:40 (GMT)
commite15bdb05e6bf52525c1df48f8e8e01aba3ce288b (patch)
treeb6a77169711c84362d7cbb252cb8d288b2656ba6 /test/tmisc.c
parentb969dce6e5625dd9d9f9cc42717a1b2027fdeeb1 (diff)
downloadhdf5-e15bdb05e6bf52525c1df48f8e8e01aba3ce288b.zip
hdf5-e15bdb05e6bf52525c1df48f8e8e01aba3ce288b.tar.gz
hdf5-e15bdb05e6bf52525c1df48f8e8e01aba3ce288b.tar.bz2
[svn-r14225] Description:
Change H5Oget_info -> H5Oget_info_by_name and re-add H5Oget_info in a simpler form for querying a particular object, to align with other new API routines. Tested on: FreeBSD/32 6.2 (duty) in debug mode FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN, in production mode Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN, in production mode Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, in production mode Mac OS X/32 10.4.10 (amazon) in debug mode
Diffstat (limited to 'test/tmisc.c')
-rw-r--r--test/tmisc.c72
1 files changed, 36 insertions, 36 deletions
diff --git a/test/tmisc.c b/test/tmisc.c
index 08cf7ef..df950ea 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -638,15 +638,15 @@ test_misc4(void)
CHECK(group3, FAIL, "H5Gcreate2");
/* Get the stat information for each group */
- ret = H5Oget_info(file1, MISC4_GROUP_1, &oinfo1, H5P_DEFAULT);
- CHECK(ret, FAIL, "H5Oget_info");
- ret = H5Oget_info(file1, MISC4_GROUP_2, &oinfo2, H5P_DEFAULT);
- CHECK(ret, FAIL, "H5Oget_info");
- ret = H5Oget_info(file2, MISC4_GROUP_1, &oinfo3, H5P_DEFAULT);
- CHECK(ret, FAIL, "H5Oget_info");
+ ret = H5Oget_info_by_name(file1, MISC4_GROUP_1, &oinfo1, H5P_DEFAULT);
+ CHECK(ret, FAIL, "H5Oget_info_by_name");
+ ret = H5Oget_info_by_name(file1, MISC4_GROUP_2, &oinfo2, H5P_DEFAULT);
+ CHECK(ret, FAIL, "H5Oget_info_by_name");
+ ret = H5Oget_info_by_name(file2, MISC4_GROUP_1, &oinfo3, H5P_DEFAULT);
+ CHECK(ret, FAIL, "H5Oget_info_by_name");
/* Verify that the fileno values are the same for groups from file1 */
- VERIFY(oinfo1.fileno, oinfo2.fileno, "H5Oget_info");
+ VERIFY(oinfo1.fileno, oinfo2.fileno, "H5Oget_info_by_name");
/* Verify that the fileno values are not the same between file1 & file2 */
if(oinfo1.fileno == oinfo3.fileno)
@@ -2855,26 +2855,26 @@ test_misc18(void)
CHECK(did1, FAIL, "H5Dcreate2");
/* Get object information */
- ret = H5Oget_info(fid, MISC18_DSET1_NAME, &oinfo, H5P_DEFAULT);
- CHECK(ret, FAIL, "H5Oget_info");
- VERIFY(oinfo.hdr.nmesgs, 6, "H5Oget_info");
- VERIFY(oinfo.hdr.nchunks, 1, "H5Oget_info");
- VERIFY(oinfo.hdr.space.total, 272, "H5Oget_info");
- VERIFY(oinfo.hdr.space.free, 152, "H5Oget_info");
- VERIFY(oinfo.num_attrs, 0, "H5Oget_info");
+ ret = H5Oget_info_by_name(fid, MISC18_DSET1_NAME, &oinfo, H5P_DEFAULT);
+ CHECK(ret, FAIL, "H5Oget_info_by_name");
+ VERIFY(oinfo.hdr.nmesgs, 6, "H5Oget_info_by_name");
+ VERIFY(oinfo.hdr.nchunks, 1, "H5Oget_info_by_name");
+ VERIFY(oinfo.hdr.space.total, 272, "H5Oget_info_by_name");
+ VERIFY(oinfo.hdr.space.free, 152, "H5Oget_info_by_name");
+ VERIFY(oinfo.num_attrs, 0, "H5Oget_info_by_name");
/* Create second dataset */
did2 = H5Dcreate2(fid, MISC18_DSET2_NAME, H5T_STD_U32LE, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
CHECK(did2, FAIL, "H5Dcreate2");
/* Get object information */
- ret = H5Oget_info(fid, MISC18_DSET2_NAME, &oinfo, H5P_DEFAULT);
- CHECK(ret, FAIL, "H5Oget_info");
- VERIFY(oinfo.hdr.nmesgs, 6, "H5Oget_info");
- VERIFY(oinfo.hdr.nchunks, 1, "H5Oget_info");
- VERIFY(oinfo.hdr.space.total, 272, "H5Oget_info");
- VERIFY(oinfo.hdr.space.free, 152, "H5Oget_info");
- VERIFY(oinfo.num_attrs, 0, "H5Oget_info");
+ ret = H5Oget_info_by_name(fid, MISC18_DSET2_NAME, &oinfo, H5P_DEFAULT);
+ CHECK(ret, FAIL, "H5Oget_info_by_name");
+ VERIFY(oinfo.hdr.nmesgs, 6, "H5Oget_info_by_name");
+ VERIFY(oinfo.hdr.nchunks, 1, "H5Oget_info_by_name");
+ VERIFY(oinfo.hdr.space.total, 272, "H5Oget_info_by_name");
+ VERIFY(oinfo.hdr.space.free, 152, "H5Oget_info_by_name");
+ VERIFY(oinfo.num_attrs, 0, "H5Oget_info_by_name");
/* Loop creating attributes on each dataset, flushing them to the file each time */
for(u = 0; u < 10; u++) {
@@ -2901,22 +2901,22 @@ test_misc18(void)
} /* end for */
/* Get object information for dataset #1 now */
- ret = H5Oget_info(fid, MISC18_DSET1_NAME, &oinfo, H5P_DEFAULT);
- CHECK(ret, FAIL, "H5Oget_info");
- VERIFY(oinfo.hdr.nmesgs, 24, "H5Oget_info");
- VERIFY(oinfo.hdr.nchunks, 9, "H5Oget_info");
- VERIFY(oinfo.hdr.space.total, 888, "H5Oget_info");
- VERIFY(oinfo.hdr.space.free, 16, "H5Oget_info");
- VERIFY(oinfo.num_attrs, 10, "H5Oget_info");
+ ret = H5Oget_info_by_name(fid, MISC18_DSET1_NAME, &oinfo, H5P_DEFAULT);
+ CHECK(ret, FAIL, "H5Oget_info_by_name");
+ VERIFY(oinfo.hdr.nmesgs, 24, "H5Oget_info_by_name");
+ VERIFY(oinfo.hdr.nchunks, 9, "H5Oget_info_by_name");
+ VERIFY(oinfo.hdr.space.total, 888, "H5Oget_info_by_name");
+ VERIFY(oinfo.hdr.space.free, 16, "H5Oget_info_by_name");
+ VERIFY(oinfo.num_attrs, 10, "H5Oget_info_by_name");
/* Get object information for dataset #2 now */
- ret = H5Oget_info(fid, MISC18_DSET2_NAME, &oinfo, H5P_DEFAULT);
- CHECK(ret, FAIL, "H5Oget_info");
- VERIFY(oinfo.hdr.nmesgs, 24, "H5Oget_info");
- VERIFY(oinfo.hdr.nchunks, 9, "H5Oget_info");
- VERIFY(oinfo.hdr.space.total, 888, "H5Oget_info");
- VERIFY(oinfo.hdr.space.free, 16, "H5Oget_info");
- VERIFY(oinfo.num_attrs, 10, "H5Oget_info");
+ ret = H5Oget_info_by_name(fid, MISC18_DSET2_NAME, &oinfo, H5P_DEFAULT);
+ CHECK(ret, FAIL, "H5Oget_info_by_name");
+ VERIFY(oinfo.hdr.nmesgs, 24, "H5Oget_info_by_name");
+ VERIFY(oinfo.hdr.nchunks, 9, "H5Oget_info_by_name");
+ VERIFY(oinfo.hdr.space.total, 888, "H5Oget_info_by_name");
+ VERIFY(oinfo.hdr.space.free, 16, "H5Oget_info_by_name");
+ VERIFY(oinfo.num_attrs, 10, "H5Oget_info_by_name");
/* Close second dataset */
ret = H5Dclose(did2);
@@ -3849,7 +3849,7 @@ test_misc23(void)
tmp_id = H5Gopen2(file_id, "/A/B01", H5P_DEFAULT);
CHECK(tmp_id, FAIL, "H5Gopen2");
- status = H5Oget_info(tmp_id, ".", &oinfo, H5P_DEFAULT);
+ status = H5Oget_info(tmp_id, &oinfo);
CHECK(status, FAIL, "H5Oget_info");
VERIFY(oinfo.rc, 1, "H5Oget_info");