mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-27 02:10:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make h5dump spacing consistent when printing VLEN datatype (#3351) (#3352)

Browse Source
This commit is contained in:
jhendersonHDF 2023-08-04 14:42:17 -05:00 committed by GitHub
parent 3262891c6b
commit 7aedee80e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/lib/h5tools_dump.c
View File

@ -2571,7 +2571,7 @@ found_string_type:
if (H5Tclose(super) < 0)
H5TOOLS_ERROR((-1), "H5Tclose failed");
h5tools_str_append(buffer, "%s", h5tools_dump_header_format->vlenblockend);
h5tools_str_append(buffer, " %s", h5tools_dump_header_format->vlenblockend);
break;

2
tools/testfiles/tarray6.ddl
View File

@ -1,7 +1,7 @@
HDF5 "tarray6.h5" {
GROUP "/" {
DATASET "Dataset1" {
DATATYPE H5T_ARRAY { [4] H5T_VLEN { H5T_STD_U32LE} }
DATATYPE H5T_ARRAY { [4] H5T_VLEN { H5T_STD_U32LE } }
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA {
(0): [ (0), (10, 11), (20, 21, 22), (30, 31, 32, 33) ],

2
tools/testfiles/tarray7.ddl
View File

@ -1,7 +1,7 @@
HDF5 "tarray7.h5" {
GROUP "/" {
DATASET "Dataset1" {
DATATYPE H5T_ARRAY { [4] H5T_VLEN { H5T_ARRAY { [4] H5T_STD_U32LE }} }
DATATYPE H5T_ARRAY { [4] H5T_VLEN { H5T_ARRAY { [4] H5T_STD_U32LE } } }
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA {
(0): [ ([ 0, 1, 2, 3 ]),

2
tools/testfiles/tempty.ddl
View File

@ -1,7 +1,7 @@
HDF5 "tempty.h5" {
GROUP "/" {
DATASET "Dataset1.0" {
DATATYPE H5T_VLEN { H5T_STD_I32LE}
DATATYPE H5T_VLEN { H5T_STD_I32LE }
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA {
(0): (), (), (), ()

2
tools/testfiles/tfill.ddl
View File

@ -124,7 +124,7 @@ GROUP "/" {
}
}
DATASET "fill_vlen" {
DATATYPE H5T_VLEN { H5T_STD_I32LE}
DATATYPE H5T_VLEN { H5T_STD_I32LE }
DATASPACE SIMPLE { ( 2 ) / ( 2 ) }
STORAGE_LAYOUT {
CONTIGUOUS

4
tools/testfiles/tmultifile.ddl
View File

@ -30,13 +30,13 @@ DATASET "Dataset1" {
}
HDF5 "tarray6.h5" {
DATASET "Dataset1" {
DATATYPE H5T_ARRAY { [4] H5T_VLEN { H5T_STD_U32LE} }
DATATYPE H5T_ARRAY { [4] H5T_VLEN { H5T_STD_U32LE } }
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
}
}
HDF5 "tarray7.h5" {
DATASET "Dataset1" {
DATATYPE H5T_ARRAY { [4] H5T_VLEN { H5T_ARRAY { [4] H5T_STD_U32LE }} }
DATATYPE H5T_ARRAY { [4] H5T_VLEN { H5T_ARRAY { [4] H5T_STD_U32LE } } }
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
}
}

24
tools/testfiles/treference.ddl
View File

@ -427,14 +427,14 @@ GROUP "/" {
}
}
ATTRIBUTE "vlen" {
DATATYPE H5T_VLEN { H5T_STD_I32LE}
DATATYPE H5T_VLEN { H5T_STD_I32LE }
DATASPACE SIMPLE { ( 2 ) / ( 2 ) }
DATA {
(0): (1), (2, 3)
}
}
ATTRIBUTE "vlen2D" {
DATATYPE H5T_VLEN { H5T_STD_I32LE}
DATATYPE H5T_VLEN { H5T_STD_I32LE }
DATASPACE SIMPLE { ( 3, 2 ) / ( 3, 2 ) }
DATA {
(0,0): (0), (1),
@ -443,7 +443,7 @@ GROUP "/" {
}
}
ATTRIBUTE "vlen3D" {
DATATYPE H5T_VLEN { H5T_STD_I32LE}
DATATYPE H5T_VLEN { H5T_STD_I32LE }
DATASPACE SIMPLE { ( 4, 3, 2 ) / ( 4, 3, 2 ) }
DATA {
(0,0,0): (0), (1),
@ -1039,14 +1039,14 @@ GROUP "/" {
}
}
ATTRIBUTE "vlen" {
DATATYPE H5T_VLEN { H5T_STD_I32LE}
DATATYPE H5T_VLEN { H5T_STD_I32LE }
DATASPACE SIMPLE { ( 2 ) / ( 2 ) }
DATA {
(0): (1), (2, 3)
}
}
ATTRIBUTE "vlen2D" {
DATATYPE H5T_VLEN { H5T_STD_I32LE}
DATATYPE H5T_VLEN { H5T_STD_I32LE }
DATASPACE SIMPLE { ( 3, 2 ) / ( 3, 2 ) }
DATA {
(0,0): (0), (1),
@ -1055,7 +1055,7 @@ GROUP "/" {
}
}
ATTRIBUTE "vlen3D" {
DATATYPE H5T_VLEN { H5T_STD_I32LE}
DATATYPE H5T_VLEN { H5T_STD_I32LE }
DATASPACE SIMPLE { ( 4, 3, 2 ) / ( 4, 3, 2 ) }
DATA {
(0,0,0): (0), (1),
@ -1501,14 +1501,14 @@ GROUP "/" {
}
}
ATTRIBUTE "vlen" {
DATATYPE H5T_VLEN { H5T_STD_I32LE}
DATATYPE H5T_VLEN { H5T_STD_I32LE }
DATASPACE SIMPLE { ( 2 ) / ( 2 ) }
DATA {
(0): (1), (2, 3)
}
}
ATTRIBUTE "vlen2D" {
DATATYPE H5T_VLEN { H5T_STD_I32LE}
DATATYPE H5T_VLEN { H5T_STD_I32LE }
DATASPACE SIMPLE { ( 3, 2 ) / ( 3, 2 ) }
DATA {
(0,0): (0), (1),
@ -1517,7 +1517,7 @@ GROUP "/" {
}
}
ATTRIBUTE "vlen3D" {
DATATYPE H5T_VLEN { H5T_STD_I32LE}
DATATYPE H5T_VLEN { H5T_STD_I32LE }
DATASPACE SIMPLE { ( 4, 3, 2 ) / ( 4, 3, 2 ) }
DATA {
(0,0,0): (0), (1),
@ -2109,14 +2109,14 @@ GROUP "/" {
}
}
DATASET "vlen" {
DATATYPE H5T_VLEN { H5T_STD_I32LE}
DATATYPE H5T_VLEN { H5T_STD_I32LE }
DATASPACE SIMPLE { ( 2 ) / ( 2 ) }
DATA {
(0): (1), (2, 3)
}
}
DATASET "vlen2D" {
DATATYPE H5T_VLEN { H5T_STD_I32LE}
DATATYPE H5T_VLEN { H5T_STD_I32LE }
DATASPACE SIMPLE { ( 3, 2 ) / ( 3, 2 ) }
DATA {
(0,0): (0), (1),
@ -2125,7 +2125,7 @@ GROUP "/" {
}
}
DATASET "vlen3D" {
DATATYPE H5T_VLEN { H5T_STD_I32LE}
DATATYPE H5T_VLEN { H5T_STD_I32LE }
DATASPACE SIMPLE { ( 4, 3, 2 ) / ( 4, 3, 2 ) }
DATA {
(0,0,0): (0), (1),

6
tools/testfiles/tvldtypes1.ddl
View File

@ -1,21 +1,21 @@
HDF5 "tvldtypes1.h5" {
GROUP "/" {
DATASET "Dataset1.0" {
DATATYPE H5T_VLEN { H5T_STD_I32LE}
DATATYPE H5T_VLEN { H5T_STD_I32LE }
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA {
(0): (0), (10, 11), (20, 21, 22), (30, 31, 32, 33)
}
}
DATASET "Dataset2.0" {
DATATYPE H5T_VLEN { H5T_IEEE_F32LE}
DATATYPE H5T_VLEN { H5T_IEEE_F32LE }
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA {
(0): (0), (10, 10.1), (20, 20.1, 20.2), (30, 30.1, 30.2, 30.3)
}
}
DATASET "Dataset3.0" {
DATATYPE H5T_VLEN { H5T_STD_I32LE}
DATATYPE H5T_VLEN { H5T_STD_I32LE }
DATASPACE SCALAR
DATA {
(0): (0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72)

2
tools/testfiles/tvldtypes2.ddl
View File

@ -1,7 +1,7 @@
HDF5 "tvldtypes2.h5" {
GROUP "/" {
DATASET "Dataset1" {
DATATYPE H5T_VLEN { H5T_VLEN { H5T_STD_U32LE}}
DATATYPE H5T_VLEN { H5T_VLEN { H5T_STD_U32LE } }
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA {
(0): ((0)), ((100), (110, 111)), ((200), (210, 211), (220, 221, 222)),

2
tools/testfiles/tvldtypes3.ddl
View File

@ -4,7 +4,7 @@ GROUP "/" {
DATATYPE H5T_COMPOUND {
H5T_STD_I32LE "i";
H5T_IEEE_F32LE "f";
H5T_VLEN { H5T_STD_U32LE} "v";
H5T_VLEN { H5T_STD_U32LE } "v";
}
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA {

2
tools/testfiles/tvldtypes4.ddl
View File

@ -4,7 +4,7 @@ GROUP "/" {
DATATYPE H5T_VLEN { H5T_COMPOUND {
H5T_STD_I32LE "i";
H5T_IEEE_F32LE "f";
}}
} }
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA {
(0): ({

2
tools/testfiles/tvldtypes5.ddl
View File

@ -1,7 +1,7 @@
HDF5 "tvldtypes5.h5" {
GROUP "/" {
DATASET "Dataset" {
DATATYPE H5T_VLEN { H5T_STD_U32LE}
DATATYPE H5T_VLEN { H5T_STD_U32LE }
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA {
(0): (0, 2, 4, 6, 8), (), (0, 2, 4, 6, 8, 10, 12), ()