summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/h5dump/h5dumpgentest.c423
-rw-r--r--tools/h5repack/h5repacktst.c154
-rw-r--r--tools/lib/talign.c6
3 files changed, 290 insertions, 293 deletions
diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c
index 2dc39b0..914cfbf 100644
--- a/tools/h5dump/h5dumpgentest.c
+++ b/tools/h5dump/h5dumpgentest.c
@@ -564,142 +564,141 @@ static void gent_compound_dt(void) { /* test compound data type */
hsize_t dset3_dim[2];
- for (i = 0; i < (int)sdim; i++) {
- dset1[i].a = i;
- dset1[i].b = (float)(i*i);
- dset1[i].c = (float)(1./(i+1));
+ for (i = 0; i < (int)sdim; i++) {
+ dset1[i].a = i;
+ dset1[i].b = (float)(i*i);
+ dset1[i].c = (float)(1./(i+1));
- dset2[i].a = i;
- dset2[i].b = (float)(i+ i*0.1);
+ dset2[i].a = i;
+ dset2[i].b = (float)(i+ i*0.1);
- dset4[i].a = i;
- dset4[i].b = (float)(i+3);
-
- dset5[i].a = i;
- dset5[i].b = (float)(i*0.1);
- }
+ dset4[i].a = i;
+ dset4[i].b = (float)(i+3);
+ dset5[i].a = i;
+ dset5[i].b = (float)(i*0.1);
+ }
- fid = H5Fcreate(FILE6, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
- space = H5Screate_simple(1, &sdim, NULL);
+ fid = H5Fcreate(FILE6, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
- type = H5Tcreate (H5T_COMPOUND, sizeof(dset1[0]));
- type2 = H5Tcreate(H5T_COMPOUND, sizeof(dset1[0]));
- H5Tinsert(type, "a_name", HOFFSET(dset1_t, a), H5T_STD_I32BE);
- H5Tinsert(type, "b_name", HOFFSET(dset1_t, b), H5T_IEEE_F32BE);
- H5Tinsert(type, "c_name", HOFFSET(dset1_t, c), H5T_IEEE_F64BE);
- H5Tinsert(type2, "a_name", HOFFSET(dset1_t, a), H5T_NATIVE_INT);
- H5Tinsert(type2, "b_name", HOFFSET(dset1_t, b), H5T_NATIVE_FLOAT);
- H5Tinsert(type2, "c_name", HOFFSET(dset1_t, c), H5T_NATIVE_DOUBLE);
- dataset = H5Dcreate(fid, "/dset1", type, space, H5P_DEFAULT);
- H5Dwrite(dataset, type2, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset1);
- H5Tclose(type2);
- H5Tclose(type);
- H5Dclose(dataset);
+ space = H5Screate_simple(1, &sdim, NULL);
- /* shared data type 1 */
- type = H5Tcreate (H5T_COMPOUND, sizeof(dset2_t));
- H5Tinsert(type, "int_name", HOFFSET(dset2_t, a), H5T_STD_I32BE);
- H5Tinsert(type, "float_name", HOFFSET(dset2_t, b), H5T_IEEE_F32BE);
- H5Tcommit(fid, "type1", type);
- type2 = H5Tcreate (H5T_COMPOUND, sizeof(dset2_t));
- H5Tinsert(type2, "int_name", HOFFSET(dset2_t, a), H5T_NATIVE_INT);
- H5Tinsert(type2, "float_name", HOFFSET(dset2_t, b), H5T_NATIVE_FLOAT);
- group = H5Gcreate2(fid, "/group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-
- dataset = H5Dcreate(group, "dset2", type, space, H5P_DEFAULT);
- H5Dwrite(dataset, type2, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset2);
- H5Tclose(type2);
- H5Tclose(type);
- H5Dclose(dataset);
+ type = H5Tcreate (H5T_COMPOUND, sizeof(dset1[0]));
+ type2 = H5Tcreate(H5T_COMPOUND, sizeof(dset1[0]));
+ H5Tinsert(type, "a_name", HOFFSET(dset1_t, a), H5T_STD_I32BE);
+ H5Tinsert(type, "b_name", HOFFSET(dset1_t, b), H5T_IEEE_F32BE);
+ H5Tinsert(type, "c_name", HOFFSET(dset1_t, c), H5T_IEEE_F64BE);
+ H5Tinsert(type2, "a_name", HOFFSET(dset1_t, a), H5T_NATIVE_INT);
+ H5Tinsert(type2, "b_name", HOFFSET(dset1_t, b), H5T_NATIVE_FLOAT);
+ H5Tinsert(type2, "c_name", HOFFSET(dset1_t, c), H5T_NATIVE_DOUBLE);
+ dataset = H5Dcreate(fid, "/dset1", type, space, H5P_DEFAULT);
+ H5Dwrite(dataset, type2, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset1);
+ H5Tclose(type2);
+ H5Tclose(type);
+ H5Dclose(dataset);
+ /* shared data type 1 */
+ type = H5Tcreate (H5T_COMPOUND, sizeof(dset2_t));
+ H5Tinsert(type, "int_name", HOFFSET(dset2_t, a), H5T_STD_I32BE);
+ H5Tinsert(type, "float_name", HOFFSET(dset2_t, b), H5T_IEEE_F32BE);
+ H5Tcommit(fid, "type1", type);
+ type2 = H5Tcreate (H5T_COMPOUND, sizeof(dset2_t));
+ H5Tinsert(type2, "int_name", HOFFSET(dset2_t, a), H5T_NATIVE_INT);
+ H5Tinsert(type2, "float_name", HOFFSET(dset2_t, b), H5T_NATIVE_FLOAT);
+ group = H5Gcreate2(fid, "/group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+
+ dataset = H5Dcreate(group, "dset2", type, space, H5P_DEFAULT);
+ H5Dwrite(dataset, type2, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset2);
+ H5Tclose(type2);
+ H5Tclose(type);
+ H5Dclose(dataset);
- /* shared data type 2 */
- type = H5Tcreate (H5T_COMPOUND, sizeof(dset3_t));
- type2 = H5Tcreate (H5T_COMPOUND, sizeof(dset3_t));
- ndims = 1; dim[0] = 4;
+ /* shared data type 2 */
+ type = H5Tcreate (H5T_COMPOUND, sizeof(dset3_t));
+ type2 = H5Tcreate (H5T_COMPOUND, sizeof(dset3_t));
- array_dt = H5Tarray_create(H5T_STD_I32BE, ndims, dim, NULL);
- H5Tinsert(type, "int_array", HOFFSET(dset3_t, a), array_dt);
- H5Tclose(array_dt);
+ ndims = 1; dim[0] = 4;
- array_dt = H5Tarray_create(H5T_NATIVE_INT, ndims, dim, NULL);
- H5Tinsert(type2, "int_array", HOFFSET(dset3_t, a), array_dt);
- H5Tclose(array_dt);
+ array_dt = H5Tarray_create(H5T_STD_I32BE, ndims, dim, NULL);
+ H5Tinsert(type, "int_array", HOFFSET(dset3_t, a), array_dt);
+ H5Tclose(array_dt);
- ndims = 2; dim[0] = 5; dim[1] = 6;
+ array_dt = H5Tarray_create(H5T_NATIVE_INT, ndims, dim, NULL);
+ H5Tinsert(type2, "int_array", HOFFSET(dset3_t, a), array_dt);
+ H5Tclose(array_dt);
- array_dt = H5Tarray_create(H5T_IEEE_F32BE, ndims, dim, NULL);
- H5Tinsert(type, "float_array", HOFFSET(dset3_t, b), array_dt);
- H5Tclose(array_dt);
+ ndims = 2; dim[0] = 5; dim[1] = 6;
- array_dt = H5Tarray_create(H5T_NATIVE_FLOAT, ndims, dim, NULL);
- H5Tinsert(type2, "float_array", HOFFSET(dset3_t, b), array_dt);
- H5Tclose(array_dt);
+ array_dt = H5Tarray_create(H5T_IEEE_F32BE, ndims, dim, NULL);
+ H5Tinsert(type, "float_array", HOFFSET(dset3_t, b), array_dt);
+ H5Tclose(array_dt);
- H5Tcommit(fid, "type2", type);
+ array_dt = H5Tarray_create(H5T_NATIVE_FLOAT, ndims, dim, NULL);
+ H5Tinsert(type2, "float_array", HOFFSET(dset3_t, b), array_dt);
+ H5Tclose(array_dt);
+ H5Tcommit(fid, "type2", type);
- dset3_dim[0] = 3; dset3_dim[1] = 6;
- space3 = H5Screate_simple(2, dset3_dim, NULL);
- dataset = H5Dcreate(group, "dset3", type, space3, H5P_DEFAULT);
- for (i = 0; i < (int)dset3_dim[0]; i++) {
- for (j = 0; j < (int)dset3_dim[1]; j++) {
- for (k = 0; k < 4; k++)
- dset3[i][j].a[k] = k+j+i;
- for (k = 0; k < 5; k++)
- for (l = 0; l < 6; l++)
- dset3[i][j].b[k][l] = (float)((k+1)+l+j+i);
- }
- }
- H5Dwrite(dataset, type2, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset3);
- H5Sclose(space3);
- H5Tclose(type);
- H5Tclose(type2);
- H5Dclose(dataset);
- /* shared data type 3 */
- type = H5Tcreate (H5T_COMPOUND, sizeof(dset4_t));
- type2 = H5Tcreate (H5T_COMPOUND, sizeof(dset4_t));
- H5Tinsert(type, "int", HOFFSET(dset4_t, a), H5T_STD_I32BE);
- H5Tinsert(type, "float", HOFFSET(dset4_t, b), H5T_IEEE_F32BE);
- H5Tcommit(group, "type3", type);
- H5Tinsert(type2, "int", HOFFSET(dset4_t, a), H5T_NATIVE_INT);
- H5Tinsert(type2, "float", HOFFSET(dset4_t, b), H5T_NATIVE_FLOAT);
- dataset = H5Dcreate(group, "dset4", type, space, H5P_DEFAULT);
- H5Dwrite(dataset, type2, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset4);
+ dset3_dim[0] = 3; dset3_dim[1] = 6;
+ space3 = H5Screate_simple(2, dset3_dim, NULL);
+ dataset = H5Dcreate(group, "dset3", type, space3, H5P_DEFAULT);
+ for (i = 0; i < (int)dset3_dim[0]; i++) {
+ for (j = 0; j < (int)dset3_dim[1]; j++) {
+ for (k = 0; k < 4; k++)
+ dset3[i][j].a[k] = k+j+i;
+ for (k = 0; k < 5; k++)
+ for (l = 0; l < 6; l++)
+ dset3[i][j].b[k][l] = (float)((k+1)+l+j+i);
+ }
+ }
+ H5Dwrite(dataset, type2, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset3);
+ H5Sclose(space3);
+ H5Tclose(type);
+ H5Tclose(type2);
+ H5Dclose(dataset);
- H5Tclose(type);
- H5Tclose(type2);
- H5Dclose(dataset);
- H5Gclose(group);
+ /* shared data type 3 */
+ type = H5Tcreate (H5T_COMPOUND, sizeof(dset4_t));
+ type2 = H5Tcreate (H5T_COMPOUND, sizeof(dset4_t));
+ H5Tinsert(type, "int", HOFFSET(dset4_t, a), H5T_STD_I32BE);
+ H5Tinsert(type, "float", HOFFSET(dset4_t, b), H5T_IEEE_F32BE);
+ H5Tcommit(group, "type3", type);
+ H5Tinsert(type2, "int", HOFFSET(dset4_t, a), H5T_NATIVE_INT);
+ H5Tinsert(type2, "float", HOFFSET(dset4_t, b), H5T_NATIVE_FLOAT);
+ dataset = H5Dcreate(group, "dset4", type, space, H5P_DEFAULT);
+ H5Dwrite(dataset, type2, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset4);
+ H5Tclose(type);
+ H5Tclose(type2);
+ H5Dclose(dataset);
+ H5Gclose(group);
- /* unamed data type */
- group = H5Gcreate2(fid, "/group2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
- type = H5Tcreate (H5T_COMPOUND, sizeof(dset5_t));
- H5Tinsert(type, "int", HOFFSET(dset5_t, a), H5T_STD_I32BE);
- H5Tinsert(type, "float", HOFFSET(dset5_t, b), H5T_IEEE_F32BE);
- H5Tcommit(group, "type4", type);
- type2 = H5Tcreate (H5T_COMPOUND, sizeof(dset5_t));
- H5Tinsert(type2, "int", HOFFSET(dset5_t, a), H5T_NATIVE_INT);
- H5Tinsert(type2, "float", HOFFSET(dset5_t, b), H5T_NATIVE_FLOAT);
- dataset = H5Dcreate(group, "dset5", type, space, H5P_DEFAULT);
- H5Dwrite(dataset, type2, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset5);
+ /* unamed data type */
+ group = H5Gcreate2(fid, "/group2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
- H5Gunlink(group,"type4");
+ type = H5Tcreate (H5T_COMPOUND, sizeof(dset5_t));
+ H5Tinsert(type, "int", HOFFSET(dset5_t, a), H5T_STD_I32BE);
+ H5Tinsert(type, "float", HOFFSET(dset5_t, b), H5T_IEEE_F32BE);
+ H5Tcommit(group, "type4", type);
+ type2 = H5Tcreate (H5T_COMPOUND, sizeof(dset5_t));
+ H5Tinsert(type2, "int", HOFFSET(dset5_t, a), H5T_NATIVE_INT);
+ H5Tinsert(type2, "float", HOFFSET(dset5_t, b), H5T_NATIVE_FLOAT);
+ dataset = H5Dcreate(group, "dset5", type, space, H5P_DEFAULT);
+ H5Dwrite(dataset, type2, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset5);
- H5Tclose(type);
- H5Tclose(type2);
- H5Dclose(dataset);
- H5Sclose(space);
- H5Gclose(group);
+ H5Ldelete(group, "type4", H5P_DEFAULT);
- H5Fclose(fid);
+ H5Tclose(type);
+ H5Tclose(type2);
+ H5Dclose(dataset);
+ H5Sclose(space);
+ H5Gclose(group);
+ H5Fclose(fid);
}
/*
@@ -750,138 +749,138 @@ static void gent_compound_dt2(void) { /* test compound data type */
hsize_t sdim, maxdim;
- sdim = 10;
- for (i = 0; i < (int)sdim; i++) {
- dset1[i].a = i;
- dset1[i].b = (float)(i*i);
- dset1[i].c = (float)(1./(i+1));
+ sdim = 10;
+ for (i = 0; i < (int)sdim; i++) {
+ dset1[i].a = i;
+ dset1[i].b = (float)(i*i);
+ dset1[i].c = (float)(1./(i+1));
- dset2[i].a = i;
- dset2[i].b = (float)(i+ i*0.1);
+ dset2[i].a = i;
+ dset2[i].b = (float)(i+ i*0.1);
- dset4[i].a = i;
- dset4[i].b = (float)(i*1.0);
+ dset4[i].a = i;
+ dset4[i].b = (float)(i*1.0);
- dset5[i].a = i;
- dset5[i].b = (float)(i*1.0);
- }
+ dset5[i].a = i;
+ dset5[i].b = (float)(i*1.0);
+ }
- fid = H5Fcreate(FILE9, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+ fid = H5Fcreate(FILE9, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
- create_plist = H5Pcreate(H5P_DATASET_CREATE);
+ create_plist = H5Pcreate(H5P_DATASET_CREATE);
- sdim = 2;
- H5Pset_chunk(create_plist, 1, &sdim);
+ sdim = 2;
+ H5Pset_chunk(create_plist, 1, &sdim);
- sdim = 6;
- maxdim = H5S_UNLIMITED;
+ sdim = 6;
+ maxdim = H5S_UNLIMITED;
- space = H5Screate_simple(1, &sdim, &maxdim);
+ space = H5Screate_simple(1, &sdim, &maxdim);
- type = H5Tcreate (H5T_COMPOUND, sizeof(dset1[0]));
+ type = H5Tcreate (H5T_COMPOUND, sizeof(dset1[0]));
- H5Tinsert(type, "a_name", HOFFSET(dset1_t, a), H5T_STD_I32BE);
- H5Tinsert(type, "b_name", HOFFSET(dset1_t, b), H5T_IEEE_F32BE);
- H5Tinsert(type, "c_name", HOFFSET(dset1_t, c), H5T_IEEE_F64BE);
+ H5Tinsert(type, "a_name", HOFFSET(dset1_t, a), H5T_STD_I32BE);
+ H5Tinsert(type, "b_name", HOFFSET(dset1_t, b), H5T_IEEE_F32BE);
+ H5Tinsert(type, "c_name", HOFFSET(dset1_t, c), H5T_IEEE_F64BE);
- dataset = H5Dcreate(fid, "/dset1", type, space, create_plist);
+ dataset = H5Dcreate(fid, "/dset1", type, space, create_plist);
- type2 = H5Tcreate (H5T_COMPOUND, sizeof(dset1[0]));
+ type2 = H5Tcreate (H5T_COMPOUND, sizeof(dset1[0]));
- H5Tinsert(type2, "a_name", HOFFSET(dset1_t, a), H5T_NATIVE_INT);
- H5Tinsert(type2, "b_name", HOFFSET(dset1_t, b), H5T_NATIVE_FLOAT);
- H5Tinsert(type2, "c_name", HOFFSET(dset1_t, c), H5T_NATIVE_DOUBLE);
+ H5Tinsert(type2, "a_name", HOFFSET(dset1_t, a), H5T_NATIVE_INT);
+ H5Tinsert(type2, "b_name", HOFFSET(dset1_t, b), H5T_NATIVE_FLOAT);
+ H5Tinsert(type2, "c_name", HOFFSET(dset1_t, c), H5T_NATIVE_DOUBLE);
- H5Dwrite(dataset, type2, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset1);
+ H5Dwrite(dataset, type2, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset1);
- H5Tclose(type);
- H5Tclose(type2);
- H5Sclose(space);
- H5Dclose(dataset);
+ H5Tclose(type);
+ H5Tclose(type2);
+ H5Sclose(space);
+ H5Dclose(dataset);
- sdim = 6;
- maxdim = 10;
+ sdim = 6;
+ maxdim = 10;
- space = H5Screate_simple(1, &sdim, &maxdim);
+ space = H5Screate_simple(1, &sdim, &maxdim);
- /* shared data type 1 */
- type = H5Tcreate (H5T_COMPOUND, sizeof(dset2_t));
- H5Tinsert(type, "int_name", HOFFSET(dset2_t, a), H5T_STD_I32BE);
- H5Tinsert(type, "float_name", HOFFSET(dset2_t, b), H5T_IEEE_F32BE);
- H5Tcommit(fid, "type1", type);
+ /* shared data type 1 */
+ type = H5Tcreate (H5T_COMPOUND, sizeof(dset2_t));
+ H5Tinsert(type, "int_name", HOFFSET(dset2_t, a), H5T_STD_I32BE);
+ H5Tinsert(type, "float_name", HOFFSET(dset2_t, b), H5T_IEEE_F32BE);
+ H5Tcommit(fid, "type1", type);
- group = H5Gcreate2(fid, "/group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+ group = H5Gcreate2(fid, "/group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
- dataset = H5Dcreate(group, "dset2", type, space, create_plist);
+ dataset = H5Dcreate(group, "dset2", type, space, create_plist);
- type2 = H5Tcreate (H5T_COMPOUND, sizeof(dset2_t));
- H5Tinsert(type2, "int_name", HOFFSET(dset2_t, a), H5T_NATIVE_INT);
- H5Tinsert(type2, "float_name", HOFFSET(dset2_t, b), H5T_NATIVE_FLOAT);
- H5Dwrite(dataset, type2, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset2);
+ type2 = H5Tcreate (H5T_COMPOUND, sizeof(dset2_t));
+ H5Tinsert(type2, "int_name", HOFFSET(dset2_t, a), H5T_NATIVE_INT);
+ H5Tinsert(type2, "float_name", HOFFSET(dset2_t, b), H5T_NATIVE_FLOAT);
+ H5Dwrite(dataset, type2, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset2);
- H5Tclose(type);
- H5Tclose(type2);
- H5Dclose(dataset);
+ H5Tclose(type);
+ H5Tclose(type2);
+ H5Dclose(dataset);
- /* shared data type 2 */
- type = H5Tcreate (H5T_COMPOUND, sizeof(dset3_t));
+ /* shared data type 2 */
+ type = H5Tcreate (H5T_COMPOUND, sizeof(dset3_t));
- ndims = 1; dim[0] = 4;
- array_dt = H5Tarray_create(H5T_STD_I32BE, ndims, dim, NULL);
- H5Tinsert(type, "int_array", HOFFSET(dset3_t, a), array_dt);
- H5Tclose(array_dt);
+ ndims = 1; dim[0] = 4;
+ array_dt = H5Tarray_create(H5T_STD_I32BE, ndims, dim, NULL);
+ H5Tinsert(type, "int_array", HOFFSET(dset3_t, a), array_dt);
+ H5Tclose(array_dt);
- ndims = 2; dim[0] = 5; dim[1] = 6;
- array_dt = H5Tarray_create(H5T_IEEE_F32BE, ndims, dim, NULL);
- H5Tinsert(type, "float_array", HOFFSET(dset3_t, b), array_dt);
- H5Tclose(array_dt);
+ ndims = 2; dim[0] = 5; dim[1] = 6;
+ array_dt = H5Tarray_create(H5T_IEEE_F32BE, ndims, dim, NULL);
+ H5Tinsert(type, "float_array", HOFFSET(dset3_t, b), array_dt);
+ H5Tclose(array_dt);
- H5Tcommit(fid, "type2", type);
- H5Tclose(type);
+ H5Tcommit(fid, "type2", type);
+ H5Tclose(type);
- /* shared data type 3 */
- type = H5Tcreate (H5T_COMPOUND, sizeof(dset4_t));
- H5Tinsert(type, "int", HOFFSET(dset4_t, a), H5T_STD_I32BE);
- H5Tinsert(type, "float", HOFFSET(dset4_t, b), H5T_IEEE_F32BE);
- H5Tcommit(group, "type3", type);
+ /* shared data type 3 */
+ type = H5Tcreate (H5T_COMPOUND, sizeof(dset4_t));
+ H5Tinsert(type, "int", HOFFSET(dset4_t, a), H5T_STD_I32BE);
+ H5Tinsert(type, "float", HOFFSET(dset4_t, b), H5T_IEEE_F32BE);
+ H5Tcommit(group, "type3", type);
- dataset = H5Dcreate(group, "dset4", type, space, create_plist);
+ dataset = H5Dcreate(group, "dset4", type, space, create_plist);
- type2 = H5Tcreate (H5T_COMPOUND, sizeof(dset4_t));
- H5Tinsert(type2, "int", HOFFSET(dset4_t, a), H5T_NATIVE_INT);
- H5Tinsert(type2, "float", HOFFSET(dset4_t, b), H5T_NATIVE_FLOAT);
- H5Dwrite(dataset, type2, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset4);
+ type2 = H5Tcreate (H5T_COMPOUND, sizeof(dset4_t));
+ H5Tinsert(type2, "int", HOFFSET(dset4_t, a), H5T_NATIVE_INT);
+ H5Tinsert(type2, "float", HOFFSET(dset4_t, b), H5T_NATIVE_FLOAT);
+ H5Dwrite(dataset, type2, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset4);
- H5Tclose(type);
- H5Tclose(type2);
- H5Dclose(dataset);
- H5Gclose(group);
+ H5Tclose(type);
+ H5Tclose(type2);
+ H5Dclose(dataset);
+ H5Gclose(group);
- /* unamed data type */
- group = H5Gcreate2(fid, "/group2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+ /* unamed data type */
+ group = H5Gcreate2(fid, "/group2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
- type = H5Tcreate (H5T_COMPOUND, sizeof(dset5_t));
- H5Tinsert(type, "int", HOFFSET(dset5_t, a), H5T_STD_I32BE);
- H5Tinsert(type, "float", HOFFSET(dset5_t, b), H5T_IEEE_F32BE);
- H5Tcommit(group, "type4", type);
- dataset = H5Dcreate(group, "dset5", type, space, create_plist);
- type2 = H5Tcreate (H5T_COMPOUND, sizeof(dset5_t));
- H5Tinsert(type2, "int", HOFFSET(dset5_t, a), H5T_NATIVE_INT);
- H5Tinsert(type2, "float", HOFFSET(dset5_t, b), H5T_NATIVE_FLOAT);
- H5Dwrite(dataset, type2, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset5);
+ type = H5Tcreate (H5T_COMPOUND, sizeof(dset5_t));
+ H5Tinsert(type, "int", HOFFSET(dset5_t, a), H5T_STD_I32BE);
+ H5Tinsert(type, "float", HOFFSET(dset5_t, b), H5T_IEEE_F32BE);
+ H5Tcommit(group, "type4", type);
+ dataset = H5Dcreate(group, "dset5", type, space, create_plist);
+ type2 = H5Tcreate (H5T_COMPOUND, sizeof(dset5_t));
+ H5Tinsert(type2, "int", HOFFSET(dset5_t, a), H5T_NATIVE_INT);
+ H5Tinsert(type2, "float", HOFFSET(dset5_t, b), H5T_NATIVE_FLOAT);
+ H5Dwrite(dataset, type2, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset5);
- H5Gunlink(group,"type4");
+ H5Ldelete(group, "type4", H5P_DEFAULT);
- H5Tclose(type);
- H5Tclose(type2);
- H5Dclose(dataset);
- H5Sclose(space);
- H5Gclose(group);
- H5Pclose(create_plist);
+ H5Tclose(type);
+ H5Tclose(type2);
+ H5Dclose(dataset);
+ H5Sclose(space);
+ H5Gclose(group);
+ H5Pclose(create_plist);
- H5Fclose(fid);
+ H5Fclose(fid);
}
@@ -5064,14 +5063,14 @@ static void gent_fcontents(void)
/* no name datatype */
- tid=H5Tcopy(H5T_NATIVE_INT);
- ret=H5Tcommit(fid, "mytype2", tid);
- assert(ret>=0);
- write_dset(fid,1,dims,"dsetmytype2",tid,buf);
- ret=H5Gunlink(fid,"mytype2");
- assert(ret>=0);
- ret=H5Tclose(tid);
- assert(ret>=0);
+ tid = H5Tcopy(H5T_NATIVE_INT);
+ ret = H5Tcommit(fid, "mytype2", tid);
+ assert(ret >= 0);
+ write_dset(fid, 1, dims, "dsetmytype2", tid, buf);
+ ret = H5Ldelete(fid, "mytype2", H5P_DEFAULT);
+ assert(ret >= 0);
+ ret = H5Tclose(tid);
+ assert(ret >= 0);
/*-------------------------------------------------------------------------
diff --git a/tools/h5repack/h5repacktst.c b/tools/h5repack/h5repacktst.c
index c21b858..cc5591d 100644
--- a/tools/h5repack/h5repacktst.c
+++ b/tools/h5repack/h5repacktst.c
@@ -2384,94 +2384,92 @@ out:
*/
int make_early(void)
{
- hsize_t dims[1] ={3000};
- hsize_t cdims[1]={30};
- hid_t fid=-1;
- hid_t dset_id=-1;
- hid_t sid=-1;
- hid_t tid=-1;
- hid_t dcpl=-1;
- int i;
- char name[10];
- int iter=100;
-
- if ((fid = H5Fcreate(FNAME5,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT))<0)
- return -1;
- if (H5Fclose(fid)<0)
- goto out;
-
- if ((sid = H5Screate_simple(1, dims, NULL))<0)
- goto out;
- if ((dcpl = H5Pcreate(H5P_DATASET_CREATE))<0)
- goto out;
- if (H5Pset_chunk(dcpl,1,cdims)<0)
- goto out;
- if (H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_EARLY)<0)
- goto out;
-
- for (i=0; i<iter; i++)
- {
- if ((fid = H5Fopen(FNAME5,H5F_ACC_RDWR,H5P_DEFAULT))<0)
- goto out;
- if ((dset_id = H5Dcreate(fid,"early",H5T_NATIVE_DOUBLE,sid,dcpl))<0)
- goto out;
- if ((tid = H5Tcopy(H5T_NATIVE_DOUBLE))<0)
- goto out;
- sprintf(name,"%d", i);
- if ((H5Tcommit(fid,name,tid))<0)
- goto out;
- if (H5Tclose(tid)<0)
- goto out;
- if (H5Dclose(dset_id)<0)
- goto out;
- if (H5Gunlink(fid,"early")<0)
- goto out;
- if (H5Fclose(fid)<0)
- goto out;
- }
-
-/*-------------------------------------------------------------------------
- * do the same without close/opening the file and creating the dataset
- *-------------------------------------------------------------------------
- */
+ hsize_t dims[1] ={3000};
+ hsize_t cdims[1]={30};
+ hid_t fid=-1;
+ hid_t dset_id=-1;
+ hid_t sid=-1;
+ hid_t tid=-1;
+ hid_t dcpl=-1;
+ int i;
+ char name[10];
+ int iter=100;
+
+ if((fid = H5Fcreate(FNAME5, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+ return -1;
+ if(H5Fclose(fid) < 0)
+ goto out;
+
+ if((sid = H5Screate_simple(1, dims, NULL)) < 0)
+ goto out;
+ if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+ goto out;
+ if(H5Pset_chunk(dcpl, 1, cdims) < 0)
+ goto out;
+ if(H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_EARLY) < 0)
+ goto out;
+
+ for(i = 0; i < iter; i++)
+ {
+ if((fid = H5Fopen(FNAME5, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
+ goto out;
+ if((dset_id = H5Dcreate(fid, "early", H5T_NATIVE_DOUBLE, sid, dcpl)) < 0)
+ goto out;
+ if((tid = H5Tcopy(H5T_NATIVE_DOUBLE)) < 0)
+ goto out;
+ sprintf(name, "%d", i);
+ if((H5Tcommit(fid, name, tid)) < 0)
+ goto out;
+ if(H5Tclose(tid) < 0)
+ goto out;
+ if(H5Dclose(dset_id) < 0)
+ goto out;
+ if(H5Ldelete(fid, "early", H5P_DEFAULT) < 0)
+ goto out;
+ if(H5Fclose(fid) < 0)
+ goto out;
+ }
- if ((fid = H5Fcreate(FNAME6,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT))<0)
- return -1;
+ /*-------------------------------------------------------------------------
+ * do the same without close/opening the file and creating the dataset
+ *-------------------------------------------------------------------------
+ */
- for (i=0; i<iter; i++)
- {
- if ((tid = H5Tcopy(H5T_NATIVE_DOUBLE))<0)
- goto out;
- sprintf(name,"%d", i);
- if ((H5Tcommit(fid,name,tid))<0)
- goto out;
- if (H5Tclose(tid)<0)
- goto out;
- }
+ if((fid = H5Fcreate(FNAME6, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+ return -1;
- if (H5Sclose(sid)<0)
- goto out;
- if (H5Pclose(dcpl)<0)
- goto out;
- if (H5Fclose(fid)<0)
- goto out;
+ for(i = 0; i < iter; i++)
+ {
+ if((tid = H5Tcopy(H5T_NATIVE_DOUBLE)) < 0)
+ goto out;
+ sprintf(name, "%d", i);
+ if((H5Tcommit(fid, name, tid)) < 0)
+ goto out;
+ if(H5Tclose(tid) < 0)
+ goto out;
+ }
+ if(H5Sclose(sid) < 0)
+ goto out;
+ if(H5Pclose(dcpl) < 0)
+ goto out;
+ if(H5Fclose(fid) < 0)
+ goto out;
- return 0;
+ return 0;
out:
- H5E_BEGIN_TRY {
- H5Tclose(tid);
- H5Pclose(dcpl);
- H5Sclose(sid);
- H5Dclose(dset_id);
- H5Fclose(fid);
- } H5E_END_TRY;
- return -1;
+ H5E_BEGIN_TRY {
+ H5Tclose(tid);
+ H5Pclose(dcpl);
+ H5Sclose(sid);
+ H5Dclose(dset_id);
+ H5Fclose(fid);
+ } H5E_END_TRY;
+ return -1;
}
-
/*-------------------------------------------------------------------------
* Function: make_layout
*
diff --git a/tools/lib/talign.c b/tools/lib/talign.c
index 21613df..b0dbbe9 100644
--- a/tools/lib/talign.c
+++ b/tools/lib/talign.c
@@ -63,12 +63,12 @@ int main(void)
fil = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
if (fil < 0) {
- puts("*FAILED*");
- return 1;
+ puts("*FAILED*");
+ return 1;
}
H5E_BEGIN_TRY {
- H5Gunlink(fil, setname);
+ H5Ldelete(fil, setname, H5P_DEFAULT);
} H5E_END_TRY;
cs6 = H5Tcopy(H5T_C_S1);
generated by cgit v0.12 at 2024-11-09 16:20:02 (GMT)