diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2007-10-31 13:13:40 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-10-31 13:13:40 (GMT) |
commit | e15bdb05e6bf52525c1df48f8e8e01aba3ce288b (patch) | |
tree | b6a77169711c84362d7cbb252cb8d288b2656ba6 /tools/h5ls | |
parent | b969dce6e5625dd9d9f9cc42717a1b2027fdeeb1 (diff) | |
download | hdf5-e15bdb05e6bf52525c1df48f8e8e01aba3ce288b.zip hdf5-e15bdb05e6bf52525c1df48f8e8e01aba3ce288b.tar.gz hdf5-e15bdb05e6bf52525c1df48f8e8e01aba3ce288b.tar.bz2 |
[svn-r14225] Description:
Change H5Oget_info -> H5Oget_info_by_name and re-add H5Oget_info in a
simpler form for querying a particular object, to align with other new API
routines.
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/h5ls')
-rw-r--r-- | tools/h5ls/h5ls.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c index d270b0c..19cfe58 100644 --- a/tools/h5ls/h5ls.c +++ b/tools/h5ls/h5ls.c @@ -1171,7 +1171,7 @@ display_type(hid_t type, int ind) if(H5Tcommitted(type)) { H5O_info_t oi; - if(H5Oget_info(type, ".", &oi, H5P_DEFAULT) >= 0) + if(H5Oget_info(type, &oi) >= 0) printf("shared-%lu:"H5_PRINTF_HADDR_FMT" ", oi.fileno, oi.addr); else @@ -1744,7 +1744,7 @@ list(hid_t group, const char *name, const H5L_info_t *linfo, void *_iter) hid_t obj; /* Get object information */ - if(H5Oget_info(group, name, &oi, H5P_DEFAULT) < 0) { + if(H5Oget_info_by_name(group, name, &oi, H5P_DEFAULT) < 0) { puts("**NOT FOUND**"); return 0; } else if(oi.type < 0 || oi.type >= H5O_TYPE_NTYPES) { @@ -2306,7 +2306,7 @@ main(int argc, const char *argv[]) li.type = H5L_TYPE_HARD; /* Open the object and display it's information */ - if(li.type == H5L_TYPE_HARD && H5Oget_info(file, oname, &oi, H5P_DEFAULT) >= 0 && H5O_TYPE_GROUP == oi.type && !grp_literal_g) { + if(li.type == H5L_TYPE_HARD && H5Oget_info_by_name(file, oname, &oi, H5P_DEFAULT) >= 0 && H5O_TYPE_GROUP == oi.type && !grp_literal_g) { /* Specified name is a group. List the complete contents of the group. */ sym_insert(&oi, oname); iter.container = container = fix_name((show_file_name_g ? fname : ""), oname); |