diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2007-10-04 19:29:58 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-10-04 19:29:58 (GMT) |
commit | bb3afd50c2e94cf2db558218c6704dcc285c72e9 (patch) | |
tree | add60605c7c88c64582acde6b3e84051f72ea27b /hl/src/H5LT.c | |
parent | 3db40827da29243b88ade3c3f174f3f5e6cd0622 (diff) | |
download | hdf5-bb3afd50c2e94cf2db558218c6704dcc285c72e9.zip hdf5-bb3afd50c2e94cf2db558218c6704dcc285c72e9.tar.gz hdf5-bb3afd50c2e94cf2db558218c6704dcc285c72e9.tar.bz2 |
[svn-r14185] Description:
Move H5Aopen_name() routine to deprecated symbol section and replace
internal usage with H5Aopen().
Add simple regression test for H5Aopen_name() to deprecated routine
test.
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 'hl/src/H5LT.c')
-rw-r--r-- | hl/src/H5LT.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c index 6e47549..1810c1e 100644 --- a/hl/src/H5LT.c +++ b/hl/src/H5LT.c @@ -1718,22 +1718,22 @@ herr_t H5LTget_attribute_ndims( hid_t loc_id, hid_t obj_id; /* Open the object */ - if ((obj_id = H5Oopen(loc_id, obj_name, H5P_DEFAULT)) < 0) + if((obj_id = H5Oopen(loc_id, obj_name, H5P_DEFAULT)) < 0) return -1; /* Open the attribute. */ - if ( ( attr_id = H5Aopen_name( obj_id, attr_name ) ) < 0 ) + if((attr_id = H5Aopen(obj_id, ".", attr_name, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5Oclose(obj_id); return -1; } /* Get the dataspace handle */ - if ( (sid = H5Aget_space( attr_id )) < 0 ) + if((sid = H5Aget_space(attr_id)) < 0) goto out; /* Get rank */ - if ( (*rank = H5Sget_simple_extent_ndims( sid )) < 0 ) + if((*rank = H5Sget_simple_extent_ndims(sid)) < 0) goto out; /* Terminate access to the attribute */ @@ -1785,21 +1785,21 @@ herr_t H5LTget_attribute_info( hid_t loc_id, hid_t obj_id; /* Open the object */ - if ((obj_id = H5Oopen(loc_id, obj_name, H5P_DEFAULT)) < 0) + if((obj_id = H5Oopen(loc_id, obj_name, H5P_DEFAULT)) < 0) return -1; /* Open the attribute. */ - if ( ( attr_id = H5Aopen_name( obj_id, attr_name ) ) < 0 ) + if((attr_id = H5Aopen(obj_id, ".", attr_name, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5Oclose(obj_id); return -1; } /* Get an identifier for the datatype. */ - tid = H5Aget_type( attr_id ); + tid = H5Aget_type(attr_id); /* Get the class. */ - *type_class = H5Tget_class( tid ); + *type_class = H5Tget_class(tid); /* Get the size. */ *type_size = H5Tget_size( tid ); @@ -2999,7 +2999,7 @@ static herr_t H5LT_get_attribute_mem(hid_t loc_id, if((obj_id = H5Oopen(loc_id, obj_name, H5P_DEFAULT)) < 0) goto out; - if((attr_id = H5Aopen_name(obj_id, attr_name)) < 0) + if((attr_id = H5Aopen(obj_id, ".", attr_name, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto out; if(H5Aread(attr_id, mem_type_id, data) < 0) @@ -3048,16 +3048,16 @@ herr_t H5LT_get_attribute_disk( hid_t loc_id, hid_t attr_id; hid_t attr_type; - if ( ( attr_id = H5Aopen_name( loc_id, attr_name ) ) < 0 ) + if(( attr_id = H5Aopen(loc_id, ".", attr_name, H5P_DEFAULT, H5P_DEFAULT)) < 0) return -1; - if ( (attr_type = H5Aget_type( attr_id )) < 0 ) + if((attr_type = H5Aget_type(attr_id)) < 0) goto out; - if ( H5Aread( attr_id, attr_type, attr_out ) < 0 ) + if(H5Aread(attr_id, attr_type, attr_out) < 0) goto out; - if ( H5Tclose( attr_type ) < 0 ) + if(H5Tclose(attr_type) < 0) goto out; if ( H5Aclose( attr_id ) < 0 ) |