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/dtypes.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/dtypes.c')
| -rw-r--r-- | test/dtypes.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/test/dtypes.c b/test/dtypes.c index 75dde75..2783f2d 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -4362,7 +4362,7 @@ test_latest(void) hid_t file = (-1); /* File ID */ hid_t tid1 = (-1), tid2 = (-1); /* Datatype ID */ hid_t fapl = (-1); /* File access property list */ - H5G_stat_t sb; /* Stat buffer for committed datatype */ + H5O_info_t oi; /* Stat buffer for committed datatype */ hsize_t old_dtype_oh_size; /* Size of object header with "old" format */ hsize_t new_dtype_oh_size; /* Size of object header with "new" format */ char filename[1024]; /* Buffer for filename */ @@ -4396,9 +4396,9 @@ test_latest(void) FAIL_STACK_ERROR /* Get information about datatype on disk */ - if(H5Gget_objinfo(file, compnd_type, TRUE, &sb) < 0) + if(H5Oget_info(file, compnd_type, &oi, H5P_DEFAULT) < 0) FAIL_STACK_ERROR - old_dtype_oh_size = sb.ohdr.size; + old_dtype_oh_size = oi.hdr.space.total; /* Close datatype */ if(H5Tclose(tid2) < 0) @@ -4421,11 +4421,11 @@ test_latest(void) FAIL_STACK_ERROR /* Get information about datatype on disk */ - if(H5Gget_objinfo(file, compnd_type, TRUE, &sb) < 0) + if(H5Oget_info(file, compnd_type, &oi, H5P_DEFAULT) < 0) FAIL_STACK_ERROR /* Check that the object header info is still the same */ - if(old_dtype_oh_size != sb.ohdr.size) + if(old_dtype_oh_size != oi.hdr.space.total) TEST_ERROR /* Close datatype */ @@ -4457,9 +4457,9 @@ test_latest(void) FAIL_STACK_ERROR /* Get information about datatype on disk */ - if(H5Gget_objinfo(file, compnd_type, TRUE, &sb) < 0) + if(H5Oget_info(file, compnd_type, &oi, H5P_DEFAULT) < 0) FAIL_STACK_ERROR - new_dtype_oh_size = sb.ohdr.size; + new_dtype_oh_size = oi.hdr.space.total; /* Check that the new format is smaller than the old format */ if(old_dtype_oh_size <= new_dtype_oh_size) @@ -4486,11 +4486,11 @@ test_latest(void) FAIL_STACK_ERROR /* Get information about datatype on disk */ - if(H5Gget_objinfo(file, compnd_type, TRUE, &sb) < 0) + if(H5Oget_info(file, compnd_type, &oi, H5P_DEFAULT) < 0) FAIL_STACK_ERROR /* Check that the object header info is still the same */ - if(new_dtype_oh_size != sb.ohdr.size) + if(new_dtype_oh_size != oi.hdr.space.total) TEST_ERROR /* Close datatype */ |