diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-09-30 14:27:10 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-09-30 14:27:10 (GMT) |
| commit | b2d661b508a7fc7a2592c13bc6bdc175551f075d (patch) | |
| tree | 13baeb0d83a7c2a4c6299993c182b1227c2f6114 /test/ntypes.c | |
| parent | 29ab58b58dce556639ea3154e262895773a8a8df (diff) | |
| download | hdf5-b2d661b508a7fc7a2592c13bc6bdc175551f075d.zip hdf5-b2d661b508a7fc7a2592c13bc6bdc175551f075d.tar.gz hdf5-b2d661b508a7fc7a2592c13bc6bdc175551f075d.tar.bz2 | |
Clang-format of source files
Diffstat (limited to 'test/ntypes.c')
| -rw-r--r-- | test/ntypes.c | 2230 |
1 files changed, 1240 insertions, 990 deletions
diff --git a/test/ntypes.c b/test/ntypes.c index 34425c4..52fe1da 100644 --- a/test/ntypes.c +++ b/test/ntypes.c @@ -20,46 +20,41 @@ #include "h5test.h" -const char *FILENAME[] = { - "ntypes", - NULL -}; - -#define DIM0 100 -#define DIM1 200 -#define DIM3 20 - - -int ipoints2[DIM0][DIM1], icheck2[DIM0][DIM1]; -short spoints2[DIM0][DIM1], scheck2[DIM0][DIM1]; -int ipoints3[DIM0][DIM1][5], icheck3[DIM0][DIM1][5]; - -#define DSET_ATOMIC_NAME_1 "atomic_type_1" -#define DSET_ATOMIC_NAME_2 "atomic_type_2" -#define DSET_ATOMIC_NAME_3 "atomic_type_3" -#define DSET_ATOMIC_NAME_4 "atomic_type_4" -#define DSET_ATOMIC_NAME_5 "atomic_type_5" -#define DSET_COMPOUND_NAME "compound_type" -#define DSET_COMPOUND_NAME_2 "compound_type_2" -#define DSET_COMPOUND_NAME_3 "compound_type_3" -#define DSET_COMPOUND_NAME_4 "compound_type_4" -#define DSET_ENUM_NAME "enum_type" -#define DSET_ARRAY_NAME "array_type" -#define DSET_ARRAY2_NAME "array_type_2" -#define DSET_VL_NAME "vl_type" -#define DSET_VLSTR_NAME "vlstr_type" -#define DSET_STR_NAME "str_type" -#define DSET_OPAQUE_NAME "opaque_type" -#define DSET1_BITFIELD_NAME "bitfield_type_1" -#define DSET2_BITFIELD_NAME "bitfield_type_2" - -#define SPACE1_DIM1 4 -#define SPACE1_RANK 1 -#define SPACE2_RANK 2 -#define SPACE2_DIM1 10 -#define SPACE2_DIM2 10 -#define BITFIELD_ENUMB 8 - +const char *FILENAME[] = {"ntypes", NULL}; + +#define DIM0 100 +#define DIM1 200 +#define DIM3 20 + +int ipoints2[DIM0][DIM1], icheck2[DIM0][DIM1]; +short spoints2[DIM0][DIM1], scheck2[DIM0][DIM1]; +int ipoints3[DIM0][DIM1][5], icheck3[DIM0][DIM1][5]; + +#define DSET_ATOMIC_NAME_1 "atomic_type_1" +#define DSET_ATOMIC_NAME_2 "atomic_type_2" +#define DSET_ATOMIC_NAME_3 "atomic_type_3" +#define DSET_ATOMIC_NAME_4 "atomic_type_4" +#define DSET_ATOMIC_NAME_5 "atomic_type_5" +#define DSET_COMPOUND_NAME "compound_type" +#define DSET_COMPOUND_NAME_2 "compound_type_2" +#define DSET_COMPOUND_NAME_3 "compound_type_3" +#define DSET_COMPOUND_NAME_4 "compound_type_4" +#define DSET_ENUM_NAME "enum_type" +#define DSET_ARRAY_NAME "array_type" +#define DSET_ARRAY2_NAME "array_type_2" +#define DSET_VL_NAME "vl_type" +#define DSET_VLSTR_NAME "vlstr_type" +#define DSET_STR_NAME "str_type" +#define DSET_OPAQUE_NAME "opaque_type" +#define DSET1_BITFIELD_NAME "bitfield_type_1" +#define DSET2_BITFIELD_NAME "bitfield_type_2" + +#define SPACE1_DIM1 4 +#define SPACE1_RANK 1 +#define SPACE2_RANK 2 +#define SPACE2_DIM1 10 +#define SPACE2_DIM2 10 +#define BITFIELD_ENUMB 8 /*------------------------------------------------------------------------- * Function: test_atomic_dtype @@ -80,59 +75,63 @@ int ipoints3[DIM0][DIM1][5], icheck3[DIM0][DIM1][5]; static herr_t test_atomic_dtype(hid_t file) { - hid_t dataset = -1, space = -1; - hid_t dtype = -1, native_type = -1; - int i, j, n; - hsize_t dims[2]; - void *tmp = NULL; + hid_t dataset = -1, space = -1; + hid_t dtype = -1, native_type = -1; + int i, j, n; + hsize_t dims[2]; + void * tmp = NULL; TESTING("atomic datatype"); /* Initialize the dataset */ - for(i = n = 0; i < DIM0; i++) - for(j = 0; j < DIM1; j++) + for (i = n = 0; i < DIM0; i++) + for (j = 0; j < DIM1; j++) ipoints2[i][j] = n++; /* Create the data space */ dims[0] = DIM0; dims[1] = DIM1; - if((space = H5Screate_simple(2, dims, NULL)) < 0) TEST_ERROR; + if ((space = H5Screate_simple(2, dims, NULL)) < 0) + TEST_ERROR; /*------------------- Test data values ------------------------*/ /* Create the dataset */ - if((dataset = H5Dcreate2(file, DSET_ATOMIC_NAME_1, H5T_STD_I32BE, space, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if ((dataset = H5Dcreate2(file, DSET_ATOMIC_NAME_1, H5T_STD_I32BE, space, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) TEST_ERROR; /* Write the data to the dataset */ - if(H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, ipoints2) < 0) + if (H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, ipoints2) < 0) TEST_ERROR; /* Close dataset */ - if(H5Dclose(dataset) < 0) TEST_ERROR; + if (H5Dclose(dataset) < 0) + TEST_ERROR; /* Open dataset again to check H5Tget_native_type */ - if((dataset = H5Dopen2(file, DSET_ATOMIC_NAME_1, H5P_DEFAULT)) < 0) TEST_ERROR; + if ((dataset = H5Dopen2(file, DSET_ATOMIC_NAME_1, H5P_DEFAULT)) < 0) + TEST_ERROR; - if((dtype = H5Dget_type(dataset)) < 0) TEST_ERROR; + if ((dtype = H5Dget_type(dataset)) < 0) + TEST_ERROR; - if((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) + if ((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) TEST_ERROR; /* Verify the datatype retrieved and converted */ - if(H5Tget_order(native_type) != H5Tget_order(H5T_NATIVE_INT)) + if (H5Tget_order(native_type) != H5Tget_order(H5T_NATIVE_INT)) TEST_ERROR; - if(H5Tget_size(native_type) < H5Tget_size(H5T_STD_I32BE)) + if (H5Tget_size(native_type) < H5Tget_size(H5T_STD_I32BE)) TEST_ERROR; - if(H5T_INTEGER != H5Tget_class(native_type)) + if (H5T_INTEGER != H5Tget_class(native_type)) TEST_ERROR; /* Read the dataset back. The temporary buffer is for special platforms * like Cray. */ - if(NULL == (tmp = HDmalloc((size_t)(DIM0 * DIM1 * H5Tget_size(native_type))))) + if (NULL == (tmp = HDmalloc((size_t)(DIM0 * DIM1 * H5Tget_size(native_type))))) TEST_ERROR - if(H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0) + if (H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0) TEST_ERROR; /* Copy data from temporary buffer to destination buffer */ @@ -141,139 +140,156 @@ test_atomic_dtype(hid_t file) tmp = NULL; /* Convert to the integer type */ - if(H5Tconvert(native_type, H5T_NATIVE_INT, (DIM0 * DIM1), icheck2, NULL, H5P_DEFAULT) < 0) + if (H5Tconvert(native_type, H5T_NATIVE_INT, (DIM0 * DIM1), icheck2, NULL, H5P_DEFAULT) < 0) TEST_ERROR; /* Check that the values read are the same as the values written */ - for(i = 0; i < DIM0; i++) - for(j = 0; j < DIM1; j++) - if(ipoints2[i][j] != icheck2[i][j]) { + for (i = 0; i < DIM0; i++) + for (j = 0; j < DIM1; j++) + if (ipoints2[i][j] != icheck2[i][j]) { H5_FAILED(); HDprintf(" Read different values than written.\n"); HDprintf(" At index %d,%d\n", i, j); goto error; } /* end if */ - if(H5Dclose(dataset) < 0) TEST_ERROR; - if(H5Tclose(native_type) < 0) TEST_ERROR; - if(H5Tclose(dtype) < 0) TEST_ERROR; + if (H5Dclose(dataset) < 0) + TEST_ERROR; + if (H5Tclose(native_type) < 0) + TEST_ERROR; + if (H5Tclose(dtype) < 0) + TEST_ERROR; /*------------------ Test different data types ----------------*/ /* Create the dataset of H5T_STD_I64LE */ - if((dataset = H5Dcreate2(file, DSET_ATOMIC_NAME_2, H5T_STD_I64LE, space, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if ((dataset = H5Dcreate2(file, DSET_ATOMIC_NAME_2, H5T_STD_I64LE, space, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) TEST_ERROR; - if((dtype = H5Dget_type(dataset)) < 0) TEST_ERROR; + if ((dtype = H5Dget_type(dataset)) < 0) + TEST_ERROR; - if((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) + if ((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) TEST_ERROR; /* Verify the datatype retrieved and converted */ - if(H5Tget_order(native_type) != H5Tget_order(H5T_NATIVE_LLONG)) + if (H5Tget_order(native_type) != H5Tget_order(H5T_NATIVE_LLONG)) TEST_ERROR; - if(H5Tget_size(native_type) < H5Tget_size(H5T_STD_I64LE)) + if (H5Tget_size(native_type) < H5Tget_size(H5T_STD_I64LE)) TEST_ERROR; - if(H5T_INTEGER!=H5Tget_class(native_type)) + if (H5T_INTEGER != H5Tget_class(native_type)) TEST_ERROR; - if(H5Dclose(dataset) < 0) TEST_ERROR; - if(H5Tclose(native_type) < 0) TEST_ERROR; - if(H5Tclose(dtype) < 0) TEST_ERROR; - + if (H5Dclose(dataset) < 0) + TEST_ERROR; + if (H5Tclose(native_type) < 0) + TEST_ERROR; + if (H5Tclose(dtype) < 0) + TEST_ERROR; /* Create the dataset of H5T_STD_I8LE */ - if((dataset = H5Dcreate2(file, DSET_ATOMIC_NAME_3, H5T_STD_I8LE, space, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if ((dataset = H5Dcreate2(file, DSET_ATOMIC_NAME_3, H5T_STD_I8LE, space, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) TEST_ERROR; - if((dtype = H5Dget_type(dataset)) < 0) TEST_ERROR; + if ((dtype = H5Dget_type(dataset)) < 0) + TEST_ERROR; - if((native_type = H5Tget_native_type(dtype, H5T_DIR_ASCEND)) < 0) + if ((native_type = H5Tget_native_type(dtype, H5T_DIR_ASCEND)) < 0) TEST_ERROR; /* Verify the datatype retrieved and converted */ - if(H5Tget_order(native_type) != H5Tget_order(H5T_NATIVE_CHAR)) + if (H5Tget_order(native_type) != H5Tget_order(H5T_NATIVE_CHAR)) TEST_ERROR; - if(H5Tget_size(native_type) < H5Tget_size(H5T_STD_I8LE)) + if (H5Tget_size(native_type) < H5Tget_size(H5T_STD_I8LE)) TEST_ERROR; - if(H5T_INTEGER!=H5Tget_class(native_type)) + if (H5T_INTEGER != H5Tget_class(native_type)) TEST_ERROR; - if(H5Dclose(dataset) < 0) TEST_ERROR; - if(H5Tclose(native_type) < 0) TEST_ERROR; - if(H5Tclose(dtype) < 0) TEST_ERROR; - + if (H5Dclose(dataset) < 0) + TEST_ERROR; + if (H5Tclose(native_type) < 0) + TEST_ERROR; + if (H5Tclose(dtype) < 0) + TEST_ERROR; /* Create the dataset of H5T_IEEE_F32BE */ - if((dataset = H5Dcreate2(file, DSET_ATOMIC_NAME_4, H5T_IEEE_F32BE, space, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if ((dataset = H5Dcreate2(file, DSET_ATOMIC_NAME_4, H5T_IEEE_F32BE, space, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) TEST_ERROR; - if((dtype = H5Dget_type(dataset)) < 0) TEST_ERROR; + if ((dtype = H5Dget_type(dataset)) < 0) + TEST_ERROR; - if((native_type = H5Tget_native_type(dtype, H5T_DIR_DESCEND)) < 0) + if ((native_type = H5Tget_native_type(dtype, H5T_DIR_DESCEND)) < 0) TEST_ERROR; /* Verify the datatype retrieved and converted */ - if(H5Tget_order(native_type) != H5Tget_order(H5T_NATIVE_FLOAT)) + if (H5Tget_order(native_type) != H5Tget_order(H5T_NATIVE_FLOAT)) TEST_ERROR; - if(H5Tget_size(native_type) < H5Tget_size(H5T_IEEE_F32BE)) + if (H5Tget_size(native_type) < H5Tget_size(H5T_IEEE_F32BE)) TEST_ERROR; - if(H5T_FLOAT!=H5Tget_class(native_type)) + if (H5T_FLOAT != H5Tget_class(native_type)) TEST_ERROR; - if(H5Dclose(dataset) < 0) TEST_ERROR; - if(H5Tclose(native_type) < 0) TEST_ERROR; - if(H5Tclose(dtype) < 0) TEST_ERROR; - + if (H5Dclose(dataset) < 0) + TEST_ERROR; + if (H5Tclose(native_type) < 0) + TEST_ERROR; + if (H5Tclose(dtype) < 0) + TEST_ERROR; /* Create the dataset of H5T_IEEE_F64BE */ - if((dataset = H5Dcreate2(file, DSET_ATOMIC_NAME_5, H5T_IEEE_F64BE, space, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if ((dataset = H5Dcreate2(file, DSET_ATOMIC_NAME_5, H5T_IEEE_F64BE, space, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) TEST_ERROR; - if((dtype = H5Dget_type(dataset)) < 0) TEST_ERROR; + if ((dtype = H5Dget_type(dataset)) < 0) + TEST_ERROR; - if((native_type = H5Tget_native_type(dtype, H5T_DIR_DESCEND)) < 0) + if ((native_type = H5Tget_native_type(dtype, H5T_DIR_DESCEND)) < 0) TEST_ERROR; /* Verify the datatype retrieved and converted */ - if(H5Tget_order(native_type) != H5Tget_order(H5T_NATIVE_DOUBLE)) + if (H5Tget_order(native_type) != H5Tget_order(H5T_NATIVE_DOUBLE)) TEST_ERROR; - if(H5Tget_size(native_type) < H5Tget_size(H5T_IEEE_F64BE)) + if (H5Tget_size(native_type) < H5Tget_size(H5T_IEEE_F64BE)) TEST_ERROR; - if(H5T_FLOAT != H5Tget_class(native_type)) + if (H5T_FLOAT != H5Tget_class(native_type)) TEST_ERROR; - if(H5Dclose(dataset) < 0) TEST_ERROR; - if(H5Tclose(native_type) < 0) TEST_ERROR; - if(H5Tclose(dtype) < 0) TEST_ERROR; - + if (H5Dclose(dataset) < 0) + TEST_ERROR; + if (H5Tclose(native_type) < 0) + TEST_ERROR; + if (H5Tclose(dtype) < 0) + TEST_ERROR; /* Close dataspace */ - if(H5Sclose(space) < 0) TEST_ERROR; + if (H5Sclose(space) < 0) + TEST_ERROR; PASSED(); return 0; error: - if(tmp) + if (tmp) HDfree(tmp); - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Dclose(dataset); H5Tclose(native_type); H5Tclose(dtype); H5Sclose(space); - } H5E_END_TRY; + } + H5E_END_TRY; return -1; } - /*------------------------------------------------------------------------- * Function: test_compound_dtype2 * @@ -294,244 +310,274 @@ static herr_t test_compound_dtype2(hid_t file) { typedef struct s2 { - short c2; - long l2; - long long ll2; + short c2; + long l2; + long long ll2; } s2; typedef struct s1 { - char c; - int i; - s2 st; - unsigned long long l; + char c; + int i; + s2 st; + unsigned long long l; } s1; - hid_t dataset = -1, space = -1; - hid_t dtype = -1, native_type = -1, tid = -1, tid2 = -1, tid_m = -1, - tid_m2 = -1, mem_id = -1, nest_mem_id = -1; - int i, j, n; - hsize_t dims[2]; - s1 *temp_point = NULL, *temp_check = NULL; - s1 *points = NULL, *check = NULL; - void *tmp = NULL, *bkg = NULL; + hid_t dataset = -1, space = -1; + hid_t dtype = -1, native_type = -1, tid = -1, tid2 = -1, tid_m = -1, tid_m2 = -1, mem_id = -1, + nest_mem_id = -1; + int i, j, n; + hsize_t dims[2]; + s1 * temp_point = NULL, *temp_check = NULL; + s1 * points = NULL, *check = NULL; + void * tmp = NULL, *bkg = NULL; TESTING("nested compound datatype"); /* Allocate space for the points & check arrays */ - if(NULL == (points = (s1 *)HDmalloc(sizeof(s1) * DIM0 * DIM1))) + if (NULL == (points = (s1 *)HDmalloc(sizeof(s1) * DIM0 * DIM1))) TEST_ERROR; - if(NULL == (check = (s1 *)HDcalloc(sizeof(s1), DIM0 * DIM1))) + if (NULL == (check = (s1 *)HDcalloc(sizeof(s1), DIM0 * DIM1))) TEST_ERROR; /* Initialize the dataset */ - for(i = n = 0, temp_point = points; i < DIM0; i++) { - for(j = 0; j < DIM1; j++, temp_point++) { - temp_point->c = 't'; - temp_point->i = n++; - temp_point->st.c2 = (short)(i + j); - temp_point->st.l2 = (i * 5 + j * 50) * n; + for (i = n = 0, temp_point = points; i < DIM0; i++) { + for (j = 0; j < DIM1; j++, temp_point++) { + temp_point->c = 't'; + temp_point->i = n++; + temp_point->st.c2 = (short)(i + j); + temp_point->st.l2 = (i * 5 + j * 50) * n; temp_point->st.ll2 = (i * 10 + j * 100) * n; - temp_point->l = (unsigned long long)((i * 40 + j * 400) * n); + temp_point->l = (unsigned long long)((i * 40 + j * 400) * n); } /* end for */ - } /* end for */ + } /* end for */ /* Create the data space */ dims[0] = DIM0; dims[1] = DIM1; - if((space = H5Screate_simple(2, dims, NULL)) < 0) TEST_ERROR; + if ((space = H5Screate_simple(2, dims, NULL)) < 0) + TEST_ERROR; /* Create compound datatype for disk storage */ - if((tid2=H5Tcreate(H5T_COMPOUND, sizeof(s2))) < 0) TEST_ERROR; - if((tid=H5Tcreate(H5T_COMPOUND, sizeof(s1))) < 0) TEST_ERROR; + if ((tid2 = H5Tcreate(H5T_COMPOUND, sizeof(s2))) < 0) + TEST_ERROR; + if ((tid = H5Tcreate(H5T_COMPOUND, sizeof(s1))) < 0) + TEST_ERROR; /* Insert and pack members */ - if(H5Tinsert(tid2, "c2", HOFFSET(s2, c2), H5T_STD_I16BE) < 0) TEST_ERROR; + if (H5Tinsert(tid2, "c2", HOFFSET(s2, c2), H5T_STD_I16BE) < 0) + TEST_ERROR; #if H5_SIZEOF_LONG == 4 - if(H5Tinsert(tid2, "l2", HOFFSET(s2, l2), H5T_STD_I32LE) < 0) TEST_ERROR; + if (H5Tinsert(tid2, "l2", HOFFSET(s2, l2), H5T_STD_I32LE) < 0) + TEST_ERROR; #elif H5_SIZEOF_LONG == 8 - if(H5Tinsert(tid2, "l2", HOFFSET(s2, l2), H5T_STD_I64LE) < 0) TEST_ERROR; + if (H5Tinsert(tid2, "l2", HOFFSET(s2, l2), H5T_STD_I64LE) < 0) + TEST_ERROR; #else #error "Unknown 'long' size" #endif #if H5_SIZEOF_LONG_LONG == 4 - if(H5Tinsert(tid2, "ll2", HOFFSET(s2, ll2), H5T_STD_I32BE) < 0) TEST_ERROR; + if (H5Tinsert(tid2, "ll2", HOFFSET(s2, ll2), H5T_STD_I32BE) < 0) + TEST_ERROR; #elif H5_SIZEOF_LONG_LONG == 8 - if(H5Tinsert(tid2, "ll2", HOFFSET(s2, ll2), H5T_STD_I64BE) < 0) TEST_ERROR; + if (H5Tinsert(tid2, "ll2", HOFFSET(s2, ll2), H5T_STD_I64BE) < 0) + TEST_ERROR; #else #error "Unknown 'long long' size" #endif - if(H5Tinsert(tid, "c", HOFFSET(s1, c), H5T_STD_U8LE) < 0) TEST_ERROR; - if(H5Tinsert(tid, "i", HOFFSET(s1, i), H5T_STD_I32LE) < 0) TEST_ERROR; - if(H5Tinsert(tid, "st", HOFFSET(s1, st), tid2) < 0) TEST_ERROR; + if (H5Tinsert(tid, "c", HOFFSET(s1, c), H5T_STD_U8LE) < 0) + TEST_ERROR; + if (H5Tinsert(tid, "i", HOFFSET(s1, i), H5T_STD_I32LE) < 0) + TEST_ERROR; + if (H5Tinsert(tid, "st", HOFFSET(s1, st), tid2) < 0) + TEST_ERROR; #if H5_SIZEOF_LONG_LONG == 4 - if(H5Tinsert(tid, "l", HOFFSET(s1, l), H5T_STD_U32BE) < 0) TEST_ERROR; + if (H5Tinsert(tid, "l", HOFFSET(s1, l), H5T_STD_U32BE) < 0) + TEST_ERROR; #elif H5_SIZEOF_LONG_LONG == 8 - if(H5Tinsert(tid, "l", HOFFSET(s1, l), H5T_STD_U64BE) < 0) TEST_ERROR; + if (H5Tinsert(tid, "l", HOFFSET(s1, l), H5T_STD_U64BE) < 0) + TEST_ERROR; #else #error "Unknown 'long long' size" #endif /* Take away the paddings */ - if(H5Tpack(tid) < 0) TEST_ERROR; + if (H5Tpack(tid) < 0) + TEST_ERROR; /* Create the dataset */ - if((dataset = H5Dcreate2(file, DSET_COMPOUND_NAME_2, tid, space, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if ((dataset = + H5Dcreate2(file, DSET_COMPOUND_NAME_2, tid, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; /* Create compound datatype for memory */ - if((tid_m2 = H5Tcreate(H5T_COMPOUND, sizeof(s2))) < 0) TEST_ERROR; - if((tid_m = H5Tcreate(H5T_COMPOUND, sizeof(s1))) < 0) TEST_ERROR; + if ((tid_m2 = H5Tcreate(H5T_COMPOUND, sizeof(s2))) < 0) + TEST_ERROR; + if ((tid_m = H5Tcreate(H5T_COMPOUND, sizeof(s1))) < 0) + TEST_ERROR; /* Insert members */ - if(H5Tinsert(tid_m2, "c2", HOFFSET(s2, c2), H5T_NATIVE_SHORT) < 0) TEST_ERROR; - if(H5Tinsert(tid_m2, "l2", HOFFSET(s2, l2), H5T_NATIVE_LONG) < 0) TEST_ERROR; - if(H5Tinsert(tid_m2, "ll2", HOFFSET(s2, ll2), H5T_NATIVE_LLONG) < 0) TEST_ERROR; - if(H5Tinsert(tid_m, "c", HOFFSET(s1, c), H5T_NATIVE_UCHAR) < 0) TEST_ERROR; - if(H5Tinsert(tid_m, "i", HOFFSET(s1, i), H5T_NATIVE_INT) < 0) TEST_ERROR; - if(H5Tinsert(tid_m, "st", HOFFSET(s1, st), tid_m2) < 0) TEST_ERROR; - if(H5Tinsert(tid_m, "l", HOFFSET(s1, l), H5T_NATIVE_ULLONG) < 0) TEST_ERROR; + if (H5Tinsert(tid_m2, "c2", HOFFSET(s2, c2), H5T_NATIVE_SHORT) < 0) + TEST_ERROR; + if (H5Tinsert(tid_m2, "l2", HOFFSET(s2, l2), H5T_NATIVE_LONG) < 0) + TEST_ERROR; + if (H5Tinsert(tid_m2, "ll2", HOFFSET(s2, ll2), H5T_NATIVE_LLONG) < 0) + TEST_ERROR; + if (H5Tinsert(tid_m, "c", HOFFSET(s1, c), H5T_NATIVE_UCHAR) < 0) + TEST_ERROR; + if (H5Tinsert(tid_m, "i", HOFFSET(s1, i), H5T_NATIVE_INT) < 0) + TEST_ERROR; + if (H5Tinsert(tid_m, "st", HOFFSET(s1, st), tid_m2) < 0) + TEST_ERROR; + if (H5Tinsert(tid_m, "l", HOFFSET(s1, l), H5T_NATIVE_ULLONG) < 0) + TEST_ERROR; /* Write the data to the dataset */ - if(H5Dwrite(dataset, tid_m, H5S_ALL, H5S_ALL, H5P_DEFAULT, points) < 0) + if (H5Dwrite(dataset, tid_m, H5S_ALL, H5S_ALL, H5P_DEFAULT, points) < 0) TEST_ERROR; /* Close dataset */ - if(H5Dclose(dataset) < 0) TEST_ERROR; + if (H5Dclose(dataset) < 0) + TEST_ERROR; /* Close dataspace */ - if(H5Sclose(space) < 0) TEST_ERROR; - + if (H5Sclose(space) < 0) + TEST_ERROR; /* Open dataset again to check H5Tget_native_type */ - if((dataset = H5Dopen2(file, DSET_COMPOUND_NAME_2, H5P_DEFAULT)) < 0) TEST_ERROR; + if ((dataset = H5Dopen2(file, DSET_COMPOUND_NAME_2, H5P_DEFAULT)) < 0) + TEST_ERROR; - if((dtype = H5Dget_type(dataset)) < 0) TEST_ERROR; + if ((dtype = H5Dget_type(dataset)) < 0) + TEST_ERROR; - if((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) + if ((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) TEST_ERROR; - if(H5Tequal(native_type, tid_m) != TRUE) + if (H5Tequal(native_type, tid_m) != TRUE) TEST_ERROR; /* Verify the datatype of each field retrieved and converted */ /* check the char member */ - if((mem_id = H5Tget_member_type(native_type, 0)) < 0) + if ((mem_id = H5Tget_member_type(native_type, 0)) < 0) TEST_ERROR; - if(H5Tget_order(mem_id) != H5Tget_order(H5T_NATIVE_SCHAR)) + if (H5Tget_order(mem_id) != H5Tget_order(H5T_NATIVE_SCHAR)) TEST_ERROR; - if(H5Tget_size(mem_id) < H5Tget_size(H5T_STD_I8LE)) + if (H5Tget_size(mem_id) < H5Tget_size(H5T_STD_I8LE)) TEST_ERROR; - if(H5T_INTEGER != H5Tget_class(mem_id)) + if (H5T_INTEGER != H5Tget_class(mem_id)) TEST_ERROR; H5Tclose(mem_id); /* check the integer member */ - if((mem_id = H5Tget_member_type(native_type, 1)) < 0) + if ((mem_id = H5Tget_member_type(native_type, 1)) < 0) TEST_ERROR; - if(H5Tget_order(mem_id) != H5Tget_order(H5T_NATIVE_INT)) + if (H5Tget_order(mem_id) != H5Tget_order(H5T_NATIVE_INT)) TEST_ERROR; - if(H5Tget_size(mem_id) < H5Tget_size(H5T_STD_I32LE)) + if (H5Tget_size(mem_id) < H5Tget_size(H5T_STD_I32LE)) TEST_ERROR; - if(H5T_INTEGER!=H5Tget_class(mem_id)) + if (H5T_INTEGER != H5Tget_class(mem_id)) TEST_ERROR; H5Tclose(mem_id); /* check the unsigned long long member */ - if((mem_id = H5Tget_member_type(native_type, 3)) < 0) + if ((mem_id = H5Tget_member_type(native_type, 3)) < 0) TEST_ERROR; - if(H5Tget_order(mem_id) != H5Tget_order(H5T_NATIVE_ULLONG)) + if (H5Tget_order(mem_id) != H5Tget_order(H5T_NATIVE_ULLONG)) TEST_ERROR; - if(H5Tget_size(mem_id) < H5Tget_size(H5T_STD_U64BE)) + if (H5Tget_size(mem_id) < H5Tget_size(H5T_STD_U64BE)) TEST_ERROR; - if(H5T_INTEGER!=H5Tget_class(mem_id)) + if (H5T_INTEGER != H5Tget_class(mem_id)) TEST_ERROR; H5Tclose(mem_id); /* check the nested compound member */ - if((nest_mem_id = H5Tget_member_type(native_type, 2)) < 0) + if ((nest_mem_id = H5Tget_member_type(native_type, 2)) < 0) TEST_ERROR; - if((mem_id = H5Tget_member_type(nest_mem_id, 0)) < 0) + if ((mem_id = H5Tget_member_type(nest_mem_id, 0)) < 0) TEST_ERROR; - if(H5Tget_order(mem_id) != H5Tget_order(H5T_NATIVE_SHORT)) + if (H5Tget_order(mem_id) != H5Tget_order(H5T_NATIVE_SHORT)) TEST_ERROR; - if(H5Tget_size(mem_id) < H5Tget_size(H5T_STD_I16BE)) + if (H5Tget_size(mem_id) < H5Tget_size(H5T_STD_I16BE)) TEST_ERROR; - if(H5T_INTEGER!=H5Tget_class(mem_id)) + if (H5T_INTEGER != H5Tget_class(mem_id)) TEST_ERROR; H5Tclose(mem_id); - if((mem_id = H5Tget_member_type(nest_mem_id, 1)) < 0) + if ((mem_id = H5Tget_member_type(nest_mem_id, 1)) < 0) + TEST_ERROR; + if (H5Tget_order(mem_id) != H5Tget_order(H5T_NATIVE_LONG)) + TEST_ERROR; +#if H5_SIZEOF_LONG == 4 + if (H5Tget_size(mem_id) < H5Tget_size(H5T_STD_I32LE)) TEST_ERROR; - if(H5Tget_order(mem_id) != H5Tget_order(H5T_NATIVE_LONG)) +#elif H5_SIZEOF_LONG == 8 + if (H5Tget_size(mem_id) < H5Tget_size(H5T_STD_I64LE)) TEST_ERROR; -#if H5_SIZEOF_LONG==4 - if(H5Tget_size(mem_id) < H5Tget_size(H5T_STD_I32LE)) TEST_ERROR; -#elif H5_SIZEOF_LONG==8 - if(H5Tget_size(mem_id) < H5Tget_size(H5T_STD_I64LE)) TEST_ERROR; #else #error "Unknown 'long' size" #endif - if(H5T_INTEGER!=H5Tget_class(mem_id)) + if (H5T_INTEGER != H5Tget_class(mem_id)) TEST_ERROR; H5Tclose(mem_id); - if((mem_id = H5Tget_member_type(nest_mem_id, 2)) < 0) + if ((mem_id = H5Tget_member_type(nest_mem_id, 2)) < 0) + TEST_ERROR; + if (H5Tget_order(mem_id) != H5Tget_order(H5T_NATIVE_LLONG)) + TEST_ERROR; +#if H5_SIZEOF_LONG_LONG == 4 + if (H5Tget_size(mem_id) < H5Tget_size(H5T_STD_I32LE)) TEST_ERROR; - if(H5Tget_order(mem_id) != H5Tget_order(H5T_NATIVE_LLONG)) +#elif H5_SIZEOF_LONG_LONG == 8 + if (H5Tget_size(mem_id) < H5Tget_size(H5T_STD_I64LE)) TEST_ERROR; -#if H5_SIZEOF_LONG_LONG==4 - if(H5Tget_size(mem_id) < H5Tget_size(H5T_STD_I32LE)) TEST_ERROR; -#elif H5_SIZEOF_LONG_LONG==8 - if(H5Tget_size(mem_id) < H5Tget_size(H5T_STD_I64LE)) TEST_ERROR; #else #error "Unknown 'long long' size" #endif - if(H5T_INTEGER!=H5Tget_class(mem_id)) + if (H5T_INTEGER != H5Tget_class(mem_id)) TEST_ERROR; H5Tclose(mem_id); /* Read the dataset back. Temporary buffer is for special platforms like * Cray */ - if(NULL == (tmp = HDmalloc(DIM0 * DIM1 * H5Tget_size(native_type)))) + if (NULL == (tmp = HDmalloc(DIM0 * DIM1 * H5Tget_size(native_type)))) TEST_ERROR - if(NULL == (bkg = HDcalloc(sizeof(s1), DIM0 * DIM1))) + if (NULL == (bkg = HDcalloc(sizeof(s1), DIM0 * DIM1))) TEST_ERROR; - if(H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0) + if (H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0) TEST_ERROR; - HDmemcpy(check, tmp, DIM0*DIM1*H5Tget_size(native_type)); + HDmemcpy(check, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); HDfree(tmp); tmp = NULL; - if(H5Tconvert(native_type, tid_m, (DIM0 * DIM1), check, bkg, H5P_DEFAULT) < 0) + if (H5Tconvert(native_type, tid_m, (DIM0 * DIM1), check, bkg, H5P_DEFAULT) < 0) TEST_ERROR; HDfree(bkg); bkg = NULL; /* Check that the values read are the same as the values written */ - for(i = 0, temp_point = points, temp_check = check; i < DIM0; i++) { - for(j = 0; j < DIM1; j++, temp_point++, temp_check++) { - if(temp_point->c != temp_check->c || - temp_point->i != temp_check->i || - temp_point->st.c2 != temp_check->st.c2 || - temp_point->st.l2 != temp_check->st.l2 || - temp_point->st.ll2 != temp_check->st.ll2 || - temp_point->l != temp_check->l ) { + for (i = 0, temp_point = points, temp_check = check; i < DIM0; i++) { + for (j = 0; j < DIM1; j++, temp_point++, temp_check++) { + if (temp_point->c != temp_check->c || temp_point->i != temp_check->i || + temp_point->st.c2 != temp_check->st.c2 || temp_point->st.l2 != temp_check->st.l2 || + temp_point->st.ll2 != temp_check->st.ll2 || temp_point->l != temp_check->l) { H5_FAILED(); HDprintf(" Read different values than written.\n"); HDprintf(" At index %d,%d\n", i, j); goto error; } /* end if */ - } /* end for */ - } /* end for */ + } /* end for */ + } /* end for */ /* Close temporary datatypes */ - if(H5Tclose(tid2) < 0) TEST_ERROR; - if(H5Tclose(tid) < 0) TEST_ERROR; - if(H5Tclose(tid_m2) < 0) TEST_ERROR; + if (H5Tclose(tid2) < 0) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Tclose(tid_m2) < 0) + TEST_ERROR; /* Close HDF5 objects */ H5Dclose(dataset); @@ -547,16 +593,17 @@ test_compound_dtype2(hid_t file) return 0; error: - if(tmp) + if (tmp) HDfree(tmp); - if(bkg) + if (bkg) HDfree(bkg); - if(points) + if (points) HDfree(points); - if(check) + if (check) HDfree(check); - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Tclose(tid); H5Tclose(tid2); H5Tclose(tid_m); @@ -567,12 +614,12 @@ error: H5Dclose(dataset); H5Tclose(dtype); H5Tclose(native_type); - } H5E_END_TRY; + } + H5E_END_TRY; return -1; } - /*------------------------------------------------------------------------- * Function: test_compound_dtype * @@ -593,32 +640,32 @@ static herr_t test_compound_dtype(hid_t file) { typedef struct { - char c; - unsigned int i; - long long l; + char c; + unsigned int i; + long long l; } s1; - hid_t dataset = -1, space = -1; - hid_t dtype = -1, native_type = -1, tid = -1, tid2 = -1, mem_id = -1; - int i, j, n; - hsize_t dims[2]; - s1 *temp_point = NULL; - s1 *temp_check = NULL; - s1 *points = NULL; - s1 *check = NULL; - void *tmp = NULL; - void *bkg = NULL; + hid_t dataset = -1, space = -1; + hid_t dtype = -1, native_type = -1, tid = -1, tid2 = -1, mem_id = -1; + int i, j, n; + hsize_t dims[2]; + s1 * temp_point = NULL; + s1 * temp_check = NULL; + s1 * points = NULL; + s1 * check = NULL; + void * tmp = NULL; + void * bkg = NULL; TESTING("compound datatype"); /* Allocate space for the points & check arrays */ - if(NULL == (points = (s1 *)HDmalloc(sizeof(s1) * DIM0 * DIM1))) + if (NULL == (points = (s1 *)HDmalloc(sizeof(s1) * DIM0 * DIM1))) TEST_ERROR; - if(NULL == (check = (s1 *)HDcalloc(sizeof(s1), DIM0 * DIM1))) + if (NULL == (check = (s1 *)HDcalloc(sizeof(s1), DIM0 * DIM1))) TEST_ERROR; /* Initialize the dataset */ - for(i = n = 0, temp_point = points; i < DIM0; i++) - for(j = 0; j < DIM1; j++, temp_point++) { + for (i = n = 0, temp_point = points; i < DIM0; i++) + for (j = 0; j < DIM1; j++, temp_point++) { temp_point->c = 't'; temp_point->i = (unsigned int)(n++); temp_point->l = (i * 10 + j * 100) * n; @@ -627,106 +674,117 @@ test_compound_dtype(hid_t file) /* Create the data space */ dims[0] = DIM0; dims[1] = DIM1; - if((space = H5Screate_simple(2, dims, NULL)) < 0) TEST_ERROR; + if ((space = H5Screate_simple(2, dims, NULL)) < 0) + TEST_ERROR; /* Create compound datatype for disk storage */ - if((tid = H5Tcreate(H5T_COMPOUND, sizeof(s1))) < 0) TEST_ERROR; + if ((tid = H5Tcreate(H5T_COMPOUND, sizeof(s1))) < 0) + TEST_ERROR; /* Insert members */ - if(H5Tinsert(tid, "c", 0, H5T_STD_U8LE) < 0) TEST_ERROR; - if(H5Tinsert(tid, "i", 1, H5T_STD_U32LE) < 0) TEST_ERROR; - if(H5Tinsert(tid, "l", 5, H5T_STD_I64BE) < 0) TEST_ERROR; + if (H5Tinsert(tid, "c", 0, H5T_STD_U8LE) < 0) + TEST_ERROR; + if (H5Tinsert(tid, "i", 1, H5T_STD_U32LE) < 0) + TEST_ERROR; + if (H5Tinsert(tid, "l", 5, H5T_STD_I64BE) < 0) + TEST_ERROR; /* Create the dataset */ - if((dataset = H5Dcreate2(file, DSET_COMPOUND_NAME, tid, space, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if ((dataset = H5Dcreate2(file, DSET_COMPOUND_NAME, tid, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < + 0) TEST_ERROR; /* Create compound datatype for datatype in memory */ - if((tid2 = H5Tcreate(H5T_COMPOUND, sizeof(s1))) < 0) TEST_ERROR; - if(H5Tinsert(tid2, "c", HOFFSET(s1, c), H5T_NATIVE_UCHAR) < 0) TEST_ERROR; - if(H5Tinsert(tid2, "i", HOFFSET(s1, i), H5T_NATIVE_UINT) < 0) TEST_ERROR; - if(H5Tinsert(tid2, "l", HOFFSET(s1, l), H5T_NATIVE_LLONG) < 0) TEST_ERROR; + if ((tid2 = H5Tcreate(H5T_COMPOUND, sizeof(s1))) < 0) + TEST_ERROR; + if (H5Tinsert(tid2, "c", HOFFSET(s1, c), H5T_NATIVE_UCHAR) < 0) + TEST_ERROR; + if (H5Tinsert(tid2, "i", HOFFSET(s1, i), H5T_NATIVE_UINT) < 0) + TEST_ERROR; + if (H5Tinsert(tid2, "l", HOFFSET(s1, l), H5T_NATIVE_LLONG) < 0) + TEST_ERROR; /* Write the data to the dataset */ - if(H5Dwrite(dataset, tid2, H5S_ALL, H5S_ALL, H5P_DEFAULT, points) < 0) + if (H5Dwrite(dataset, tid2, H5S_ALL, H5S_ALL, H5P_DEFAULT, points) < 0) TEST_ERROR; /* Close dataset */ - if(H5Dclose(dataset) < 0) TEST_ERROR; + if (H5Dclose(dataset) < 0) + TEST_ERROR; /* Close dataspace */ - if(H5Sclose(space) < 0) TEST_ERROR; - + if (H5Sclose(space) < 0) + TEST_ERROR; /* Open dataset again to check H5Tget_native_type */ - if((dataset = H5Dopen2(file, DSET_COMPOUND_NAME, H5P_DEFAULT)) < 0) TEST_ERROR; + if ((dataset = H5Dopen2(file, DSET_COMPOUND_NAME, H5P_DEFAULT)) < 0) + TEST_ERROR; - if((dtype = H5Dget_type(dataset)) < 0) TEST_ERROR; + if ((dtype = H5Dget_type(dataset)) < 0) + TEST_ERROR; - if((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) + if ((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) TEST_ERROR; - if(H5Tequal(native_type, tid2) != TRUE) + if (H5Tequal(native_type, tid2) != TRUE) TEST_ERROR; /* Verify the datatype of each field retrieved and converted */ - if((mem_id = H5Tget_member_type(native_type, 0)) < 0) + if ((mem_id = H5Tget_member_type(native_type, 0)) < 0) TEST_ERROR; - if(H5Tget_order(mem_id) != H5Tget_order(H5T_NATIVE_UCHAR)) + if (H5Tget_order(mem_id) != H5Tget_order(H5T_NATIVE_UCHAR)) TEST_ERROR; - if(H5Tget_size(mem_id) < H5Tget_size(H5T_STD_U8LE)) + if (H5Tget_size(mem_id) < H5Tget_size(H5T_STD_U8LE)) TEST_ERROR; - if(H5T_INTEGER!=H5Tget_class(mem_id)) + if (H5T_INTEGER != H5Tget_class(mem_id)) TEST_ERROR; H5Tclose(mem_id); - if((mem_id = H5Tget_member_type(native_type, 1)) < 0) + if ((mem_id = H5Tget_member_type(native_type, 1)) < 0) TEST_ERROR; - if(H5Tget_order(mem_id) != H5Tget_order(H5T_NATIVE_UINT)) + if (H5Tget_order(mem_id) != H5Tget_order(H5T_NATIVE_UINT)) TEST_ERROR; - if(H5Tget_size(mem_id) < H5Tget_size(H5T_STD_U32LE)) + if (H5Tget_size(mem_id) < H5Tget_size(H5T_STD_U32LE)) TEST_ERROR; - if(H5T_INTEGER!=H5Tget_class(mem_id)) + if (H5T_INTEGER != H5Tget_class(mem_id)) TEST_ERROR; H5Tclose(mem_id); - if((mem_id = H5Tget_member_type(native_type, 2)) < 0) + if ((mem_id = H5Tget_member_type(native_type, 2)) < 0) TEST_ERROR; - if(H5Tget_order(mem_id) != H5Tget_order(H5T_NATIVE_LLONG)) + if (H5Tget_order(mem_id) != H5Tget_order(H5T_NATIVE_LLONG)) TEST_ERROR; - if(H5Tget_size(mem_id) < H5Tget_size(H5T_STD_I64BE)) + if (H5Tget_size(mem_id) < H5Tget_size(H5T_STD_I64BE)) TEST_ERROR; - if(H5T_INTEGER!=H5Tget_class(mem_id)) + if (H5T_INTEGER != H5Tget_class(mem_id)) TEST_ERROR; H5Tclose(mem_id); /* Read the dataset back. Temporary buffer is for special platforms like * Cray */ - if(NULL == (tmp = HDmalloc(DIM0 * DIM1 * H5Tget_size(native_type)))) + if (NULL == (tmp = HDmalloc(DIM0 * DIM1 * H5Tget_size(native_type)))) TEST_ERROR - if(NULL == (bkg = HDcalloc(sizeof(s1), DIM0 * DIM1))) + if (NULL == (bkg = HDcalloc(sizeof(s1), DIM0 * DIM1))) TEST_ERROR - if(H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0) + if (H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0) TEST_ERROR; HDmemcpy(check, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); HDfree(tmp); tmp = NULL; - if(H5Tconvert(native_type, tid2, (DIM0 * DIM1), check, bkg, H5P_DEFAULT) < 0) + if (H5Tconvert(native_type, tid2, (DIM0 * DIM1), check, bkg, H5P_DEFAULT) < 0) TEST_ERROR; HDfree(bkg); bkg = NULL; /* Check that the values read are the same as the values written */ - for(i = 0, temp_point = points, temp_check = check; i < DIM0; i++) - for(j = 0; j < DIM1; j++, temp_point++, temp_check++) - if(temp_point->c != temp_check->c || - temp_point->i != temp_check->i || - temp_point->l != temp_check->l ) { + for (i = 0, temp_point = points, temp_check = check; i < DIM0; i++) + for (j = 0; j < DIM1; j++, temp_point++, temp_check++) + if (temp_point->c != temp_check->c || temp_point->i != temp_check->i || + temp_point->l != temp_check->l) { H5_FAILED(); HDprintf(" Read different values than written.\n"); HDprintf(" At index %d,%d\n", i, j); @@ -734,7 +792,8 @@ test_compound_dtype(hid_t file) } /* end if */ /* Close datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; H5Dclose(dataset); H5Tclose(dtype); @@ -750,16 +809,17 @@ test_compound_dtype(hid_t file) error: /* Free memory for test data */ - if(tmp) + if (tmp) HDfree(tmp); - if(bkg) + if (bkg) HDfree(bkg); - if(points) + if (points) HDfree(points); - if(check) + if (check) HDfree(check); - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Tclose(tid); H5Sclose(space); H5Tclose(mem_id); @@ -767,12 +827,12 @@ error: H5Tclose(dtype); H5Tclose(native_type); H5Tclose(tid2); - } H5E_END_TRY; + } + H5E_END_TRY; return -1; } - /*------------------------------------------------------------------------- * Function: test_compound_dtype3 * @@ -793,169 +853,184 @@ static herr_t test_compound_dtype3(hid_t file) { typedef struct { - char c; - int a[5]; - long long l; + char c; + int a[5]; + long long l; } s1; - hid_t dataset = -1, space = -1; - hid_t dtype = -1, native_type = -1, tid = -1, tid2 = -1, tid_m = -1, - tid_m2 = -1, mem_id = -1, nest_mem_id = -1; - hsize_t array_dims[1] = {5}; - int i, j, k, n; - hsize_t dims[2]; - s1 *temp_point = NULL, *temp_check = NULL; - s1 *points = NULL, *check = NULL; - void *tmp = NULL, *bkg = NULL; + hid_t dataset = -1, space = -1; + hid_t dtype = -1, native_type = -1, tid = -1, tid2 = -1, tid_m = -1, tid_m2 = -1, mem_id = -1, + nest_mem_id = -1; + hsize_t array_dims[1] = {5}; + int i, j, k, n; + hsize_t dims[2]; + s1 * temp_point = NULL, *temp_check = NULL; + s1 * points = NULL, *check = NULL; + void * tmp = NULL, *bkg = NULL; TESTING("compound datatype with array as field"); /* Allocate space for the points & check arrays */ - if(NULL == (points = (s1 *)HDmalloc(sizeof(s1) * DIM0 * DIM1))) + if (NULL == (points = (s1 *)HDmalloc(sizeof(s1) * DIM0 * DIM1))) TEST_ERROR; - if(NULL == (check = (s1 *)HDcalloc(sizeof(s1), DIM0 * DIM1))) + if (NULL == (check = (s1 *)HDcalloc(sizeof(s1), DIM0 * DIM1))) TEST_ERROR; /* Initialize the dataset */ - for(i = n = 0, temp_point = points; i < DIM0; i++) - for(j = 0; j < DIM1; j++, temp_point++) { + for (i = n = 0, temp_point = points; i < DIM0; i++) + for (j = 0; j < DIM1; j++, temp_point++) { temp_point->c = 't'; temp_point->l = (i * 10 + j * 100) * n; - for(k = 0; k < 5; k++) + for (k = 0; k < 5; k++) (temp_point->a)[k] = n++; } /* end for */ /* Create the data space */ dims[0] = DIM0; dims[1] = DIM1; - if((space = H5Screate_simple(2, dims, NULL)) < 0) TEST_ERROR; + if ((space = H5Screate_simple(2, dims, NULL)) < 0) + TEST_ERROR; /* Create array datatype */ - if((tid2 = H5Tarray_create2(H5T_STD_I32LE, 1, array_dims)) < 0) TEST_ERROR; + if ((tid2 = H5Tarray_create2(H5T_STD_I32LE, 1, array_dims)) < 0) + TEST_ERROR; /* Create compound datatype for disk storage */ - if((tid = H5Tcreate(H5T_COMPOUND, 29)) < 0) TEST_ERROR; + if ((tid = H5Tcreate(H5T_COMPOUND, 29)) < 0) + TEST_ERROR; /* Insert members */ - if(H5Tinsert(tid, "c", 0, H5T_STD_U8LE) < 0) TEST_ERROR; - if(H5Tinsert(tid, "a", 1, tid2) < 0) TEST_ERROR; - if(H5Tinsert(tid, "l", 21, H5T_STD_I64BE) < 0) TEST_ERROR; + if (H5Tinsert(tid, "c", 0, H5T_STD_U8LE) < 0) + TEST_ERROR; + if (H5Tinsert(tid, "a", 1, tid2) < 0) + TEST_ERROR; + if (H5Tinsert(tid, "l", 21, H5T_STD_I64BE) < 0) + TEST_ERROR; /* Create the dataset */ - if((dataset = H5Dcreate2(file, DSET_COMPOUND_NAME_3, tid, space, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if ((dataset = + H5Dcreate2(file, DSET_COMPOUND_NAME_3, tid, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; /* Create array datatype */ - if((tid_m2 = H5Tarray_create2(H5T_NATIVE_INT, 1, array_dims)) < 0) TEST_ERROR; + if ((tid_m2 = H5Tarray_create2(H5T_NATIVE_INT, 1, array_dims)) < 0) + TEST_ERROR; /* Create compound datatype for datatype in memory */ - if((tid_m = H5Tcreate(H5T_COMPOUND, sizeof(s1))) < 0) TEST_ERROR; - if(H5Tinsert(tid_m, "c", HOFFSET(s1, c), H5T_NATIVE_UCHAR) < 0) TEST_ERROR; - if(H5Tinsert(tid_m, "a", HOFFSET(s1, a), tid_m2) < 0) TEST_ERROR; - if(H5Tinsert(tid_m, "l", HOFFSET(s1, l), H5T_NATIVE_LLONG) < 0) TEST_ERROR; + if ((tid_m = H5Tcreate(H5T_COMPOUND, sizeof(s1))) < 0) + TEST_ERROR; + if (H5Tinsert(tid_m, "c", HOFFSET(s1, c), H5T_NATIVE_UCHAR) < 0) + TEST_ERROR; + if (H5Tinsert(tid_m, "a", HOFFSET(s1, a), tid_m2) < 0) + TEST_ERROR; + if (H5Tinsert(tid_m, "l", HOFFSET(s1, l), H5T_NATIVE_LLONG) < 0) + TEST_ERROR; /* Write the data to the dataset */ - if(H5Dwrite(dataset, tid_m, H5S_ALL, H5S_ALL, H5P_DEFAULT, points) < 0) + if (H5Dwrite(dataset, tid_m, H5S_ALL, H5S_ALL, H5P_DEFAULT, points) < 0) TEST_ERROR; /* Close dataset */ - if(H5Dclose(dataset) < 0) TEST_ERROR; + if (H5Dclose(dataset) < 0) + TEST_ERROR; /* Close datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR; - if(H5Tclose(tid2) < 0) TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Tclose(tid2) < 0) + TEST_ERROR; /* Close dataspace */ - if(H5Sclose(space) < 0) TEST_ERROR; - + if (H5Sclose(space) < 0) + TEST_ERROR; /* Open dataset again to check H5Tget_native_type */ - if((dataset = H5Dopen2(file, DSET_COMPOUND_NAME_3, H5P_DEFAULT)) < 0) TEST_ERROR; + if ((dataset = H5Dopen2(file, DSET_COMPOUND_NAME_3, H5P_DEFAULT)) < 0) + TEST_ERROR; - if((dtype = H5Dget_type(dataset)) < 0) TEST_ERROR; + if ((dtype = H5Dget_type(dataset)) < 0) + TEST_ERROR; - if((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) + if ((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) TEST_ERROR; /* Verify the datatype of each field retrieved and converted */ /* check the char member */ - if((mem_id = H5Tget_member_type(native_type, 0)) < 0) + if ((mem_id = H5Tget_member_type(native_type, 0)) < 0) TEST_ERROR; - if(H5Tget_order(mem_id) != H5Tget_order(H5T_NATIVE_UCHAR)) + if (H5Tget_order(mem_id) != H5Tget_order(H5T_NATIVE_UCHAR)) TEST_ERROR; - if(H5Tget_size(mem_id) < H5Tget_size(H5T_STD_U8LE)) + if (H5Tget_size(mem_id) < H5Tget_size(H5T_STD_U8LE)) TEST_ERROR; - if(H5T_INTEGER!=H5Tget_class(mem_id)) + if (H5T_INTEGER != H5Tget_class(mem_id)) TEST_ERROR; H5Tclose(mem_id); /* check the array member */ - if((mem_id = H5Tget_member_type(native_type, 1)) < 0) + if ((mem_id = H5Tget_member_type(native_type, 1)) < 0) TEST_ERROR; - if(H5T_ARRAY!=H5Tget_class(mem_id)) + if (H5T_ARRAY != H5Tget_class(mem_id)) TEST_ERROR; - if((nest_mem_id = H5Tget_super(mem_id)) < 0) + if ((nest_mem_id = H5Tget_super(mem_id)) < 0) TEST_ERROR; - if(H5Tget_order(nest_mem_id) != H5Tget_order(H5T_NATIVE_INT)) + if (H5Tget_order(nest_mem_id) != H5Tget_order(H5T_NATIVE_INT)) TEST_ERROR; - if(H5Tget_size(nest_mem_id) < H5Tget_size(H5T_STD_I32LE)) + if (H5Tget_size(nest_mem_id) < H5Tget_size(H5T_STD_I32LE)) TEST_ERROR; - if(H5T_INTEGER!=H5Tget_class(nest_mem_id)) + if (H5T_INTEGER != H5Tget_class(nest_mem_id)) TEST_ERROR; H5Tclose(nest_mem_id); H5Tclose(mem_id); /* check the long long member */ - if((mem_id = H5Tget_member_type(native_type, 2)) < 0) + if ((mem_id = H5Tget_member_type(native_type, 2)) < 0) TEST_ERROR; - if(H5Tget_order(mem_id) != H5Tget_order(H5T_NATIVE_LLONG)) + if (H5Tget_order(mem_id) != H5Tget_order(H5T_NATIVE_LLONG)) TEST_ERROR; - if(H5Tget_size(mem_id) < H5Tget_size(H5T_STD_I64BE)) + if (H5Tget_size(mem_id) < H5Tget_size(H5T_STD_I64BE)) TEST_ERROR; - if(H5T_INTEGER!=H5Tget_class(mem_id)) + if (H5T_INTEGER != H5Tget_class(mem_id)) TEST_ERROR; H5Tclose(mem_id); /* Read the dataset back. Temporary buffer is for special platforms like * Cray */ - if(NULL == (tmp = HDmalloc(DIM0 * DIM1 * H5Tget_size(native_type)))) + if (NULL == (tmp = HDmalloc(DIM0 * DIM1 * H5Tget_size(native_type)))) TEST_ERROR; - if(NULL == (bkg = HDcalloc(sizeof(s1), DIM0 * DIM1))) + if (NULL == (bkg = HDcalloc(sizeof(s1), DIM0 * DIM1))) TEST_ERROR; - if(H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0) + if (H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0) TEST_ERROR; HDmemcpy(check, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); HDfree(tmp); tmp = NULL; - if(H5Tconvert(native_type, tid_m, (DIM0 * DIM1), check, bkg, H5P_DEFAULT) < 0) + if (H5Tconvert(native_type, tid_m, (DIM0 * DIM1), check, bkg, H5P_DEFAULT) < 0) TEST_ERROR; HDfree(bkg); bkg = NULL; /* Check that the values read are the same as the values written */ - for(i = 0, temp_point = points, temp_check = check; i < DIM0; i++) - for(j = 0; j < DIM1; j++, temp_point++, temp_check++) { - if(temp_point->c != temp_check->c || - temp_point->l != temp_check->l ) { + for (i = 0, temp_point = points, temp_check = check; i < DIM0; i++) + for (j = 0; j < DIM1; j++, temp_point++, temp_check++) { + if (temp_point->c != temp_check->c || temp_point->l != temp_check->l) { H5_FAILED(); HDprintf(" Read different values than written.\n"); HDprintf(" At index %d,%d\n", i, j); goto error; } /* end if */ - for(k = 0; k < 5; k++) { - if(temp_point->a[k] != temp_check->a[k]) { + for (k = 0; k < 5; k++) { + if (temp_point->a[k] != temp_check->a[k]) { H5_FAILED(); HDprintf(" Read different values than written.\n"); HDprintf(" At index %d,%d,%d\n", i, j, k); goto error; } /* end if */ - } /* end for */ - } /* end for */ + } /* end for */ + } /* end for */ H5Dclose(dataset); H5Tclose(dtype); @@ -972,16 +1047,17 @@ test_compound_dtype3(hid_t file) error: /* Free memory for test data */ - if(tmp) + if (tmp) HDfree(tmp); - if(bkg) + if (bkg) HDfree(bkg); - if(points) + if (points) HDfree(points); - if(check) + if (check) HDfree(check); - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Sclose(space); H5Tclose(mem_id); H5Tclose(nest_mem_id); @@ -992,12 +1068,12 @@ error: H5Tclose(tid2); H5Tclose(tid_m); H5Tclose(tid_m2); - } H5E_END_TRY; + } + H5E_END_TRY; return -1; } - /*------------------------------------------------------------------------- * Function: test_compound_opaque * @@ -1018,159 +1094,173 @@ static herr_t test_compound_opaque(hid_t file) { typedef struct { - char c; - unsigned char o[5]; - long long l; + char c; + unsigned char o[5]; + long long l; } s1; - hid_t dataset = -1, space = -1; - hid_t dtype = -1, native_type = -1, tid = -1, tid2 = -1, tid_m = -1, - mem_id = -1; - int i, j, k, n; - hsize_t dims[2]; - s1 *temp_point = NULL, *temp_check = NULL; - s1 *points = NULL, *check = NULL; - void *tmp = NULL, *bkg = NULL; + hid_t dataset = -1, space = -1; + hid_t dtype = -1, native_type = -1, tid = -1, tid2 = -1, tid_m = -1, mem_id = -1; + int i, j, k, n; + hsize_t dims[2]; + s1 * temp_point = NULL, *temp_check = NULL; + s1 * points = NULL, *check = NULL; + void * tmp = NULL, *bkg = NULL; TESTING("compound datatype with opaque field"); /* Allocate space for the points & check arrays */ - if(NULL == (points = (s1 *)HDmalloc(sizeof(s1) * DIM0 * DIM1))) + if (NULL == (points = (s1 *)HDmalloc(sizeof(s1) * DIM0 * DIM1))) TEST_ERROR; - if(NULL == (check = (s1 *)HDcalloc(sizeof(s1), DIM0 * DIM1))) + if (NULL == (check = (s1 *)HDcalloc(sizeof(s1), DIM0 * DIM1))) TEST_ERROR; /* Initialize the dataset */ - for(i = n = 0, temp_point = points; i < DIM0; i++) - for(j = 0; j < DIM1; j++, temp_point++) { + for (i = n = 0, temp_point = points; i < DIM0; i++) + for (j = 0; j < DIM1; j++, temp_point++) { temp_point->c = 't'; temp_point->l = (i * 10 + j * 100) * n; - for(k = 0; k < 5; k++) + for (k = 0; k < 5; k++) (temp_point->o)[k] = (unsigned char)(n++); } /* end for */ /* Create the data space */ dims[0] = DIM0; dims[1] = DIM1; - if((space = H5Screate_simple(2, dims, NULL)) < 0) TEST_ERROR; + if ((space = H5Screate_simple(2, dims, NULL)) < 0) + TEST_ERROR; /* Create opaque datatype */ - if((tid2 = H5Tcreate(H5T_OPAQUE, sizeof(temp_point->o))) < 0) TEST_ERROR; - if(H5Tset_tag(tid2, "testing opaque field") < 0) TEST_ERROR; + if ((tid2 = H5Tcreate(H5T_OPAQUE, sizeof(temp_point->o))) < 0) + TEST_ERROR; + if (H5Tset_tag(tid2, "testing opaque field") < 0) + TEST_ERROR; /* Create compound datatype for disk storage */ - if((tid = H5Tcreate(H5T_COMPOUND, 14)) < 0) TEST_ERROR; + if ((tid = H5Tcreate(H5T_COMPOUND, 14)) < 0) + TEST_ERROR; /* Insert members */ - if(H5Tinsert(tid, "c", 0, H5T_STD_U8LE) < 0) TEST_ERROR; - if(H5Tinsert(tid, "o", 1, tid2) < 0) TEST_ERROR; - if(H5Tinsert(tid, "l", 6, H5T_STD_I64BE) < 0) TEST_ERROR; + if (H5Tinsert(tid, "c", 0, H5T_STD_U8LE) < 0) + TEST_ERROR; + if (H5Tinsert(tid, "o", 1, tid2) < 0) + TEST_ERROR; + if (H5Tinsert(tid, "l", 6, H5T_STD_I64BE) < 0) + TEST_ERROR; /* Create the dataset */ - if((dataset = H5Dcreate2(file, DSET_COMPOUND_NAME_4, tid, space, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if ((dataset = + H5Dcreate2(file, DSET_COMPOUND_NAME_4, tid, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; /* Create compound datatype for datatype in memory */ - if((tid_m = H5Tcreate(H5T_COMPOUND, sizeof(s1))) < 0) TEST_ERROR; - if(H5Tinsert(tid_m, "c", HOFFSET(s1, c), H5T_NATIVE_UCHAR) < 0) TEST_ERROR; - if(H5Tinsert(tid_m, "o", HOFFSET(s1, o), tid2) < 0) TEST_ERROR; - if(H5Tinsert(tid_m, "l", HOFFSET(s1, l), H5T_NATIVE_LLONG) < 0) TEST_ERROR; + if ((tid_m = H5Tcreate(H5T_COMPOUND, sizeof(s1))) < 0) + TEST_ERROR; + if (H5Tinsert(tid_m, "c", HOFFSET(s1, c), H5T_NATIVE_UCHAR) < 0) + TEST_ERROR; + if (H5Tinsert(tid_m, "o", HOFFSET(s1, o), tid2) < 0) + TEST_ERROR; + if (H5Tinsert(tid_m, "l", HOFFSET(s1, l), H5T_NATIVE_LLONG) < 0) + TEST_ERROR; /* Write the data to the dataset */ - if(H5Dwrite(dataset, tid_m, H5S_ALL, H5S_ALL, H5P_DEFAULT, points) < 0) + if (H5Dwrite(dataset, tid_m, H5S_ALL, H5S_ALL, H5P_DEFAULT, points) < 0) TEST_ERROR; /* Close dataset */ - if(H5Dclose(dataset) < 0) TEST_ERROR; + if (H5Dclose(dataset) < 0) + TEST_ERROR; /* Close datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR; - if(H5Tclose(tid2) < 0) TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Tclose(tid2) < 0) + TEST_ERROR; /* Close dataspace */ - if(H5Sclose(space) < 0) TEST_ERROR; - + if (H5Sclose(space) < 0) + TEST_ERROR; /* Open dataset again to check H5Tget_native_type */ - if((dataset = H5Dopen2(file, DSET_COMPOUND_NAME_4, H5P_DEFAULT)) < 0) TEST_ERROR; + if ((dataset = H5Dopen2(file, DSET_COMPOUND_NAME_4, H5P_DEFAULT)) < 0) + TEST_ERROR; - if((dtype = H5Dget_type(dataset)) < 0) TEST_ERROR; + if ((dtype = H5Dget_type(dataset)) < 0) + TEST_ERROR; - if((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) + if ((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) TEST_ERROR; /* Verify the datatype of each field retrieved and converted */ /* check the char member */ - if((mem_id = H5Tget_member_type(native_type, 0)) < 0) + if ((mem_id = H5Tget_member_type(native_type, 0)) < 0) TEST_ERROR; - if(H5Tget_order(mem_id) != H5Tget_order(H5T_NATIVE_UCHAR)) + if (H5Tget_order(mem_id) != H5Tget_order(H5T_NATIVE_UCHAR)) TEST_ERROR; - if(H5Tget_size(mem_id) < H5Tget_size(H5T_STD_U8LE)) + if (H5Tget_size(mem_id) < H5Tget_size(H5T_STD_U8LE)) TEST_ERROR; - if(H5T_INTEGER!=H5Tget_class(mem_id)) + if (H5T_INTEGER != H5Tget_class(mem_id)) TEST_ERROR; H5Tclose(mem_id); /* check the array member */ - if((mem_id = H5Tget_member_type(native_type, 1)) < 0) + if ((mem_id = H5Tget_member_type(native_type, 1)) < 0) TEST_ERROR; - if(H5T_OPAQUE!=H5Tget_class(mem_id)) + if (H5T_OPAQUE != H5Tget_class(mem_id)) TEST_ERROR; - if(H5Tget_size(mem_id) != sizeof(temp_point->o)) + if (H5Tget_size(mem_id) != sizeof(temp_point->o)) TEST_ERROR; H5Tclose(mem_id); /* check the long long member */ - if((mem_id = H5Tget_member_type(native_type, 2)) < 0) + if ((mem_id = H5Tget_member_type(native_type, 2)) < 0) TEST_ERROR; - if(H5Tget_order(mem_id) != H5Tget_order(H5T_NATIVE_LLONG)) + if (H5Tget_order(mem_id) != H5Tget_order(H5T_NATIVE_LLONG)) TEST_ERROR; - if(H5Tget_size(mem_id) < H5Tget_size(H5T_STD_I64BE)) + if (H5Tget_size(mem_id) < H5Tget_size(H5T_STD_I64BE)) TEST_ERROR; - if(H5T_INTEGER!=H5Tget_class(mem_id)) + if (H5T_INTEGER != H5Tget_class(mem_id)) TEST_ERROR; H5Tclose(mem_id); /* Read the dataset back. Temporary buffer is for special platforms like * Cray */ - if(NULL == (tmp = HDmalloc(DIM0 * DIM1 * H5Tget_size(native_type)))) + if (NULL == (tmp = HDmalloc(DIM0 * DIM1 * H5Tget_size(native_type)))) TEST_ERROR; - if(NULL == (bkg = HDcalloc(sizeof(s1), DIM0 * DIM1))) + if (NULL == (bkg = HDcalloc(sizeof(s1), DIM0 * DIM1))) TEST_ERROR; - if(H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0) + if (H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0) TEST_ERROR; HDmemcpy(check, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); HDfree(tmp); tmp = NULL; - if(H5Tconvert(native_type, tid_m, (DIM0 * DIM1), check, bkg, H5P_DEFAULT) < 0) + if (H5Tconvert(native_type, tid_m, (DIM0 * DIM1), check, bkg, H5P_DEFAULT) < 0) TEST_ERROR; HDfree(bkg); bkg = NULL; /* Check that the values read are the same as the values written */ - for(i = 0, temp_point = points, temp_check = check; i < DIM0; i++) - for(j = 0; j < DIM1; j++, temp_point++, temp_check++) { - if(temp_point->c != temp_check->c || - temp_point->l != temp_check->l ) { + for (i = 0, temp_point = points, temp_check = check; i < DIM0; i++) + for (j = 0; j < DIM1; j++, temp_point++, temp_check++) { + if (temp_point->c != temp_check->c || temp_point->l != temp_check->l) { H5_FAILED(); HDprintf(" Read different values than written.\n"); HDprintf(" At index %d,%d\n", i, j); goto error; } /* end if */ - for(k = 0; k < 5; k++) { - if(temp_point->o[k] != temp_check->o[k]) { + for (k = 0; k < 5; k++) { + if (temp_point->o[k] != temp_check->o[k]) { H5_FAILED(); HDprintf(" Read different values than written.\n"); HDprintf(" At index %d,%d,%d\n", i, j, k); goto error; } /* end if */ - } /* end for */ - } /* end for */ + } /* end for */ + } /* end for */ H5Dclose(dataset); H5Tclose(dtype); @@ -1186,16 +1276,17 @@ test_compound_opaque(hid_t file) error: /* Free memory for test data */ - if(tmp) + if (tmp) HDfree(tmp); - if(bkg) + if (bkg) HDfree(bkg); - if(points) + if (points) HDfree(points); - if(check) + if (check) HDfree(check); - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Sclose(space); H5Tclose(mem_id); H5Dclose(dataset); @@ -1204,12 +1295,12 @@ error: H5Tclose(tid); H5Tclose(tid2); H5Tclose(tid_m); - } H5E_END_TRY; + } + H5E_END_TRY; return -1; } - /*------------------------------------------------------------------------- * Function: test_enum_dtype * @@ -1229,101 +1320,102 @@ error: static herr_t test_enum_dtype(hid_t file) { - hid_t dataset = -1, space = -1; - hid_t tid = -1, tid_m = -1, dtype = -1, native_type = -1; - int i, j, n; - hsize_t dims[2]; - void *tmp = NULL; - short colors[8]; + hid_t dataset = -1, space = -1; + hid_t tid = -1, tid_m = -1, dtype = -1, native_type = -1; + int i, j, n; + hsize_t dims[2]; + void * tmp = NULL; + short colors[8]; unsigned char sub_colors[16]; - const char *mname[] = { "RED", - "GREEN", - "BLUE", - "YELLOW", - "PINK", - "PURPLE", - "ORANGE", - "WHITE" }; + const char * mname[] = {"RED", "GREEN", "BLUE", "YELLOW", "PINK", "PURPLE", "ORANGE", "WHITE"}; TESTING("enum datatype"); /* Initialize the dataset */ - for(i = 0; i < DIM0; i++) - for(j = 0, n = 0; j < DIM1; j++, n++) + for (i = 0; i < DIM0; i++) + for (j = 0, n = 0; j < DIM1; j++, n++) spoints2[i][j] = (short)((i * 10 + j * 100 + n) % 8); /* Create the data space */ dims[0] = DIM0; dims[1] = DIM1; - if((space = H5Screate_simple(2, dims, NULL)) < 0) TEST_ERROR; + if ((space = H5Screate_simple(2, dims, NULL)) < 0) + TEST_ERROR; /* Construct enum type based on native type */ - if((tid = H5Tenum_create(H5T_STD_I16LE)) < 0) TEST_ERROR; + if ((tid = H5Tenum_create(H5T_STD_I16LE)) < 0) + TEST_ERROR; - for(i = 0; i < 8; i++) { - sub_colors[i * 2] = (unsigned char)i; + for (i = 0; i < 8; i++) { + sub_colors[i * 2] = (unsigned char)i; sub_colors[i * 2 + 1] = 0; - if(H5Tenum_insert(tid, mname[i], &(sub_colors[i*2])) < 0) TEST_ERROR; + if (H5Tenum_insert(tid, mname[i], &(sub_colors[i * 2])) < 0) + TEST_ERROR; } /* end for */ /* Create the dataset */ - if((dataset = H5Dcreate2(file, DSET_ENUM_NAME, tid, space, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if ((dataset = H5Dcreate2(file, DSET_ENUM_NAME, tid, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; /* Construct enum type based on native type in memory */ - if((tid_m = H5Tenum_create(H5T_NATIVE_SHORT)) < 0) TEST_ERROR; + if ((tid_m = H5Tenum_create(H5T_NATIVE_SHORT)) < 0) + TEST_ERROR; - for(i = 0; i < 8; i++) { + for (i = 0; i < 8; i++) { colors[i] = (short)i; - if(H5Tenum_insert(tid_m, mname[i], &(colors[i])) < 0) TEST_ERROR; + if (H5Tenum_insert(tid_m, mname[i], &(colors[i])) < 0) + TEST_ERROR; } /* end for */ /* Write the data to the dataset */ - if(H5Dwrite(dataset, tid_m, H5S_ALL, H5S_ALL, H5P_DEFAULT, spoints2) < 0) + if (H5Dwrite(dataset, tid_m, H5S_ALL, H5S_ALL, H5P_DEFAULT, spoints2) < 0) TEST_ERROR; /* Close dataset */ - if(H5Dclose(dataset) < 0) TEST_ERROR; + if (H5Dclose(dataset) < 0) + TEST_ERROR; /* Close datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; /* Close dataspace */ - if(H5Sclose(space) < 0) TEST_ERROR; + if (H5Sclose(space) < 0) + TEST_ERROR; /* Open dataset again to check H5Tget_native_type */ - if((dataset = H5Dopen2(file, DSET_ENUM_NAME, H5P_DEFAULT)) < 0) TEST_ERROR; + if ((dataset = H5Dopen2(file, DSET_ENUM_NAME, H5P_DEFAULT)) < 0) + TEST_ERROR; - if((dtype = H5Dget_type(dataset)) < 0) TEST_ERROR; + if ((dtype = H5Dget_type(dataset)) < 0) + TEST_ERROR; - if((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) + if ((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) TEST_ERROR; /* Read the dataset back. Temporary buffer is for special platforms like * Cray */ - if(NULL == (tmp = HDmalloc(DIM0 * DIM1 * H5Tget_size(native_type)))) + if (NULL == (tmp = HDmalloc(DIM0 * DIM1 * H5Tget_size(native_type)))) TEST_ERROR - if(H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0) + if (H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0) TEST_ERROR; HDmemcpy(scheck2, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); HDfree(tmp); tmp = NULL; - if(H5Tconvert(native_type, tid_m, (DIM0 * DIM1), scheck2, NULL, H5P_DEFAULT) < 0) + if (H5Tconvert(native_type, tid_m, (DIM0 * DIM1), scheck2, NULL, H5P_DEFAULT) < 0) TEST_ERROR; /* Check that the values read are the same as the values written */ - for(i = 0; i < DIM0; i++) - for(j = 0; j < DIM1; j++) - if(spoints2[i][j] != scheck2[i][j]) { + for (i = 0; i < DIM0; i++) + for (j = 0; j < DIM1; j++) + if (spoints2[i][j] != scheck2[i][j]) { H5_FAILED(); HDprintf(" Read different values than written.\n"); HDprintf(" At index %d,%d\n", i, j); - HDprintf(" spoints2[i][j]=%hd, scheck2[i][j]=%hd\n", spoints2[i][j], - scheck2[i][j]); + HDprintf(" spoints2[i][j]=%hd, scheck2[i][j]=%hd\n", spoints2[i][j], scheck2[i][j]); goto error; } /* end if */ @@ -1336,22 +1428,23 @@ test_enum_dtype(hid_t file) error: /* Free memory for test data */ - if(tmp) + if (tmp) HDfree(tmp); - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Sclose(space); H5Dclose(dataset); H5Tclose(dtype); H5Tclose(native_type); H5Tclose(tid); H5Tclose(tid_m); - } H5E_END_TRY; + } + H5E_END_TRY; return -1; } - /*------------------------------------------------------------------------- * Function: test_array_dtype * @@ -1372,109 +1465,124 @@ static herr_t test_array_dtype(hid_t file) { typedef struct { - char c; - int i; + char c; + int i; long long l; } s1; - hid_t dataset = -1, space = -1; - hid_t dtype = -1, native_type = -1, tid = -1, tid2 = -1, tid3 = -1, tid_m = -1; - int i, j, k, n; - hsize_t space_dims[2], array_dims[1]={5}; - s1 *temp_point = NULL, *temp_check = NULL; - s1 *points = NULL, *check = NULL; - void *tmp = NULL; + hid_t dataset = -1, space = -1; + hid_t dtype = -1, native_type = -1, tid = -1, tid2 = -1, tid3 = -1, tid_m = -1; + int i, j, k, n; + hsize_t space_dims[2], array_dims[1] = {5}; + s1 * temp_point = NULL, *temp_check = NULL; + s1 * points = NULL, *check = NULL; + void * tmp = NULL; TESTING("array of compound datatype"); /* Allocate space for the points & check arrays */ - if(NULL == (points = (s1 *)HDmalloc(sizeof(s1) * DIM0 * DIM1 * 5))) + if (NULL == (points = (s1 *)HDmalloc(sizeof(s1) * DIM0 * DIM1 * 5))) TEST_ERROR; - if(NULL == (check = (s1 *)HDcalloc(sizeof(s1), DIM0 * DIM1 * 5))) + if (NULL == (check = (s1 *)HDcalloc(sizeof(s1), DIM0 * DIM1 * 5))) TEST_ERROR; /* Initialize the dataset */ - for(i = n = 0, temp_point = points; i < DIM0; i++) - for(j = 0; j < DIM1; j++) - for(k = 0; k < 5; k++,temp_point++) { - temp_point->c= 't'; - temp_point->i= n++; - temp_point->l= (i * 10 + j * 100) * n; + for (i = n = 0, temp_point = points; i < DIM0; i++) + for (j = 0; j < DIM1; j++) + for (k = 0; k < 5; k++, temp_point++) { + temp_point->c = 't'; + temp_point->i = n++; + temp_point->l = (i * 10 + j * 100) * n; } /* end for */ /* Create the data space */ space_dims[0] = DIM0; space_dims[1] = DIM1; - if((space = H5Screate_simple(2, space_dims, NULL)) < 0) TEST_ERROR; + if ((space = H5Screate_simple(2, space_dims, NULL)) < 0) + TEST_ERROR; /* Create compound datatype for disk storage */ - if((tid2 = H5Tcreate(H5T_COMPOUND, 13)) < 0) TEST_ERROR; + if ((tid2 = H5Tcreate(H5T_COMPOUND, 13)) < 0) + TEST_ERROR; /* Insert members */ - if(H5Tinsert(tid2, "c", 0, H5T_STD_U8BE) < 0) TEST_ERROR; - if(H5Tinsert(tid2, "i", 1, H5T_STD_U32LE) < 0) TEST_ERROR; - if(H5Tinsert(tid2, "l", 5, H5T_STD_I64BE) < 0) TEST_ERROR; + if (H5Tinsert(tid2, "c", 0, H5T_STD_U8BE) < 0) + TEST_ERROR; + if (H5Tinsert(tid2, "i", 1, H5T_STD_U32LE) < 0) + TEST_ERROR; + if (H5Tinsert(tid2, "l", 5, H5T_STD_I64BE) < 0) + TEST_ERROR; /* Create array datatype for disk storage */ - if((tid = H5Tarray_create2(tid2, 1, array_dims)) < 0) TEST_ERROR; + if ((tid = H5Tarray_create2(tid2, 1, array_dims)) < 0) + TEST_ERROR; /* Create the dataset */ - if((dataset = H5Dcreate2(file, DSET_ARRAY_NAME, tid, space, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if ((dataset = H5Dcreate2(file, DSET_ARRAY_NAME, tid, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; /* Create compound datatype for datatype in memory */ - if((tid3 = H5Tcreate(H5T_COMPOUND, sizeof(s1))) < 0) TEST_ERROR; - if(H5Tinsert(tid3, "c", HOFFSET(s1, c), H5T_NATIVE_UCHAR) < 0) TEST_ERROR; - if(H5Tinsert(tid3, "i", HOFFSET(s1, i), H5T_NATIVE_UINT) < 0) TEST_ERROR; - if(H5Tinsert(tid3, "l", HOFFSET(s1, l), H5T_NATIVE_LLONG) < 0) TEST_ERROR; + if ((tid3 = H5Tcreate(H5T_COMPOUND, sizeof(s1))) < 0) + TEST_ERROR; + if (H5Tinsert(tid3, "c", HOFFSET(s1, c), H5T_NATIVE_UCHAR) < 0) + TEST_ERROR; + if (H5Tinsert(tid3, "i", HOFFSET(s1, i), H5T_NATIVE_UINT) < 0) + TEST_ERROR; + if (H5Tinsert(tid3, "l", HOFFSET(s1, l), H5T_NATIVE_LLONG) < 0) + TEST_ERROR; /* Create array datatype for memory */ - if((tid_m = H5Tarray_create2(tid3, 1, array_dims)) < 0) TEST_ERROR; + if ((tid_m = H5Tarray_create2(tid3, 1, array_dims)) < 0) + TEST_ERROR; /* Write the data to the dataset */ - if(H5Dwrite(dataset, tid_m, H5S_ALL, H5S_ALL, H5P_DEFAULT, points) < 0) + if (H5Dwrite(dataset, tid_m, H5S_ALL, H5S_ALL, H5P_DEFAULT, points) < 0) TEST_ERROR; /* Close dataset */ - if(H5Dclose(dataset) < 0) TEST_ERROR; + if (H5Dclose(dataset) < 0) + TEST_ERROR; /* Close datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR; - if(H5Tclose(tid2) < 0) TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; + if (H5Tclose(tid2) < 0) + TEST_ERROR; /* Close dataspace */ - if(H5Sclose(space) < 0) TEST_ERROR; + if (H5Sclose(space) < 0) + TEST_ERROR; /* Open dataset again to check H5Tget_native_type */ - if((dataset = H5Dopen2(file, DSET_ARRAY_NAME, H5P_DEFAULT)) < 0) TEST_ERROR; + if ((dataset = H5Dopen2(file, DSET_ARRAY_NAME, H5P_DEFAULT)) < 0) + TEST_ERROR; - if((dtype = H5Dget_type(dataset)) < 0) TEST_ERROR; + if ((dtype = H5Dget_type(dataset)) < 0) + TEST_ERROR; - if((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) + if ((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) TEST_ERROR; /* Read the dataset back. Temporary buffer is for special platforms like * Cray */ - if(NULL == (tmp = HDmalloc(DIM0 * DIM1 * H5Tget_size(native_type)))) + if (NULL == (tmp = HDmalloc(DIM0 * DIM1 * H5Tget_size(native_type)))) TEST_ERROR - if(H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0) + if (H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0) TEST_ERROR; HDmemcpy(check, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); HDfree(tmp); tmp = NULL; - if(H5Tconvert(native_type, tid_m, (DIM0 * DIM1), check, NULL, H5P_DEFAULT) < 0) + if (H5Tconvert(native_type, tid_m, (DIM0 * DIM1), check, NULL, H5P_DEFAULT) < 0) TEST_ERROR; /* Check that the values read are the same as the values written */ - for(i = 0, temp_point = points, temp_check = check; i < DIM0; i++) - for(j = 0; j < DIM1; j++) - for(k = 0; k < 5; k++, temp_point++, temp_check++) - if(temp_point->c != temp_check->c || - temp_point->i != temp_check->i || - temp_point->l != temp_check->l ) { + for (i = 0, temp_point = points, temp_check = check; i < DIM0; i++) + for (j = 0; j < DIM1; j++) + for (k = 0; k < 5; k++, temp_point++, temp_check++) + if (temp_point->c != temp_check->c || temp_point->i != temp_check->i || + temp_point->l != temp_check->l) { H5_FAILED(); HDprintf(" Read different values than written.\n"); HDprintf(" At index %d,%d\n", i, j); @@ -1482,11 +1590,16 @@ test_array_dtype(hid_t file) } /* end if */ /* Close HDF5 objects */ - if(H5Dclose(dataset)) TEST_ERROR; - if(H5Tclose(native_type)) TEST_ERROR; - if(H5Tclose(dtype)) TEST_ERROR; - if(H5Tclose(tid_m) < 0) TEST_ERROR; - if(H5Tclose(tid3) < 0) TEST_ERROR; + if (H5Dclose(dataset)) + TEST_ERROR; + if (H5Tclose(native_type)) + TEST_ERROR; + if (H5Tclose(dtype)) + TEST_ERROR; + if (H5Tclose(tid_m) < 0) + TEST_ERROR; + if (H5Tclose(tid3) < 0) + TEST_ERROR; /* Free memory for test data */ HDfree(points); @@ -1497,14 +1610,15 @@ test_array_dtype(hid_t file) error: /* Free memory for test data */ - if(tmp) + if (tmp) HDfree(tmp); - if(points) + if (points) HDfree(points); - if(check) + if (check) HDfree(check); - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Sclose(space); H5Dclose(dataset); H5Tclose(dtype); @@ -1513,12 +1627,12 @@ error: H5Tclose(tid2); H5Tclose(tid3); H5Tclose(tid_m); - } H5E_END_TRY; + } + H5E_END_TRY; return -1; } - /*------------------------------------------------------------------------- * Function: test_array_dtype2 * @@ -1538,77 +1652,84 @@ error: static herr_t test_array_dtype2(hid_t file) { - hid_t dataset = -1, space = -1; - hid_t dtype = -1, native_type = -1, tid = -1, tid_m = -1; - int i, j, k, n; - hsize_t space_dims[2], array_dims[1] = {5}; - void *tmp = NULL; + hid_t dataset = -1, space = -1; + hid_t dtype = -1, native_type = -1, tid = -1, tid_m = -1; + int i, j, k, n; + hsize_t space_dims[2], array_dims[1] = {5}; + void * tmp = NULL; TESTING("array of atomic datatype"); /* Initialize the dataset */ - for(i = n = 0;i < DIM0; i++) - for(j = 0; j < DIM1; j++) - for(k = 0; k < 5; k++) + for (i = n = 0; i < DIM0; i++) + for (j = 0; j < DIM1; j++) + for (k = 0; k < 5; k++) ipoints3[i][j][k] = n++; /* Create the data space */ space_dims[0] = DIM0; space_dims[1] = DIM1; - if((space = H5Screate_simple(2, space_dims, NULL)) < 0) TEST_ERROR; + if ((space = H5Screate_simple(2, space_dims, NULL)) < 0) + TEST_ERROR; /* Create array datatype for disk storage */ - if((tid = H5Tarray_create2(H5T_STD_I32LE, 1, array_dims)) < 0) TEST_ERROR; + if ((tid = H5Tarray_create2(H5T_STD_I32LE, 1, array_dims)) < 0) + TEST_ERROR; /* Create the dataset */ - if((dataset = H5Dcreate2(file, DSET_ARRAY2_NAME, tid, space, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if ((dataset = H5Dcreate2(file, DSET_ARRAY2_NAME, tid, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; /* Create array datatype for memory */ - if((tid_m = H5Tarray_create2(H5T_NATIVE_INT, 1, array_dims)) < 0) TEST_ERROR; + if ((tid_m = H5Tarray_create2(H5T_NATIVE_INT, 1, array_dims)) < 0) + TEST_ERROR; /* Write the data to the dataset */ - if(H5Dwrite(dataset, tid_m, H5S_ALL, H5S_ALL, H5P_DEFAULT, ipoints3) < 0) + if (H5Dwrite(dataset, tid_m, H5S_ALL, H5S_ALL, H5P_DEFAULT, ipoints3) < 0) TEST_ERROR; /* Close dataset */ - if(H5Dclose(dataset) < 0) TEST_ERROR; + if (H5Dclose(dataset) < 0) + TEST_ERROR; /* Close datatype */ - if(H5Tclose(tid) < 0) TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; /* Close dataspace */ - if(H5Sclose(space) < 0) TEST_ERROR; + if (H5Sclose(space) < 0) + TEST_ERROR; /* Open dataset again to check H5Tget_native_type */ - if((dataset = H5Dopen2(file, DSET_ARRAY2_NAME, H5P_DEFAULT)) < 0) TEST_ERROR; + if ((dataset = H5Dopen2(file, DSET_ARRAY2_NAME, H5P_DEFAULT)) < 0) + TEST_ERROR; - if((dtype = H5Dget_type(dataset)) < 0) TEST_ERROR; + if ((dtype = H5Dget_type(dataset)) < 0) + TEST_ERROR; - if((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) + if ((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) TEST_ERROR; /* Read the dataset back. Temporary buffer is for special platforms like * Cray */ - if(NULL == (tmp = HDmalloc(DIM0 * DIM1 * H5Tget_size(native_type)))) + if (NULL == (tmp = HDmalloc(DIM0 * DIM1 * H5Tget_size(native_type)))) TEST_ERROR - if(H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0) + if (H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0) TEST_ERROR; HDmemcpy(icheck3, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); HDfree(tmp); tmp = NULL; - if(H5Tconvert(native_type, tid_m, (DIM0 * DIM1), icheck3, NULL, H5P_DEFAULT) < 0) + if (H5Tconvert(native_type, tid_m, (DIM0 * DIM1), icheck3, NULL, H5P_DEFAULT) < 0) TEST_ERROR; /* Check that the values read are the same as the values written */ - for(i = 0; i < DIM0; i++) - for(j = 0; j < DIM1; j++) - for(k = 0; k < 5; k++) - if(icheck3[i][j][k] != ipoints3[i][j][k]) { + for (i = 0; i < DIM0; i++) + for (j = 0; j < DIM1; j++) + for (k = 0; k < 5; k++) + if (icheck3[i][j][k] != ipoints3[i][j][k]) { H5_FAILED(); HDprintf(" Read different values than written.\n"); HDprintf(" At index %d,%d\n", i, j); @@ -1616,32 +1737,37 @@ test_array_dtype2(hid_t file) } /* end if */ /* Close HDF5 objects */ - if(H5Dclose(dataset)) TEST_ERROR; - if(H5Tclose(native_type)) TEST_ERROR; - if(H5Tclose(dtype)) TEST_ERROR; - if(H5Tclose(tid_m) < 0) TEST_ERROR; + if (H5Dclose(dataset)) + TEST_ERROR; + if (H5Tclose(native_type)) + TEST_ERROR; + if (H5Tclose(dtype)) + TEST_ERROR; + if (H5Tclose(tid_m) < 0) + TEST_ERROR; PASSED(); return 0; error: /* Free memory for test data */ - if(tmp) + if (tmp) HDfree(tmp); - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Sclose(space); H5Dclose(dataset); H5Tclose(dtype); H5Tclose(native_type); H5Tclose(tid); H5Tclose(tid_m); - } H5E_END_TRY; + } + H5E_END_TRY; return -1; } - /*------------------------------------------------------------------------- * Function: test_vl_dtype * @@ -1661,153 +1787,175 @@ error: static herr_t test_vl_dtype(hid_t file) { - hvl_t wdata[SPACE1_DIM1]; /* Information to write */ - hvl_t rdata[SPACE1_DIM1]; /* Information read in */ - hvl_t *t1, *t2; /* Temporary pointer to VL information */ - hsize_t dims1[] = {SPACE1_DIM1}; - hid_t dataset = -1, space = -1; - hid_t dtype = -1, native_type = -1, nat_super_type = -1, tid = -1, tid2 = -1, tid_m = -1, tid_m2 = -1; - size_t i, j, k; - void **tmp = NULL; + hvl_t wdata[SPACE1_DIM1]; /* Information to write */ + hvl_t rdata[SPACE1_DIM1]; /* Information read in */ + hvl_t * t1, *t2; /* Temporary pointer to VL information */ + hsize_t dims1[] = {SPACE1_DIM1}; + hid_t dataset = -1, space = -1; + hid_t dtype = -1, native_type = -1, nat_super_type = -1, tid = -1, tid2 = -1, tid_m = -1, tid_m2 = -1; + size_t i, j, k; + void ** tmp = NULL; TESTING("variable length datatype"); /* Allocate and initialize VL data to write */ - for(i = 0; i < SPACE1_DIM1; i++) { + for (i = 0; i < SPACE1_DIM1; i++) { wdata[i].p = HDmalloc((i + 1) * sizeof(hvl_t)); - if(NULL == wdata[i].p) { + if (NULL == wdata[i].p) { H5_FAILED(); - HDprintf(" Cannot allocate memory for VL data! i=%u\n",(unsigned)i); + HDprintf(" Cannot allocate memory for VL data! i=%u\n", (unsigned)i); goto error; } /* end if */ wdata[i].len = i + 1; - for(t1 = (hvl_t *)wdata[i].p, j = 0; j < (i + 1); j++, t1++) { + for (t1 = (hvl_t *)wdata[i].p, j = 0; j < (i + 1); j++, t1++) { t1->p = HDmalloc((j + 1) * sizeof(unsigned int)); - if(NULL == t1->p) { + if (NULL == t1->p) { H5_FAILED(); - HDprintf(" Cannot allocate memory for VL data! i=%u, j=%u\n",(unsigned)i,(unsigned)j); + HDprintf(" Cannot allocate memory for VL data! i=%u, j=%u\n", (unsigned)i, (unsigned)j); goto error; } /* end if */ t1->len = j + 1; - for(k = 0; k < (j + 1); k++) + for (k = 0; k < (j + 1); k++) ((unsigned int *)t1->p)[k] = (unsigned int)(i * 100 + j * 10 + k); } /* end for */ - } /* end for */ + } /* end for */ /* Create dataspace for datasets */ - if((space = H5Screate_simple(SPACE1_RANK, dims1, NULL)) < 0) TEST_ERROR; + if ((space = H5Screate_simple(SPACE1_RANK, dims1, NULL)) < 0) + TEST_ERROR; /* Create the base VL type */ - if((tid2 = H5Tvlen_create (H5T_STD_U32LE)) < 0) TEST_ERROR; + if ((tid2 = H5Tvlen_create(H5T_STD_U32LE)) < 0) + TEST_ERROR; /* Create a VL datatype for disk storage */ - if((tid = H5Tvlen_create(tid2)) < 0) TEST_ERROR + if ((tid = H5Tvlen_create(tid2)) < 0) + TEST_ERROR /* Create a dataset */ - if((dataset = H5Dcreate2(file, DSET_VL_NAME, tid, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if ((dataset = H5Dcreate2(file, DSET_VL_NAME, tid, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; /* Create a base VL datatype for memory */ - if((tid_m2 = H5Tvlen_create(H5T_NATIVE_UINT)) < 0) TEST_ERROR; + if ((tid_m2 = H5Tvlen_create(H5T_NATIVE_UINT)) < 0) + TEST_ERROR; /* Create a VL datatype for memory */ - if((tid_m = H5Tvlen_create (tid_m2)) < 0) TEST_ERROR; + if ((tid_m = H5Tvlen_create(tid_m2)) < 0) + TEST_ERROR; /* Write dataset to disk */ - if(H5Dwrite(dataset, tid_m, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata) < 0) TEST_ERROR; + if (H5Dwrite(dataset, tid_m, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata) < 0) + TEST_ERROR; /* Close Dataset */ - if(H5Dclose(dataset) < 0) TEST_ERROR; + if (H5Dclose(dataset) < 0) + TEST_ERROR; /* Close datatype */ - if(H5Tclose(tid2) < 0) TEST_ERROR; - if(H5Tclose(tid) < 0) TEST_ERROR; + if (H5Tclose(tid2) < 0) + TEST_ERROR; + if (H5Tclose(tid) < 0) + TEST_ERROR; /* Open a dataset */ - if((dataset = H5Dopen2(file, DSET_VL_NAME, H5P_DEFAULT)) < 0) TEST_ERROR; + if ((dataset = H5Dopen2(file, DSET_VL_NAME, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Get native datatype for dataset */ - if((dtype = H5Dget_type(dataset)) < 0) TEST_ERROR; + if ((dtype = H5Dget_type(dataset)) < 0) + TEST_ERROR; - if((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) + if ((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) TEST_ERROR; /* Also get native base type for this nested VL type. Should be an integer type. */ - if((nat_super_type = H5Tget_super(native_type)) < 0) + if ((nat_super_type = H5Tget_super(native_type)) < 0) TEST_ERROR; - if((nat_super_type = H5Tget_super(nat_super_type)) < 0) + if ((nat_super_type = H5Tget_super(nat_super_type)) < 0) TEST_ERROR; /* Read dataset from disk */ - if(H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata) < 0) TEST_ERROR; + if (H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata) < 0) + TEST_ERROR; /* Compare data read in */ - for(i = 0; i < SPACE1_DIM1; i++) { - if(wdata[i].len != rdata[i].len) { + for (i = 0; i < SPACE1_DIM1; i++) { + if (wdata[i].len != rdata[i].len) { H5_FAILED(); - HDprintf(" VL data length don't match!, wdata[%d].len=%d, rdata[%d].len=%d\n",(int)i,(int)wdata[i].len,(int)i,(int)rdata[i].len); + HDprintf(" VL data length don't match!, wdata[%d].len=%d, rdata[%d].len=%d\n", (int)i, + (int)wdata[i].len, (int)i, (int)rdata[i].len); goto error; } /* end if */ - for(t1 = (hvl_t *)wdata[i].p, t2 = (hvl_t *)rdata[i].p, j = 0; j < rdata[i].len; j++, t1++, t2++) { - if(t1->len != t2->len) { + for (t1 = (hvl_t *)wdata[i].p, t2 = (hvl_t *)rdata[i].p, j = 0; j < rdata[i].len; j++, t1++, t2++) { + if (t1->len != t2->len) { H5_FAILED(); - HDprintf(" VL data length don't match!, wdata[%d].len=%d, rdata[%d].len=%d\n",(int)i,(int)wdata[i].len,(int)i,(int)rdata[i].len); + HDprintf(" VL data length don't match!, wdata[%d].len=%d, rdata[%d].len=%d\n", (int)i, + (int)wdata[i].len, (int)i, (int)rdata[i].len); goto error; } /* end if */ /* use temporary buffer to convert datatype. This is for special * platforms like Cray */ - if(NULL == (tmp = (void **)HDmalloc(t2->len * sizeof(unsigned int)))) + if (NULL == (tmp = (void **)HDmalloc(t2->len * sizeof(unsigned int)))) TEST_ERROR HDmemcpy(tmp, t2->p, t2->len * H5Tget_size(nat_super_type)); - if(H5Tconvert(nat_super_type, H5T_NATIVE_UINT, t2->len, tmp, NULL, H5P_DEFAULT) < 0) + if (H5Tconvert(nat_super_type, H5T_NATIVE_UINT, t2->len, tmp, NULL, H5P_DEFAULT) < 0) TEST_ERROR; - for(k = 0; k < t2->len; k++) { - if(((unsigned int *)t1->p)[k] != ((unsigned int *)tmp)[k]) { + for (k = 0; k < t2->len; k++) { + if (((unsigned int *)t1->p)[k] != ((unsigned int *)tmp)[k]) { H5_FAILED(); - HDprintf(" VL data don't match!, wdata[%u].p=%d, rdata[%u].p=%u\n", - (unsigned)i, ((unsigned int*)t1->p)[k], (unsigned)i, ((unsigned int*)tmp)[k]); + HDprintf(" VL data don't match!, wdata[%u].p=%d, rdata[%u].p=%u\n", (unsigned)i, + ((unsigned int *)t1->p)[k], (unsigned)i, ((unsigned int *)tmp)[k]); goto error; } /* end if */ - } /* end for */ + } /* end for */ HDfree(tmp); tmp = NULL; } /* end for */ - } /* end for */ + } /* end for */ /* Reclaim the read VL data */ - if(H5Treclaim(native_type, space, H5P_DEFAULT, rdata) < 0) TEST_ERROR; + if (H5Treclaim(native_type, space, H5P_DEFAULT, rdata) < 0) + TEST_ERROR; /* Reclaim the write VL data */ - if(H5Treclaim(native_type, space, H5P_DEFAULT, wdata) < 0) TEST_ERROR; + if (H5Treclaim(native_type, space, H5P_DEFAULT, wdata) < 0) + TEST_ERROR; /* Close Dataset */ - if(H5Dclose(dataset) < 0) TEST_ERROR; + if (H5Dclose(dataset) < 0) + TEST_ERROR; /* Close datatype */ - if(H5Tclose(native_type) < 0) TEST_ERROR; - native_type = -1; /* reset so that error handling can check for VL reclaim */ - if(H5Tclose(dtype) < 0) TEST_ERROR; - if(H5Tclose(tid_m) < 0) TEST_ERROR; - if(H5Tclose(tid_m2) < 0) TEST_ERROR; - + if (H5Tclose(native_type) < 0) + TEST_ERROR; + native_type = -1; /* reset so that error handling can check for VL reclaim */ + if (H5Tclose(dtype) < 0) + TEST_ERROR; + if (H5Tclose(tid_m) < 0) + TEST_ERROR; + if (H5Tclose(tid_m2) < 0) + TEST_ERROR; /* Close disk dataspace */ - if(H5Sclose(space) < 0) TEST_ERROR; + if (H5Sclose(space) < 0) + TEST_ERROR; PASSED(); return 0; error: /* Free memory for test data */ - if(tmp) + if (tmp) HDfree(tmp); - H5E_BEGIN_TRY { - if(native_type > 0) { + H5E_BEGIN_TRY + { + if (native_type > 0) { H5Treclaim(native_type, space, H5P_DEFAULT, rdata); H5Treclaim(native_type, space, H5P_DEFAULT, wdata); } /* end if */ @@ -1820,12 +1968,12 @@ error: H5Tclose(tid2); H5Tclose(tid_m); H5Tclose(tid_m2); - } H5E_END_TRY; + } + H5E_END_TRY; return -1; } /* end test_vl_type() */ - /*------------------------------------------------------------------------- * Function: test_vlstr_dtype * @@ -1846,88 +1994,100 @@ static herr_t test_vlstr_dtype(hid_t file) { /* Information to write */ - const char *wdata[SPACE1_DIM1]= { - "Four score and seven years ago our forefathers brought forth on this continent a new nation,", - "conceived in liberty and dedicated to the proposition that all men are created equal.", - "Now we are engaged in a great civil war,", - "testing whether that nation or any nation so conceived and so dedicated can long endure." - }; - char *rdata[SPACE1_DIM1]; /* Information read in */ - hbool_t rdata_alloc = FALSE; /* Whether the read data is allocated */ - hid_t dataset = -1; /* Dataset ID */ - hid_t sid1 = -1; /* Dataspace ID */ - hid_t tid1 = -1, dtype = -1, native_type = -1; /* Datatype ID */ - hsize_t dims1[] = {SPACE1_DIM1}; - unsigned i; /* counting variable */ + const char *wdata[SPACE1_DIM1] = { + "Four score and seven years ago our forefathers brought forth on this continent a new nation,", + "conceived in liberty and dedicated to the proposition that all men are created equal.", + "Now we are engaged in a great civil war,", + "testing whether that nation or any nation so conceived and so dedicated can long endure."}; + char * rdata[SPACE1_DIM1]; /* Information read in */ + hbool_t rdata_alloc = FALSE; /* Whether the read data is allocated */ + hid_t dataset = -1; /* Dataset ID */ + hid_t sid1 = -1; /* Dataspace ID */ + hid_t tid1 = -1, dtype = -1, native_type = -1; /* Datatype ID */ + hsize_t dims1[] = {SPACE1_DIM1}; + unsigned i; /* counting variable */ /* Output message about test being performed */ TESTING("variable length string datatype"); /* Create dataspace for datasets */ - if((sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL)) < 0) TEST_ERROR; + if ((sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL)) < 0) + TEST_ERROR; /* Create a datatype to refer to */ - if((tid1 = H5Tcopy(H5T_C_S1)) < 0) TEST_ERROR; + if ((tid1 = H5Tcopy(H5T_C_S1)) < 0) + TEST_ERROR; - if(H5Tset_size(tid1,H5T_VARIABLE) < 0) TEST_ERROR; - if(H5T_STRING != H5Tget_class(tid1) || !H5Tis_variable_str(tid1)) + if (H5Tset_size(tid1, H5T_VARIABLE) < 0) + TEST_ERROR; + if (H5T_STRING != H5Tget_class(tid1) || !H5Tis_variable_str(tid1)) TEST_ERROR; /* Create a dataset */ - if((dataset = H5Dcreate2(file, DSET_VLSTR_NAME, tid1, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; + if ((dataset = H5Dcreate2(file, DSET_VLSTR_NAME, tid1, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Write dataset to disk */ - if(H5Dwrite(dataset, tid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata) < 0) TEST_ERROR; + if (H5Dwrite(dataset, tid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata) < 0) + TEST_ERROR; /* Close Dataset */ - if(H5Dclose(dataset) < 0) TEST_ERROR; + if (H5Dclose(dataset) < 0) + TEST_ERROR; /* Open a dataset */ - if((dataset = H5Dopen2(file, DSET_VLSTR_NAME, H5P_DEFAULT)) < 0) TEST_ERROR; + if ((dataset = H5Dopen2(file, DSET_VLSTR_NAME, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Get datatype for dataset */ - if((dtype = H5Dget_type(dataset)) < 0) TEST_ERROR; + if ((dtype = H5Dget_type(dataset)) < 0) + TEST_ERROR; /* Construct native type */ - if((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) + if ((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) TEST_ERROR; /* Check if the data type is equal */ - if(!H5Tequal(native_type, tid1)) + if (!H5Tequal(native_type, tid1)) TEST_ERROR; /* Read dataset from disk */ - if(H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata) < 0) TEST_ERROR; + if (H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata) < 0) + TEST_ERROR; rdata_alloc = TRUE; /* Compare data read in */ - for(i = 0; i < SPACE1_DIM1; i++) { - if(HDstrlen(wdata[i]) != HDstrlen(rdata[i])) { + for (i = 0; i < SPACE1_DIM1; i++) { + if (HDstrlen(wdata[i]) != HDstrlen(rdata[i])) { H5_FAILED(); - HDprintf(" VL data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n", - (int)i, (int)HDstrlen(wdata[i]), (int)i, (int)HDstrlen(rdata[i])); + HDprintf(" VL data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n", (int)i, + (int)HDstrlen(wdata[i]), (int)i, (int)HDstrlen(rdata[i])); goto error; } /* end if */ - if(HDstrcmp(wdata[i], rdata[i]) != 0 ) { + if (HDstrcmp(wdata[i], rdata[i]) != 0) { H5_FAILED(); - HDprintf(" VL data values don't match!, wdata[%d]=%s, rdata[%d]=%s\n", - (int)i, wdata[i], (int)i, rdata[i]); + HDprintf(" VL data values don't match!, wdata[%d]=%s, rdata[%d]=%s\n", (int)i, wdata[i], + (int)i, rdata[i]); goto error; } /* end if */ - } /* end for */ + } /* end for */ /* Close Dataset */ - if(H5Dclose(dataset) < 0) TEST_ERROR; + if (H5Dclose(dataset) < 0) + TEST_ERROR; /* Close datatype */ - if(H5Tclose(tid1) < 0) TEST_ERROR; - if(H5Tclose(native_type) < 0) TEST_ERROR; + if (H5Tclose(tid1) < 0) + TEST_ERROR; + if (H5Tclose(native_type) < 0) + TEST_ERROR; /* Close disk dataspace */ - if(H5Sclose(sid1) < 0) TEST_ERROR; + if (H5Sclose(sid1) < 0) + TEST_ERROR; /* Free memory for rdata */ - for(i = 0; i < SPACE1_DIM1; i++) + for (i = 0; i < SPACE1_DIM1; i++) HDfree(rdata[i]); rdata_alloc = FALSE; @@ -1935,24 +2095,25 @@ test_vlstr_dtype(hid_t file) return 0; error: - if(rdata_alloc) { + if (rdata_alloc) { /* Free memory for rdata */ - for(i = 0; i < SPACE1_DIM1; i++) + for (i = 0; i < SPACE1_DIM1; i++) HDfree(rdata[i]); } /* end if */ - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Dclose(dataset); H5Tclose(dtype); H5Tclose(native_type); H5Tclose(sid1); H5Tclose(tid1); - } H5E_END_TRY; + } + H5E_END_TRY; return -1; } /* end test_vlstr_dtype() */ - /*------------------------------------------------------------------------- * Function: test_str_dtype * @@ -1972,99 +2133,109 @@ error: static herr_t test_str_dtype(hid_t file) { - const char wdata[SPACE1_DIM1][4]= { - "one", - "two", - "3rd", - "4th" - }; /* Information to write */ - char rdata[SPACE1_DIM1][4]; /* Information read in */ - hid_t dataset = -1; /* Dataset ID */ - hid_t sid1 = -1; /* Dataspace ID */ - hid_t tid1 = -1, dtype = -1, native_type = -1; /* Datatype ID */ + const char wdata[SPACE1_DIM1][4] = {"one", "two", "3rd", "4th"}; /* Information to write */ + char rdata[SPACE1_DIM1][4]; /* Information read in */ + hid_t dataset = -1; /* Dataset ID */ + hid_t sid1 = -1; /* Dataspace ID */ + hid_t tid1 = -1, dtype = -1, native_type = -1; /* Datatype ID */ hsize_t dims1[] = {SPACE1_DIM1}; - unsigned i; /* counting variable */ + unsigned i; /* counting variable */ /* Output message about test being performed */ TESTING("fixed-length string datatype"); /* Create dataspace for datasets */ - if((sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL)) < 0) TEST_ERROR; + if ((sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL)) < 0) + TEST_ERROR; /* Create a datatype to refer to */ - if((tid1 = H5Tcopy (H5T_C_S1)) < 0) TEST_ERROR; + if ((tid1 = H5Tcopy(H5T_C_S1)) < 0) + TEST_ERROR; - if(H5Tset_size(tid1, 4) < 0) TEST_ERROR; - if(H5T_STRING != H5Tget_class(tid1)) TEST_ERROR; + if (H5Tset_size(tid1, 4) < 0) + TEST_ERROR; + if (H5T_STRING != H5Tget_class(tid1)) + TEST_ERROR; /* Create a dataset */ - if((dataset = H5Dcreate2(file, DSET_STR_NAME, tid1, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; + if ((dataset = H5Dcreate2(file, DSET_STR_NAME, tid1, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Write dataset to disk */ - if(H5Dwrite(dataset, tid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata) < 0) TEST_ERROR; + if (H5Dwrite(dataset, tid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata) < 0) + TEST_ERROR; /* Close Dataset */ - if(H5Dclose(dataset) < 0) TEST_ERROR; + if (H5Dclose(dataset) < 0) + TEST_ERROR; /* Open a dataset */ - if((dataset = H5Dopen2(file, DSET_STR_NAME, H5P_DEFAULT)) < 0) TEST_ERROR; + if ((dataset = H5Dopen2(file, DSET_STR_NAME, H5P_DEFAULT)) < 0) + TEST_ERROR; /* Get datatype for dataset */ - if((dtype = H5Dget_type(dataset)) < 0) TEST_ERROR; + if ((dtype = H5Dget_type(dataset)) < 0) + TEST_ERROR; /* Construct native type */ - if((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) + if ((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) TEST_ERROR; /* Check if the data type is equal */ - if(!H5Tequal(native_type, tid1) || H5T_STRING!=H5Tget_class(native_type)) + if (!H5Tequal(native_type, tid1) || H5T_STRING != H5Tget_class(native_type)) TEST_ERROR; /* Read dataset from disk */ - if(H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata) < 0) TEST_ERROR; + if (H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata) < 0) + TEST_ERROR; /* Compare data read in */ - for(i = 0; i < SPACE1_DIM1; i++) { - if(HDstrlen(wdata[i]) != HDstrlen(rdata[i])) { + for (i = 0; i < SPACE1_DIM1; i++) { + if (HDstrlen(wdata[i]) != HDstrlen(rdata[i])) { H5_FAILED(); - HDprintf(" data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n", - (int)i, (int)HDstrlen(wdata[i]), (int)i, (int)HDstrlen(rdata[i])); + HDprintf(" data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n", (int)i, + (int)HDstrlen(wdata[i]), (int)i, (int)HDstrlen(rdata[i])); goto error; } /* end if */ - if(HDstrcmp(wdata[i], rdata[i]) != 0 ) { + if (HDstrcmp(wdata[i], rdata[i]) != 0) { H5_FAILED(); - HDprintf(" data values don't match!, wdata[%d]=%s, rdata[%d]=%s\n", - (int)i, wdata[i], (int)i, rdata[i]); + HDprintf(" data values don't match!, wdata[%d]=%s, rdata[%d]=%s\n", (int)i, wdata[i], (int)i, + rdata[i]); goto error; } /* end if */ - } /* end for */ + } /* end for */ /* Close Dataset */ - if(H5Dclose(dataset) < 0) TEST_ERROR; + if (H5Dclose(dataset) < 0) + TEST_ERROR; /* Close datatype */ - if(H5Tclose(tid1) < 0) TEST_ERROR; - if(H5Tclose(native_type) < 0) TEST_ERROR; + if (H5Tclose(tid1) < 0) + TEST_ERROR; + if (H5Tclose(native_type) < 0) + TEST_ERROR; /* Close disk dataspace */ - if(H5Sclose(sid1) < 0) TEST_ERROR; + if (H5Sclose(sid1) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Dclose(dataset); H5Tclose(dtype); H5Tclose(native_type); H5Tclose(tid1); H5Tclose(sid1); - } H5E_END_TRY; + } + H5E_END_TRY; return -1; } /* end test_str_dtype() */ - /*------------------------------------------------------------------------- * Function: test_refer_dtype * @@ -2088,124 +2259,126 @@ test_refer_dtype(hid_t file) typedef struct s1_t { unsigned int a; unsigned int b; - float c; + float c; } s1_t; - hid_t dataset = -1; /* Dataset ID */ - hid_t group = -1; /* Group ID */ - hid_t sid1 = -1; /* Dataspace ID */ - hid_t tid1 = -1, dtype = -1, native_type = -1; /* Datatype ID */ - hsize_t dims1[] = {1}; - H5O_type_t obj_type; /* Object type */ - hobj_ref_t *wbuf = NULL, /* buffer to write to disk */ - *rbuf = NULL; /* buffer read from disk */ + hid_t dataset = -1; /* Dataset ID */ + hid_t group = -1; /* Group ID */ + hid_t sid1 = -1; /* Dataspace ID */ + hid_t tid1 = -1, dtype = -1, native_type = -1; /* Datatype ID */ + hsize_t dims1[] = {1}; + H5O_type_t obj_type; /* Object type */ + hobj_ref_t *wbuf = NULL, /* buffer to write to disk */ + *rbuf = NULL; /* buffer read from disk */ /* Output message about test being performed */ TESTING("reference datatype"); /* Allocate write & read buffers */ - if(NULL == (wbuf = (hobj_ref_t *)HDmalloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t))))) + if (NULL == (wbuf = (hobj_ref_t *)HDmalloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t))))) TEST_ERROR - if(NULL == (rbuf = (hobj_ref_t *)HDmalloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t))))) + if (NULL == (rbuf = (hobj_ref_t *)HDmalloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t))))) TEST_ERROR /* Create dataspace for datasets */ - if((sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL)) < 0) + if ((sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL)) < 0) TEST_ERROR; /* Create a group */ - if((group = H5Gcreate2(file, "Group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((group = H5Gcreate2(file, "Group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Create a datatype to refer to */ - if((tid1 = H5Tcreate (H5T_COMPOUND, sizeof(s1_t))) < 0) + if ((tid1 = H5Tcreate(H5T_COMPOUND, sizeof(s1_t))) < 0) TEST_ERROR; /* Insert fields */ - if(H5Tinsert (tid1, "a", HOFFSET(s1_t,a), H5T_NATIVE_INT) < 0) + if (H5Tinsert(tid1, "a", HOFFSET(s1_t, a), H5T_NATIVE_INT) < 0) TEST_ERROR; - if(H5Tinsert (tid1, "b", HOFFSET(s1_t, b), H5T_NATIVE_INT) < 0) + if (H5Tinsert(tid1, "b", HOFFSET(s1_t, b), H5T_NATIVE_INT) < 0) TEST_ERROR; - if(H5Tinsert(tid1, "c", HOFFSET(s1_t, c), H5T_NATIVE_FLOAT) < 0) + if (H5Tinsert(tid1, "c", HOFFSET(s1_t, c), H5T_NATIVE_FLOAT) < 0) TEST_ERROR; /* Save datatype for later */ - if(H5Tcommit2(group, "Datatype1", tid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) + if (H5Tcommit2(group, "Datatype1", tid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR; /* Close datatype */ - if(H5Tclose(tid1) < 0) + if (H5Tclose(tid1) < 0) TEST_ERROR; /* Close group */ - if(H5Gclose(group) < 0) + if (H5Gclose(group) < 0) TEST_ERROR; /* Create a dataset */ - if((dataset = H5Dcreate2(file, "Dataset3", H5T_STD_REF_OBJ, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if ((dataset = + H5Dcreate2(file, "Dataset3", H5T_STD_REF_OBJ, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; /* Create reference to named datatype */ - if(H5Rcreate(wbuf, file, "/Group1/Datatype1", H5R_OBJECT, (hid_t)-1) < 0) + if (H5Rcreate(wbuf, file, "/Group1/Datatype1", H5R_OBJECT, (hid_t)-1) < 0) TEST_ERROR; - if(H5Rget_obj_type2(dataset, H5R_OBJECT, wbuf, &obj_type) < 0) + if (H5Rget_obj_type2(dataset, H5R_OBJECT, wbuf, &obj_type) < 0) TEST_ERROR; - if(obj_type != H5O_TYPE_NAMED_DATATYPE) + if (obj_type != H5O_TYPE_NAMED_DATATYPE) TEST_ERROR; /* Write selection to disk */ - if(H5Dwrite(dataset, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, wbuf) < 0) + if (H5Dwrite(dataset, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, wbuf) < 0) TEST_ERROR; /* Close disk dataspace */ - if(H5Sclose(sid1) < 0) + if (H5Sclose(sid1) < 0) TEST_ERROR; /* Close Dataset */ - if(H5Dclose(dataset) < 0) + if (H5Dclose(dataset) < 0) TEST_ERROR; /* Open the dataset */ - if((dataset = H5Dopen2(file, "/Dataset3", H5P_DEFAULT)) < 0) + if ((dataset = H5Dopen2(file, "/Dataset3", H5P_DEFAULT)) < 0) TEST_ERROR; /* Get datatype for dataset */ - if((dtype = H5Dget_type(dataset)) < 0) + if ((dtype = H5Dget_type(dataset)) < 0) TEST_ERROR; /* Construct native type */ - if((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) + if ((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) TEST_ERROR; /* Check if the data type is equal */ - if(!H5Tequal(native_type, H5T_STD_REF_OBJ)) + if (!H5Tequal(native_type, H5T_STD_REF_OBJ)) TEST_ERROR; /* Read selection from disk */ - if(H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0) + if (H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0) TEST_ERROR; /* Open datatype object */ - if((tid1 = H5Rdereference2(dataset, H5P_DEFAULT, H5R_OBJECT, rbuf)) < 0) + if ((tid1 = H5Rdereference2(dataset, H5P_DEFAULT, H5R_OBJECT, rbuf)) < 0) TEST_ERROR; /* Verify correct datatype */ - if(H5Tget_class(tid1) != H5T_COMPOUND) + if (H5Tget_class(tid1) != H5T_COMPOUND) TEST_ERROR; - if(H5Tget_nmembers(tid1)!=3) + if (H5Tget_nmembers(tid1) != 3) TEST_ERROR; /* Close datatype */ - if(H5Tclose(tid1) < 0) + if (H5Tclose(tid1) < 0) TEST_ERROR; - if(H5Tclose(native_type) < 0) + if (H5Tclose(native_type) < 0) TEST_ERROR; /* Close Dataset */ - if(H5Dclose(dataset) < 0) + if (H5Dclose(dataset) < 0) TEST_ERROR; /* Free memory buffers */ @@ -2217,23 +2390,24 @@ test_refer_dtype(hid_t file) return 0; error: - if(wbuf) + if (wbuf) HDfree(wbuf); - if(rbuf) + if (rbuf) HDfree(rbuf); - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Sclose(sid1); H5Gclose(group); H5Tclose(tid1); H5Tclose(dtype); H5Tclose(native_type); H5Dclose(dataset); - } H5E_END_TRY; + } + H5E_END_TRY; return -1; -} /* test_refer_dtype() */ - +} /* test_refer_dtype() */ /*------------------------------------------------------------------------- * Function: test_refer_dtype2 @@ -2254,172 +2428,171 @@ error: static herr_t test_refer_dtype2(hid_t file) { - hid_t dset1 = -1, /* Dataset ID */ - dset2 = -1; /* Dereferenced dataset ID */ - hid_t sid1 = -1, /* Dataspace ID #1 */ - sid2 = -1; /* Dataspace ID #2 */ + hid_t dset1 = -1, /* Dataset ID */ + dset2 = -1; /* Dereferenced dataset ID */ + hid_t sid1 = -1, /* Dataspace ID #1 */ + sid2 = -1; /* Dataspace ID #2 */ hid_t dtype = -1, native_type = -1; - hsize_t dims1[] = { 1 }, dims2[] = { SPACE2_DIM1, SPACE2_DIM2 }; - hsize_t start[SPACE2_RANK]; /* Starting location of hyperslab */ - hsize_t stride[SPACE2_RANK]; /* Stride of hyperslab */ - hsize_t count[SPACE2_RANK]; /* Element count of hyperslab */ - hsize_t block[SPACE2_RANK]; /* Block size of hyperslab */ - hdset_reg_ref_t wbuf, /* buffer to write to disk */ - rbuf; /* buffer read from disk */ - uint8_t *dwbuf = NULL, /* Buffer for writing numeric data to disk */ - *drbuf = NULL; /* Buffer for reading numeric data from disk */ - uint8_t *tu8 = NULL; /* Temporary pointer to uint8 data */ - H5O_type_t obj_type; /* Object type */ - int i; /* counting variables */ + hsize_t dims1[] = {1}, dims2[] = {SPACE2_DIM1, SPACE2_DIM2}; + hsize_t start[SPACE2_RANK]; /* Starting location of hyperslab */ + hsize_t stride[SPACE2_RANK]; /* Stride of hyperslab */ + hsize_t count[SPACE2_RANK]; /* Element count of hyperslab */ + hsize_t block[SPACE2_RANK]; /* Block size of hyperslab */ + hdset_reg_ref_t wbuf, /* buffer to write to disk */ + rbuf; /* buffer read from disk */ + uint8_t *dwbuf = NULL, /* Buffer for writing numeric data to disk */ + *drbuf = NULL; /* Buffer for reading numeric data from disk */ + uint8_t * tu8 = NULL; /* Temporary pointer to uint8 data */ + H5O_type_t obj_type; /* Object type */ + int i; /* counting variables */ /* Output message about test being performed */ TESTING("dataset region reference"); /* Allocate write & read buffers */ - if(NULL == (dwbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2))) + if (NULL == (dwbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2))) TEST_ERROR - if(NULL == (drbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), SPACE2_DIM1 * SPACE2_DIM2))) + if (NULL == (drbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), SPACE2_DIM1 * SPACE2_DIM2))) TEST_ERROR /* Create dataspace for datasets */ - if((sid2 = H5Screate_simple(SPACE2_RANK, dims2, NULL)) < 0) + if ((sid2 = H5Screate_simple(SPACE2_RANK, dims2, NULL)) < 0) TEST_ERROR; /* Create a dataset */ - if((dset2 = H5Dcreate2(file, "Dataset2", H5T_STD_U8LE, sid2, H5P_DEFAULT, - H5P_DEFAULT, H5P_DEFAULT)) < 0) + if ((dset2 = H5Dcreate2(file, "Dataset2", H5T_STD_U8LE, sid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; - for(tu8 = dwbuf, i = 0; i < SPACE2_DIM1 * SPACE2_DIM2; i++) + for (tu8 = dwbuf, i = 0; i < SPACE2_DIM1 * SPACE2_DIM2; i++) *tu8++ = (uint8_t)(i * 3); /* Write selection to disk */ - if(H5Dwrite(dset2, H5T_STD_U8LE, H5S_ALL, H5S_ALL, H5P_DEFAULT, dwbuf) < 0) + if (H5Dwrite(dset2, H5T_STD_U8LE, H5S_ALL, H5S_ALL, H5P_DEFAULT, dwbuf) < 0) TEST_ERROR; /* Close Dataset */ - if(H5Dclose(dset2) < 0) + if (H5Dclose(dset2) < 0) TEST_ERROR; /* Create dataspace for the reference dataset */ - if((sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL)) < 0) + if ((sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL)) < 0) TEST_ERROR; /* Create a reference dataset */ - if((dset1 = H5Dcreate2(file, "Dataset1", H5T_STD_REF_DSETREG, sid1, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if ((dset1 = H5Dcreate2(file, "Dataset1", H5T_STD_REF_DSETREG, sid1, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) TEST_ERROR; /* Create references */ /* Select 6x6 hyperslab for first reference */ - start[0] = 2; - start[1] = 2; + start[0] = 2; + start[1] = 2; stride[0] = 1; stride[1] = 1; - count[0] = 1; - count[1] = 1; - block[0] = 6; - block[1] = 6; + count[0] = 1; + count[1] = 1; + block[0] = 6; + block[1] = 6; - if(H5Sselect_hyperslab(sid2, H5S_SELECT_SET, start, stride, count, block) < 0) + if (H5Sselect_hyperslab(sid2, H5S_SELECT_SET, start, stride, count, block) < 0) TEST_ERROR; - if((int)H5Sget_select_npoints(sid2) != 36) + if ((int)H5Sget_select_npoints(sid2) != 36) TEST_ERROR; /* Store first dataset region */ - if(H5Rcreate(&wbuf, file, "/Dataset2", H5R_DATASET_REGION, sid2) < 0) + if (H5Rcreate(&wbuf, file, "/Dataset2", H5R_DATASET_REGION, sid2) < 0) TEST_ERROR; - if(H5Rget_obj_type2(dset1, H5R_DATASET_REGION, &wbuf, &obj_type) < 0) + if (H5Rget_obj_type2(dset1, H5R_DATASET_REGION, &wbuf, &obj_type) < 0) TEST_ERROR; - if(obj_type != H5O_TYPE_DATASET) + if (obj_type != H5O_TYPE_DATASET) TEST_ERROR; /* Write selection to disk */ - if(H5Dwrite(dset1, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wbuf) < 0) + if (H5Dwrite(dset1, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wbuf) < 0) TEST_ERROR; /* Close disk dataspace */ - if(H5Sclose(sid1) < 0) + if (H5Sclose(sid1) < 0) TEST_ERROR; /* Close Dataset */ - if(H5Dclose(dset1) < 0) + if (H5Dclose(dset1) < 0) TEST_ERROR; /* Close uint8 dataset dataspace */ - if(H5Sclose(sid2) < 0) + if (H5Sclose(sid2) < 0) TEST_ERROR; /* Open the dataset */ - if((dset1 = H5Dopen2(file, "/Dataset1", H5P_DEFAULT)) < 0) + if ((dset1 = H5Dopen2(file, "/Dataset1", H5P_DEFAULT)) < 0) TEST_ERROR; /* Get datatype for dataset */ - if((dtype = H5Dget_type(dset1)) < 0) + if ((dtype = H5Dget_type(dset1)) < 0) TEST_ERROR; /* Construct native type */ - if((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) + if ((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) TEST_ERROR; /* Check if the data type is equal */ - if(!H5Tequal(native_type, H5T_STD_REF_DSETREG)) + if (!H5Tequal(native_type, H5T_STD_REF_DSETREG)) TEST_ERROR; /* Read selection from disk */ - if(H5Dread(dset1, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rbuf) < 0) + if (H5Dread(dset1, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rbuf) < 0) TEST_ERROR; /* Try to open objects */ - if((dset2 = H5Rdereference2(dset1, H5P_DEFAULT, H5R_DATASET_REGION, &rbuf)) < 0) + if ((dset2 = H5Rdereference2(dset1, H5P_DEFAULT, H5R_DATASET_REGION, &rbuf)) < 0) TEST_ERROR; /* Check what H5Rget_obj_type2 function returns */ - if(H5Rget_obj_type2(dset1, H5R_DATASET_REGION, &rbuf, &obj_type) < 0) + if (H5Rget_obj_type2(dset1, H5R_DATASET_REGION, &rbuf, &obj_type) < 0) TEST_ERROR; - if(obj_type != H5O_TYPE_DATASET) + if (obj_type != H5O_TYPE_DATASET) TEST_ERROR; /* Check information in referenced dataset */ - if((sid1 = H5Dget_space(dset2)) < 0) + if ((sid1 = H5Dget_space(dset2)) < 0) TEST_ERROR; - if((int)H5Sget_simple_extent_npoints(sid1) != 100) + if ((int)H5Sget_simple_extent_npoints(sid1) != 100) TEST_ERROR; /* Read from disk */ - if(H5Dread(dset2, H5T_STD_U8LE, H5S_ALL, H5S_ALL, H5P_DEFAULT, drbuf) < 0) + if (H5Dread(dset2, H5T_STD_U8LE, H5S_ALL, H5S_ALL, H5P_DEFAULT, drbuf) < 0) TEST_ERROR; - for(tu8 = (uint8_t *)drbuf, i = 0; i < (SPACE2_DIM1 * SPACE2_DIM2); i++, tu8++) - if(*tu8 != (uint8_t)(i * 3)) + for (tu8 = (uint8_t *)drbuf, i = 0; i < (SPACE2_DIM1 * SPACE2_DIM2); i++, tu8++) + if (*tu8 != (uint8_t)(i * 3)) TEST_ERROR; /* Get the hyperslab selection */ - if((sid2 = H5Rget_region(dset1, H5R_DATASET_REGION, &rbuf)) < 0) + if ((sid2 = H5Rget_region(dset1, H5R_DATASET_REGION, &rbuf)) < 0) TEST_ERROR; /* Verify correct hyperslab selected */ - if((int)H5Sget_select_npoints(sid2) != 36) + if ((int)H5Sget_select_npoints(sid2) != 36) TEST_ERROR; - if((int)H5Sget_select_hyper_nblocks(sid2) != 1) + if ((int)H5Sget_select_hyper_nblocks(sid2) != 1) TEST_ERROR; /* Close region space */ - if(H5Sclose(sid2) < 0) + if (H5Sclose(sid2) < 0) TEST_ERROR; /* Close first space */ - if(H5Sclose(sid1) < 0) + if (H5Sclose(sid1) < 0) TEST_ERROR; /* Close dereferenced Dataset */ - if(H5Dclose(dset2) < 0) + if (H5Dclose(dset2) < 0) TEST_ERROR; /* Close Dataset */ - if(H5Dclose(dset1) < 0) + if (H5Dclose(dset1) < 0) TEST_ERROR; /* Free memory buffers */ @@ -2431,23 +2604,24 @@ test_refer_dtype2(hid_t file) error: /* Free memory buffers */ - if(dwbuf) + if (dwbuf) HDfree(dwbuf); - if(drbuf) + if (drbuf) HDfree(drbuf); - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Sclose(sid2); H5Sclose(sid1); H5Tclose(dtype); H5Tclose(native_type); H5Dclose(dset2); H5Dclose(dset1); - } H5E_END_TRY; + } + H5E_END_TRY; return -1; -} /* test_refer_dtype2() */ - +} /* test_refer_dtype2() */ /*------------------------------------------------------------------------- * Function: test_opaque_dtype @@ -2469,72 +2643,85 @@ static herr_t test_opaque_dtype(hid_t file) { hid_t type = -1, space = -1, dset = -1; - hid_t dataset = -1, dtype = -1, native_type = -1; - size_t i; - unsigned char wbuf[32], rbuf[32]; - hsize_t nelmts; + hid_t dataset = -1, dtype = -1, native_type = -1; + size_t i; + unsigned char wbuf[32], rbuf[32]; + hsize_t nelmts; TESTING("opaque datatype"); /* opaque_1 */ nelmts = sizeof(wbuf); - if((type = H5Tcreate(H5T_OPAQUE, 1)) < 0) TEST_ERROR; - if(H5Tset_tag(type, "testing 1-byte opaque type") < 0) TEST_ERROR; - if((space = H5Screate_simple(1, &nelmts, NULL)) < 0) TEST_ERROR; - if((dset = H5Dcreate2(file, DSET_OPAQUE_NAME, type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if ((type = H5Tcreate(H5T_OPAQUE, 1)) < 0) + TEST_ERROR; + if (H5Tset_tag(type, "testing 1-byte opaque type") < 0) + TEST_ERROR; + if ((space = H5Screate_simple(1, &nelmts, NULL)) < 0) + TEST_ERROR; + if ((dset = H5Dcreate2(file, DSET_OPAQUE_NAME, type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; - for(i = 0; i < sizeof(wbuf); i++) + for (i = 0; i < sizeof(wbuf); i++) wbuf[i] = (unsigned char)(0xff ^ i); - if(H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, wbuf) < 0) TEST_ERROR; - if(H5Sclose(space) < 0) TEST_ERROR; - if(H5Dclose(dset) < 0) TEST_ERROR; - + if (H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, wbuf) < 0) + TEST_ERROR; + if (H5Sclose(space) < 0) + TEST_ERROR; + if (H5Dclose(dset) < 0) + TEST_ERROR; /* Open dataset again to check H5Tget_native_type */ - if((dataset = H5Dopen2(file, DSET_OPAQUE_NAME, H5P_DEFAULT)) < 0) TEST_ERROR; + if ((dataset = H5Dopen2(file, DSET_OPAQUE_NAME, H5P_DEFAULT)) < 0) + TEST_ERROR; - if((dtype = H5Dget_type(dataset)) < 0) TEST_ERROR; + if ((dtype = H5Dget_type(dataset)) < 0) + TEST_ERROR; - if((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) + if ((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) TEST_ERROR; - if(!H5Tequal(native_type, type)) TEST_ERROR; + if (!H5Tequal(native_type, type)) + TEST_ERROR; - if(H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0) + if (H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0) TEST_ERROR; - for(i = 0; i < sizeof(rbuf); i++) - if(rbuf[i] != wbuf[i]) { + for (i = 0; i < sizeof(rbuf); i++) + if (rbuf[i] != wbuf[i]) { H5_FAILED(); HDprintf(" Read different values than written.\n"); HDprintf(" At index %u\n", (unsigned)i); goto error; } /* end if */ - if(H5Tclose(type) < 0) TEST_ERROR; - if(H5Tclose(dtype) < 0) TEST_ERROR; - if(H5Tclose(native_type) < 0) TEST_ERROR; - if(H5Dclose(dataset) < 0) TEST_ERROR; + if (H5Tclose(type) < 0) + TEST_ERROR; + if (H5Tclose(dtype) < 0) + TEST_ERROR; + if (H5Tclose(native_type) < 0) + TEST_ERROR; + if (H5Dclose(dataset) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Sclose(space); H5Tclose(type); H5Tclose(dtype); H5Tclose(native_type); H5Dclose(dset); H5Dclose(dataset); - } H5E_END_TRY; + } + H5E_END_TRY; return -1; } /* test_opaque_dtype */ - /*------------------------------------------------------------------------- * Function: test_bitfield_dtype * @@ -2557,61 +2744,76 @@ error: static herr_t test_bitfield_dtype(hid_t file) { - hid_t type=-1, space=-1, dset1=-1, dset2=-1; - hid_t dataset1=-1, dataset2=-1, dtype=-1, native_type=-1; - size_t ntype_size, i; - unsigned char wbuf[BITFIELD_ENUMB*sizeof(int)]; - unsigned char *p=NULL; - void *rbuf = NULL; - unsigned int intw[BITFIELD_ENUMB], intr[BITFIELD_ENUMB]; + hid_t type = -1, space = -1, dset1 = -1, dset2 = -1; + hid_t dataset1 = -1, dataset2 = -1, dtype = -1, native_type = -1; + size_t ntype_size, i; + unsigned char wbuf[BITFIELD_ENUMB * sizeof(int)]; + unsigned char *p = NULL; + void * rbuf = NULL; + unsigned int intw[BITFIELD_ENUMB], intr[BITFIELD_ENUMB]; hsize_t nelmts; TESTING("bitfield datatype"); nelmts = BITFIELD_ENUMB; - if((type = H5Tcopy(H5T_STD_B32BE)) < 0) TEST_ERROR; + if ((type = H5Tcopy(H5T_STD_B32BE)) < 0) + TEST_ERROR; - if((space = H5Screate_simple(1, &nelmts, NULL)) < 0) TEST_ERROR; + if ((space = H5Screate_simple(1, &nelmts, NULL)) < 0) + TEST_ERROR; /* Create and write to dataset1 with a unsigned char buffer */ - if((dset1 = H5Dcreate2(file, DSET1_BITFIELD_NAME, type, space, H5P_DEFAULT, H5P_DEFAULT, - H5P_DEFAULT)) < 0) TEST_ERROR; + if ((dset1 = H5Dcreate2(file, DSET1_BITFIELD_NAME, type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < + 0) + TEST_ERROR; - for(i = 0; i < BITFIELD_ENUMB*sizeof(int); i++) + for (i = 0; i < BITFIELD_ENUMB * sizeof(int); i++) wbuf[i] = (unsigned char)((unsigned int)0xff ^ (unsigned int)i); - if(H5Dwrite(dset1, H5T_NATIVE_B32, H5S_ALL, H5S_ALL, H5P_DEFAULT, wbuf) < 0) TEST_ERROR; - if(H5Dclose(dset1) < 0) TEST_ERROR; + if (H5Dwrite(dset1, H5T_NATIVE_B32, H5S_ALL, H5S_ALL, H5P_DEFAULT, wbuf) < 0) + TEST_ERROR; + if (H5Dclose(dset1) < 0) + TEST_ERROR; /* Create and write to dataset2 with a unsigned int buffer */ - if((dset2 = H5Dcreate2(file, DSET2_BITFIELD_NAME, type, space, H5P_DEFAULT, H5P_DEFAULT, - H5P_DEFAULT)) < 0) TEST_ERROR; + if ((dset2 = H5Dcreate2(file, DSET2_BITFIELD_NAME, type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < + 0) + TEST_ERROR; - for(i = 0; i < BITFIELD_ENUMB; i++) - intw[i] = (unsigned int)0xff << (unsigned int)((i*8)%32); + for (i = 0; i < BITFIELD_ENUMB; i++) + intw[i] = (unsigned int)0xff << (unsigned int)((i * 8) % 32); - if(H5Dwrite(dset2, H5T_NATIVE_B32, H5S_ALL, H5S_ALL, H5P_DEFAULT, intw) < 0) TEST_ERROR; - if(H5Dclose(dset2) < 0) TEST_ERROR; - if(H5Sclose(space) < 0) TEST_ERROR; - if(H5Tclose(type) < 0) TEST_ERROR; + if (H5Dwrite(dset2, H5T_NATIVE_B32, H5S_ALL, H5S_ALL, H5P_DEFAULT, intw) < 0) + TEST_ERROR; + if (H5Dclose(dset2) < 0) + TEST_ERROR; + if (H5Sclose(space) < 0) + TEST_ERROR; + if (H5Tclose(type) < 0) + TEST_ERROR; /* Open dataset1 again to check H5Tget_native_type */ - if((dataset1 = H5Dopen2(file, DSET1_BITFIELD_NAME, H5P_DEFAULT)) < 0) TEST_ERROR; + if ((dataset1 = H5Dopen2(file, DSET1_BITFIELD_NAME, H5P_DEFAULT)) < 0) + TEST_ERROR; - if((dtype = H5Dget_type(dataset1)) < 0) TEST_ERROR; + if ((dtype = H5Dget_type(dataset1)) < 0) + TEST_ERROR; - if((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) TEST_ERROR; + if ((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) + TEST_ERROR; - if((ntype_size = H5Tget_size(native_type)) == 0) TEST_ERROR; + if ((ntype_size = H5Tget_size(native_type)) == 0) + TEST_ERROR; - rbuf = HDmalloc((size_t)nelmts*ntype_size); + rbuf = HDmalloc((size_t)nelmts * ntype_size); /* Read the data and compare them */ - if(H5Dread(dataset1, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0) TEST_ERROR; + if (H5Dread(dataset1, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0) + TEST_ERROR; p = (unsigned char *)rbuf; - for(i = 0; i < BITFIELD_ENUMB*4; i++) { - if(*p != wbuf[i]) { + for (i = 0; i < BITFIELD_ENUMB * 4; i++) { + if (*p != wbuf[i]) { H5_FAILED(); HDprintf(" Read different values than written.\n"); HDprintf(" At index %zu\n", i); @@ -2620,23 +2822,31 @@ test_bitfield_dtype(hid_t file) p++; } - if(H5Tclose(dtype) < 0) TEST_ERROR; - if(H5Tclose(native_type) < 0) TEST_ERROR; - if(H5Dclose(dataset1) < 0) TEST_ERROR; - if(rbuf) HDfree(rbuf); + if (H5Tclose(dtype) < 0) + TEST_ERROR; + if (H5Tclose(native_type) < 0) + TEST_ERROR; + if (H5Dclose(dataset1) < 0) + TEST_ERROR; + if (rbuf) + HDfree(rbuf); /* Open dataset2 again to check H5Tget_native_type */ - if((dataset2 = H5Dopen2(file, DSET2_BITFIELD_NAME, H5P_DEFAULT)) < 0) TEST_ERROR; + if ((dataset2 = H5Dopen2(file, DSET2_BITFIELD_NAME, H5P_DEFAULT)) < 0) + TEST_ERROR; - if((dtype = H5Dget_type(dataset2)) < 0) TEST_ERROR; + if ((dtype = H5Dget_type(dataset2)) < 0) + TEST_ERROR; - if((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) TEST_ERROR; + if ((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) + TEST_ERROR; /* Read the data and compare them */ - if(H5Dread(dataset2, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, intr) < 0) TEST_ERROR; + if (H5Dread(dataset2, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, intr) < 0) + TEST_ERROR; - for(i = 0; i < BITFIELD_ENUMB; i++) { - if(intr[i] != intw[i]) { + for (i = 0; i < BITFIELD_ENUMB; i++) { + if (intr[i] != intw[i]) { H5_FAILED(); HDprintf(" Read different values than written.\n"); HDprintf(" At index %zu\n", i); @@ -2644,15 +2854,19 @@ test_bitfield_dtype(hid_t file) } } - if(H5Tclose(dtype) < 0) TEST_ERROR; - if(H5Tclose(native_type) < 0) TEST_ERROR; - if(H5Dclose(dataset2) < 0) TEST_ERROR; + if (H5Tclose(dtype) < 0) + TEST_ERROR; + if (H5Tclose(native_type) < 0) + TEST_ERROR; + if (H5Dclose(dataset2) < 0) + TEST_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Sclose(space); H5Tclose(type); H5Tclose(dtype); @@ -2661,12 +2875,12 @@ error: H5Dclose(dset2); H5Dclose(dataset1); H5Dclose(dataset2); - } H5E_END_TRY; + } + H5E_END_TRY; return -1; } /* test_bitfield_dtype */ - /*------------------------------------------------------------------------- * Function: test_ninteger * @@ -2686,27 +2900,27 @@ error: static herr_t test_ninteger(void) { - hid_t fid1 = -1; /* file ID */ - hid_t fid2 = -1; /* file ID */ - hid_t did1 = -1; /* dataset ID */ - hid_t did2 = -1; /* dataset ID */ - hid_t sid1 = -1; /* dataspace ID */ - hid_t dcpl1 = -1; /* dataset creation property list ID */ - hid_t dcpl2 = -1; /* dataset creation property list ID */ - hid_t tid1 = -1; /* file datatype */ - hid_t tid2 = -1; /* file datatype */ - hid_t nid1 = -1; /* native datatype */ - hid_t nid2 = -1; /* native datatype */ - hsize_t dims[1] = {DIM3}; /* dataspace dimensions */ - hsize_t nelmts; /* number of elements in dataset */ - int rank = 1; /* rank of dataset */ - int buf[DIM3]; - int chk[DIM3]; - int i; + hid_t fid1 = -1; /* file ID */ + hid_t fid2 = -1; /* file ID */ + hid_t did1 = -1; /* dataset ID */ + hid_t did2 = -1; /* dataset ID */ + hid_t sid1 = -1; /* dataspace ID */ + hid_t dcpl1 = -1; /* dataset creation property list ID */ + hid_t dcpl2 = -1; /* dataset creation property list ID */ + hid_t tid1 = -1; /* file datatype */ + hid_t tid2 = -1; /* file datatype */ + hid_t nid1 = -1; /* native datatype */ + hid_t nid2 = -1; /* native datatype */ + hsize_t dims[1] = {DIM3}; /* dataspace dimensions */ + hsize_t nelmts; /* number of elements in dataset */ + int rank = 1; /* rank of dataset */ + int buf[DIM3]; + int chk[DIM3]; + int i; TESTING("native integer "); - for(i = 0; i < DIM3; i++) + for (i = 0; i < DIM3; i++) buf[i] = i; /*------------------------------------------------------------------------- @@ -2714,26 +2928,34 @@ test_ninteger(void) *------------------------------------------------------------------------- */ /* create a file using default properties */ - if((fid1 = H5Fcreate("tstint1.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if ((fid1 = H5Fcreate("tstint1.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR /* create a data space */ - if((sid1 = H5Screate_simple(rank, dims, NULL)) < 0) FAIL_STACK_ERROR + if ((sid1 = H5Screate_simple(rank, dims, NULL)) < 0) + FAIL_STACK_ERROR /* create dcpl */ - if((dcpl1 = H5Pcreate(H5P_DATASET_CREATE)) < 0) FAIL_STACK_ERROR + if ((dcpl1 = H5Pcreate(H5P_DATASET_CREATE)) < 0) + FAIL_STACK_ERROR /* create a dataset */ - if((did1 = H5Dcreate2(fid1, "dset", H5T_NATIVE_INT, sid1, H5P_DEFAULT, dcpl1, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((did1 = H5Dcreate2(fid1, "dset", H5T_NATIVE_INT, sid1, H5P_DEFAULT, dcpl1, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* write */ - if(H5Dwrite(did1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) FAIL_STACK_ERROR + if (H5Dwrite(did1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) + FAIL_STACK_ERROR /* close */ - if(H5Sclose(sid1) < 0) FAIL_STACK_ERROR - if(H5Pclose(dcpl1) < 0) FAIL_STACK_ERROR - if(H5Dclose(did1) < 0) FAIL_STACK_ERROR - if(H5Fclose(fid1) < 0) FAIL_STACK_ERROR + if (H5Sclose(sid1) < 0) + FAIL_STACK_ERROR + if (H5Pclose(dcpl1) < 0) + FAIL_STACK_ERROR + if (H5Dclose(did1) < 0) + FAIL_STACK_ERROR + if (H5Fclose(fid1) < 0) + FAIL_STACK_ERROR /*------------------------------------------------------------------------- * step 2: open and create another file copying the data from file1 @@ -2741,71 +2963,87 @@ test_ninteger(void) */ /* open */ - if((fid1 = H5Fopen("tstint1.h5", H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((fid1 = H5Fopen("tstint1.h5", H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* open dataset */ - if((did1 = H5Dopen2(fid1, "dset", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((did1 = H5Dopen2(fid1, "dset", H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR - if((sid1 = H5Dget_space(did1)) < 0) FAIL_STACK_ERROR + if ((sid1 = H5Dget_space(did1)) < 0) + FAIL_STACK_ERROR /* get dcpl */ - if((dcpl1 = H5Dget_create_plist(did1)) < 0) FAIL_STACK_ERROR + if ((dcpl1 = H5Dget_create_plist(did1)) < 0) + FAIL_STACK_ERROR /* get file datatype */ - if((tid1 = H5Dget_type(did1)) < 0) FAIL_STACK_ERROR + if ((tid1 = H5Dget_type(did1)) < 0) + FAIL_STACK_ERROR /* get native datatype */ - if((nid1 = H5Tget_native_type(tid1, H5T_DIR_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((nid1 = H5Tget_native_type(tid1, H5T_DIR_DEFAULT)) < 0) + FAIL_STACK_ERROR /* get size */ - if(H5Tget_size(nid1) == 0) FAIL_STACK_ERROR + if (H5Tget_size(nid1) == 0) + FAIL_STACK_ERROR /* get rank */ - if((rank = H5Sget_simple_extent_ndims(sid1)) < 0) FAIL_STACK_ERROR + if ((rank = H5Sget_simple_extent_ndims(sid1)) < 0) + FAIL_STACK_ERROR HDmemset(dims, 0, sizeof dims); /* get dimension */ - if(H5Sget_simple_extent_dims(sid1, dims, NULL) < 0) FAIL_STACK_ERROR + if (H5Sget_simple_extent_dims(sid1, dims, NULL) < 0) + FAIL_STACK_ERROR nelmts = 1; - for(i = 0; i < rank; i++) + for (i = 0; i < rank; i++) nelmts *= dims[i]; /* read */ - if(H5Dread(did1, nid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, chk) < 0) FAIL_STACK_ERROR + if (H5Dread(did1, nid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, chk) < 0) + FAIL_STACK_ERROR /* create a file using default properties */ - if((fid2 = H5Fcreate("tstint2.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((fid2 = H5Fcreate("tstint2.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* create a dataset using the native type */ - if((did2 = H5Dcreate2(fid2, "dset", nid1, sid1, H5P_DEFAULT, dcpl1, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((did2 = H5Dcreate2(fid2, "dset", nid1, sid1, H5P_DEFAULT, dcpl1, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* write */ - if(H5Dwrite(did2, nid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, chk) < 0) FAIL_STACK_ERROR + if (H5Dwrite(did2, nid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, chk) < 0) + FAIL_STACK_ERROR /* get dcpl */ - if((dcpl2 = H5Dget_create_plist(did2)) < 0) FAIL_STACK_ERROR + if ((dcpl2 = H5Dget_create_plist(did2)) < 0) + FAIL_STACK_ERROR /* get file datatype */ - if((tid2 = H5Dget_type(did2)) < 0) FAIL_STACK_ERROR + if ((tid2 = H5Dget_type(did2)) < 0) + FAIL_STACK_ERROR /* get native datatype */ - if((nid2 = H5Tget_native_type(tid2, H5T_DIR_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((nid2 = H5Tget_native_type(tid2, H5T_DIR_DEFAULT)) < 0) + FAIL_STACK_ERROR /* check */ - if(H5Tget_precision(nid1) != H5Tget_precision(nid2)) { + if (H5Tget_precision(nid1) != H5Tget_precision(nid2)) { HDprintf(" Precision differ.\n"); TEST_ERROR } /* end if */ /* compare dataset creation property lists */ - if(H5Pequal(dcpl1, dcpl2) <= 0) { + if (H5Pequal(dcpl1, dcpl2) <= 0) { HDprintf(" Property lists differ.\n"); TEST_ERROR } /* end if */ /* check */ - for(i = 0; i < DIM3; i++) - if(buf[i] != chk[i]) { + for (i = 0; i < DIM3; i++) + if (buf[i] != chk[i]) { H5_FAILED(); HDprintf(" Read different values than written.\n"); HDprintf(" At index %d\n", i); @@ -2813,23 +3051,35 @@ test_ninteger(void) } /* end if */ /* close */ - if(H5Sclose(sid1) < 0) FAIL_STACK_ERROR - if(H5Pclose(dcpl1) < 0) FAIL_STACK_ERROR - if(H5Pclose(dcpl2) < 0) FAIL_STACK_ERROR - if(H5Tclose(tid1) < 0) FAIL_STACK_ERROR - if(H5Tclose(tid2) < 0) FAIL_STACK_ERROR - if(H5Tclose(nid1) < 0) FAIL_STACK_ERROR - if(H5Tclose(nid2) < 0) FAIL_STACK_ERROR - if(H5Dclose(did1) < 0) FAIL_STACK_ERROR - if(H5Dclose(did2) < 0) FAIL_STACK_ERROR - if(H5Fclose(fid1) < 0) FAIL_STACK_ERROR - if(H5Fclose(fid2) < 0) FAIL_STACK_ERROR + if (H5Sclose(sid1) < 0) + FAIL_STACK_ERROR + if (H5Pclose(dcpl1) < 0) + FAIL_STACK_ERROR + if (H5Pclose(dcpl2) < 0) + FAIL_STACK_ERROR + if (H5Tclose(tid1) < 0) + FAIL_STACK_ERROR + if (H5Tclose(tid2) < 0) + FAIL_STACK_ERROR + if (H5Tclose(nid1) < 0) + FAIL_STACK_ERROR + if (H5Tclose(nid2) < 0) + FAIL_STACK_ERROR + if (H5Dclose(did1) < 0) + FAIL_STACK_ERROR + if (H5Dclose(did2) < 0) + FAIL_STACK_ERROR + if (H5Fclose(fid1) < 0) + FAIL_STACK_ERROR + if (H5Fclose(fid2) < 0) + FAIL_STACK_ERROR PASSED(); return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Pclose(dcpl1); H5Pclose(dcpl2); H5Tclose(tid1); @@ -2841,12 +3091,12 @@ error: H5Sclose(sid1); H5Fclose(fid1); H5Fclose(fid2); - } H5E_END_TRY; + } + H5E_END_TRY; return -1; } /* end test_ninteger() */ - /*------------------------------------------------------------------------- * Function: main * @@ -2862,41 +3112,41 @@ error: int main(void) { - hid_t file, fapl; - int nerrors = 0; - char filename[1024]; + hid_t file, fapl; + int nerrors = 0; + char filename[1024]; h5_reset(); fapl = h5_fileaccess(); h5_fixname(FILENAME[0], fapl, filename, sizeof filename); - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) goto error; - nerrors += test_atomic_dtype(file) < 0 ? 1 : 0; - nerrors += test_compound_dtype(file) < 0 ? 1 : 0; - nerrors += test_compound_dtype2(file) < 0 ? 1 : 0; - nerrors += test_compound_dtype3(file) < 0 ? 1 : 0; - nerrors += test_compound_opaque(file) < 0 ? 1 : 0; - nerrors += test_enum_dtype(file) < 0 ? 1 : 0; - nerrors += test_array_dtype(file) < 0 ? 1 : 0; - nerrors += test_array_dtype2(file) < 0 ? 1 : 0; - nerrors += test_vl_dtype(file) < 0 ? 1 : 0; - nerrors += test_vlstr_dtype(file) < 0 ? 1 : 0; - nerrors += test_str_dtype(file) < 0 ? 1 : 0; - nerrors += test_refer_dtype(file) < 0 ? 1 : 0; - nerrors += test_refer_dtype2(file) < 0 ? 1 : 0; - nerrors += test_opaque_dtype(file) < 0 ? 1 : 0; - nerrors += test_bitfield_dtype(file) < 0 ? 1 : 0; - nerrors += test_ninteger() < 0 ? 1 : 0; - - if(H5Fclose(file) < 0) + nerrors += test_atomic_dtype(file) < 0 ? 1 : 0; + nerrors += test_compound_dtype(file) < 0 ? 1 : 0; + nerrors += test_compound_dtype2(file) < 0 ? 1 : 0; + nerrors += test_compound_dtype3(file) < 0 ? 1 : 0; + nerrors += test_compound_opaque(file) < 0 ? 1 : 0; + nerrors += test_enum_dtype(file) < 0 ? 1 : 0; + nerrors += test_array_dtype(file) < 0 ? 1 : 0; + nerrors += test_array_dtype2(file) < 0 ? 1 : 0; + nerrors += test_vl_dtype(file) < 0 ? 1 : 0; + nerrors += test_vlstr_dtype(file) < 0 ? 1 : 0; + nerrors += test_str_dtype(file) < 0 ? 1 : 0; + nerrors += test_refer_dtype(file) < 0 ? 1 : 0; + nerrors += test_refer_dtype2(file) < 0 ? 1 : 0; + nerrors += test_opaque_dtype(file) < 0 ? 1 : 0; + nerrors += test_bitfield_dtype(file) < 0 ? 1 : 0; + nerrors += test_ninteger() < 0 ? 1 : 0; + + if (H5Fclose(file) < 0) goto error; /* Verify symbol table messages are cached */ nerrors += (h5_verify_cached_stabs(FILENAME, fapl) < 0 ? 1 : 0); - if(nerrors) + if (nerrors) goto error; HDprintf("All native datatype tests passed.\n"); @@ -2905,15 +3155,15 @@ main(void) return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Fclose(file); h5_cleanup(FILENAME, fapl); - } H5E_END_TRY; + } + H5E_END_TRY; nerrors = MAX(1, nerrors); - HDprintf("***** %d DATASET TEST%s FAILED! *****\n", - nerrors, 1 == nerrors ? "" : "S"); + HDprintf("***** %d DATASET TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); return 1; } - |