summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>2002-04-05 19:42:58 (GMT)
committerRobb Matzke <matzke@llnl.gov>2002-04-05 19:42:58 (GMT)
commit9606ebdfc7318b73860cea422d326334d44e288e (patch)
treeac37e8b338a1b5721d711479b34bec7eeec9443e /tools
parent2bd888792cdf1d404744f150030e91550c55e30a (diff)
downloadhdf5-9606ebdfc7318b73860cea422d326334d44e288e.zip
hdf5-9606ebdfc7318b73860cea422d326334d44e288e.tar.gz
hdf5-9606ebdfc7318b73860cea422d326334d44e288e.tar.bz2
[svn-r5143] ./hdf5-devel/tools/h5ls/h5ls.c
Minor h5ls bugfix for compound types with array members. (Similar changes shortly for 1.4 branch). 2002-04-04 16:39:09 Robb Matzke <matzke@arborea.spizella.com> * display_cmpd_type: Removed code to display array dimensions from display_cmpd_type() since this was a holdover from the days when hdf5 didn't have an array datatype and was duplicated by display_array_type().
Diffstat (limited to 'tools')
-rw-r--r--tools/h5ls/h5ls.c34
1 files changed, 1 insertions, 33 deletions
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index e5cd9a5..5fd7df6 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -707,10 +707,7 @@ static hbool_t
display_cmpd_type(hid_t type, int ind)
{
char *name=NULL; /*member name */
- int ndims; /*dimensionality */
- hsize_t dims[H5S_MAX_RANK]; /*dimensions */
size_t size; /*total size of type in bytes */
- int perm[H5S_MAX_RANK]; /*index permutation */
hid_t subtype; /*member data type */
int i, j, n; /*miscellaneous counters */
@@ -727,37 +724,8 @@ display_cmpd_type(hid_t type, int ind)
(unsigned long)H5Tget_member_offset(type, i));
free(name);
- /* Grab member's type */
+ /* Member's type */
subtype = H5Tget_member_type(type, i);
-
- /* Dimensions and permutation */
- if(H5Tget_class(subtype)==H5T_ARRAY) {
- ndims = H5Tget_array_ndims(subtype);
- H5Tget_array_dims(subtype, dims, perm);
- } /* end if */
- else
- ndims=0;
-
- if (ndims>0) {
- printf("[");
- for (j=0; j<ndims; j++)
- printf("%s%lu", j?",":"", (unsigned long)(dims[j]));
- printf("]");
-
- for (j=0; j<ndims; j++)
- if (perm[j]!=j)
- break;
-
- if (j<ndims) {
- printf("x[");
- for (j=0; j<ndims; j++)
- printf("%s%d", j?",":"", perm[j]);
- printf("]");
- }
- printf(" ");
- }
-
- /* Data type */
display_type(subtype, ind+4);
H5Tclose(subtype);
}