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 /tools/h5repack | |
| 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 'tools/h5repack')
| -rw-r--r-- | tools/h5repack/h5repack_copy.c | 7 | ||||
| -rw-r--r-- | tools/h5repack/h5repack_refs.c | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c index dedca0a..5734285 100644 --- a/tools/h5repack/h5repack_copy.c +++ b/tools/h5repack/h5repack_copy.c @@ -901,10 +901,11 @@ int copy_attr(hid_t loc_in, int rank; /* rank of dataset */ hsize_t dims[H5S_MAX_RANK];/* dimensions of dataset */ char name[255]; - int n, j; + H5O_info_t oinfo; /* Object info */ + int j; unsigned u; - if ((n = H5Aget_num_attrs(loc_in))<0) + if(H5Oget_info(loc_in, ".", &oinfo, H5P_DEFAULT) < 0) goto error; /*------------------------------------------------------------------------- @@ -912,7 +913,7 @@ int copy_attr(hid_t loc_in, *------------------------------------------------------------------------- */ - for ( u = 0; u < (unsigned)n; u++) + for ( u = 0; u < (unsigned)oinfo.num_attrs; u++) { buf=NULL; diff --git a/tools/h5repack/h5repack_refs.c b/tools/h5repack/h5repack_refs.c index f1738e8..8ec1cfd 100644 --- a/tools/h5repack/h5repack_refs.c +++ b/tools/h5repack/h5repack_refs.c @@ -418,13 +418,14 @@ static int copy_refs_attr(hid_t loc_in, int rank; /* rank of dataset */ hsize_t dims[H5S_MAX_RANK];/* dimensions of dataset */ char name[255]; - int n, j; + H5O_info_t oinfo; /* Object info */ + int j; unsigned u; - if((n = H5Aget_num_attrs(loc_in)) < 0) + if(H5Oget_info(loc_in, ".", &oinfo, H5P_DEFAULT) < 0) goto error; - for(u = 0; u < (unsigned)n; u++) { + for(u = 0; u < (unsigned)oinfo.num_attrs; u++) { /*------------------------------------------------------------------------- * open *------------------------------------------------------------------------- |