summaryrefslogtreecommitdiffstats
path: root/tools/h5ls
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2006-10-09 04:18:18 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2006-10-09 04:18:18 (GMT)
commit14dcb6db33f88011c3499d439c53890ab09d1ba2 (patch)
treecc05060f7dd94342c2e06726ef6b550bf4a7d8f1 /tools/h5ls
parent20720af231c875330a6074f65ee1c54e6a806fbb (diff)
downloadhdf5-14dcb6db33f88011c3499d439c53890ab09d1ba2.zip
hdf5-14dcb6db33f88011c3499d439c53890ab09d1ba2.tar.gz
hdf5-14dcb6db33f88011c3499d439c53890ab09d1ba2.tar.bz2
[svn-r12736] Description:
Add "use the latest format" support for dataspace object header encode/ decode routines and clean up format a bit for the latest format (new to 1.8.x releases) Remove storing 'perm' parameter for array datatypes in memory and the file, and add test to make certain that if any user applications are attempting to store them, we get some reports back. (Should be unlikely, since the RefMan says that the parameter is not implemented and is unsupported). Carry those changes into the tests, etc. Clean up a bunch more compiler warnings. Tested on: FreeBSD/32 4.11 (sleipnir) w/threadsafe Linux/32 2.4 (heping) w/FORTRAN & C++ Linux/64 2.4 (mir) w/enable-1.6-compat
Diffstat (limited to 'tools/h5ls')
-rw-r--r--tools/h5ls/h5ls.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index 978baf2..04a9371 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -1057,34 +1057,21 @@ static hbool_t
display_array_type(hid_t type, int ind)
{
hid_t super;
- int ndims, i, *perm=NULL, identity;
+ int ndims, i;
hsize_t *dims=NULL;
if (H5T_ARRAY!=H5Tget_class(type)) return FALSE;
ndims = H5Tget_array_ndims(type);
if (ndims) {
dims = malloc(ndims*sizeof(dims[0]));
- perm = malloc(ndims*sizeof(perm[0]));
- H5Tget_array_dims(type, dims, perm);
+ H5Tget_array_dims(type, dims, NULL);
/* Print dimensions */
for (i=0; i<ndims; i++)
HDfprintf(stdout, "%s%Hu" , i?",":"[", dims[i]);
putchar(']');
- /* Print permutation vector if not identity */
- for (i=0, identity=TRUE; identity && i<ndims; i++) {
- if (i!=perm[i]) identity = FALSE;
- }
- if (!identity) {
- fputs(" perm=[", stdout);
- for (i=0; i<ndims; i++)
- HDfprintf(stdout, "%s%d", i?",":"", perm[i]);
- putchar(']');
- }
-
free(dims);
- free(perm);
} else {
fputs(" [SCALAR]", stdout);
}