diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2007-10-04 15:06:28 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-10-04 15:06:28 (GMT) |
| commit | 59b51a2ea72ff98586372a454adfd8c790a62734 (patch) | |
| tree | 74173cf2dab79097c9dc8f116a22ad0138d310a2 /tools/h5ls | |
| parent | 302830e60108513d9ff2e710444dc0d0188c92ee (diff) | |
| download | hdf5-59b51a2ea72ff98586372a454adfd8c790a62734.zip hdf5-59b51a2ea72ff98586372a454adfd8c790a62734.tar.gz hdf5-59b51a2ea72ff98586372a454adfd8c790a62734.tar.bz2 | |
[svn-r14180] Description:
Make H5Aiterate() versioned and change all internal use to H5Aiterate2()
Leave some regression tests that exercise H5Aiterate1()
Fix attribute display in h5dump & h5ls to be "by name" by default
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 2.6 (smirom) w/default API=1.6.x, 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 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c index 4ea6bbc..e12b447 100644 --- a/tools/h5ls/h5ls.c +++ b/tools/h5ls/h5ls.c @@ -1322,10 +1322,11 @@ dump_dataset_values(hid_t dset) *------------------------------------------------------------------------- */ static herr_t -list_attr (hid_t obj, const char *attr_name, void UNUSED *op_data) +list_attr(hid_t obj, const char *attr_name, const H5A_info_t UNUSED *ainfo, + void UNUSED *op_data) { hid_t attr, space, type, p_type; - hsize_t size[64], nelmts=1; + hsize_t size[64], nelmts = 1; int ndims, i, n; size_t need; hsize_t temp_need; @@ -1784,7 +1785,7 @@ list(hid_t group, const char *name, const H5L_info_t *linfo, void *_iter) /* Display attributes */ if(oi.type >= 0) - H5Aiterate(obj, NULL, list_attr, NULL); + H5Aiterate2(obj, ".", H5_INDEX_NAME, H5_ITER_INC, NULL, list_attr, NULL, H5P_DEFAULT); /* Object location & reference count */ printf(" %-10s %lu:"H5_PRINTF_HADDR_FMT"\n", "Location:", oi.fileno, oi.addr); @@ -2312,7 +2313,7 @@ main(int argc, const char *argv[]) if(verbose_g > 0) { if((root = H5Gopen2(file, "/", H5P_DEFAULT)) < 0) leave(1); - H5Aiterate(root, NULL, list_attr, NULL); + H5Aiterate2(root, ".", H5_INDEX_NAME, H5_ITER_INC, NULL, list_attr, NULL, H5P_DEFAULT); if(H5Gclose(root) < 0) leave(1); } /* end if */ |