diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2007-10-04 17:36:17 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-10-04 17:36:17 (GMT) |
| commit | d4eec753a1de150377773998db4f5035df60b21b (patch) | |
| tree | ea4e3f2e61ac4c3f4667188f80417fbb0cea7275 /test/objcopy.c | |
| parent | 3026ace6ae3873486664ef3f744dd803a323fe31 (diff) | |
| download | hdf5-d4eec753a1de150377773998db4f5035df60b21b.zip hdf5-d4eec753a1de150377773998db4f5035df60b21b.tar.gz hdf5-d4eec753a1de150377773998db4f5035df60b21b.tar.bz2 | |
[svn-r14183] Description:
Move H5Aget_num_attrs() into deprecated routines section, replacing all
internal usage with H5Oget_info().
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/objcopy.c')
| -rwxr-xr-x | test/objcopy.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/test/objcopy.c b/test/objcopy.c index f6d32d1..ff0e4bb 100755 --- a/test/objcopy.c +++ b/test/objcopy.c @@ -760,11 +760,8 @@ static int compare_std_attributes(hid_t oid, hid_t oid2, hid_t pid) { hid_t aid = -1, aid2 = -1; /* Attribute IDs */ - int num_attrs; /* Number of attributes */ - int num_attrs2; /* Number of attributes */ - char attr_name[ATTR_NAME_LEN]; /* Attribute name */ + H5O_info_t oinfo1, oinfo2; /* Object info */ unsigned cpy_flags; /* Object copy flags */ - unsigned i; /* Local index variable */ /* Retrieve the object copy flags from the property list, if it's non-DEFAULT */ if(pid != H5P_DEFAULT) { @@ -774,23 +771,26 @@ compare_std_attributes(hid_t oid, hid_t oid2, hid_t pid) cpy_flags = 0; /* Check the number of attributes on source dataset */ - if((num_attrs = H5Aget_num_attrs(oid)) < 0) TEST_ERROR + if(H5Oget_info(oid, ".", &oinfo1, H5P_DEFAULT) < 0) TEST_ERROR /* Check the number of attributes on destination dataset */ - if((num_attrs2 = H5Aget_num_attrs(oid2)) < 0) TEST_ERROR + if(H5Oget_info(oid2, ".", &oinfo2, H5P_DEFAULT) < 0) TEST_ERROR if(cpy_flags & H5O_COPY_WITHOUT_ATTR_FLAG) { /* Check that the destination has no attributes */ - if(num_attrs2 != 0) TEST_ERROR + if(oinfo2.num_attrs != 0) TEST_ERROR } /* end if */ else { + char attr_name[ATTR_NAME_LEN]; /* Attribute name */ + unsigned i; /* Local index variable */ + /* Compare the number of attributes */ - if(num_attrs != num_attrs2) TEST_ERROR + if(oinfo1.num_attrs != oinfo1.num_attrs) TEST_ERROR /* Check the attributes are equal */ - for(i = 0; i < (unsigned)num_attrs; i++) { - if ( (aid = H5Aopen_idx(oid, i) ) < 0 ) TEST_ERROR - if ( H5Aget_name(aid, ATTR_NAME_LEN, attr_name ) < 0) TEST_ERROR + for(i = 0; i < (unsigned)oinfo1.num_attrs; i++) { + if((aid = H5Aopen_idx(oid, i)) < 0) TEST_ERROR + if(H5Aget_name(aid, ATTR_NAME_LEN, attr_name) < 0) TEST_ERROR if((aid2 = H5Aopen_name(oid2, attr_name)) < 0) TEST_ERROR |