summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tools/h5dump/h5dumpgentest.c31
-rw-r--r--tools/testfiles/tcmpdints.ddl768
-rw-r--r--tools/testfiles/tcmpdints.h5bin9312 -> 9312 bytes
3 files changed, 405 insertions, 394 deletions
diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c
index 7c3ddf4..1687cc7 100644
--- a/tools/h5dump/h5dumpgentest.c
+++ b/tools/h5dump/h5dumpgentest.c
@@ -8852,14 +8852,14 @@ static void gent_compound_int_array(void) {
static void gent_compound_ints(void) {
hid_t fid, dataset, space;
hsize_t dims[1];
- uint8_t valu8bits;
- uint16_t valu16bits;
- uint32_t valu32bits;
- uint64_t valu64bits;
- int8_t val8bits;
- int16_t val16bits;
- int32_t val32bits;
- int64_t val64bits;
+ uint8_t valu8bits = (uint8_t) ~0u; /* all 1s */
+ uint16_t valu16bits = (uint16_t) ~0u; /* all 1s */
+ uint32_t valu32bits = (uint32_t) ~0u; /* all 1s */
+ uint64_t valu64bits = (uint64_t) ~0Lu; /* all 1s */
+ int8_t val8bits = (int8_t) ~0; /* all 1s */
+ int16_t val16bits = (int16_t) ~0; /* all 1s */
+ int32_t val32bits = (int32_t) ~0; /* all 1s */
+ int64_t val64bits = (int64_t) ~0L; /* all 1s */
/* Structure and array for compound types */
typedef struct Cmpd1Struct {
uint8_t dsetu8;
@@ -8873,6 +8873,7 @@ static void gent_compound_ints(void) {
double dsetdbl;
} Cmpd1Struct;
Cmpd1Struct Cmpd1[F77_LENGTH];
+
typedef struct Cmpd2Struct {
uint64_t dsetu64;
uint32_t dsetu32;
@@ -8891,7 +8892,7 @@ static void gent_compound_ints(void) {
herr_t status; /* Error checking variable */
hsize_t dim[] = { F77_LENGTH }; /* Dataspace dimensions */
- int m, n, o; /* Array init loop vars */
+ int m; /* Array init loop vars */
/* Initialize the data in the arrays/datastructure */
for (m = 0; m < F77_LENGTH; m++) {
@@ -9008,6 +9009,16 @@ static void gent_compound_ints(void) {
status = H5Tclose(Cmpd1Structid);
HDassert(status >= 0);
+ status = H5Sclose(space);
+ HDassert(status >= 0);
+
+ status = H5Dclose(dataset);
+ HDassert(status >= 0);
+
+ /* Create the dataspace */
+ space = H5Screate_simple(F76_RANK, dim, NULL);
+ HDassert(space >= 0);
+
/* Create the memory data type */
Cmpd2Structid = H5Tcreate(H5T_COMPOUND, sizeof(Cmpd2Struct));
HDassert(Cmpd2Structid >= 0);
@@ -9044,7 +9055,7 @@ static void gent_compound_ints(void) {
dataset = H5Dcreate2(fid, F77_DATASETNAME2, Cmpd2Structid, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
/* Write data to the dataset */
- status = H5Dwrite(dataset, Cmpd2Structid, H5S_ALL, H5S_ALL, H5P_DEFAULT, Cmpd1);
+ status = H5Dwrite(dataset, Cmpd2Structid, H5S_ALL, H5S_ALL, H5P_DEFAULT, Cmpd2);
HDassert(status >= 0);
/* Release resources */
diff --git a/tools/testfiles/tcmpdints.ddl b/tools/testfiles/tcmpdints.ddl
index f62f588..f2986f3 100644
--- a/tools/testfiles/tcmpdints.ddl
+++ b/tools/testfiles/tcmpdints.ddl
@@ -735,707 +735,707 @@ GROUP "/" {
DATASPACE SIMPLE { ( 64 ) / ( 64 ) }
DATA {
(0): {
- 18446744073709519103,
+ 18446744073709551615,
4294967295,
65535,
255,
- -65281,
+ -1,
-1,
-1,
-1,
0.0001
},
(1): {
- 18446744069414453502,
+ 18446744073709551614,
4294967294,
- 65535,
- 255,
- -4295098114,
+ 65534,
+ 254,
+ -2,
+ -2,
+ -2,
-2,
- -1,
- -1,
1.0001
},
(2): {
- 18446744060824387836,
+ 18446744073709551612,
4294967292,
- 65535,
- 255,
- -12885163780,
+ 65532,
+ 252,
+ -4,
+ -4,
+ -4,
-4,
- -1,
- -1,
2.0001
},
(3): {
- 18446744043644256504,
+ 18446744073709551608,
4294967288,
- 65535,
- 255,
- -30065295112,
+ 65528,
+ 248,
+ -8,
+ -8,
+ -8,
-8,
- -1,
- -1,
3.0001
},
(4): {
- 18446744009283993840,
+ 18446744073709551600,
4294967280,
- 65535,
- 255,
- -64425557776,
+ 65520,
+ 240,
+ -16,
+ -16,
+ -16,
-16,
- -1,
- -1,
4.0001
},
(5): {
- 18446743940563468512,
+ 18446744073709551584,
4294967264,
- 65535,
- 255,
- -133146083104,
+ 65504,
+ 224,
+ -32,
+ -32,
+ -32,
-32,
- -1,
- -1,
5.0001
},
(6): {
- 18446743803122417856,
+ 18446744073709551552,
4294967232,
- 65535,
- 255,
- -270587133760,
+ 65472,
+ 192,
+ -64,
+ -64,
+ -64,
-64,
- -1,
- -1,
6.0001
},
(7): {
- 18446743528240316544,
+ 18446744073709551488,
4294967168,
- 65535,
- 255,
- -545469235072,
+ 65408,
+ 128,
+ -128,
+ -128,
+ -128,
-128,
- -1,
- -1,
7.0001
},
(8): {
- 18446742978476114175,
+ 18446744073709551360,
4294967040,
- 65535,
+ 65280,
255,
- -1095233437441,
-256,
- -1,
+ -256,
+ -256,
-1,
8.0001
},
(9): {
- 18446741878947709182,
+ 18446744073709551104,
4294966784,
- 65535,
- 255,
- -2194761842434,
+ 65024,
+ 254,
-512,
- -1,
- -1,
+ -512,
+ -512,
+ -2,
9.0001
},
(10): {
- 18446739679890964476,
+ 18446744073709550592,
4294966272,
- 65535,
- 255,
- -4393818587140,
+ 64512,
+ 252,
-1024,
- -1,
- -1,
+ -1024,
+ -1024,
+ -4,
10.0001
},
(11): {
- 18446735281777344504,
+ 18446744073709549568,
4294965248,
- 65535,
- 255,
- -8791932207112,
+ 63488,
+ 248,
-2048,
- -1,
- -1,
+ -2048,
+ -2048,
+ -8,
11.0001
},
(12): {
- 18446726485550100720,
+ 18446744073709547520,
4294963200,
- 65535,
- 255,
- -17588159512336,
+ 61440,
+ 240,
-4096,
- -1,
- -1,
+ -4096,
+ -4096,
+ -16,
12.0001
},
(13): {
- 18446708893095559392,
+ 18446744073709543424,
4294959104,
- 65535,
- 255,
- -35180613992224,
+ 57344,
+ 224,
-8192,
- -1,
- -1,
+ -8192,
+ -8192,
+ -32,
13.0001
},
(14): {
- 18446673708186664896,
+ 18446744073709535232,
4294950912,
- 65535,
- 255,
- -70365522886720,
+ 49152,
+ 192,
-16384,
- -1,
- -1,
+ -16384,
+ -16384,
+ -64,
14.0001
},
(15): {
- 18446603338368745344,
+ 18446744073709518848,
4294934528,
- 65535,
- 255,
- -140735340806272,
+ 32768,
+ 128,
-32768,
- -1,
- -1,
+ -32768,
+ -32768,
+ -128,
15.0001
},
(16): {
- 18446462603027807487,
+ 18446744073709486080,
4294901760,
65535,
255,
- -281470681747201,
+ -65536,
-65536,
-1,
-1,
16.0001
},
(17): {
- 18446181128050999550,
+ 18446744073709420544,
4294836224,
- 65535,
- 255,
- -562945658584834,
+ 65534,
+ 254,
-131072,
- -1,
- -1,
+ -131072,
+ -2,
+ -2,
17.0001
},
(18): {
- 18445618178097414396,
+ 18446744073709289472,
4294705152,
- 65535,
- 255,
- -1125895612137220,
+ 65532,
+ 252,
-262144,
- -1,
- -1,
+ -262144,
+ -4,
+ -4,
18.0001
},
(19): {
- 18444492278190309624,
+ 18446744073709027328,
4294443008,
- 65535,
- 255,
- -2251795519241992,
+ 65528,
+ 248,
-524288,
- -1,
- -1,
+ -524288,
+ -8,
+ -8,
19.0001
},
(20): {
- 18442240478376100080,
+ 18446744073708503040,
4293918720,
- 65535,
- 255,
- -4503595333451536,
+ 65520,
+ 240,
-1048576,
- -1,
- -1,
+ -1048576,
+ -16,
+ -16,
20.0001
},
(21): {
- 18437736878747680992,
+ 18446744073707454464,
4292870144,
- 65535,
- 255,
- -9007194961870624,
+ 65504,
+ 224,
-2097152,
- -1,
- -1,
+ -2097152,
+ -32,
+ -32,
21.0001
},
(22): {
- 18428729679490842816,
+ 18446744073705357312,
4290772992,
- 65535,
- 255,
- -18014394218708800,
+ 65472,
+ 192,
-4194304,
- -1,
- -1,
+ -4194304,
+ -64,
+ -64,
22.0001
},
(23): {
- 18410715280977166464,
+ 18446744073701163008,
4286578688,
- 65535,
- 255,
- -36028792732385152,
+ 65408,
+ 128,
-8388608,
- -1,
- -1,
+ -8388608,
+ -128,
+ -128,
23.0001
},
(24): {
- 18374686483949814015,
+ 18446744073692774400,
4278190080,
- 65535,
+ 65280,
255,
- -72057589759737601,
-16777216,
- -1,
+ -16777216,
+ -256,
-1,
24.0001
},
(25): {
- 18302628889895108862,
+ 18446744073675997184,
4261412864,
- 65535,
- 255,
- -144115183814442754,
+ 65024,
+ 254,
-33554432,
- -1,
- -1,
+ -33554432,
+ -512,
+ -2,
25.0001
},
(26): {
- 18158513701785698556,
+ 18446744073642442752,
4227858432,
- 65535,
- 255,
- -288230371923853060,
+ 64512,
+ 252,
-67108864,
- -1,
- -1,
+ -67108864,
+ -1024,
+ -4,
26.0001
},
(27): {
- 17870283325566921976,
+ 18446744073575333888,
4160749568,
- 65535,
- 255,
- -576460748142618888,
+ 63488,
+ 248,
-134217728,
- -1,
- -1,
+ -134217728,
+ -2048,
+ -8,
27.0001
},
(28): {
- 17293822573129296880,
+ 18446744073441116160,
4026531840,
- 65535,
- 255,
- -1152921500580249872,
+ 61440,
+ 240,
-268435456,
- -1,
- -1,
+ -268435456,
+ -4096,
+ -16,
28.0001
},
(29): {
- 16140901068254019552,
+ 18446744073172680704,
3758096384,
- 65535,
- 255,
- -2305843005455532064,
+ 57344,
+ 224,
-536870912,
- -1,
- -1,
+ -536870912,
+ -8192,
+ -32,
29.0001
},
(30): {
- 13835058058503454656,
+ 18446744072635809792,
3221225472,
- 65535,
- 255,
- -4611686015206097728,
+ 49152,
+ 192,
-1073741824,
- -1,
- -1,
+ -1073741824,
+ -16384,
+ -64,
30.0001
},
(31): {
- 9223372039002259584,
+ 18446744071562067968,
2147483648,
- 65535,
- 255,
- -9223372034707292032,
+ 32768,
+ 128,
-2147483648,
- -1,
- -1,
+ -2147483648,
+ -32768,
+ -128,
31.0001
},
(32): {
- 18446744073709486335,
- 0,
+ 18446744069414584320,
+ 4294967295,
65535,
255,
- -65281,
- 0,
+ -4294967296,
+ -1,
-1,
-1,
32.0001
},
(33): {
- 18446744069414518782,
- 0,
+ 18446744065119617024,
+ 4294967294,
65534,
- 255,
- -4295032834,
- 0,
+ 254,
+ -8589934592,
+ -2,
+ -2,
-2,
- -1,
33.0001
},
(34): {
- 18446744060824453116,
- 0,
+ 18446744056529682432,
+ 4294967292,
65532,
- 255,
- -12885098756,
- 0,
+ 252,
+ -17179869184,
+ -4,
+ -4,
-4,
- -1,
34.0001
},
(35): {
- 18446744043644317944,
- 0,
+ 18446744039349813248,
+ 4294967288,
65528,
- 255,
- -30065245960,
- 0,
+ 248,
+ -34359738368,
+ -8,
+ -8,
-8,
- -1,
35.0001
},
(36): {
- 18446744009283993840,
- 0,
+ 18446744004990074880,
+ 4294967280,
65520,
- 255,
- -64425557776,
- 0,
+ 240,
+ -68719476736,
+ -16,
+ -16,
-16,
- -1,
36.0001
},
(37): {
- 18446743940563468512,
- 0,
+ 18446743936270598144,
+ 4294967264,
65504,
- 255,
- -133146083104,
- 0,
+ 224,
+ -137438953472,
+ -32,
+ -32,
-32,
- -1,
37.0001
},
(38): {
- 18446743803122417856,
- 0,
+ 18446743798831644672,
+ 4294967232,
65472,
- 255,
- -270587133760,
- 0,
+ 192,
+ -274877906944,
+ -64,
+ -64,
-64,
- -1,
38.0001
},
(39): {
- 18446743528240316544,
- 0,
+ 18446743523953737728,
+ 4294967168,
65408,
- 255,
- -545469235072,
- 0,
+ 128,
+ -549755813888,
+ -128,
+ -128,
-128,
- -1,
39.0001
},
(40): {
- 18446742978476114175,
- 0,
+ 18446742974197923840,
+ 4294967040,
65280,
255,
- -1095233437441,
- 0,
+ -1099511627776,
+ -256,
-256,
-1,
40.0001
},
(41): {
- 18446741878947709182,
- 0,
+ 18446741874686296064,
+ 4294966784,
65024,
- 255,
- -2194761842434,
- 0,
+ 254,
+ -2199023255552,
-512,
- -1,
+ -512,
+ -2,
41.0001
},
(42): {
- 18446739679890899196,
- 0,
+ 18446739675663040512,
+ 4294966272,
64512,
- 255,
- -4393818652420,
- 0,
+ 252,
+ -4398046511104,
-1024,
- -1,
+ -1024,
+ -4,
42.0001
},
(43): {
- 18446735281777279224,
- 0,
+ 18446735277616529408,
+ 4294965248,
63488,
- 255,
- -8791932272392,
- 0,
+ 248,
+ -8796093022208,
-2048,
- -1,
+ -2048,
+ -8,
43.0001
},
(44): {
- 18446726485550039280,
- 0,
+ 18446726481523507200,
+ 4294963200,
61440,
- 255,
- -17588159512336,
- 0,
+ 240,
+ -17592186044416,
-4096,
- -1,
+ -4096,
+ -16,
44.0001
},
(45): {
- 18446708893095559392,
- 0,
+ 18446708889337462784,
+ 4294959104,
57344,
- 255,
- -35180613927200,
- 0,
+ 224,
+ -35184372088832,
-8192,
- -1,
+ -8192,
+ -32,
45.0001
},
(46): {
- 18446673708186664896,
- 0,
+ 18446673704965373952,
+ 4294950912,
49152,
- 255,
- -70365522886720,
- 0,
+ 192,
+ -70368744177664,
-16384,
- -1,
+ -16384,
+ -64,
46.0001
},
(47): {
- 18446603338368745344,
- 0,
+ 18446603336221196288,
+ 4294934528,
32768,
- 255,
- -140735340807040,
- 0,
+ 128,
+ -140737488355328,
-32768,
- -1,
+ -32768,
+ -128,
47.0001
},
(48): {
- 18446462603027742975,
- 0,
- 0,
+ 18446462598732840960,
+ 4294901760,
+ 65535,
255,
- -281470681808641,
- 0,
- 0,
+ -281474976710656,
+ -65536,
+ -1,
-1,
48.0001
},
(49): {
- 18446181128050966782,
- 0,
- 0,
+ 18446181123756130304,
+ 4294836224,
+ 65534,
254,
- -562945658584834,
- 0,
- 0,
+ -562949953421312,
+ -131072,
+ -2,
-2,
49.0001
},
(50): {
- 18445618178097479676,
- 0,
- 0,
+ 18445618173802708992,
+ 4294705152,
+ 65532,
252,
- -1125895612071940,
- 0,
- 0,
+ -1125899906842624,
+ -262144,
+ -4,
-4,
50.0001
},
(51): {
- 18444492278190374904,
- 0,
- 0,
+ 18444492273895866368,
+ 4294443008,
+ 65528,
248,
- -2251795519176968,
- 0,
- 0,
+ -2251799813685248,
+ -524288,
+ -8,
-8,
51.0001
},
(52): {
- 18442240478376161520,
- 0,
- 0,
+ 18442240474082181120,
+ 4293918720,
+ 65520,
240,
- -4503595333402384,
- 0,
- 0,
+ -4503599627370496,
+ -1048576,
+ -16,
-16,
52.0001
},
(53): {
- 18437736878747680992,
- 0,
- 0,
+ 18437736874454810624,
+ 4292870144,
+ 65504,
224,
- -9007194961870624,
- 0,
- 0,
+ -9007199254740992,
+ -2097152,
+ -32,
-32,
53.0001
},
(54): {
- 18428729679490842816,
- 0,
- 0,
+ 18428729675200069632,
+ 4290772992,
+ 65472,
192,
- -18014394218708800,
- 0,
- 0,
+ -18014398509481984,
+ -4194304,
+ -64,
-64,
54.0001
},
(55): {
- 18410715280977166464,
- 0,
- 0,
+ 18410715276690587648,
+ 4286578688,
+ 65408,
128,
- -36028792732385152,
- 0,
- 0,
+ -36028797018963968,
+ -8388608,
+ -128,
-128,
55.0001
},
(56): {
- 18374686483949814015,
- 0,
- 0,
- 0,
- -72057589759737601,
- 0,
- 0,
- 0,
+ 18374686479671623680,
+ 4278190080,
+ 65280,
+ 255,
+ -72057594037927936,
+ -16777216,
+ -256,
+ -1,
56.0001
},
(57): {
- 18302628889895108862,
- 0,
- 0,
- 0,
- -144115183814442754,
- 0,
- 0,
- 0,
+ 18302628885633695744,
+ 4261412864,
+ 65024,
+ 254,
+ -144115188075855872,
+ -33554432,
+ -512,
+ -2,
57.0001
},
(58): {
- 18158513701785698556,
- 0,
- 0,
- 0,
- -288230371923853060,
- 0,
- 0,
- 0,
+ 18158513697557839872,
+ 4227858432,
+ 64512,
+ 252,
+ -288230376151711744,
+ -67108864,
+ -1024,
+ -4,
58.0001
},
(59): {
- 17870283325566877944,
- 0,
- 0,
- 0,
- -576460748142673672,
- 0,
- 0,
- 0,
+ 17870283321406128128,
+ 4160749568,
+ 63488,
+ 248,
+ -576460752303423488,
+ -134217728,
+ -2048,
+ -8,
59.0001
},
(60): {
- 17293822573129236720,
- 0,
- 0,
- 0,
- -1152921500580314896,
- 0,
- 0,
- 0,
+ 17293822569102704640,
+ 4026531840,
+ 61440,
+ 240,
+ -1152921504606846976,
+ -268435456,
+ -4096,
+ -16,
60.0001
},
(61): {
- 16140901068253954272,
- 0,
- 0,
- 0,
- -2305843005455597344,
- 0,
- 0,
- 0,
+ 16140901064495857664,
+ 3758096384,
+ 57344,
+ 224,
+ -2305843009213693952,
+ -536870912,
+ -8192,
+ -32,
61.0001
},
(62): {
- 13835058058503389376,
- 0,
- 0,
- 0,
- -4611686015206145088,
- 0,
- 0,
- 0,
+ 13835058055282163712,
+ 3221225472,
+ 49152,
+ 192,
+ -4611686018427387904,
+ -1073741824,
+ -16384,
+ -64,
62.0001
},
(63): {
- 9223372039002314368,
- 0,
- 0,
- 0,
- -9223372034707231872,
- 0,
- 0,
- 0,
+ 9223372036854775808,
+ 2147483648,
+ 32768,
+ 128,
+ -9223372036854775808,
+ -2147483648,
+ -32768,
+ -128,
63.0001
}
}
diff --git a/tools/testfiles/tcmpdints.h5 b/tools/testfiles/tcmpdints.h5
index 15b0aa8..d4af1c4 100644
--- a/tools/testfiles/tcmpdints.h5
+++ b/tools/testfiles/tcmpdints.h5
Binary files differ
generated by cgit v0.12 at 2024-11-22 15:52:03 (GMT)