diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2005-08-27 13:34:28 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2005-08-27 13:34:28 (GMT) |
| commit | fefbe61aca1a42e716e900be7af5b382be5e19c1 (patch) | |
| tree | dbb600c8b6555569a4d94ff69b24e72c4787693d /test/tmisc.c | |
| parent | 538d37a1bcc15a600c71fad0566d8480c2344ee6 (diff) | |
| download | hdf5-fefbe61aca1a42e716e900be7af5b382be5e19c1.zip hdf5-fefbe61aca1a42e716e900be7af5b382be5e19c1.tar.gz hdf5-fefbe61aca1a42e716e900be7af5b382be5e19c1.tar.bz2 | |
[svn-r11304] Purpose:
Code cleanup (sorta)
Description:
Adjust H5G_stat_t to prepare for eventual "external link" information.
This also puts the information for regular objects and soft links into more
obviously separate places.
Platforms tested:
FreeBSD 4.11 (sleipnir)
Linux 2.4
Diffstat (limited to 'test/tmisc.c')
| -rw-r--r-- | test/tmisc.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/test/tmisc.c b/test/tmisc.c index 6cc7556..d228452 100644 --- a/test/tmisc.c +++ b/test/tmisc.c @@ -2812,10 +2812,10 @@ test_misc18(void) /* Get object information */ ret = H5Gget_objinfo(fid,MISC18_DSET1_NAME,0,&statbuf); CHECK(ret, FAIL, "H5Gget_objinfo"); - VERIFY(statbuf.ohdr.nmesgs, 6, "H5Gget_objinfo"); - VERIFY(statbuf.ohdr.nchunks, 1, "H5Gget_objinfo"); - VERIFY(statbuf.ohdr.size, 272, "H5Gget_objinfo"); - VERIFY(statbuf.ohdr.free, 152, "H5Gget_objinfo"); + VERIFY(statbuf.u.obj.ohdr.nmesgs, 6, "H5Gget_objinfo"); + VERIFY(statbuf.u.obj.ohdr.nchunks, 1, "H5Gget_objinfo"); + VERIFY(statbuf.u.obj.ohdr.size, 272, "H5Gget_objinfo"); + VERIFY(statbuf.u.obj.ohdr.free, 152, "H5Gget_objinfo"); /* Create second dataset */ did2 = H5Dcreate(fid, MISC18_DSET2_NAME, H5T_STD_U32LE, sid, H5P_DEFAULT); @@ -2824,10 +2824,10 @@ test_misc18(void) /* Get object information */ ret = H5Gget_objinfo(fid,MISC18_DSET2_NAME,0,&statbuf); CHECK(ret, FAIL, "H5Gget_objinfo"); - VERIFY(statbuf.ohdr.nmesgs, 6, "H5Gget_objinfo"); - VERIFY(statbuf.ohdr.nchunks, 1, "H5Gget_objinfo"); - VERIFY(statbuf.ohdr.size, 272, "H5Gget_objinfo"); - VERIFY(statbuf.ohdr.free, 152, "H5Gget_objinfo"); + VERIFY(statbuf.u.obj.ohdr.nmesgs, 6, "H5Gget_objinfo"); + VERIFY(statbuf.u.obj.ohdr.nchunks, 1, "H5Gget_objinfo"); + VERIFY(statbuf.u.obj.ohdr.size, 272, "H5Gget_objinfo"); + VERIFY(statbuf.u.obj.ohdr.free, 152, "H5Gget_objinfo"); /* Loop creating attributes on each dataset, flushing them to the file each time */ for(u=0; u<10; u++) { @@ -2856,18 +2856,18 @@ test_misc18(void) /* Get object information for dataset #1 now */ ret = H5Gget_objinfo(fid,MISC18_DSET1_NAME,0,&statbuf); CHECK(ret, FAIL, "H5Gget_objinfo"); - VERIFY(statbuf.ohdr.nmesgs, 24, "H5Gget_objinfo"); - VERIFY(statbuf.ohdr.nchunks, 9, "H5Gget_objinfo"); - VERIFY(statbuf.ohdr.size, 888, "H5Gget_objinfo"); - VERIFY(statbuf.ohdr.free, 16, "H5Gget_objinfo"); + VERIFY(statbuf.u.obj.ohdr.nmesgs, 24, "H5Gget_objinfo"); + VERIFY(statbuf.u.obj.ohdr.nchunks, 9, "H5Gget_objinfo"); + VERIFY(statbuf.u.obj.ohdr.size, 888, "H5Gget_objinfo"); + VERIFY(statbuf.u.obj.ohdr.free, 16, "H5Gget_objinfo"); /* Get object information for dataset #2 now */ ret = H5Gget_objinfo(fid,MISC18_DSET2_NAME,0,&statbuf); CHECK(ret, FAIL, "H5Gget_objinfo"); - VERIFY(statbuf.ohdr.nmesgs, 24, "H5Gget_objinfo"); - VERIFY(statbuf.ohdr.nchunks, 9, "H5Gget_objinfo"); - VERIFY(statbuf.ohdr.size, 888, "H5Gget_objinfo"); - VERIFY(statbuf.ohdr.free, 16, "H5Gget_objinfo"); + VERIFY(statbuf.u.obj.ohdr.nmesgs, 24, "H5Gget_objinfo"); + VERIFY(statbuf.u.obj.ohdr.nchunks, 9, "H5Gget_objinfo"); + VERIFY(statbuf.u.obj.ohdr.size, 888, "H5Gget_objinfo"); + VERIFY(statbuf.u.obj.ohdr.free, 16, "H5Gget_objinfo"); /* Close second dataset */ ret = H5Dclose(did2); |