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/dtypes.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/dtypes.c')
-rw-r--r-- | test/dtypes.c | 6286 |
1 files changed, 3526 insertions, 2760 deletions
diff --git a/test/dtypes.c b/test/dtypes.c index e96e826..bb9bb2e 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -20,19 +20,19 @@ #include "testhdf5.h" #include "H5srcdir.h" -#include "H5Iprivate.h" /* For checking that datatype id's don't leak */ +#include "H5Iprivate.h" /* For checking that datatype id's don't leak */ /* Number of elements in each test */ -#define NTESTELEM 100000 +#define NTESTELEM 100000 /* For test_compound_8 and test_compound_10 */ -#define ARRAY_DIM 4 +#define ARRAY_DIM 4 /* * Offset from alinged memory returned by malloc(). This can be used to test * that type conversions handle non-aligned buffers correctly. */ -#define ALIGNMENT 1 +#define ALIGNMENT 1 /* * Define if you want to test alignment code on a machine that doesn't @@ -43,103 +43,93 @@ /* Alignment test stuff */ #ifdef TEST_ALIGNMENT -#define H5T_FRIEND /*suppress error about including H5Tpkg */ +#define H5T_FRIEND /*suppress error about including H5Tpkg */ #include "H5Tpkg.h" #endif /* Use in version bound test */ -#define H5F_FRIEND /*suppress error about including H5Fpkg */ +#define H5F_FRIEND /*suppress error about including H5Fpkg */ #define H5F_TESTING -#include "H5Fpkg.h" /* File access */ +#include "H5Fpkg.h" /* File access */ /* Use in version bound test */ -#define H5O_FRIEND /*suppress error about including H5Opkg */ -#include "H5Opkg.h" /* Object headers */ +#define H5O_FRIEND /*suppress error about including H5Opkg */ +#include "H5Opkg.h" /* Object headers */ -#define SET_ALIGNMENT(TYPE,VAL) \ - H5T_NATIVE_##TYPE##_ALIGN_g=MAX(H5T_NATIVE_##TYPE##_ALIGN_g, VAL) +#define SET_ALIGNMENT(TYPE, VAL) H5T_NATIVE_##TYPE##_ALIGN_g = MAX(H5T_NATIVE_##TYPE##_ALIGN_g, VAL) /* * Macro for checking that the correct number of datatype ids are present. Be * careful as the call to H5Tunregister removes *ALL* compound conversions from * the soft conversion list. One must call reset_hdf5() after this. */ -#define CHECK_NMEMBS(NMEMBS,SRC_ID,DST_ID) \ - if(H5Tunregister(H5T_PERS_SOFT, NULL, SRC_ID, DST_ID, NULL) < 0) \ - FAIL_STACK_ERROR \ - if(H5Tclose(SRC_ID) < 0 || ((SRC_ID) != (DST_ID) && H5Tclose(DST_ID) < 0)) \ - FAIL_STACK_ERROR \ - if((NMEMBS) != H5I_nmembers(H5I_DATATYPE)) { \ - H5_FAILED(); \ - HDprintf(" #dtype ids expected: %lld; found: %lld\n", \ - (long long)NMEMBS, (long long)H5I_nmembers(H5I_DATATYPE)); \ - goto error; \ +#define CHECK_NMEMBS(NMEMBS, SRC_ID, DST_ID) \ + if (H5Tunregister(H5T_PERS_SOFT, NULL, SRC_ID, DST_ID, NULL) < 0) \ + FAIL_STACK_ERROR \ + if (H5Tclose(SRC_ID) < 0 || ((SRC_ID) != (DST_ID) && H5Tclose(DST_ID) < 0)) \ + FAIL_STACK_ERROR \ + if ((NMEMBS) != H5I_nmembers(H5I_DATATYPE)) { \ + H5_FAILED(); \ + HDprintf(" #dtype ids expected: %lld; found: %lld\n", (long long)NMEMBS, \ + (long long)H5I_nmembers(H5I_DATATYPE)); \ + goto error; \ } -const char *FILENAME[] = { - "dtypes0", - "dtypes1", - "dtypes2", - "dtypes3", - "dtypes4", - "dtypes5", - "dtypes6", - "dtypes7", - "dtypes8", - "dtypes9", - "dtypes10", - NULL -}; - -#define TESTFILE "bad_compound.h5" +const char *FILENAME[] = {"dtypes0", "dtypes1", "dtypes2", "dtypes3", "dtypes4", "dtypes5", + "dtypes6", "dtypes7", "dtypes8", "dtypes9", "dtypes10", NULL}; + +#define TESTFILE "bad_compound.h5" typedef struct complex_t { - double re; - double im; + double re; + double im; } complex_t; typedef enum dtype_t { - INT_SCHAR, INT_UCHAR, INT_SHORT, INT_USHORT, INT_INT, INT_UINT, - INT_LONG, INT_ULONG, INT_LLONG, INT_ULLONG, FLT_FLOAT, FLT_DOUBLE, - FLT_LDOUBLE, OTHER + INT_SCHAR, + INT_UCHAR, + INT_SHORT, + INT_USHORT, + INT_INT, + INT_UINT, + INT_LONG, + INT_ULONG, + INT_LLONG, + INT_ULLONG, + FLT_FLOAT, + FLT_DOUBLE, + FLT_LDOUBLE, + OTHER } dtype_t; /* This doesn't seem to be used anywhere... -BMR */ -typedef enum { - E1_RED, - E1_GREEN, - E1_BLUE, - E1_ORANGE, - E1_YELLOW -} color_t; +typedef enum { E1_RED, E1_GREEN, E1_BLUE, E1_ORANGE, E1_YELLOW } color_t; /* Constant for size of conversion buffer for int <-> float exception test */ -#define CONVERT_SIZE 4 +#define CONVERT_SIZE 4 /* Constants for compound_13 test */ -#define COMPOUND13_ARRAY_SIZE 256 -#define COMPOUND13_ATTR_NAME "attr" +#define COMPOUND13_ARRAY_SIZE 256 +#define COMPOUND13_ATTR_NAME "attr" /* Constants for delete_obj_named test */ -#define DEL_OBJ_NAMED_DATASET "/Dataset" -#define DEL_OBJ_NAMED_NAMED_DTYPE "/Dtype" -#define DEL_OBJ_NAMED_ATTRIBUTE "Attr" +#define DEL_OBJ_NAMED_DATASET "/Dataset" +#define DEL_OBJ_NAMED_NAMED_DTYPE "/Dtype" +#define DEL_OBJ_NAMED_ATTRIBUTE "Attr" /* Constant for testing conversion of UTF-8 characters */ -#define UTF8_DATASET "utf8" -#define UTF8_DATASET2 "2nd_utf8" -#define ASCII_DATASET "ascii" -#define ASCII_DATASET2 "2nd_ascii" +#define UTF8_DATASET "utf8" +#define UTF8_DATASET2 "2nd_utf8" +#define ASCII_DATASET "ascii" +#define ASCII_DATASET2 "2nd_ascii" /* Count opaque conversions */ static int num_opaque_conversions_g = 0; -static int opaque_check(int tag_it); -static herr_t convert_opaque(hid_t st, hid_t dt, H5T_cdata_t *cdata, - size_t nelmts, size_t buf_stride, size_t bkg_stride, void *_buf, - void *bkg, hid_t dset_xfer_plid); -static int opaque_long(void); -static int opaque_funcs(void); - +static int opaque_check(int tag_it); +static herr_t convert_opaque(hid_t st, hid_t dt, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, + size_t bkg_stride, void *_buf, void *bkg, hid_t dset_xfer_plid); +static int opaque_long(void); +static int opaque_funcs(void); /*------------------------------------------------------------------------- * Function: reset_hdf5 @@ -158,26 +148,24 @@ reset_hdf5(void) { h5_reset(); #ifdef TEST_ALIGNMENT - SET_ALIGNMENT(SCHAR, H5_SIZEOF_CHAR); - SET_ALIGNMENT(UCHAR, H5_SIZEOF_CHAR); - SET_ALIGNMENT(SHORT, H5_SIZEOF_SHORT); - SET_ALIGNMENT(USHORT, H5_SIZEOF_SHORT); - SET_ALIGNMENT(INT, H5_SIZEOF_INT); - SET_ALIGNMENT(UINT, H5_SIZEOF_INT); - SET_ALIGNMENT(LONG, H5_SIZEOF_LONG); - SET_ALIGNMENT(ULONG, H5_SIZEOF_LONG); - SET_ALIGNMENT(LLONG, H5_SIZEOF_LONG_LONG); - SET_ALIGNMENT(ULLONG, H5_SIZEOF_LONG_LONG); - SET_ALIGNMENT(FLOAT, H5_SIZEOF_FLOAT); - SET_ALIGNMENT(DOUBLE, H5_SIZEOF_DOUBLE); -#if H5_SIZEOF_LONG_DOUBLE !=0 + SET_ALIGNMENT(SCHAR, H5_SIZEOF_CHAR); + SET_ALIGNMENT(UCHAR, H5_SIZEOF_CHAR); + SET_ALIGNMENT(SHORT, H5_SIZEOF_SHORT); + SET_ALIGNMENT(USHORT, H5_SIZEOF_SHORT); + SET_ALIGNMENT(INT, H5_SIZEOF_INT); + SET_ALIGNMENT(UINT, H5_SIZEOF_INT); + SET_ALIGNMENT(LONG, H5_SIZEOF_LONG); + SET_ALIGNMENT(ULONG, H5_SIZEOF_LONG); + SET_ALIGNMENT(LLONG, H5_SIZEOF_LONG_LONG); + SET_ALIGNMENT(ULLONG, H5_SIZEOF_LONG_LONG); + SET_ALIGNMENT(FLOAT, H5_SIZEOF_FLOAT); + SET_ALIGNMENT(DOUBLE, H5_SIZEOF_DOUBLE); +#if H5_SIZEOF_LONG_DOUBLE != 0 SET_ALIGNMENT(LDOUBLE, H5_SIZEOF_LONG_DOUBLE); #endif #endif - } - /*------------------------------------------------------------------------- * Function: test_classes * @@ -193,88 +181,111 @@ reset_hdf5(void) static int test_classes(void) { - struct complex { /* Struct with complex fields */ + struct complex { /* Struct with complex fields */ hvl_t vl_c; hvl_t vl_s; }; - hid_t cmpd_id; /* Compound datatype */ - hid_t vlc_id; /* VL type of char */ - hid_t vls_id; /* VL string */ - hid_t memb_id; /* Compound member datatype */ - H5T_class_t memb_cls; - H5T_class_t tcls; - int nmembs; - unsigned u; + hid_t cmpd_id; /* Compound datatype */ + hid_t vlc_id; /* VL type of char */ + hid_t vls_id; /* VL string */ + hid_t memb_id; /* Compound member datatype */ + H5T_class_t memb_cls; + H5T_class_t tcls; + int nmembs; + unsigned u; TESTING("H5Tget_class()"); /*------------------------------------------------------------- * Check class of some atomic types. *-----------------------------------------------------------*/ - if((tcls = H5Tget_class(H5T_NATIVE_INT)) < 0) TEST_ERROR - if(H5T_INTEGER != tcls) TEST_ERROR + if ((tcls = H5Tget_class(H5T_NATIVE_INT)) < 0) + TEST_ERROR + if (H5T_INTEGER != tcls) + TEST_ERROR - if((tcls = H5Tget_class(H5T_NATIVE_DOUBLE)) < 0) TEST_ERROR - if(H5T_FLOAT != tcls) TEST_ERROR + if ((tcls = H5Tget_class(H5T_NATIVE_DOUBLE)) < 0) + TEST_ERROR + if (H5T_FLOAT != tcls) + TEST_ERROR /* Create a VL datatype of char. It should be a VL, not a string class. */ - if((vlc_id = H5Tvlen_create(H5T_NATIVE_CHAR)) < 0) TEST_ERROR + if ((vlc_id = H5Tvlen_create(H5T_NATIVE_CHAR)) < 0) + TEST_ERROR /* Make certain that the correct classes can be detected */ - if((tcls = H5Tget_class(vlc_id)) < 0) TEST_ERROR - if(H5T_VLEN != tcls) TEST_ERROR + if ((tcls = H5Tget_class(vlc_id)) < 0) + TEST_ERROR + if (H5T_VLEN != tcls) + TEST_ERROR /* Make certain that an incorrect class is not detected */ - if(H5T_STRING == tcls) TEST_ERROR + if (H5T_STRING == tcls) + TEST_ERROR /* Create a VL string. It should be a string, not a VL class. */ - if((vls_id = H5Tcopy(H5T_C_S1)) < 0) TEST_ERROR - if(H5Tset_size(vls_id, H5T_VARIABLE) < 0) TEST_ERROR; + if ((vls_id = H5Tcopy(H5T_C_S1)) < 0) + TEST_ERROR + if (H5Tset_size(vls_id, H5T_VARIABLE) < 0) + TEST_ERROR; /* Make certain that the correct classes can be detected */ - if((tcls = H5Tget_class(vls_id)) < 0) TEST_ERROR - if(H5T_STRING != tcls) TEST_ERROR + if ((tcls = H5Tget_class(vls_id)) < 0) + TEST_ERROR + if (H5T_STRING != tcls) + TEST_ERROR /* Make certain that an incorrect class is not detected */ - if(H5T_VLEN == tcls) TEST_ERROR + if (H5T_VLEN == tcls) + TEST_ERROR /*------------------------------------------------------------- * Check class for member types of compound type. *-----------------------------------------------------------*/ /* Create a compound datatype and insert some complex types */ - if((cmpd_id = H5Tcreate(H5T_COMPOUND, sizeof(struct complex))) < 0) TEST_ERROR - if(H5Tinsert(cmpd_id, "vl_c", HOFFSET(struct complex, vl_c), vlc_id) < 0) TEST_ERROR - if(H5Tinsert(cmpd_id, "vl_s", HOFFSET(struct complex, vl_s), vls_id) < 0) TEST_ERROR + if ((cmpd_id = H5Tcreate(H5T_COMPOUND, sizeof(struct complex))) < 0) + TEST_ERROR + if (H5Tinsert(cmpd_id, "vl_c", HOFFSET(struct complex, vl_c), vlc_id) < 0) + TEST_ERROR + if (H5Tinsert(cmpd_id, "vl_s", HOFFSET(struct complex, vl_s), vls_id) < 0) + TEST_ERROR - if((nmembs = H5Tget_nmembers(cmpd_id)) < 0) TEST_ERROR + if ((nmembs = H5Tget_nmembers(cmpd_id)) < 0) + TEST_ERROR - for(u = 0; u < (unsigned)nmembs; u++) { + for (u = 0; u < (unsigned)nmembs; u++) { /* Get member type ID */ - if((memb_id = H5Tget_member_type(cmpd_id, u)) < 0) TEST_ERROR + if ((memb_id = H5Tget_member_type(cmpd_id, u)) < 0) + TEST_ERROR /* Get member type class */ - if((memb_cls = H5Tget_member_class (cmpd_id, u)) < 0) TEST_ERROR + if ((memb_cls = H5Tget_member_class(cmpd_id, u)) < 0) + TEST_ERROR /* Verify member class */ - if(H5Tdetect_class(memb_id, memb_cls) < 0) TEST_ERROR + if (H5Tdetect_class(memb_id, memb_cls) < 0) + TEST_ERROR /* Close member type ID */ - if(H5Tclose(memb_id) < 0) TEST_ERROR + if (H5Tclose(memb_id) < 0) + TEST_ERROR } /* end for */ /* Close datatypes */ - if(H5Tclose(cmpd_id) < 0) TEST_ERROR - if(H5Tclose(vlc_id) < 0) TEST_ERROR - if(H5Tclose(vls_id) < 0) TEST_ERROR + if (H5Tclose(cmpd_id) < 0) + TEST_ERROR + if (H5Tclose(vlc_id) < 0) + TEST_ERROR + if (H5Tclose(vls_id) < 0) + TEST_ERROR PASSED(); return 0; - error: +error: return 1; } - /*------------------------------------------------------------------------- * Function: test_copy * @@ -290,32 +301,32 @@ test_classes(void) static int test_copy(void) { - hid_t a_copy; - herr_t status; + hid_t a_copy; + herr_t status; TESTING("H5Tcopy()"); - if ((a_copy = H5Tcopy(H5T_NATIVE_SHORT)) < 0) goto error; - if (H5Tclose(a_copy) < 0) goto error; + if ((a_copy = H5Tcopy(H5T_NATIVE_SHORT)) < 0) + goto error; + if (H5Tclose(a_copy) < 0) + goto error; /* We should not be able to close a built-in byte */ - H5E_BEGIN_TRY { - status = H5Tclose (H5T_NATIVE_SCHAR); - } H5E_END_TRY; - if (status>=0) { + H5E_BEGIN_TRY { status = H5Tclose(H5T_NATIVE_SCHAR); } + H5E_END_TRY; + if (status >= 0) { H5_FAILED(); - HDputs (" Should not be able to close a predefined type!"); + HDputs(" Should not be able to close a predefined type!"); goto error; } PASSED(); return 0; - error: +error: return 1; } - /*------------------------------------------------------------------------- * Function: test_detect * @@ -338,29 +349,29 @@ test_copy(void) static int test_detect(void) { - struct atomic { /* Struct with atomic fields */ - int i; - float f; - char c; + struct atomic { /* Struct with atomic fields */ + int i; + float f; + char c; double d; - short s; + short s; }; - struct complex { /* Struct with complex fields */ + struct complex { /* Struct with complex fields */ hobj_ref_t arr_r[3][3]; - int i; - hvl_t vl_f; - hvl_t vl_s; - char c; - short s; + int i; + hvl_t vl_f; + hvl_t vl_s; + char c; + short s; }; - hid_t atom_cmpd_id; /* Atomic Compound datatype */ - hid_t atom_arr_id; /* Atomic Array datatype */ - hid_t atom_vlf_id; /* Atomic VL datatype of float */ - hid_t atom_vlc_id; /* Atomic VL datatype of char */ - hid_t atom_vls_id; /* Atomic VL string datatype */ - hid_t cplx_cmpd_id; /* Complex Compound datatype */ - unsigned rank = 2; /* Rank for array datatype */ - hsize_t dims[2] = {3,3}; /* Dimensions for array datatype */ + hid_t atom_cmpd_id; /* Atomic Compound datatype */ + hid_t atom_arr_id; /* Atomic Array datatype */ + hid_t atom_vlf_id; /* Atomic VL datatype of float */ + hid_t atom_vlc_id; /* Atomic VL datatype of char */ + hid_t atom_vls_id; /* Atomic VL string datatype */ + hid_t cplx_cmpd_id; /* Complex Compound datatype */ + unsigned rank = 2; /* Rank for array datatype */ + hsize_t dims[2] = {3, 3}; /* Dimensions for array datatype */ TESTING("H5Tdetect_class()"); @@ -368,121 +379,176 @@ test_detect(void) * Test class of some atomic types. *------------------------------------------------------------------------------*/ /* Native integers should be in the integer class */ - if(H5Tdetect_class(H5T_NATIVE_INT,H5T_INTEGER)!=TRUE) TEST_ERROR + if (H5Tdetect_class(H5T_NATIVE_INT, H5T_INTEGER) != TRUE) + TEST_ERROR /* Native integers should _not_ be in other classes */ - if(H5Tdetect_class(H5T_NATIVE_INT,H5T_FLOAT)!=FALSE) TEST_ERROR - if(H5Tdetect_class(H5T_NATIVE_INT,H5T_ARRAY)!=FALSE) TEST_ERROR - if(H5Tdetect_class(H5T_NATIVE_INT,H5T_ENUM)!=FALSE) TEST_ERROR + if (H5Tdetect_class(H5T_NATIVE_INT, H5T_FLOAT) != FALSE) + TEST_ERROR + if (H5Tdetect_class(H5T_NATIVE_INT, H5T_ARRAY) != FALSE) + TEST_ERROR + if (H5Tdetect_class(H5T_NATIVE_INT, H5T_ENUM) != FALSE) + TEST_ERROR /*-------------------------------------------------------------------------------- * Test class of a compound type with some atomic types as fields. *------------------------------------------------------------------------------*/ /* Create a compound datatype and insert some atomic types */ - if ((atom_cmpd_id = H5Tcreate(H5T_COMPOUND, sizeof(struct atomic))) < 0) TEST_ERROR - if (H5Tinsert(atom_cmpd_id, "i", HOFFSET(struct atomic, i), H5T_NATIVE_INT) < 0) TEST_ERROR - if (H5Tinsert(atom_cmpd_id, "f", HOFFSET(struct atomic, f), H5T_NATIVE_FLOAT) < 0) TEST_ERROR - if (H5Tinsert(atom_cmpd_id, "c", HOFFSET(struct atomic, c), H5T_NATIVE_CHAR) < 0) TEST_ERROR - if (H5Tinsert(atom_cmpd_id, "d", HOFFSET(struct atomic, d), H5T_NATIVE_DOUBLE) < 0) TEST_ERROR - if (H5Tinsert(atom_cmpd_id, "s", HOFFSET(struct atomic, s), H5T_NATIVE_SHORT) < 0) TEST_ERROR + if ((atom_cmpd_id = H5Tcreate(H5T_COMPOUND, sizeof(struct atomic))) < 0) + TEST_ERROR + if (H5Tinsert(atom_cmpd_id, "i", HOFFSET(struct atomic, i), H5T_NATIVE_INT) < 0) + TEST_ERROR + if (H5Tinsert(atom_cmpd_id, "f", HOFFSET(struct atomic, f), H5T_NATIVE_FLOAT) < 0) + TEST_ERROR + if (H5Tinsert(atom_cmpd_id, "c", HOFFSET(struct atomic, c), H5T_NATIVE_CHAR) < 0) + TEST_ERROR + if (H5Tinsert(atom_cmpd_id, "d", HOFFSET(struct atomic, d), H5T_NATIVE_DOUBLE) < 0) + TEST_ERROR + if (H5Tinsert(atom_cmpd_id, "s", HOFFSET(struct atomic, s), H5T_NATIVE_SHORT) < 0) + TEST_ERROR /* Make certain that the correct classes can be detected */ - if(H5Tdetect_class(atom_cmpd_id,H5T_COMPOUND)!=TRUE) TEST_ERROR - if(H5Tdetect_class(atom_cmpd_id,H5T_INTEGER)!=TRUE) TEST_ERROR - if(H5Tdetect_class(atom_cmpd_id,H5T_FLOAT)!=TRUE) TEST_ERROR + if (H5Tdetect_class(atom_cmpd_id, H5T_COMPOUND) != TRUE) + TEST_ERROR + if (H5Tdetect_class(atom_cmpd_id, H5T_INTEGER) != TRUE) + TEST_ERROR + if (H5Tdetect_class(atom_cmpd_id, H5T_FLOAT) != TRUE) + TEST_ERROR /* Make certain that an incorrect class is not detected */ - if(H5Tdetect_class(atom_cmpd_id,H5T_VLEN)!=FALSE) TEST_ERROR + if (H5Tdetect_class(atom_cmpd_id, H5T_VLEN) != FALSE) + TEST_ERROR /*-------------------------------------------------------------------------------- * Test class of some complex types. *------------------------------------------------------------------------------*/ /* Create an array datatype with an atomic base type */ - if((atom_arr_id = H5Tarray_create2(H5T_STD_REF_OBJ, rank, dims)) < 0) TEST_ERROR + if ((atom_arr_id = H5Tarray_create2(H5T_STD_REF_OBJ, rank, dims)) < 0) + TEST_ERROR /* Make certain that the correct classes can be detected */ - if(H5Tdetect_class(atom_arr_id,H5T_ARRAY)!=TRUE) TEST_ERROR - if(H5Tdetect_class(atom_arr_id,H5T_REFERENCE)!=TRUE) TEST_ERROR + if (H5Tdetect_class(atom_arr_id, H5T_ARRAY) != TRUE) + TEST_ERROR + if (H5Tdetect_class(atom_arr_id, H5T_REFERENCE) != TRUE) + TEST_ERROR /* Make certain that an incorrect class is not detected */ - if(H5Tdetect_class(atom_arr_id,H5T_VLEN)!=FALSE) TEST_ERROR - if(H5Tdetect_class(atom_arr_id,H5T_FLOAT)!=FALSE) TEST_ERROR - if(H5Tdetect_class(atom_arr_id,H5T_INTEGER)!=FALSE) TEST_ERROR + if (H5Tdetect_class(atom_arr_id, H5T_VLEN) != FALSE) + TEST_ERROR + if (H5Tdetect_class(atom_arr_id, H5T_FLOAT) != FALSE) + TEST_ERROR + if (H5Tdetect_class(atom_arr_id, H5T_INTEGER) != FALSE) + TEST_ERROR /* Create a VL datatype with an atomic base type of float*/ - if((atom_vlf_id=H5Tvlen_create(H5T_NATIVE_FLOAT)) < 0) TEST_ERROR + if ((atom_vlf_id = H5Tvlen_create(H5T_NATIVE_FLOAT)) < 0) + TEST_ERROR /* Make certain that the correct classes can be detected */ - if(H5Tdetect_class(atom_vlf_id,H5T_VLEN)!=TRUE) TEST_ERROR - if(H5Tdetect_class(atom_vlf_id,H5T_FLOAT)!=TRUE) TEST_ERROR + if (H5Tdetect_class(atom_vlf_id, H5T_VLEN) != TRUE) + TEST_ERROR + if (H5Tdetect_class(atom_vlf_id, H5T_FLOAT) != TRUE) + TEST_ERROR /* Make certain that an incorrect class is not detected */ - if(H5Tdetect_class(atom_vlf_id,H5T_COMPOUND)!=FALSE) TEST_ERROR - if(H5Tdetect_class(atom_vlf_id,H5T_INTEGER)!=FALSE) TEST_ERROR + if (H5Tdetect_class(atom_vlf_id, H5T_COMPOUND) != FALSE) + TEST_ERROR + if (H5Tdetect_class(atom_vlf_id, H5T_INTEGER) != FALSE) + TEST_ERROR /* Create a VL datatype with an atomic base type of char. It should be a VL * but not a string class. */ - if((atom_vlc_id=H5Tvlen_create(H5T_NATIVE_CHAR)) < 0) TEST_ERROR + if ((atom_vlc_id = H5Tvlen_create(H5T_NATIVE_CHAR)) < 0) + TEST_ERROR /* Make certain that the correct classes can be detected */ - if(H5Tdetect_class(atom_vlc_id,H5T_VLEN)!=TRUE) TEST_ERROR - if(H5Tdetect_class(atom_vlc_id,H5T_INTEGER)!=TRUE) TEST_ERROR + if (H5Tdetect_class(atom_vlc_id, H5T_VLEN) != TRUE) + TEST_ERROR + if (H5Tdetect_class(atom_vlc_id, H5T_INTEGER) != TRUE) + TEST_ERROR /* Make certain that an incorrect class is not detected */ - if(H5Tdetect_class(atom_vlc_id,H5T_STRING)!=FALSE) TEST_ERROR + if (H5Tdetect_class(atom_vlc_id, H5T_STRING) != FALSE) + TEST_ERROR /* Create a VL string. It should be a string, not a VL class. */ - if((atom_vls_id=H5Tcopy(H5T_C_S1)) < 0) TEST_ERROR - if(H5Tset_size(atom_vls_id, H5T_VARIABLE) < 0) TEST_ERROR; + if ((atom_vls_id = H5Tcopy(H5T_C_S1)) < 0) + TEST_ERROR + if (H5Tset_size(atom_vls_id, H5T_VARIABLE) < 0) + TEST_ERROR; /* Make certain that the correct classes can be detected */ - if(H5Tdetect_class(atom_vls_id,H5T_STRING)!=TRUE) TEST_ERROR + if (H5Tdetect_class(atom_vls_id, H5T_STRING) != TRUE) + TEST_ERROR /* Make certain that an incorrect class is not detected */ - if(H5Tdetect_class(atom_vls_id,H5T_VLEN)!=FALSE) TEST_ERROR + if (H5Tdetect_class(atom_vls_id, H5T_VLEN) != FALSE) + TEST_ERROR /*-------------------------------------------------------------------------------- * Test class of a compound type with some complex types as fields. *------------------------------------------------------------------------------*/ /* Create a compound datatype and insert some complex types */ - if ((cplx_cmpd_id = H5Tcreate(H5T_COMPOUND, sizeof(struct complex))) < 0) TEST_ERROR - if (H5Tinsert(cplx_cmpd_id, "arr_r", HOFFSET(struct complex, arr_r), atom_arr_id) < 0) TEST_ERROR - if (H5Tinsert(cplx_cmpd_id, "i", HOFFSET(struct complex, i), H5T_NATIVE_INT) < 0) TEST_ERROR - if (H5Tinsert(cplx_cmpd_id, "vl_f", HOFFSET(struct complex, vl_f), atom_vlf_id) < 0) TEST_ERROR - if (H5Tinsert(cplx_cmpd_id, "vl_s", HOFFSET(struct complex, vl_s), atom_vls_id) < 0) TEST_ERROR - if (H5Tinsert(cplx_cmpd_id, "c", HOFFSET(struct complex, c), H5T_NATIVE_CHAR) < 0) TEST_ERROR - if (H5Tinsert(cplx_cmpd_id, "s", HOFFSET(struct complex, s), H5T_NATIVE_SHORT) < 0) TEST_ERROR + if ((cplx_cmpd_id = H5Tcreate(H5T_COMPOUND, sizeof(struct complex))) < 0) + TEST_ERROR + if (H5Tinsert(cplx_cmpd_id, "arr_r", HOFFSET(struct complex, arr_r), atom_arr_id) < 0) + TEST_ERROR + if (H5Tinsert(cplx_cmpd_id, "i", HOFFSET(struct complex, i), H5T_NATIVE_INT) < 0) + TEST_ERROR + if (H5Tinsert(cplx_cmpd_id, "vl_f", HOFFSET(struct complex, vl_f), atom_vlf_id) < 0) + TEST_ERROR + if (H5Tinsert(cplx_cmpd_id, "vl_s", HOFFSET(struct complex, vl_s), atom_vls_id) < 0) + TEST_ERROR + if (H5Tinsert(cplx_cmpd_id, "c", HOFFSET(struct complex, c), H5T_NATIVE_CHAR) < 0) + TEST_ERROR + if (H5Tinsert(cplx_cmpd_id, "s", HOFFSET(struct complex, s), H5T_NATIVE_SHORT) < 0) + TEST_ERROR /* Make certain that the correct classes can be detected */ - if(H5Tdetect_class(cplx_cmpd_id,H5T_COMPOUND)!=TRUE) TEST_ERROR - if(H5Tdetect_class(cplx_cmpd_id,H5T_ARRAY)!=TRUE) TEST_ERROR - if(H5Tdetect_class(cplx_cmpd_id,H5T_REFERENCE)!=TRUE) TEST_ERROR - if(H5Tdetect_class(cplx_cmpd_id,H5T_INTEGER)!=TRUE) TEST_ERROR - if(H5Tdetect_class(cplx_cmpd_id,H5T_FLOAT)!=TRUE) TEST_ERROR - if(H5Tdetect_class(cplx_cmpd_id,H5T_STRING)!=TRUE) TEST_ERROR - if(H5Tdetect_class(cplx_cmpd_id,H5T_VLEN)!=TRUE) TEST_ERROR + if (H5Tdetect_class(cplx_cmpd_id, H5T_COMPOUND) != TRUE) + TEST_ERROR + if (H5Tdetect_class(cplx_cmpd_id, H5T_ARRAY) != TRUE) + TEST_ERROR + if (H5Tdetect_class(cplx_cmpd_id, H5T_REFERENCE) != TRUE) + TEST_ERROR + if (H5Tdetect_class(cplx_cmpd_id, H5T_INTEGER) != TRUE) + TEST_ERROR + if (H5Tdetect_class(cplx_cmpd_id, H5T_FLOAT) != TRUE) + TEST_ERROR + if (H5Tdetect_class(cplx_cmpd_id, H5T_STRING) != TRUE) + TEST_ERROR + if (H5Tdetect_class(cplx_cmpd_id, H5T_VLEN) != TRUE) + TEST_ERROR /* Make certain that an incorrect class is not detected */ - if(H5Tdetect_class(cplx_cmpd_id,H5T_TIME)!=FALSE) TEST_ERROR - if(H5Tdetect_class(cplx_cmpd_id,H5T_ENUM)!=FALSE) TEST_ERROR + if (H5Tdetect_class(cplx_cmpd_id, H5T_TIME) != FALSE) + TEST_ERROR + if (H5Tdetect_class(cplx_cmpd_id, H5T_ENUM) != FALSE) + TEST_ERROR /* Close complex compound datatype */ - if(H5Tclose(cplx_cmpd_id) < 0) TEST_ERROR + if (H5Tclose(cplx_cmpd_id) < 0) + TEST_ERROR /* Close atomic VL datatype of float */ - if(H5Tclose(atom_vlf_id) < 0) TEST_ERROR + if (H5Tclose(atom_vlf_id) < 0) + TEST_ERROR /* Close atomic VL datatype of char */ - if(H5Tclose(atom_vlc_id) < 0) TEST_ERROR + if (H5Tclose(atom_vlc_id) < 0) + TEST_ERROR /* Close atomic VL string datatype */ - if(H5Tclose(atom_vls_id) < 0) TEST_ERROR + if (H5Tclose(atom_vls_id) < 0) + TEST_ERROR /* Close atomic array datatype */ - if(H5Tclose(atom_arr_id) < 0) TEST_ERROR + if (H5Tclose(atom_arr_id) < 0) + TEST_ERROR /* Close atomic compound datatype */ - if(H5Tclose(atom_cmpd_id) < 0) TEST_ERROR + if (H5Tclose(atom_cmpd_id) < 0) + TEST_ERROR PASSED(); return 0; @@ -491,7 +557,6 @@ error: return 1; } - /*------------------------------------------------------------------------- * Function: test_compound_1 * @@ -507,18 +572,18 @@ error: static int test_compound_1(void) { - hid_t complex_id; - hid_t super; - size_t size; - H5T_pad_t lsb, msb; - H5T_cset_t cset; - H5T_str_t strpad; - H5T_order_t order; - H5T_sign_t sign; - char *tag = NULL; - int offset; - herr_t ret; - int retval = 1; + hid_t complex_id; + hid_t super; + size_t size; + H5T_pad_t lsb, msb; + H5T_cset_t cset; + H5T_str_t strpad; + H5T_order_t order; + H5T_sign_t sign; + char * tag = NULL; + int offset; + herr_t ret; + int retval = 1; TESTING("compound datatypes"); @@ -527,131 +592,117 @@ test_compound_1(void) goto error; /* Try to shrink and expand the size */ - if(H5Tset_size(complex_id, sizeof(double)) < 0) + if (H5Tset_size(complex_id, sizeof(double)) < 0) goto error; - if(H5Tset_size(complex_id, sizeof(complex_t)) < 0) + if (H5Tset_size(complex_id, sizeof(complex_t)) < 0) goto error; /* Attempt to add the new compound datatype as a field within itself */ - H5E_BEGIN_TRY { - ret=H5Tinsert(complex_id, "compound", (size_t)0, complex_id); - } H5E_END_TRY; - if (ret>=0) { + H5E_BEGIN_TRY { ret = H5Tinsert(complex_id, "compound", (size_t)0, complex_id); } + H5E_END_TRY; + if (ret >= 0) { FAIL_PUTS_ERROR("Inserted compound datatype into itself?"); } /* end if */ /* Add a couple fields */ - if(H5Tinsert(complex_id, "real", HOFFSET(complex_t, re), H5T_NATIVE_DOUBLE) < 0) + if (H5Tinsert(complex_id, "real", HOFFSET(complex_t, re), H5T_NATIVE_DOUBLE) < 0) goto error; - if(H5Tinsert(complex_id, "imaginary", HOFFSET(complex_t, im), H5T_NATIVE_DOUBLE) < 0) + if (H5Tinsert(complex_id, "imaginary", HOFFSET(complex_t, im), H5T_NATIVE_DOUBLE) < 0) goto error; /* Test some functions that aren't supposed to work for compound type */ /* Tries to shrink the size and trail the last member */ - H5E_BEGIN_TRY { - ret=H5Tset_size(complex_id, sizeof(double)); - } H5E_END_TRY; - if (ret>=0) { + H5E_BEGIN_TRY { ret = H5Tset_size(complex_id, sizeof(double)); } + H5E_END_TRY; + if (ret >= 0) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ - H5E_BEGIN_TRY { - size=H5Tget_precision(complex_id); - } H5E_END_TRY; - if (size>0) { + H5E_BEGIN_TRY { size = H5Tget_precision(complex_id); } + H5E_END_TRY; + if (size > 0) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ size = 128; - H5E_BEGIN_TRY { - ret = H5Tset_precision(complex_id, size); - } H5E_END_TRY; - if (ret>=0) { + H5E_BEGIN_TRY { ret = H5Tset_precision(complex_id, size); } + H5E_END_TRY; + if (ret >= 0) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ - H5E_BEGIN_TRY { - ret = H5Tget_pad(complex_id, &lsb, &msb); - } H5E_END_TRY; - if (ret>=0) { + H5E_BEGIN_TRY { ret = H5Tget_pad(complex_id, &lsb, &msb); } + H5E_END_TRY; + if (ret >= 0) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ - H5E_BEGIN_TRY { - size = H5Tget_ebias(complex_id); - } H5E_END_TRY; - if (size>0) { + H5E_BEGIN_TRY { size = H5Tget_ebias(complex_id); } + H5E_END_TRY; + if (size > 0) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ - H5E_BEGIN_TRY { - lsb = H5Tget_inpad(complex_id); - } H5E_END_TRY; - if (lsb>=0) { + H5E_BEGIN_TRY { lsb = H5Tget_inpad(complex_id); } + H5E_END_TRY; + if (lsb >= 0) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ - H5E_BEGIN_TRY { - cset = H5Tget_cset(complex_id); - } H5E_END_TRY; - if (cset>-1) { + H5E_BEGIN_TRY { cset = H5Tget_cset(complex_id); } + H5E_END_TRY; + if (cset > -1) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ - H5E_BEGIN_TRY { - strpad = H5Tget_strpad(complex_id); - } H5E_END_TRY; - if (strpad>-1) { + H5E_BEGIN_TRY { strpad = H5Tget_strpad(complex_id); } + H5E_END_TRY; + if (strpad > -1) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ - H5E_BEGIN_TRY { - offset = H5Tget_offset(complex_id); - } H5E_END_TRY; - if (offset>=0) { + H5E_BEGIN_TRY { offset = H5Tget_offset(complex_id); } + H5E_END_TRY; + if (offset >= 0) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ /* We started to support this function for compound type in 1.8.6 release. */ - if((order = H5Tget_order(complex_id)) == H5T_ORDER_ERROR) + if ((order = H5Tget_order(complex_id)) == H5T_ORDER_ERROR) FAIL_PUTS_ERROR("Can't get order for compound type."); - if(order != H5T_ORDER_LE && order != H5T_ORDER_BE) + if (order != H5T_ORDER_LE && order != H5T_ORDER_BE) FAIL_PUTS_ERROR("Wrong order for this type."); - H5E_BEGIN_TRY { - sign = H5Tget_sign(complex_id); - } H5E_END_TRY; - if (sign>-1) { + H5E_BEGIN_TRY { sign = H5Tget_sign(complex_id); } + H5E_END_TRY; + if (sign > -1) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ - H5E_BEGIN_TRY { - tag = H5Tget_tag(complex_id); - } H5E_END_TRY; + H5E_BEGIN_TRY { tag = H5Tget_tag(complex_id); } + H5E_END_TRY; if (tag) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ - H5E_BEGIN_TRY { - super = H5Tget_super(complex_id); - } H5E_END_TRY; - if (super>=0) { + H5E_BEGIN_TRY { super = H5Tget_super(complex_id); } + H5E_END_TRY; + if (super >= 0) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ - if (H5Tclose (complex_id) < 0) + if (H5Tclose(complex_id) < 0) goto error; PASSED(); retval = 0; error: - if(tag) + if (tag) H5free_memory(tag); return retval; } - /*------------------------------------------------------------------------- * Function: test_compound_2 * @@ -671,18 +722,18 @@ test_compound_2(void) { struct st { int a, b, c[4], d, e; - } *s_ptr; + } * s_ptr; struct dt { int e, d, c[4], b, a; - } *d_ptr; + } * d_ptr; - const size_t nelmts = NTESTELEM; - const hsize_t four = 4; - unsigned char *buf=NULL, *orig=NULL, *bkg=NULL; - hid_t st=-1, dt=-1; - hid_t array_dt; - int64_t nmembs; - int i; + const size_t nelmts = NTESTELEM; + const hsize_t four = 4; + unsigned char *buf = NULL, *orig = NULL, *bkg = NULL; + hid_t st = -1, dt = -1; + hid_t array_dt; + int64_t nmembs; + int i; TESTING("compound element reordering"); @@ -690,66 +741,60 @@ test_compound_2(void) FAIL_STACK_ERROR /* Sizes should be the same, but be careful just in case */ - buf = (unsigned char*)HDmalloc(nelmts * MAX(sizeof(struct st), sizeof(struct dt))); - bkg = (unsigned char*)HDmalloc(nelmts * sizeof(struct dt)); - orig = (unsigned char*)HDmalloc(nelmts * sizeof(struct st)); - for (i=0; i<(int)nelmts; i++) { - s_ptr = ((struct st*)((void *)orig)) + i; - s_ptr->a = i*8+0; - s_ptr->b = i*8+1; - s_ptr->c[0] = i*8+2; - s_ptr->c[1] = i*8+3; - s_ptr->c[2] = i*8+4; - s_ptr->c[3] = i*8+5; - s_ptr->d = i*8+6; - s_ptr->e = i*8+7; + buf = (unsigned char *)HDmalloc(nelmts * MAX(sizeof(struct st), sizeof(struct dt))); + bkg = (unsigned char *)HDmalloc(nelmts * sizeof(struct dt)); + orig = (unsigned char *)HDmalloc(nelmts * sizeof(struct st)); + for (i = 0; i < (int)nelmts; i++) { + s_ptr = ((struct st *)((void *)orig)) + i; + s_ptr->a = i * 8 + 0; + s_ptr->b = i * 8 + 1; + s_ptr->c[0] = i * 8 + 2; + s_ptr->c[1] = i * 8 + 3; + s_ptr->c[2] = i * 8 + 4; + s_ptr->c[3] = i * 8 + 5; + s_ptr->d = i * 8 + 6; + s_ptr->e = i * 8 + 7; } - HDmemcpy(buf, orig, nelmts*sizeof(struct st)); + HDmemcpy(buf, orig, nelmts * sizeof(struct st)); /* Build hdf5 datatypes */ - array_dt = H5Tarray_create2(H5T_NATIVE_INT,1, &four); - if((st = H5Tcreate(H5T_COMPOUND, sizeof(struct st))) < 0 || - H5Tinsert(st, "a", HOFFSET(struct st, a), H5T_NATIVE_INT) < 0 || - H5Tinsert(st, "b", HOFFSET(struct st, b), H5T_NATIVE_INT) < 0 || - H5Tinsert(st, "c", HOFFSET(struct st, c), array_dt) < 0 || - H5Tinsert(st, "d", HOFFSET(struct st, d), H5T_NATIVE_INT) < 0 || - H5Tinsert(st, "e", HOFFSET(struct st, e), H5T_NATIVE_INT) < 0) + array_dt = H5Tarray_create2(H5T_NATIVE_INT, 1, &four); + if ((st = H5Tcreate(H5T_COMPOUND, sizeof(struct st))) < 0 || + H5Tinsert(st, "a", HOFFSET(struct st, a), H5T_NATIVE_INT) < 0 || + H5Tinsert(st, "b", HOFFSET(struct st, b), H5T_NATIVE_INT) < 0 || + H5Tinsert(st, "c", HOFFSET(struct st, c), array_dt) < 0 || + H5Tinsert(st, "d", HOFFSET(struct st, d), H5T_NATIVE_INT) < 0 || + H5Tinsert(st, "e", HOFFSET(struct st, e), H5T_NATIVE_INT) < 0) goto error; H5Tclose(array_dt); array_dt = H5Tarray_create2(H5T_NATIVE_INT, 1, &four); - if((dt = H5Tcreate(H5T_COMPOUND, sizeof(struct dt))) < 0 || - H5Tinsert(dt, "a", HOFFSET(struct dt, a), H5T_NATIVE_INT) < 0 || - H5Tinsert(dt, "b", HOFFSET(struct dt, b), H5T_NATIVE_INT) < 0 || - H5Tinsert(dt, "c", HOFFSET(struct dt, c), array_dt) < 0 || - H5Tinsert(dt, "d", HOFFSET(struct dt, d), H5T_NATIVE_INT) < 0 || - H5Tinsert(dt, "e", HOFFSET(struct dt, e), H5T_NATIVE_INT) < 0) + if ((dt = H5Tcreate(H5T_COMPOUND, sizeof(struct dt))) < 0 || + H5Tinsert(dt, "a", HOFFSET(struct dt, a), H5T_NATIVE_INT) < 0 || + H5Tinsert(dt, "b", HOFFSET(struct dt, b), H5T_NATIVE_INT) < 0 || + H5Tinsert(dt, "c", HOFFSET(struct dt, c), array_dt) < 0 || + H5Tinsert(dt, "d", HOFFSET(struct dt, d), H5T_NATIVE_INT) < 0 || + H5Tinsert(dt, "e", HOFFSET(struct dt, e), H5T_NATIVE_INT) < 0) goto error; H5Tclose(array_dt); /* Perform the conversion */ - if (H5Tconvert(st, dt, nelmts, buf, bkg, H5P_DEFAULT) < 0) goto error; + if (H5Tconvert(st, dt, nelmts, buf, bkg, H5P_DEFAULT) < 0) + goto error; /* Compare results */ - for (i=0; i<(int)nelmts; i++) { - s_ptr = ((struct st*)((void *)orig)) + i; - d_ptr = ((struct dt*)((void *)buf)) + i; - if (s_ptr->a != d_ptr->a || - s_ptr->b != d_ptr->b || - s_ptr->c[0] != d_ptr->c[0] || - s_ptr->c[1] != d_ptr->c[1] || - s_ptr->c[2] != d_ptr->c[2] || - s_ptr->c[3] != d_ptr->c[3] || - s_ptr->d != d_ptr->d || - s_ptr->e != d_ptr->e) { + for (i = 0; i < (int)nelmts; i++) { + s_ptr = ((struct st *)((void *)orig)) + i; + d_ptr = ((struct dt *)((void *)buf)) + i; + if (s_ptr->a != d_ptr->a || s_ptr->b != d_ptr->b || s_ptr->c[0] != d_ptr->c[0] || + s_ptr->c[1] != d_ptr->c[1] || s_ptr->c[2] != d_ptr->c[2] || s_ptr->c[3] != d_ptr->c[3] || + s_ptr->d != d_ptr->d || s_ptr->e != d_ptr->e) { H5_FAILED(); HDprintf(" i=%d\n", i); - HDprintf(" src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", - s_ptr->a, s_ptr->b, s_ptr->c[0], s_ptr->c[1], s_ptr->c[2], - s_ptr->c[3], s_ptr->d, s_ptr->e); - HDprintf(" dst={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", - d_ptr->a, d_ptr->b, d_ptr->c[0], d_ptr->c[1], d_ptr->c[2], - d_ptr->c[3], d_ptr->d, d_ptr->e); + HDprintf(" src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", s_ptr->a, s_ptr->b, s_ptr->c[0], + s_ptr->c[1], s_ptr->c[2], s_ptr->c[3], s_ptr->d, s_ptr->e); + HDprintf(" dst={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", d_ptr->a, d_ptr->b, d_ptr->c[0], + d_ptr->c[1], d_ptr->c[2], d_ptr->c[3], d_ptr->d, d_ptr->e); goto error; } } @@ -758,7 +803,7 @@ test_compound_2(void) HDfree(buf); HDfree(bkg); HDfree(orig); - CHECK_NMEMBS(nmembs , st, dt) + CHECK_NMEMBS(nmembs, st, dt) PASSED(); @@ -778,7 +823,6 @@ error: return 1; } - /*------------------------------------------------------------------------- * Function: test_compound_3 * @@ -798,16 +842,16 @@ test_compound_3(void) { struct st { int a, b, c[4], d, e; - } *s_ptr; - struct dt { - int a, c[4], e; - } *d_ptr; - - const size_t nelmts = NTESTELEM; - const hsize_t four = 4; - unsigned char *buf=NULL, *orig=NULL, *bkg=NULL; - hid_t st=-1, dt=-1; - hid_t array_dt; + } * s_ptr; + struct dt { + int a, c[4], e; + } * d_ptr; + + const size_t nelmts = NTESTELEM; + const hsize_t four = 4; + unsigned char *buf = NULL, *orig = NULL, *bkg = NULL; + hid_t st = -1, dt = -1; + hid_t array_dt; int64_t nmembs; int i; @@ -817,38 +861,38 @@ test_compound_3(void) FAIL_STACK_ERROR /* Initialize */ - buf = (unsigned char*)HDmalloc(nelmts * MAX(sizeof(struct st), sizeof(struct dt))); - bkg = (unsigned char*)HDmalloc(nelmts * sizeof(struct dt)); - orig = (unsigned char*)HDmalloc(nelmts * sizeof(struct st)); - for (i=0; i<(int)nelmts; i++) { - s_ptr = ((struct st*)((void *)orig)) + i; - s_ptr->a = i*8+0; - s_ptr->b = i*8+1; - s_ptr->c[0] = i*8+2; - s_ptr->c[1] = i*8+3; - s_ptr->c[2] = i*8+4; - s_ptr->c[3] = i*8+5; - s_ptr->d = i*8+6; - s_ptr->e = i*8+7; + buf = (unsigned char *)HDmalloc(nelmts * MAX(sizeof(struct st), sizeof(struct dt))); + bkg = (unsigned char *)HDmalloc(nelmts * sizeof(struct dt)); + orig = (unsigned char *)HDmalloc(nelmts * sizeof(struct st)); + for (i = 0; i < (int)nelmts; i++) { + s_ptr = ((struct st *)((void *)orig)) + i; + s_ptr->a = i * 8 + 0; + s_ptr->b = i * 8 + 1; + s_ptr->c[0] = i * 8 + 2; + s_ptr->c[1] = i * 8 + 3; + s_ptr->c[2] = i * 8 + 4; + s_ptr->c[3] = i * 8 + 5; + s_ptr->d = i * 8 + 6; + s_ptr->e = i * 8 + 7; } - HDmemcpy(buf, orig, nelmts*sizeof(struct st)); + HDmemcpy(buf, orig, nelmts * sizeof(struct st)); /* Build hdf5 datatypes */ array_dt = H5Tarray_create2(H5T_NATIVE_INT, 1, &four); - if((st = H5Tcreate(H5T_COMPOUND, sizeof(struct st))) < 0 || - H5Tinsert(st, "a", HOFFSET(struct st, a), H5T_NATIVE_INT) < 0 || - H5Tinsert(st, "b", HOFFSET(struct st, b), H5T_NATIVE_INT) < 0 || - H5Tinsert(st, "c", HOFFSET(struct st, c), array_dt) < 0 || - H5Tinsert(st, "d", HOFFSET(struct st, d), H5T_NATIVE_INT) < 0 || - H5Tinsert(st, "e", HOFFSET(struct st, e), H5T_NATIVE_INT) < 0) + if ((st = H5Tcreate(H5T_COMPOUND, sizeof(struct st))) < 0 || + H5Tinsert(st, "a", HOFFSET(struct st, a), H5T_NATIVE_INT) < 0 || + H5Tinsert(st, "b", HOFFSET(struct st, b), H5T_NATIVE_INT) < 0 || + H5Tinsert(st, "c", HOFFSET(struct st, c), array_dt) < 0 || + H5Tinsert(st, "d", HOFFSET(struct st, d), H5T_NATIVE_INT) < 0 || + H5Tinsert(st, "e", HOFFSET(struct st, e), H5T_NATIVE_INT) < 0) goto error; H5Tclose(array_dt); array_dt = H5Tarray_create2(H5T_NATIVE_INT, 1, &four); - if((dt = H5Tcreate(H5T_COMPOUND, sizeof(struct dt))) < 0 || - H5Tinsert(dt, "a", HOFFSET(struct dt, a), H5T_NATIVE_INT) < 0 || - H5Tinsert(dt, "c", HOFFSET(struct dt, c), array_dt) < 0 || - H5Tinsert(dt, "e", HOFFSET(struct dt, e), H5T_NATIVE_INT) < 0) + if ((dt = H5Tcreate(H5T_COMPOUND, sizeof(struct dt))) < 0 || + H5Tinsert(dt, "a", HOFFSET(struct dt, a), H5T_NATIVE_INT) < 0 || + H5Tinsert(dt, "c", HOFFSET(struct dt, c), array_dt) < 0 || + H5Tinsert(dt, "e", HOFFSET(struct dt, e), H5T_NATIVE_INT) < 0) goto error; H5Tclose(array_dt); @@ -857,23 +901,17 @@ test_compound_3(void) goto error; /* Compare results */ - for (i=0; i<(int)nelmts; i++) { - s_ptr = ((struct st*)((void *)orig)) + i; - d_ptr = ((struct dt*)((void *)buf)) + i; - if (s_ptr->a != d_ptr->a || - s_ptr->c[0] != d_ptr->c[0] || - s_ptr->c[1] != d_ptr->c[1] || - s_ptr->c[2] != d_ptr->c[2] || - s_ptr->c[3] != d_ptr->c[3] || - s_ptr->e != d_ptr->e) { + for (i = 0; i < (int)nelmts; i++) { + s_ptr = ((struct st *)((void *)orig)) + i; + d_ptr = ((struct dt *)((void *)buf)) + i; + if (s_ptr->a != d_ptr->a || s_ptr->c[0] != d_ptr->c[0] || s_ptr->c[1] != d_ptr->c[1] || + s_ptr->c[2] != d_ptr->c[2] || s_ptr->c[3] != d_ptr->c[3] || s_ptr->e != d_ptr->e) { H5_FAILED(); HDprintf(" i=%d\n", i); - HDprintf(" src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", - s_ptr->a, s_ptr->b, s_ptr->c[0], s_ptr->c[1], s_ptr->c[2], - s_ptr->c[3], s_ptr->d, s_ptr->e); - HDprintf(" dst={a=%d, c=[%d,%d,%d,%d], e=%d\n", - d_ptr->a, d_ptr->c[0], d_ptr->c[1], d_ptr->c[2], - d_ptr->c[3], d_ptr->e); + HDprintf(" src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", s_ptr->a, s_ptr->b, s_ptr->c[0], + s_ptr->c[1], s_ptr->c[2], s_ptr->c[3], s_ptr->d, s_ptr->e); + HDprintf(" dst={a=%d, c=[%d,%d,%d,%d], e=%d\n", d_ptr->a, d_ptr->c[0], d_ptr->c[1], + d_ptr->c[2], d_ptr->c[3], d_ptr->e); goto error; } } @@ -901,7 +939,6 @@ error: return 1; } - /*------------------------------------------------------------------------- * Function: test_compound_4 * @@ -922,19 +959,19 @@ test_compound_4(void) struct st { int a, b, c[4], d, e; - } *s_ptr; + } * s_ptr; struct dt { short b; - int a, c[4]; + int a, c[4]; short d; - int e; - } *d_ptr; - - const size_t nelmts = NTESTELEM; - const hsize_t four = 4; - unsigned char *buf=NULL, *orig=NULL, *bkg=NULL; - hid_t st=-1, dt=-1; - hid_t array_dt; + int e; + } * d_ptr; + + const size_t nelmts = NTESTELEM; + const hsize_t four = 4; + unsigned char *buf = NULL, *orig = NULL, *bkg = NULL; + hid_t st = -1, dt = -1; + hid_t array_dt; int64_t nmembs; int i; @@ -944,40 +981,40 @@ test_compound_4(void) FAIL_STACK_ERROR /* Sizes should be the same, but be careful just in case */ - buf = (unsigned char*)HDmalloc(nelmts * MAX(sizeof(struct st), sizeof(struct dt))); - bkg = (unsigned char*)HDmalloc(nelmts * sizeof(struct dt)); - orig = (unsigned char*)HDmalloc(nelmts * sizeof(struct st)); - for (i=0; i<(int)nelmts; i++) { - s_ptr = ((struct st*)((void *)orig)) + i; - s_ptr->a = i*8+0; - s_ptr->b = (i*8+1) & 0x7fff; - s_ptr->c[0] = i*8+2; - s_ptr->c[1] = i*8+3; - s_ptr->c[2] = i*8+4; - s_ptr->c[3] = i*8+5; - s_ptr->d = (i*8+6) & 0x7fff; - s_ptr->e = i*8+7; + buf = (unsigned char *)HDmalloc(nelmts * MAX(sizeof(struct st), sizeof(struct dt))); + bkg = (unsigned char *)HDmalloc(nelmts * sizeof(struct dt)); + orig = (unsigned char *)HDmalloc(nelmts * sizeof(struct st)); + for (i = 0; i < (int)nelmts; i++) { + s_ptr = ((struct st *)((void *)orig)) + i; + s_ptr->a = i * 8 + 0; + s_ptr->b = (i * 8 + 1) & 0x7fff; + s_ptr->c[0] = i * 8 + 2; + s_ptr->c[1] = i * 8 + 3; + s_ptr->c[2] = i * 8 + 4; + s_ptr->c[3] = i * 8 + 5; + s_ptr->d = (i * 8 + 6) & 0x7fff; + s_ptr->e = i * 8 + 7; } - HDmemcpy(buf, orig, nelmts*sizeof(struct st)); + HDmemcpy(buf, orig, nelmts * sizeof(struct st)); /* Build hdf5 datatypes */ array_dt = H5Tarray_create2(H5T_NATIVE_INT, 1, &four); - if((st = H5Tcreate(H5T_COMPOUND, sizeof(struct st))) < 0 || - H5Tinsert(st, "a", HOFFSET(struct st, a), H5T_NATIVE_INT) < 0 || - H5Tinsert(st, "b", HOFFSET(struct st, b), H5T_NATIVE_INT) < 0 || - H5Tinsert(st, "c", HOFFSET(struct st, c), array_dt) < 0 || - H5Tinsert(st, "d", HOFFSET(struct st, d), H5T_NATIVE_INT) < 0 || - H5Tinsert(st, "e", HOFFSET(struct st, e), H5T_NATIVE_INT) < 0) + if ((st = H5Tcreate(H5T_COMPOUND, sizeof(struct st))) < 0 || + H5Tinsert(st, "a", HOFFSET(struct st, a), H5T_NATIVE_INT) < 0 || + H5Tinsert(st, "b", HOFFSET(struct st, b), H5T_NATIVE_INT) < 0 || + H5Tinsert(st, "c", HOFFSET(struct st, c), array_dt) < 0 || + H5Tinsert(st, "d", HOFFSET(struct st, d), H5T_NATIVE_INT) < 0 || + H5Tinsert(st, "e", HOFFSET(struct st, e), H5T_NATIVE_INT) < 0) goto error; H5Tclose(array_dt); array_dt = H5Tarray_create2(H5T_NATIVE_INT, 1, &four); - if((dt = H5Tcreate(H5T_COMPOUND, sizeof(struct dt))) < 0 || - H5Tinsert(dt, "a", HOFFSET(struct dt, a), H5T_NATIVE_INT) < 0 || - H5Tinsert(dt, "b", HOFFSET(struct dt, b), H5T_NATIVE_SHORT) < 0 || - H5Tinsert(dt, "c", HOFFSET(struct dt, c), array_dt) < 0 || - H5Tinsert(dt, "d", HOFFSET(struct dt, d), H5T_NATIVE_SHORT) < 0 || - H5Tinsert(dt, "e", HOFFSET(struct dt, e), H5T_NATIVE_INT) < 0) + if ((dt = H5Tcreate(H5T_COMPOUND, sizeof(struct dt))) < 0 || + H5Tinsert(dt, "a", HOFFSET(struct dt, a), H5T_NATIVE_INT) < 0 || + H5Tinsert(dt, "b", HOFFSET(struct dt, b), H5T_NATIVE_SHORT) < 0 || + H5Tinsert(dt, "c", HOFFSET(struct dt, c), array_dt) < 0 || + H5Tinsert(dt, "d", HOFFSET(struct dt, d), H5T_NATIVE_SHORT) < 0 || + H5Tinsert(dt, "e", HOFFSET(struct dt, e), H5T_NATIVE_INT) < 0) goto error; H5Tclose(array_dt); @@ -986,25 +1023,18 @@ test_compound_4(void) goto error; /* Compare results */ - for (i=0; i<(int)nelmts; i++) { - s_ptr = ((struct st*)((void *)orig)) + i; - d_ptr = ((struct dt*)((void *)buf)) + i; - if (s_ptr->a != d_ptr->a || - s_ptr->b != d_ptr->b || - s_ptr->c[0] != d_ptr->c[0] || - s_ptr->c[1] != d_ptr->c[1] || - s_ptr->c[2] != d_ptr->c[2] || - s_ptr->c[3] != d_ptr->c[3] || - s_ptr->d != d_ptr->d || - s_ptr->e != d_ptr->e) { + for (i = 0; i < (int)nelmts; i++) { + s_ptr = ((struct st *)((void *)orig)) + i; + d_ptr = ((struct dt *)((void *)buf)) + i; + if (s_ptr->a != d_ptr->a || s_ptr->b != d_ptr->b || s_ptr->c[0] != d_ptr->c[0] || + s_ptr->c[1] != d_ptr->c[1] || s_ptr->c[2] != d_ptr->c[2] || s_ptr->c[3] != d_ptr->c[3] || + s_ptr->d != d_ptr->d || s_ptr->e != d_ptr->e) { H5_FAILED(); HDprintf(" i=%d\n", i); - HDprintf(" src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", - s_ptr->a, s_ptr->b, s_ptr->c[0], s_ptr->c[1], s_ptr->c[2], - s_ptr->c[3], s_ptr->d, s_ptr->e); - HDprintf(" dst={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", - d_ptr->a, d_ptr->b, d_ptr->c[0], d_ptr->c[1], d_ptr->c[2], - d_ptr->c[3], d_ptr->d, d_ptr->e); + HDprintf(" src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", s_ptr->a, s_ptr->b, s_ptr->c[0], + s_ptr->c[1], s_ptr->c[2], s_ptr->c[3], s_ptr->d, s_ptr->e); + HDprintf(" dst={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", d_ptr->a, d_ptr->b, d_ptr->c[0], + d_ptr->c[1], d_ptr->c[2], d_ptr->c[3], d_ptr->d, d_ptr->e); goto error; } } @@ -1032,7 +1062,6 @@ error: return 1; } - /*------------------------------------------------------------------------- * Function: test_compound_5 * @@ -1052,38 +1081,37 @@ static int test_compound_5(void) { typedef struct { - char name[16]; - short tdim; - short coll_ids[4]; + char name[16]; + short tdim; + short coll_ids[4]; } src_type_t; typedef struct { - char name[16]; - short tdim; - int coll_ids[4]; + char name[16]; + short tdim; + int coll_ids[4]; } dst_type_t; - hsize_t dims[1] = {4}; - hid_t src_type, dst_type, short_array, int_array, string; - hid_t array_dt; - src_type_t src[2] = {{"one", 102, {104, 105, 106, 107}}, - {"two", 202, {204, 205, 206, 207}}}; + hsize_t dims[1] = {4}; + hid_t src_type, dst_type, short_array, int_array, string; + hid_t array_dt; + src_type_t src[2] = {{"one", 102, {104, 105, 106, 107}}, {"two", 202, {204, 205, 206, 207}}}; - dst_type_t *dst; - void *buf = HDcalloc((size_t)2, sizeof(dst_type_t)); - void *bkg = HDcalloc((size_t)2, sizeof(dst_type_t)); - int retval = 1; + dst_type_t *dst; + void * buf = HDcalloc((size_t)2, sizeof(dst_type_t)); + void * bkg = HDcalloc((size_t)2, sizeof(dst_type_t)); + int retval = 1; TESTING("optimized struct converter"); /* Build datatypes */ - short_array = H5Tcreate(H5T_COMPOUND, 4*sizeof(short)); - array_dt = H5Tarray_create2(H5T_NATIVE_SHORT, 1, dims); + short_array = H5Tcreate(H5T_COMPOUND, 4 * sizeof(short)); + array_dt = H5Tarray_create2(H5T_NATIVE_SHORT, 1, dims); H5Tinsert(short_array, "_", (size_t)0, array_dt); H5Tclose(array_dt); - int_array = H5Tcreate(H5T_COMPOUND, 4*sizeof(int)); - array_dt = H5Tarray_create2(H5T_NATIVE_INT, 1, dims); + int_array = H5Tcreate(H5T_COMPOUND, 4 * sizeof(int)); + array_dt = H5Tarray_create2(H5T_NATIVE_INT, 1, dims); H5Tinsert(int_array, "_", (size_t)0, array_dt); H5Tclose(array_dt); @@ -1091,19 +1119,19 @@ test_compound_5(void) H5Tset_size(string, (size_t)16); src_type = H5Tcreate(H5T_COMPOUND, sizeof(src_type_t)); - H5Tinsert(src_type, "name", HOFFSET(src_type_t, name), string ); - H5Tinsert(src_type, "tdim", HOFFSET(src_type_t, tdim), H5T_NATIVE_SHORT); - H5Tinsert(src_type, "coll_ids", HOFFSET(src_type_t, coll_ids), short_array ); + H5Tinsert(src_type, "name", HOFFSET(src_type_t, name), string); + H5Tinsert(src_type, "tdim", HOFFSET(src_type_t, tdim), H5T_NATIVE_SHORT); + H5Tinsert(src_type, "coll_ids", HOFFSET(src_type_t, coll_ids), short_array); dst_type = H5Tcreate(H5T_COMPOUND, sizeof(dst_type_t)); - H5Tinsert(dst_type, "name", HOFFSET(dst_type_t, name), string ); - H5Tinsert(dst_type, "tdim", HOFFSET(dst_type_t, tdim), H5T_NATIVE_SHORT); - H5Tinsert(dst_type, "coll_ids", HOFFSET(dst_type_t, coll_ids), int_array ); + H5Tinsert(dst_type, "name", HOFFSET(dst_type_t, name), string); + H5Tinsert(dst_type, "tdim", HOFFSET(dst_type_t, tdim), H5T_NATIVE_SHORT); + H5Tinsert(dst_type, "coll_ids", HOFFSET(dst_type_t, coll_ids), int_array); /* Convert data */ HDmemcpy(buf, src, sizeof(src)); H5Tconvert(src_type, dst_type, (size_t)2, buf, bkg, H5P_DEFAULT); - dst = (dst_type_t*)buf; + dst = (dst_type_t *)buf; /* Cleanup */ H5Tclose(src_type); @@ -1112,15 +1140,10 @@ test_compound_5(void) H5Tclose(short_array); H5Tclose(int_array); - - /* Check results */ - if (HDmemcmp(src[1].name, dst[1].name, sizeof(src[1].name)) || - src[1].tdim!=dst[1].tdim || - src[1].coll_ids[0]!=dst[1].coll_ids[0] || - src[1].coll_ids[1]!=dst[1].coll_ids[1] || - src[1].coll_ids[2]!=dst[1].coll_ids[2] || - src[1].coll_ids[3]!=dst[1].coll_ids[3]) { + if (HDmemcmp(src[1].name, dst[1].name, sizeof(src[1].name)) || src[1].tdim != dst[1].tdim || + src[1].coll_ids[0] != dst[1].coll_ids[0] || src[1].coll_ids[1] != dst[1].coll_ids[1] || + src[1].coll_ids[2] != dst[1].coll_ids[2] || src[1].coll_ids[3] != dst[1].coll_ids[3]) { H5_FAILED(); } else { @@ -1134,7 +1157,6 @@ test_compound_5(void) return retval; } - /*------------------------------------------------------------------------- * Function: test_compound_6 * @@ -1156,15 +1178,15 @@ test_compound_6(void) struct st { short b; short d; - } *s_ptr; + } * s_ptr; struct dt { long b; long d; - } *d_ptr; + } * d_ptr; - const size_t nelmts = NTESTELEM; - unsigned char *buf=NULL, *orig=NULL, *bkg=NULL; - hid_t st=-1, dt=-1; + const size_t nelmts = NTESTELEM; + unsigned char *buf = NULL, *orig = NULL, *bkg = NULL; + hid_t st = -1, dt = -1; int64_t nmembs; int i; @@ -1174,27 +1196,27 @@ test_compound_6(void) FAIL_STACK_ERROR /* Sizes should be the same, but be careful just in case */ - buf = (unsigned char*)HDmalloc(nelmts * MAX(sizeof(struct st), sizeof(struct dt))); - bkg = (unsigned char*)HDmalloc(nelmts * sizeof(struct dt)); - orig = (unsigned char*)HDmalloc(nelmts * sizeof(struct st)); - for (i=0; i<(int)nelmts; i++) { - s_ptr = ((struct st*)((void *)orig)) + i; - s_ptr->b = (int16_t)((i*8+1) & 0x7fff); - s_ptr->d = (int16_t)((i*8+6) & 0x7fff); + buf = (unsigned char *)HDmalloc(nelmts * MAX(sizeof(struct st), sizeof(struct dt))); + bkg = (unsigned char *)HDmalloc(nelmts * sizeof(struct dt)); + orig = (unsigned char *)HDmalloc(nelmts * sizeof(struct st)); + for (i = 0; i < (int)nelmts; i++) { + s_ptr = ((struct st *)((void *)orig)) + i; + s_ptr->b = (int16_t)((i * 8 + 1) & 0x7fff); + s_ptr->d = (int16_t)((i * 8 + 6) & 0x7fff); } - HDmemcpy(buf, orig, nelmts*sizeof(struct st)); + HDmemcpy(buf, orig, nelmts * sizeof(struct st)); /* Build hdf5 datatypes */ - if ((st=H5Tcreate(H5T_COMPOUND, sizeof(struct st))) < 0 || - H5Tinsert(st, "b", HOFFSET(struct st, b), H5T_NATIVE_SHORT) < 0 || - H5Tinsert(st, "d", HOFFSET(struct st, d), H5T_NATIVE_SHORT) < 0) { + if ((st = H5Tcreate(H5T_COMPOUND, sizeof(struct st))) < 0 || + H5Tinsert(st, "b", HOFFSET(struct st, b), H5T_NATIVE_SHORT) < 0 || + H5Tinsert(st, "d", HOFFSET(struct st, d), H5T_NATIVE_SHORT) < 0) { H5_FAILED(); goto error; } - if ((dt=H5Tcreate(H5T_COMPOUND, sizeof(struct dt))) < 0 || - H5Tinsert(dt, "b", HOFFSET(struct dt, b), H5T_NATIVE_LONG) < 0 || - H5Tinsert(dt, "d", HOFFSET(struct dt, d), H5T_NATIVE_LONG) < 0) { + if ((dt = H5Tcreate(H5T_COMPOUND, sizeof(struct dt))) < 0 || + H5Tinsert(dt, "b", HOFFSET(struct dt, b), H5T_NATIVE_LONG) < 0 || + H5Tinsert(dt, "d", HOFFSET(struct dt, d), H5T_NATIVE_LONG) < 0) { H5_FAILED(); goto error; } @@ -1206,17 +1228,14 @@ test_compound_6(void) } /* Compare results */ - for (i=0; i<(int)nelmts; i++) { - s_ptr = ((struct st*)((void *)orig)) + i; - d_ptr = ((struct dt*)((void *)buf)) + i; - if (s_ptr->b != d_ptr->b || - s_ptr->d != d_ptr->d) { + for (i = 0; i < (int)nelmts; i++) { + s_ptr = ((struct st *)((void *)orig)) + i; + d_ptr = ((struct dt *)((void *)buf)) + i; + if (s_ptr->b != d_ptr->b || s_ptr->d != d_ptr->d) { H5_FAILED(); HDprintf(" i=%d\n", i); - HDprintf(" src={b=%d, d=%d\n", - (int)s_ptr->b, (int)s_ptr->d); - HDprintf(" dst={b=%ld, d=%ld\n", - d_ptr->b, d_ptr->d); + HDprintf(" src={b=%d, d=%d\n", (int)s_ptr->b, (int)s_ptr->d); + HDprintf(" dst={b=%ld, d=%ld\n", d_ptr->b, d_ptr->d); goto error; } } @@ -1268,99 +1287,97 @@ static int test_compound_7(void) { struct s1 { - int a; + int a; float b; - long c; + long c; }; struct s2 { - int a; - float b; - long c; + int a; + float b; + long c; double d; }; - hid_t tid1,tid2; + hid_t tid1, tid2; herr_t ret; TESTING("compound element insertion"); - if((tid1= H5Tcreate( H5T_COMPOUND, sizeof(struct s1))) < 0) { + if ((tid1 = H5Tcreate(H5T_COMPOUND, sizeof(struct s1))) < 0) { H5_FAILED(); HDprintf("Can't create datatype!\n"); goto error; } /* end if */ - if(H5Tinsert(tid1,"a",HOFFSET(struct s1,a),H5T_NATIVE_INT) < 0) { + if (H5Tinsert(tid1, "a", HOFFSET(struct s1, a), H5T_NATIVE_INT) < 0) { H5_FAILED(); HDprintf("Can't insert field 'a'\n"); goto error; } /* end if */ - if(H5Tinsert(tid1,"b",HOFFSET(struct s1,b),H5T_NATIVE_FLOAT) < 0) { + if (H5Tinsert(tid1, "b", HOFFSET(struct s1, b), H5T_NATIVE_FLOAT) < 0) { H5_FAILED(); HDprintf("Can't insert field 'b'\n"); goto error; } /* end if */ - if(H5Tinsert(tid1,"c",HOFFSET(struct s1,c),H5T_NATIVE_LONG) < 0) { + if (H5Tinsert(tid1, "c", HOFFSET(struct s1, c), H5T_NATIVE_LONG) < 0) { H5_FAILED(); HDprintf("Can't insert field 'c'\n"); goto error; } /* end if */ - if(H5Tget_size(tid1)!=sizeof(struct s1)) { + if (H5Tget_size(tid1) != sizeof(struct s1)) { H5_FAILED(); HDprintf("Incorrect size for struct 1\n"); goto error; } /* end if */ - if((tid2= H5Tcopy(tid1)) < 0) { + if ((tid2 = H5Tcopy(tid1)) < 0) { H5_FAILED(); HDprintf("Can't copy datatype\n"); goto error; } /* end if */ - if(H5Tget_size(tid2)==sizeof(struct s2)) { + if (H5Tget_size(tid2) == sizeof(struct s2)) { H5_FAILED(); HDprintf("Incorrect size for struct 2\n"); goto error; } /* end if */ /* Should not be able to insert field past end of compound datatype */ - H5E_BEGIN_TRY { - ret=H5Tinsert(tid2,"d",HOFFSET(struct s2,d),H5T_NATIVE_DOUBLE); - } H5E_END_TRY; - if(ret>=0) { + H5E_BEGIN_TRY { ret = H5Tinsert(tid2, "d", HOFFSET(struct s2, d), H5T_NATIVE_DOUBLE); } + H5E_END_TRY; + if (ret >= 0) { H5_FAILED(); HDprintf("Inserted field 'd'?\n"); goto error; } /* end if */ /* Should not be able to shrink size of compound datatype */ - H5E_BEGIN_TRY { - ret=H5Tset_size(tid2, sizeof(struct s1)/2); - } H5E_END_TRY; - if(ret>=0) { + H5E_BEGIN_TRY { ret = H5Tset_size(tid2, sizeof(struct s1) / 2); } + H5E_END_TRY; + if (ret >= 0) { H5_FAILED(); HDprintf("Shrunk compound type?\n"); goto error; } /* end if */ /* Increase compound type size and try inserting field again */ - if(H5Tset_size(tid2, sizeof(struct s2)) < 0) { + if (H5Tset_size(tid2, sizeof(struct s2)) < 0) { H5_FAILED(); HDprintf("Can't increase size for compound type\n"); goto error; } /* end if */ - if( H5Tinsert(tid2,"d",HOFFSET(struct s2,d),H5T_NATIVE_DOUBLE) < 0) { + if (H5Tinsert(tid2, "d", HOFFSET(struct s2, d), H5T_NATIVE_DOUBLE) < 0) { H5_FAILED(); HDprintf("Can't expand compound datatype\n"); goto error; } /* end if */ - if(H5Tget_size(tid2)!=sizeof(struct s2)) { + if (H5Tget_size(tid2) != sizeof(struct s2)) { H5_FAILED(); HDprintf("Incorrect size for struct 2\n"); goto error; @@ -1390,7 +1407,6 @@ error: return 1; } - /*------------------------------------------------------------------------- * Function: test_compound_8 * @@ -1414,18 +1430,18 @@ static int test_compound_8(void) { typedef struct s1 { - char a; - int b; + char a; + int b; } s1; typedef struct s2 { - char c; - s1 d; + char c; + s1 d; } s2; - hid_t tid1, tid1_copy, tid2, tid2_copy, tid3, arr_tid; - size_t tsize; + hid_t tid1, tid1_copy, tid2, tid2_copy, tid3, arr_tid; + size_t tsize; hsize_t dims[1] = {ARRAY_DIM}; - herr_t ret; + herr_t ret; TESTING("packing compound datatypes"); @@ -1433,60 +1449,69 @@ test_compound_8(void) * Test H5Tpack for compound type */ /* Create first compound datatype */ - if((tid1 = H5Tcreate( H5T_COMPOUND, sizeof(struct s1))) < 0) { - H5_FAILED(); AT(); + if ((tid1 = H5Tcreate(H5T_COMPOUND, sizeof(struct s1))) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't create datatype!\n"); goto error; } /* end if */ - if(H5Tinsert(tid1,"a",HOFFSET(struct s1,a),H5T_NATIVE_CHAR) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(tid1, "a", HOFFSET(struct s1, a), H5T_NATIVE_CHAR) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'a'\n"); goto error; } /* end if */ - if(H5Tinsert(tid1,"b",HOFFSET(struct s1,b),H5T_NATIVE_INT) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(tid1, "b", HOFFSET(struct s1, b), H5T_NATIVE_INT) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'b'\n"); goto error; } /* end if */ /* Make a copy of the type for later use */ - if((tid1_copy = H5Tcopy(tid1)) < 0) { - H5_FAILED(); AT(); + if ((tid1_copy = H5Tcopy(tid1)) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't copy type #1\n"); goto error; } /* end if */ /* Test H5Tpack for the first compound type */ - if(H5Tpack(tid1) < 0) { - H5_FAILED(); AT(); + if (H5Tpack(tid1) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't pack the compound datatype\n"); goto error; } /* end if */ - if(H5Tlock(tid1) < 0) { - H5_FAILED(); AT(); + if (H5Tlock(tid1) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't lock the compound datatype\n"); goto error; } /* end if */ /* If the type is already packed, packing a locked type is OK */ - if(H5Tpack(tid1) < 0) { - H5_FAILED(); AT(); + if (H5Tpack(tid1) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't pack the compound datatype for second time\n"); goto error; } /* end if */ /* Verify the size of packed compound type */ - if((tsize = H5Tget_size(tid1)) == 0) { - H5_FAILED(); AT(); + if ((tsize = H5Tget_size(tid1)) == 0) { + H5_FAILED(); + AT(); HDprintf("Can't get size of the compound datatype\n"); goto error; } /* end if */ - if(tsize != (sizeof(char) + sizeof(int))) { - H5_FAILED(); AT(); + if (tsize != (sizeof(char) + sizeof(int))) { + H5_FAILED(); + AT(); HDprintf("The size of the packed compound datatype is incorrect\n"); goto error; } /* end if */ @@ -1495,85 +1520,96 @@ test_compound_8(void) * Test H5Tpack for nested compound type */ /* Create second compound datatype */ - if((tid2 = H5Tcreate( H5T_COMPOUND, sizeof(struct s2))) < 0) { - H5_FAILED(); AT(); + if ((tid2 = H5Tcreate(H5T_COMPOUND, sizeof(struct s2))) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't create datatype!\n"); goto error; } /* end if */ - if(H5Tinsert(tid2,"c",HOFFSET(struct s2,c),H5T_NATIVE_CHAR) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(tid2, "c", HOFFSET(struct s2, c), H5T_NATIVE_CHAR) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'c'\n"); goto error; } /* end if */ /* Insert the member of unpacked compound type */ - if(H5Tinsert(tid2,"d",HOFFSET(struct s2,d),tid1_copy) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(tid2, "d", HOFFSET(struct s2, d), tid1_copy) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'd'\n"); goto error; } /* end if */ /* Make a copy of the type for later */ - if((tid3=H5Tcopy(tid2)) < 0) { - H5_FAILED(); AT(); + if ((tid3 = H5Tcopy(tid2)) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't copy type #2\n"); goto error; } /* end if */ /* Make a copy of the type for later */ - if((tid2_copy = H5Tcopy(tid2)) < 0) { - H5_FAILED(); AT(); + if ((tid2_copy = H5Tcopy(tid2)) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't copy type #2\n"); goto error; } /* end if */ /* Test H5Tpack for the second compound type */ - if(H5Tpack(tid2) < 0) { - H5_FAILED(); AT(); + if (H5Tpack(tid2) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't pack the compound datatype\n"); goto error; } /* end if */ - if(H5Tlock(tid2) < 0) { - H5_FAILED(); AT(); + if (H5Tlock(tid2) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't lock the compound datatype\n"); goto error; } /* end if */ /* If the type is already packed, packing a locked type is OK */ - if(H5Tpack(tid2) < 0) { - H5_FAILED(); AT(); + if (H5Tpack(tid2) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't pack the compound datatype for second time\n"); goto error; } /* end if */ /* Lock unpacked type */ - if(H5Tlock(tid3) < 0) { - H5_FAILED(); AT(); + if (H5Tlock(tid3) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't lock the compound datatype\n"); goto error; } /* end if */ /* If the type is not packed, packing a locked type shouldn't work */ - H5E_BEGIN_TRY { - ret=H5Tpack(tid3); - } H5E_END_TRY; - if(ret>=0) { - H5_FAILED(); AT(); + H5E_BEGIN_TRY { ret = H5Tpack(tid3); } + H5E_END_TRY; + if (ret >= 0) { + H5_FAILED(); + AT(); HDprintf("Packing locked datatype worked?\n"); goto error; } /* end if */ /* Verify the size of packed compound type */ - if((tsize = H5Tget_size(tid2)) == 0) { - H5_FAILED(); AT(); + if ((tsize = H5Tget_size(tid2)) == 0) { + H5_FAILED(); + AT(); HDprintf("Can't get size of the compound datatype\n"); goto error; } /* end if */ - if(tsize != (sizeof(char) + sizeof(char) + sizeof(int))) { - H5_FAILED(); AT(); + if (tsize != (sizeof(char) + sizeof(char) + sizeof(int))) { + H5_FAILED(); + AT(); HDprintf("The size of the packed compound datatype is incorrect: tsize = %zu\n", tsize); goto error; } /* end if */ @@ -1582,47 +1618,53 @@ test_compound_8(void) * Test H5Tpack for array type of nested compound type */ /* Create an array type of compound type */ - if((arr_tid = H5Tarray_create2(tid2_copy, 1, dims)) < 0) { - H5_FAILED(); AT(); + if ((arr_tid = H5Tarray_create2(tid2_copy, 1, dims)) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't create an array datatype\n"); goto error; } /* end if */ /* Test H5Tpack for the array type */ - if(H5Tpack(arr_tid) < 0) { - H5_FAILED(); AT(); + if (H5Tpack(arr_tid) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't pack the array datatype\n"); goto error; } /* end if */ /* Verify the size of packed compound type */ - if((tsize = H5Tget_size(arr_tid)) == 0) { - H5_FAILED(); AT(); + if ((tsize = H5Tget_size(arr_tid)) == 0) { + H5_FAILED(); + AT(); HDprintf("Can't get size of the array datatype\n"); goto error; } /* end if */ - if(tsize != ARRAY_DIM * (sizeof(char) + sizeof(char) + sizeof(int))) { - H5_FAILED(); AT(); + if (tsize != ARRAY_DIM * (sizeof(char) + sizeof(char) + sizeof(int))) { + H5_FAILED(); + AT(); HDprintf("The size of the packed array datatype is incorrect\n"); goto error; } /* end if */ - - if(H5Tclose(tid1_copy) < 0) { - H5_FAILED(); AT(); + if (H5Tclose(tid1_copy) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't close the compound datatype\n"); goto error; } /* end if */ - if(H5Tclose(tid2_copy) < 0) { - H5_FAILED(); AT(); + if (H5Tclose(tid2_copy) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't close the compound datatype\n"); goto error; } /* end if */ - if(H5Tclose(arr_tid) < 0) { - H5_FAILED(); AT(); + if (H5Tclose(arr_tid) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't close the array datatype\n"); goto error; } /* end if */ @@ -1632,11 +1674,10 @@ test_compound_8(void) PASSED(); return 0; - error: +error: return 1; } - /*------------------------------------------------------------------------- * Function: test_compound_9 * @@ -1654,214 +1695,238 @@ static int test_compound_9(void) { typedef struct cmpd_struct_w { - int i1; - const char* str; - int i2; + int i1; + const char *str; + int i2; } cmpd_struct_w; typedef struct cmpd_struct_r { - int i1; - char* str; - int i2; + int i1; + char *str; + int i2; } cmpd_struct_r; cmpd_struct_w wdata = {11, "variable-length string", 22}; cmpd_struct_r rdata; - hid_t file; - hid_t cmpd_tid, str_id, dup_tid; - hid_t space_id; - hid_t dset_id; - hsize_t dim1[1]; - char filename[1024]; + hid_t file; + hid_t cmpd_tid, str_id, dup_tid; + hid_t space_id; + hid_t dset_id; + hsize_t dim1[1]; + char filename[1024]; TESTING("compound datatype with VL string"); /* Create File */ h5_fixname(FILENAME[3], H5P_DEFAULT, filename, sizeof filename); - if((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED(); AT(); + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't create file!\n"); goto error; } /* end if */ /* Create first compound datatype */ - if((cmpd_tid = H5Tcreate( H5T_COMPOUND, sizeof(struct cmpd_struct_w))) < 0) { - H5_FAILED(); AT(); + if ((cmpd_tid = H5Tcreate(H5T_COMPOUND, sizeof(struct cmpd_struct_w))) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't create datatype!\n"); goto error; } /* end if */ - if(H5Tinsert(cmpd_tid, "i1", HOFFSET(struct cmpd_struct_w, i1), H5T_NATIVE_INT) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(cmpd_tid, "i1", HOFFSET(struct cmpd_struct_w, i1), H5T_NATIVE_INT) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'i1'\n"); goto error; } /* end if */ str_id = H5Tcopy(H5T_C_S1); - if(H5Tset_size(str_id,H5T_VARIABLE) < 0) { - H5_FAILED(); AT(); + if (H5Tset_size(str_id, H5T_VARIABLE) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't set size for VL string\n"); goto error; } /* end if */ - if(H5Tinsert(cmpd_tid, "vl_string", HOFFSET(cmpd_struct_w, str), str_id) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(cmpd_tid, "vl_string", HOFFSET(cmpd_struct_w, str), str_id) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'i1'\n"); goto error; } /* end if */ - if(H5Tinsert(cmpd_tid, "i2", HOFFSET(struct cmpd_struct_w, i2), H5T_NATIVE_INT) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(cmpd_tid, "i2", HOFFSET(struct cmpd_struct_w, i2), H5T_NATIVE_INT) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'i2'\n"); goto error; } /* end if */ - if(H5Tcommit2(file, "compound", cmpd_tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED(); AT(); + if (H5Tcommit2(file, "compound", cmpd_tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't commit datatype\n"); goto error; } /* end if */ - if(H5Tclose(cmpd_tid) < 0) { - H5_FAILED(); AT(); + if (H5Tclose(cmpd_tid) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't close datatype\n"); goto error; } /* end if */ - if((cmpd_tid = H5Topen2(file, "compound", H5P_DEFAULT)) < 0) + if ((cmpd_tid = H5Topen2(file, "compound", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if((dup_tid = H5Tcopy(cmpd_tid)) < 0) { - H5_FAILED(); AT(); + if ((dup_tid = H5Tcopy(cmpd_tid)) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't copy datatype\n"); goto error; } /* end if */ dim1[0] = 1; - if((space_id = H5Screate_simple(1, dim1, NULL)) < 0) { - H5_FAILED(); AT(); + if ((space_id = H5Screate_simple(1, dim1, NULL)) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't create space\n"); goto error; } /* end if */ - if((dset_id = H5Dcreate2(file, "Dataset", dup_tid, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED(); AT(); + if ((dset_id = H5Dcreate2(file, "Dataset", dup_tid, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < + 0) { + H5_FAILED(); + AT(); HDprintf("Can't create dataset\n"); goto error; } /* end if */ - if(H5Dwrite(dset_id, dup_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata) < 0) { - H5_FAILED(); AT(); + if (H5Dwrite(dset_id, dup_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't write data\n"); goto error; } /* end if */ - if(H5Dread(dset_id, dup_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata) < 0) { - H5_FAILED(); AT(); + if (H5Dread(dset_id, dup_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't read data\n"); goto error; } /* end if */ - if(rdata.i1 != wdata.i1 || rdata.i2 != wdata.i2 || HDstrcmp(rdata.str, wdata.str)) { - H5_FAILED(); AT(); + if (rdata.i1 != wdata.i1 || rdata.i2 != wdata.i2 || HDstrcmp(rdata.str, wdata.str)) { + H5_FAILED(); + AT(); HDprintf("incorrect read data\n"); goto error; } /* end if */ - if(H5Treclaim(dup_tid, space_id, H5P_DEFAULT, &rdata) < 0) { - H5_FAILED(); AT(); + if (H5Treclaim(dup_tid, space_id, H5P_DEFAULT, &rdata) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't reclaim read data\n"); goto error; } /* end if */ rdata.str = NULL; - if(H5Dclose(dset_id) < 0) + if (H5Dclose(dset_id) < 0) goto error; - if(H5Tclose(cmpd_tid) < 0) + if (H5Tclose(cmpd_tid) < 0) goto error; - if(H5Tclose(dup_tid) < 0) + if (H5Tclose(dup_tid) < 0) goto error; - if(H5Tclose(str_id) < 0) + if (H5Tclose(str_id) < 0) goto error; - if(H5Sclose(space_id) < 0) + if (H5Sclose(space_id) < 0) goto error; - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) goto error; - - if((file = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) { - H5_FAILED(); AT(); + if ((file = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) { + H5_FAILED(); + AT(); HDprintf("cannot open file\n"); goto error; } /* end if */ - if((dset_id = H5Dopen2(file, "Dataset", H5P_DEFAULT)) < 0) { - H5_FAILED(); AT(); + if ((dset_id = H5Dopen2(file, "Dataset", H5P_DEFAULT)) < 0) { + H5_FAILED(); + AT(); HDprintf("cannot open dataset\n"); goto error; } /* end if */ - if((space_id = H5Dget_space(dset_id)) < 0) { - H5_FAILED(); AT(); + if ((space_id = H5Dget_space(dset_id)) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't get space\n"); goto error; } /* end if */ - if((cmpd_tid = H5Dget_type(dset_id)) < 0) { - H5_FAILED(); AT(); + if ((cmpd_tid = H5Dget_type(dset_id)) < 0) { + H5_FAILED(); + AT(); HDprintf("cannot open dataset\n"); goto error; } /* end if */ - if((dup_tid = H5Tcopy(cmpd_tid)) < 0) { - H5_FAILED(); AT(); + if ((dup_tid = H5Tcopy(cmpd_tid)) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't copy datatype\n"); goto error; } /* end if */ rdata.i1 = rdata.i2 = 0; - if(rdata.str) HDfree(rdata.str); + if (rdata.str) + HDfree(rdata.str); - if(H5Dread(dset_id, dup_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata) < 0) { - H5_FAILED(); AT(); + if (H5Dread(dset_id, dup_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't read data\n"); goto error; } /* end if */ - if(rdata.i1!=wdata.i1 || rdata.i2!=wdata.i2 || strcmp(rdata.str, wdata.str)) { - H5_FAILED(); AT(); + if (rdata.i1 != wdata.i1 || rdata.i2 != wdata.i2 || strcmp(rdata.str, wdata.str)) { + H5_FAILED(); + AT(); HDprintf("incorrect read data\n"); goto error; } /* end if */ - if(H5Treclaim(dup_tid, space_id, H5P_DEFAULT, &rdata) < 0) { - H5_FAILED(); AT(); + if (H5Treclaim(dup_tid, space_id, H5P_DEFAULT, &rdata) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't read data\n"); goto error; } /* end if */ rdata.str = NULL; - if(rdata.str) HDfree(rdata.str); + if (rdata.str) + HDfree(rdata.str); - if(H5Dclose(dset_id) < 0) + if (H5Dclose(dset_id) < 0) goto error; - if(H5Sclose(space_id) < 0) + if (H5Sclose(space_id) < 0) goto error; - if(H5Tclose(cmpd_tid) < 0) + if (H5Tclose(cmpd_tid) < 0) goto error; - if(H5Tclose(dup_tid) < 0) + if (H5Tclose(dup_tid) < 0) goto error; - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) goto error; PASSED(); return 0; - error: +error: return 1; } - /*------------------------------------------------------------------------- * Function: test_compound_10 * @@ -1882,10 +1947,10 @@ static int test_compound_10(void) { typedef struct cmpd_struct { - int i1; - char* str; - hvl_t text; - int i2; + int i1; + char *str; + hvl_t text; + int i2; } cmpd_struct; cmpd_struct wdata[ARRAY_DIM]; @@ -1894,168 +1959,186 @@ test_compound_10(void) hid_t arr_tid, cmpd_tid, cstr_id, vlstr_id; hid_t space_id; hid_t dset_id; - hsize_t arr_dim[1] = {ARRAY_DIM}; /* Array dimensions */ + hsize_t arr_dim[1] = {ARRAY_DIM}; /* Array dimensions */ hsize_t dim1[1]; - void *t1, *t2; + void * t1, *t2; char filename[1024]; size_t len; int i; TESTING("array datatype of compound type with VL string"); - for(i=0; i<ARRAY_DIM; i++) { - wdata[i].i1 = i*10+i; - wdata[i].str = HDstrdup("C string A"); + for (i = 0; i < ARRAY_DIM; i++) { + wdata[i].i1 = i * 10 + i; + wdata[i].str = HDstrdup("C string A"); wdata[i].str[9] = (char)(wdata[i].str[9] + i); - wdata[i].i2 = i*1000+i*10; + wdata[i].i2 = i * 1000 + i * 10; - wdata[i].text.p = (void*)HDstrdup("variable-length text A\0"); - len = wdata[i].text.len = HDstrlen((char*)wdata[i].text.p)+1; + wdata[i].text.p = (void *)HDstrdup("variable-length text A\0"); + len = wdata[i].text.len = HDstrlen((char *)wdata[i].text.p) + 1; ((char *)(wdata[i].text.p))[len - 2] = (char)(((char *)(wdata[i].text.p))[len - 2] + i); - ((char*)(wdata[i].text.p))[len-1] = '\0'; + ((char *)(wdata[i].text.p))[len - 1] = '\0'; } /* Create File */ h5_fixname(FILENAME[4], H5P_DEFAULT, filename, sizeof filename); - if((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED(); AT(); + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't create file!\n"); goto error; } /* end if */ /* Create first compound datatype */ - if((cmpd_tid = H5Tcreate( H5T_COMPOUND, sizeof(struct cmpd_struct))) < 0) { - H5_FAILED(); AT(); + if ((cmpd_tid = H5Tcreate(H5T_COMPOUND, sizeof(struct cmpd_struct))) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't create datatype!\n"); goto error; } /* end if */ - if(H5Tinsert(cmpd_tid,"i1",HOFFSET(struct cmpd_struct,i1),H5T_NATIVE_INT) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(cmpd_tid, "i1", HOFFSET(struct cmpd_struct, i1), H5T_NATIVE_INT) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'i1'\n"); goto error; } /* end if */ cstr_id = H5Tcopy(H5T_C_S1); - if(H5Tset_size(cstr_id,H5T_VARIABLE) < 0) { - H5_FAILED(); AT(); + if (H5Tset_size(cstr_id, H5T_VARIABLE) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't set size for C string\n"); goto error; } /* end if */ - if(H5Tinsert(cmpd_tid,"c_string",HOFFSET(cmpd_struct,str),cstr_id) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(cmpd_tid, "c_string", HOFFSET(cmpd_struct, str), cstr_id) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'str'\n"); goto error; } /* end if */ /* Create vl-string datatype */ - if((vlstr_id = H5Tvlen_create(H5T_NATIVE_CHAR)) < 0) { - H5_FAILED(); AT(); + if ((vlstr_id = H5Tvlen_create(H5T_NATIVE_CHAR)) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't create VL string\n"); goto error; } /* end if */ - if(H5Tinsert(cmpd_tid, "vl_string",HOFFSET(cmpd_struct, text), vlstr_id) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(cmpd_tid, "vl_string", HOFFSET(cmpd_struct, text), vlstr_id) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'text'\n"); goto error; } /* end if */ - if(H5Tinsert(cmpd_tid,"i2",HOFFSET(struct cmpd_struct,i2),H5T_NATIVE_INT) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(cmpd_tid, "i2", HOFFSET(struct cmpd_struct, i2), H5T_NATIVE_INT) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'i2'\n"); goto error; } /* end if */ /* Create the array datatype for c_string data */ - if((arr_tid = H5Tarray_create2(cmpd_tid, 1, arr_dim)) < 0) { - H5_FAILED(); AT(); + if ((arr_tid = H5Tarray_create2(cmpd_tid, 1, arr_dim)) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't create array type\n"); goto error; } /* end if */ dim1[0] = 1; - if((space_id = H5Screate_simple(1,dim1,NULL)) < 0) { - H5_FAILED(); AT(); + if ((space_id = H5Screate_simple(1, dim1, NULL)) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't create space\n"); goto error; } /* end if */ - if((dset_id = H5Dcreate2(file, "Dataset", arr_tid, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED(); AT(); + if ((dset_id = H5Dcreate2(file, "Dataset", arr_tid, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < + 0) { + H5_FAILED(); + AT(); HDprintf("Can't create dataset\n"); goto error; } /* end if */ - if(H5Dwrite(dset_id, arr_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata) < 0) { - H5_FAILED(); AT(); + if (H5Dwrite(dset_id, arr_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't write data\n"); goto error; } /* end if */ - if(H5Dread(dset_id, arr_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata) < 0) { - H5_FAILED(); AT(); + if (H5Dread(dset_id, arr_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't read data\n"); goto error; } /* end if */ - for(i = 0; i < ARRAY_DIM; i++) { - if(rdata[i].i1 != wdata[i].i1 || rdata[i].i2 != wdata[i].i2 || + for (i = 0; i < ARRAY_DIM; i++) { + if (rdata[i].i1 != wdata[i].i1 || rdata[i].i2 != wdata[i].i2 || HDstrcmp(rdata[i].str, wdata[i].str)) { - H5_FAILED(); AT(); + H5_FAILED(); + AT(); HDprintf("incorrect read data\n"); goto error; } /* end if */ - if(rdata[i].text.len!=wdata[i].text.len) { - H5_FAILED(); AT(); + if (rdata[i].text.len != wdata[i].text.len) { + H5_FAILED(); + AT(); HDprintf("incorrect VL length\n"); goto error; } /* end if */ t1 = rdata[i].text.p; t2 = wdata[i].text.p; - if(strcmp((char*)t1, (char*)t2)) { - H5_FAILED(); AT(); + if (strcmp((char *)t1, (char *)t2)) { + H5_FAILED(); + AT(); HDprintf("incorrect VL read data\n"); goto error; } } /* end for */ - if(H5Treclaim(arr_tid, space_id, H5P_DEFAULT, &rdata) < 0) { - H5_FAILED(); AT(); + if (H5Treclaim(arr_tid, space_id, H5P_DEFAULT, &rdata) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't reclaim read data\n"); goto error; } /* end if */ - if(H5Treclaim(arr_tid, space_id, H5P_DEFAULT, &wdata) < 0) { - H5_FAILED(); AT(); + if (H5Treclaim(arr_tid, space_id, H5P_DEFAULT, &wdata) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't reclaim read data\n"); goto error; } /* end if */ - if(H5Dclose(dset_id) < 0) + if (H5Dclose(dset_id) < 0) goto error; - if(H5Tclose(arr_tid) < 0) + if (H5Tclose(arr_tid) < 0) goto error; - if(H5Tclose(cmpd_tid) < 0) + if (H5Tclose(cmpd_tid) < 0) goto error; - if(H5Tclose(cstr_id) < 0) + if (H5Tclose(cstr_id) < 0) goto error; - if(H5Tclose(vlstr_id) < 0) + if (H5Tclose(vlstr_id) < 0) goto error; - if(H5Sclose(space_id) < 0) + if (H5Sclose(space_id) < 0) goto error; - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) goto error; PASSED(); return 0; - error: +error: return 1; } - /*------------------------------------------------------------------------- * Function: test_compound_11 * @@ -2079,61 +2162,77 @@ test_compound_11(void) { typedef struct { double d1; - int i1; - char *s1; - int i2; + int i1; + char * s1; + int i2; double d2; double d3; } big_t; typedef struct { double d1; - int i1; - char *s1; + int i1; + char * s1; } little_t; - hid_t var_string_tid; /* Datatype IDs for type conversion */ - hid_t big_tid, little_tid; /* Datatype IDs for type conversion */ - hid_t big_tid2, little_tid2; /* Datatype IDs for type conversion */ - hid_t opaq_src_tid, opaq_dst_tid; /* Datatype IDs for type conversion */ - hid_t space_id; /* Dataspace for buffer elements */ - hsize_t dim[1]; /* Dimensions for dataspace */ - void *buf = NULL; /* Conversion buffer */ - void *buf_orig = NULL; /* Copy of original conversion buffer */ - void *bkg = NULL; /* Background buffer */ - size_t u; /* Local index variable */ - int retval = 1; + hid_t var_string_tid; /* Datatype IDs for type conversion */ + hid_t big_tid, little_tid; /* Datatype IDs for type conversion */ + hid_t big_tid2, little_tid2; /* Datatype IDs for type conversion */ + hid_t opaq_src_tid, opaq_dst_tid; /* Datatype IDs for type conversion */ + hid_t space_id; /* Dataspace for buffer elements */ + hsize_t dim[1]; /* Dimensions for dataspace */ + void * buf = NULL; /* Conversion buffer */ + void * buf_orig = NULL; /* Copy of original conversion buffer */ + void * bkg = NULL; /* Background buffer */ + size_t u; /* Local index variable */ + int retval = 1; TESTING("registering type conversion routine with compound conversions"); /* Create variable string type for use in both structs */ - if((var_string_tid=H5Tcopy(H5T_C_S1)) < 0) TEST_ERROR - if(H5Tset_size(var_string_tid,H5T_VARIABLE) < 0) TEST_ERROR + if ((var_string_tid = H5Tcopy(H5T_C_S1)) < 0) + TEST_ERROR + if (H5Tset_size(var_string_tid, H5T_VARIABLE) < 0) + TEST_ERROR /* Create type for 'big' struct */ - if((big_tid = H5Tcreate(H5T_COMPOUND, sizeof(big_t))) < 0) TEST_ERROR + if ((big_tid = H5Tcreate(H5T_COMPOUND, sizeof(big_t))) < 0) + TEST_ERROR - if(H5Tinsert(big_tid, "d1", HOFFSET(big_t, d1), H5T_NATIVE_DOUBLE) < 0) TEST_ERROR - if(H5Tinsert(big_tid, "i1", HOFFSET(big_t, i1), H5T_NATIVE_INT) < 0) TEST_ERROR - if(H5Tinsert(big_tid, "s1", HOFFSET(big_t, s1), var_string_tid) < 0) TEST_ERROR - if(H5Tinsert(big_tid, "i2", HOFFSET(big_t, i2), H5T_NATIVE_INT) < 0) TEST_ERROR - if(H5Tinsert(big_tid, "d2", HOFFSET(big_t, d2), H5T_NATIVE_DOUBLE) < 0) TEST_ERROR - if(H5Tinsert(big_tid, "d3", HOFFSET(big_t, d3), H5T_NATIVE_DOUBLE) < 0) TEST_ERROR + if (H5Tinsert(big_tid, "d1", HOFFSET(big_t, d1), H5T_NATIVE_DOUBLE) < 0) + TEST_ERROR + if (H5Tinsert(big_tid, "i1", HOFFSET(big_t, i1), H5T_NATIVE_INT) < 0) + TEST_ERROR + if (H5Tinsert(big_tid, "s1", HOFFSET(big_t, s1), var_string_tid) < 0) + TEST_ERROR + if (H5Tinsert(big_tid, "i2", HOFFSET(big_t, i2), H5T_NATIVE_INT) < 0) + TEST_ERROR + if (H5Tinsert(big_tid, "d2", HOFFSET(big_t, d2), H5T_NATIVE_DOUBLE) < 0) + TEST_ERROR + if (H5Tinsert(big_tid, "d3", HOFFSET(big_t, d3), H5T_NATIVE_DOUBLE) < 0) + TEST_ERROR /* Create type for 'little' struct (with "out of order" inserts) */ - if((little_tid = H5Tcreate(H5T_COMPOUND, sizeof(little_t))) < 0) TEST_ERROR + if ((little_tid = H5Tcreate(H5T_COMPOUND, sizeof(little_t))) < 0) + TEST_ERROR - if(H5Tinsert(little_tid, "d1", HOFFSET(little_t, d1), H5T_NATIVE_DOUBLE) < 0) TEST_ERROR - if(H5Tinsert(little_tid, "s1", HOFFSET(little_t, s1), var_string_tid) < 0) TEST_ERROR - if(H5Tinsert(little_tid, "i1", HOFFSET(little_t, i1), H5T_NATIVE_INT) < 0) TEST_ERROR + if (H5Tinsert(little_tid, "d1", HOFFSET(little_t, d1), H5T_NATIVE_DOUBLE) < 0) + TEST_ERROR + if (H5Tinsert(little_tid, "s1", HOFFSET(little_t, s1), var_string_tid) < 0) + TEST_ERROR + if (H5Tinsert(little_tid, "i1", HOFFSET(little_t, i1), H5T_NATIVE_INT) < 0) + TEST_ERROR /* Allocate buffers */ - if((buf=HDmalloc(sizeof(big_t)*NTESTELEM))==NULL) TEST_ERROR - if((buf_orig=HDmalloc(sizeof(big_t)*NTESTELEM))==NULL) TEST_ERROR - if((bkg=HDmalloc(sizeof(big_t)*NTESTELEM))==NULL) TEST_ERROR + if ((buf = HDmalloc(sizeof(big_t) * NTESTELEM)) == NULL) + TEST_ERROR + if ((buf_orig = HDmalloc(sizeof(big_t) * NTESTELEM)) == NULL) + TEST_ERROR + if ((bkg = HDmalloc(sizeof(big_t) * NTESTELEM)) == NULL) + TEST_ERROR /* Initialize buffer */ - for(u = 0; u < NTESTELEM; u++) { + for (u = 0; u < NTESTELEM; u++) { ((big_t *)buf)[u].d1 = (double)u * (double)1.5f; ((big_t *)buf)[u].d2 = (double)u * (double)2.5f; ((big_t *)buf)[u].d3 = (double)u * (double)3.5f; @@ -2144,11 +2243,12 @@ test_compound_11(void) } /* end for */ /* Make copy of buffer before conversion */ - HDmemcpy(buf_orig,buf,sizeof(big_t)*NTESTELEM); + HDmemcpy(buf_orig, buf, sizeof(big_t) * NTESTELEM); dim[0] = NTESTELEM; - if((space_id = H5Screate_simple(1, dim, NULL)) < 0) { - H5_FAILED(); AT(); + if ((space_id = H5Screate_simple(1, dim, NULL)) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't create space\n"); goto error; } /* end if */ @@ -2156,149 +2256,170 @@ test_compound_11(void) /* Make copies of the 'big' and 'little' datatypes, so the type * conversion routine doesn't use the same ones this time and next time */ - if((big_tid2=H5Tcopy(big_tid)) < 0) TEST_ERROR - if((little_tid2=H5Tcopy(little_tid)) < 0) TEST_ERROR + if ((big_tid2 = H5Tcopy(big_tid)) < 0) + TEST_ERROR + if ((little_tid2 = H5Tcopy(little_tid)) < 0) + TEST_ERROR /* Convert buffer from 'big' to 'little' struct */ - if(H5Tconvert(big_tid2,little_tid2,(size_t)NTESTELEM,buf,bkg,H5P_DEFAULT) < 0) TEST_ERROR + if (H5Tconvert(big_tid2, little_tid2, (size_t)NTESTELEM, buf, bkg, H5P_DEFAULT) < 0) + TEST_ERROR /* Verify converted buffer is correct */ - for(u=0; u<NTESTELEM; u++) { - if(!H5_DBL_ABS_EQUAL(((big_t *)buf_orig)[u].d1, ((little_t *)buf)[u].d1)) { - HDprintf("Error, line #%d: buf_orig[%u].d1=%f, buf[%u].d1=%f\n",__LINE__, - (unsigned)u,((big_t *)buf_orig)[u].d1,(unsigned)u,((little_t *)buf)[u].d1); + for (u = 0; u < NTESTELEM; u++) { + if (!H5_DBL_ABS_EQUAL(((big_t *)buf_orig)[u].d1, ((little_t *)buf)[u].d1)) { + HDprintf("Error, line #%d: buf_orig[%u].d1=%f, buf[%u].d1=%f\n", __LINE__, (unsigned)u, + ((big_t *)buf_orig)[u].d1, (unsigned)u, ((little_t *)buf)[u].d1); TEST_ERROR } /* end if */ - if(((big_t *)buf_orig)[u].i1!=((little_t *)buf)[u].i1) { - HDprintf("Error, line #%d: buf_orig[%u].i1=%d, buf[%u].i1=%d\n",__LINE__, - (unsigned)u,((big_t *)buf_orig)[u].i1,(unsigned)u,((little_t *)buf)[u].i1); + if (((big_t *)buf_orig)[u].i1 != ((little_t *)buf)[u].i1) { + HDprintf("Error, line #%d: buf_orig[%u].i1=%d, buf[%u].i1=%d\n", __LINE__, (unsigned)u, + ((big_t *)buf_orig)[u].i1, (unsigned)u, ((little_t *)buf)[u].i1); TEST_ERROR } /* end if */ - if(((big_t *)buf_orig)[u].s1==NULL || ((little_t *)buf)[u].s1==NULL) { - HDprintf("Error, line #%d: buf_orig[%u].s1=%p, buf[%u].s1=%p\n",__LINE__, - (unsigned)u,((big_t *)buf_orig)[u].s1,(unsigned)u,((little_t *)buf)[u].s1); + if (((big_t *)buf_orig)[u].s1 == NULL || ((little_t *)buf)[u].s1 == NULL) { + HDprintf("Error, line #%d: buf_orig[%u].s1=%p, buf[%u].s1=%p\n", __LINE__, (unsigned)u, + ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); TEST_ERROR } /* end if */ - else if(HDstrcmp(((big_t *)buf_orig)[u].s1,((little_t *)buf)[u].s1)) { - HDprintf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n",__LINE__, - (unsigned)u,((big_t *)buf_orig)[u].s1,(unsigned)u,((little_t *)buf)[u].s1); + else if (HDstrcmp(((big_t *)buf_orig)[u].s1, ((little_t *)buf)[u].s1)) { + HDprintf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u, + ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); TEST_ERROR } /* end if */ - } /* end for */ - if(H5Treclaim(little_tid2, space_id, H5P_DEFAULT, buf) < 0) { - H5_FAILED(); AT(); + } /* end for */ + if (H5Treclaim(little_tid2, space_id, H5P_DEFAULT, buf) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't reclaim data\n"); goto error; } /* end if */ /* Build source and destination types for conversion routine */ - if((opaq_src_tid=H5Tcreate(H5T_OPAQUE, (size_t)4)) < 0) TEST_ERROR - if(H5Tset_tag(opaq_src_tid, "opaque source type") < 0) TEST_ERROR - if((opaq_dst_tid=H5Tcreate(H5T_OPAQUE, (size_t)4)) < 0) TEST_ERROR - if(H5Tset_tag(opaq_dst_tid, "opaque destination type") < 0) TEST_ERROR + if ((opaq_src_tid = H5Tcreate(H5T_OPAQUE, (size_t)4)) < 0) + TEST_ERROR + if (H5Tset_tag(opaq_src_tid, "opaque source type") < 0) + TEST_ERROR + if ((opaq_dst_tid = H5Tcreate(H5T_OPAQUE, (size_t)4)) < 0) + TEST_ERROR + if (H5Tset_tag(opaq_dst_tid, "opaque destination type") < 0) + TEST_ERROR /* Register new type conversion routine */ - if(H5Tregister(H5T_PERS_HARD, "opaq_test", opaq_src_tid, opaq_dst_tid, convert_opaque) < 0) TEST_ERROR + if (H5Tregister(H5T_PERS_HARD, "opaq_test", opaq_src_tid, opaq_dst_tid, convert_opaque) < 0) + TEST_ERROR /* Recover the original buffer information */ - HDmemcpy(buf,buf_orig,sizeof(big_t)*NTESTELEM); + HDmemcpy(buf, buf_orig, sizeof(big_t) * NTESTELEM); /* Convert buffer from 'big' to 'little' struct */ - if(H5Tconvert(big_tid,little_tid,(size_t)NTESTELEM,buf,bkg,H5P_DEFAULT) < 0) TEST_ERROR + if (H5Tconvert(big_tid, little_tid, (size_t)NTESTELEM, buf, bkg, H5P_DEFAULT) < 0) + TEST_ERROR /* Verify converted buffer is correct */ - for(u=0; u<NTESTELEM; u++) { - if(!H5_DBL_ABS_EQUAL(((big_t *)buf_orig)[u].d1, ((little_t *)buf)[u].d1)) { - HDprintf("Error, line #%d: buf_orig[%u].d1=%f, buf[%u].d1=%f\n",__LINE__, - (unsigned)u,((big_t *)buf_orig)[u].d1,(unsigned)u,((little_t *)buf)[u].d1); + for (u = 0; u < NTESTELEM; u++) { + if (!H5_DBL_ABS_EQUAL(((big_t *)buf_orig)[u].d1, ((little_t *)buf)[u].d1)) { + HDprintf("Error, line #%d: buf_orig[%u].d1=%f, buf[%u].d1=%f\n", __LINE__, (unsigned)u, + ((big_t *)buf_orig)[u].d1, (unsigned)u, ((little_t *)buf)[u].d1); TEST_ERROR } /* end if */ - if(((big_t *)buf_orig)[u].i1!=((little_t *)buf)[u].i1) { - HDprintf("Error, line #%d: buf_orig[%u].i1=%d, buf[%u].i1=%d\n",__LINE__, - (unsigned)u,((big_t *)buf_orig)[u].i1,(unsigned)u,((little_t *)buf)[u].i1); + if (((big_t *)buf_orig)[u].i1 != ((little_t *)buf)[u].i1) { + HDprintf("Error, line #%d: buf_orig[%u].i1=%d, buf[%u].i1=%d\n", __LINE__, (unsigned)u, + ((big_t *)buf_orig)[u].i1, (unsigned)u, ((little_t *)buf)[u].i1); TEST_ERROR } /* end if */ - if(((big_t *)buf_orig)[u].s1==NULL || ((little_t *)buf)[u].s1==NULL) { - HDprintf("Error, line #%d: buf_orig[%u].s1=%p, buf[%u].s1=%p\n",__LINE__, - (unsigned)u,((big_t *)buf_orig)[u].s1,(unsigned)u,((little_t *)buf)[u].s1); + if (((big_t *)buf_orig)[u].s1 == NULL || ((little_t *)buf)[u].s1 == NULL) { + HDprintf("Error, line #%d: buf_orig[%u].s1=%p, buf[%u].s1=%p\n", __LINE__, (unsigned)u, + ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); TEST_ERROR } /* end if */ - else if(HDstrcmp(((big_t *)buf_orig)[u].s1,((little_t *)buf)[u].s1)) { - HDprintf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n",__LINE__, - (unsigned)u,((big_t *)buf_orig)[u].s1,(unsigned)u,((little_t *)buf)[u].s1); + else if (HDstrcmp(((big_t *)buf_orig)[u].s1, ((little_t *)buf)[u].s1)) { + HDprintf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u, + ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); TEST_ERROR } /* end if */ - } /* end for */ - if(H5Treclaim(little_tid, space_id, H5P_DEFAULT, buf) < 0) { - H5_FAILED(); AT(); + } /* end for */ + if (H5Treclaim(little_tid, space_id, H5P_DEFAULT, buf) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't reclaim data\n"); goto error; } /* end if */ /* Unregister the conversion routine */ - if(H5Tunregister(H5T_PERS_HARD, "opaq_test", opaq_src_tid, opaq_dst_tid, convert_opaque) < 0) TEST_ERROR + if (H5Tunregister(H5T_PERS_HARD, "opaq_test", opaq_src_tid, opaq_dst_tid, convert_opaque) < 0) + TEST_ERROR /* Recover the original buffer information */ - HDmemcpy(buf,buf_orig,sizeof(big_t)*NTESTELEM); + HDmemcpy(buf, buf_orig, sizeof(big_t) * NTESTELEM); /* Convert buffer from 'big' to 'little' struct */ - if(H5Tconvert(big_tid,little_tid,(size_t)NTESTELEM,buf,bkg,H5P_DEFAULT) < 0) TEST_ERROR + if (H5Tconvert(big_tid, little_tid, (size_t)NTESTELEM, buf, bkg, H5P_DEFAULT) < 0) + TEST_ERROR /* Verify converted buffer is correct */ - for(u=0; u<NTESTELEM; u++) { - if(!H5_DBL_ABS_EQUAL(((big_t *)buf_orig)[u].d1, ((little_t *)buf)[u].d1)) { - HDprintf("Error, line #%d: buf_orig[%u].d1=%f, buf[%u].d1=%f\n",__LINE__, - (unsigned)u,((big_t *)buf_orig)[u].d1,(unsigned)u,((little_t *)buf)[u].d1); + for (u = 0; u < NTESTELEM; u++) { + if (!H5_DBL_ABS_EQUAL(((big_t *)buf_orig)[u].d1, ((little_t *)buf)[u].d1)) { + HDprintf("Error, line #%d: buf_orig[%u].d1=%f, buf[%u].d1=%f\n", __LINE__, (unsigned)u, + ((big_t *)buf_orig)[u].d1, (unsigned)u, ((little_t *)buf)[u].d1); TEST_ERROR } /* end if */ - if(((big_t *)buf_orig)[u].i1!=((little_t *)buf)[u].i1) { - HDprintf("Error, line #%d: buf_orig[%u].i1=%d, buf[%u].i1=%d\n",__LINE__, - (unsigned)u,((big_t *)buf_orig)[u].i1,(unsigned)u,((little_t *)buf)[u].i1); + if (((big_t *)buf_orig)[u].i1 != ((little_t *)buf)[u].i1) { + HDprintf("Error, line #%d: buf_orig[%u].i1=%d, buf[%u].i1=%d\n", __LINE__, (unsigned)u, + ((big_t *)buf_orig)[u].i1, (unsigned)u, ((little_t *)buf)[u].i1); TEST_ERROR } /* end if */ - if(((big_t *)buf_orig)[u].s1==NULL || ((little_t *)buf)[u].s1==NULL) { - HDprintf("Error, line #%d: buf_orig[%u].s1=%p, buf[%u].s1=%p\n",__LINE__, - (unsigned)u,((big_t *)buf_orig)[u].s1,(unsigned)u,((little_t *)buf)[u].s1); + if (((big_t *)buf_orig)[u].s1 == NULL || ((little_t *)buf)[u].s1 == NULL) { + HDprintf("Error, line #%d: buf_orig[%u].s1=%p, buf[%u].s1=%p\n", __LINE__, (unsigned)u, + ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); TEST_ERROR } /* end if */ - else if(HDstrcmp(((big_t *)buf_orig)[u].s1,((little_t *)buf)[u].s1)) { - HDprintf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n",__LINE__, - (unsigned)u,((big_t *)buf_orig)[u].s1,(unsigned)u,((little_t *)buf)[u].s1); + else if (HDstrcmp(((big_t *)buf_orig)[u].s1, ((little_t *)buf)[u].s1)) { + HDprintf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u, + ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); TEST_ERROR } /* end if */ - } /* end for */ - if(H5Treclaim(little_tid, space_id, H5P_DEFAULT, buf) < 0) { - H5_FAILED(); AT(); + } /* end for */ + if (H5Treclaim(little_tid, space_id, H5P_DEFAULT, buf) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't reclaim data\n"); goto error; } /* end if */ /* Free everything */ - for(u=0; u<NTESTELEM; u++) + for (u = 0; u < NTESTELEM; u++) HDfree(((big_t *)buf_orig)[u].s1); - if(H5Sclose(space_id) < 0) TEST_ERROR - if(H5Tclose(opaq_dst_tid) < 0) TEST_ERROR - if(H5Tclose(opaq_src_tid) < 0) TEST_ERROR - if(H5Tclose(little_tid2) < 0) TEST_ERROR - if(H5Tclose(big_tid2) < 0) TEST_ERROR - if(H5Tclose(little_tid) < 0) TEST_ERROR - if(H5Tclose(big_tid) < 0) TEST_ERROR - if(H5Tclose(var_string_tid) < 0) TEST_ERROR + if (H5Sclose(space_id) < 0) + TEST_ERROR + if (H5Tclose(opaq_dst_tid) < 0) + TEST_ERROR + if (H5Tclose(opaq_src_tid) < 0) + TEST_ERROR + if (H5Tclose(little_tid2) < 0) + TEST_ERROR + if (H5Tclose(big_tid2) < 0) + TEST_ERROR + if (H5Tclose(little_tid) < 0) + TEST_ERROR + if (H5Tclose(big_tid) < 0) + TEST_ERROR + if (H5Tclose(var_string_tid) < 0) + TEST_ERROR PASSED(); retval = 0; error: - if(buf) + if (buf) HDfree(buf); - if(buf_orig) + if (buf_orig) HDfree(buf_orig); - if(bkg) + if (bkg) HDfree(bkg); return retval; } - /*------------------------------------------------------------------------- * Function: test_compound_12 * @@ -2320,68 +2441,80 @@ error: static int test_compound_12(void) { - hid_t complex_id; - size_t size = 0; - size_t offset, new_size, tmp_size; + hid_t complex_id; + size_t size = 0; + size_t offset, new_size, tmp_size; herr_t ret; TESTING("adjust size of compound datatypes"); /* Create a compound type of minimal size */ - if ((complex_id = H5Tcreate(H5T_COMPOUND, (size_t)1)) < 0) goto error; + if ((complex_id = H5Tcreate(H5T_COMPOUND, (size_t)1)) < 0) + goto error; /* Verify the size */ - if((new_size=H5Tget_size(complex_id))==0) goto error; - if(new_size!=1) goto error; + if ((new_size = H5Tget_size(complex_id)) == 0) + goto error; + if (new_size != 1) + goto error; /* Add a couple fields and adjust the size */ offset = size; - if((tmp_size=H5Tget_size(H5T_NATIVE_DOUBLE))==0) goto error; - size+=tmp_size; - if (H5Tset_size(complex_id, size) < 0) goto error; - if (H5Tinsert(complex_id, "real", offset, - H5T_NATIVE_DOUBLE) < 0) goto error; + if ((tmp_size = H5Tget_size(H5T_NATIVE_DOUBLE)) == 0) + goto error; + size += tmp_size; + if (H5Tset_size(complex_id, size) < 0) + goto error; + if (H5Tinsert(complex_id, "real", offset, H5T_NATIVE_DOUBLE) < 0) + goto error; offset = size; - if((tmp_size=H5Tget_size(H5T_NATIVE_DOUBLE))==0) goto error; - size+=tmp_size; - if (H5Tset_size(complex_id, size) < 0) goto error; - if (H5Tinsert(complex_id, "imaginary", offset, - H5T_NATIVE_DOUBLE) < 0) goto error; + if ((tmp_size = H5Tget_size(H5T_NATIVE_DOUBLE)) == 0) + goto error; + size += tmp_size; + if (H5Tset_size(complex_id, size) < 0) + goto error; + if (H5Tinsert(complex_id, "imaginary", offset, H5T_NATIVE_DOUBLE) < 0) + goto error; /* Increase and decrease the size. */ - if((tmp_size=H5Tget_size(H5T_NATIVE_DOUBLE))==0) goto error; - size+=tmp_size; - if (H5Tset_size(complex_id, size) < 0) goto error; + if ((tmp_size = H5Tget_size(H5T_NATIVE_DOUBLE)) == 0) + goto error; + size += tmp_size; + if (H5Tset_size(complex_id, size) < 0) + goto error; - if((tmp_size=H5Tget_size(H5T_NATIVE_DOUBLE))==0) goto error; - size-=tmp_size; - if (H5Tset_size(complex_id, size) < 0) goto error; + if ((tmp_size = H5Tget_size(H5T_NATIVE_DOUBLE)) == 0) + goto error; + size -= tmp_size; + if (H5Tset_size(complex_id, size) < 0) + goto error; /* Verify the size */ - if((new_size=H5Tget_size(complex_id))==0) goto error; - if(new_size!=size) goto error; + if ((new_size = H5Tget_size(complex_id)) == 0) + goto error; + if (new_size != size) + goto error; /* Tries to cut last member. Supposed to fail. */ size--; - H5E_BEGIN_TRY { - ret = H5Tset_size(complex_id, size); - } H5E_END_TRY; - if(ret>=0) { + H5E_BEGIN_TRY { ret = H5Tset_size(complex_id, size); } + H5E_END_TRY; + if (ret >= 0) { H5_FAILED(); puts(" Tries to cut off the last member. Should have failed."); goto error; } - if (H5Tclose (complex_id) < 0) goto error; + if (H5Tclose(complex_id) < 0) + goto error; PASSED(); return 0; - error: +error: return 1; } - /*------------------------------------------------------------------------- * Function: test_compound_13 * @@ -2403,78 +2536,110 @@ test_compound_13(void) { struct s1 { unsigned char x[COMPOUND13_ARRAY_SIZE + 1]; - float y; + float y; }; - struct s1 data_out, data_in; - hid_t fileid, grpid, dtypeid, array1_tid, spaceid, attid; - hid_t fapl_id; - hsize_t dims[1] = {COMPOUND13_ARRAY_SIZE + 1}; - char filename[1024]; - unsigned u; + struct s1 data_out, data_in; + hid_t fileid, grpid, dtypeid, array1_tid, spaceid, attid; + hid_t fapl_id; + hsize_t dims[1] = {COMPOUND13_ARRAY_SIZE + 1}; + char filename[1024]; + unsigned u; TESTING("compound datatypes of boundary size with latest format"); /* Create some phony data. */ HDmemset(&data_out, 0, sizeof(data_out)); - for(u = 0; u < COMPOUND13_ARRAY_SIZE + 1; u++) + for (u = 0; u < COMPOUND13_ARRAY_SIZE + 1; u++) data_out.x[u] = (unsigned char)u; data_out.y = 99.99f; /* Set latest_format in access propertly list to enable the latest * compound datatype format. */ - if((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0) FAIL_STACK_ERROR - if(H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) FAIL_STACK_ERROR + if ((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0) + FAIL_STACK_ERROR + if (H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) + FAIL_STACK_ERROR /* Open file and get root group. */ h5_fixname(FILENAME[4], H5P_DEFAULT, filename, sizeof filename); - if((fileid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id)) < 0) FAIL_STACK_ERROR - if((grpid = H5Gopen2(fileid, "/", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((fileid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id)) < 0) + FAIL_STACK_ERROR + if ((grpid = H5Gopen2(fileid, "/", H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Create a compound type. */ - if((dtypeid = H5Tcreate(H5T_COMPOUND, sizeof(struct s1))) < 0) FAIL_STACK_ERROR - if((array1_tid = H5Tarray_create2(H5T_NATIVE_UCHAR, 1, dims)) < 0) FAIL_STACK_ERROR - if(H5Tinsert(dtypeid, "x", HOFFSET(struct s1, x), array1_tid) < 0) FAIL_STACK_ERROR - if(H5Tinsert(dtypeid, "y", HOFFSET(struct s1, y), H5T_NATIVE_FLOAT) < 0) FAIL_STACK_ERROR + if ((dtypeid = H5Tcreate(H5T_COMPOUND, sizeof(struct s1))) < 0) + FAIL_STACK_ERROR + if ((array1_tid = H5Tarray_create2(H5T_NATIVE_UCHAR, 1, dims)) < 0) + FAIL_STACK_ERROR + if (H5Tinsert(dtypeid, "x", HOFFSET(struct s1, x), array1_tid) < 0) + FAIL_STACK_ERROR + if (H5Tinsert(dtypeid, "y", HOFFSET(struct s1, y), H5T_NATIVE_FLOAT) < 0) + FAIL_STACK_ERROR /* Create a space. */ - if((spaceid = H5Screate(H5S_SCALAR)) < 0) FAIL_STACK_ERROR + if ((spaceid = H5Screate(H5S_SCALAR)) < 0) + FAIL_STACK_ERROR /* Create an attribute of this compound type. */ - if((attid = H5Acreate2(grpid, COMPOUND13_ATTR_NAME, dtypeid, spaceid, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((attid = H5Acreate2(grpid, COMPOUND13_ATTR_NAME, dtypeid, spaceid, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Write some data. */ - if(H5Awrite(attid, dtypeid, &data_out) < 0) FAIL_STACK_ERROR + if (H5Awrite(attid, dtypeid, &data_out) < 0) + FAIL_STACK_ERROR /* Release all resources. */ - if(H5Aclose(attid) < 0) FAIL_STACK_ERROR - if(H5Tclose(array1_tid) < 0) FAIL_STACK_ERROR - if(H5Tclose(dtypeid) < 0) FAIL_STACK_ERROR - if(H5Sclose(spaceid) < 0) FAIL_STACK_ERROR - if(H5Gclose(grpid) < 0) FAIL_STACK_ERROR - if(H5Fclose(fileid) < 0) FAIL_STACK_ERROR - if(H5Pclose(fapl_id) < 0) FAIL_STACK_ERROR + if (H5Aclose(attid) < 0) + FAIL_STACK_ERROR + if (H5Tclose(array1_tid) < 0) + FAIL_STACK_ERROR + if (H5Tclose(dtypeid) < 0) + FAIL_STACK_ERROR + if (H5Sclose(spaceid) < 0) + FAIL_STACK_ERROR + if (H5Gclose(grpid) < 0) + FAIL_STACK_ERROR + if (H5Fclose(fileid) < 0) + FAIL_STACK_ERROR + if (H5Pclose(fapl_id) < 0) + FAIL_STACK_ERROR /* Now open the file and read it. */ - if((fileid = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if((grpid = H5Gopen2(fileid, "/", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if((attid = H5Aopen(grpid, COMPOUND13_ATTR_NAME, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if((dtypeid = H5Aget_type(attid)) < 0) FAIL_STACK_ERROR - if(H5Tget_class(dtypeid) != H5T_COMPOUND) FAIL_STACK_ERROR - if(HOFFSET(struct s1, x) != H5Tget_member_offset(dtypeid, 0)) TEST_ERROR - if(HOFFSET(struct s1, y) != H5Tget_member_offset(dtypeid, 1)) TEST_ERROR - if(H5Aread(attid, dtypeid, &data_in) < 0) FAIL_STACK_ERROR + if ((fileid = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if ((grpid = H5Gopen2(fileid, "/", H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if ((attid = H5Aopen(grpid, COMPOUND13_ATTR_NAME, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if ((dtypeid = H5Aget_type(attid)) < 0) + FAIL_STACK_ERROR + if (H5Tget_class(dtypeid) != H5T_COMPOUND) + FAIL_STACK_ERROR + if (HOFFSET(struct s1, x) != H5Tget_member_offset(dtypeid, 0)) + TEST_ERROR + if (HOFFSET(struct s1, y) != H5Tget_member_offset(dtypeid, 1)) + TEST_ERROR + if (H5Aread(attid, dtypeid, &data_in) < 0) + FAIL_STACK_ERROR /* Check the data. */ for (u = 0; u < COMPOUND13_ARRAY_SIZE + 1; u++) - if(data_out.x[u] != data_in.x[u]) TEST_ERROR - if(!H5_FLT_ABS_EQUAL(data_out.y, data_in.y)) TEST_ERROR + if (data_out.x[u] != data_in.x[u]) + TEST_ERROR + if (!H5_FLT_ABS_EQUAL(data_out.y, data_in.y)) + TEST_ERROR /* Release all resources. */ - if(H5Aclose(attid) < 0) FAIL_STACK_ERROR - if(H5Tclose(dtypeid) < 0) FAIL_STACK_ERROR - if(H5Gclose(grpid) < 0) FAIL_STACK_ERROR - if(H5Fclose(fileid) < 0) FAIL_STACK_ERROR + if (H5Aclose(attid) < 0) + FAIL_STACK_ERROR + if (H5Tclose(dtypeid) < 0) + FAIL_STACK_ERROR + if (H5Gclose(grpid) < 0) + FAIL_STACK_ERROR + if (H5Fclose(fileid) < 0) + FAIL_STACK_ERROR PASSED(); return 0; @@ -2483,7 +2648,6 @@ error: return 1; } /* end test_compound_13() */ - /*------------------------------------------------------------------------- * Function: test_compound_14 * @@ -2507,390 +2671,440 @@ static int test_compound_14(void) { typedef struct cmpd_struct_1_w { - char c1; - char c2; - const char* str; + char c1; + char c2; + const char *str; } cmpd_struct_1_w; typedef struct cmpd_struct_1_r { - char c1; - char c2; - char* str; + char c1; + char c2; + char *str; } cmpd_struct_1_r; typedef struct cmpd_struct_2_w { - char c1; - char c2; - const char* str; - long l1; - long l2; - long l3; - long l4; + char c1; + char c2; + const char *str; + long l1; + long l2; + long l3; + long l4; } cmpd_struct_2_w; typedef struct cmpd_struct_2_r { - char c1; - char c2; - char* str; - long l1; - long l2; - long l3; - long l4; + char c1; + char c2; + char *str; + long l1; + long l2; + long l3; + long l4; } cmpd_struct_2_r; cmpd_struct_1_w wdata1 = {'A', 'B', "variable-length string"}; cmpd_struct_1_r rdata1; cmpd_struct_2_w wdata2 = {'C', 'D', "another vlen!", 1, 2, -1, 9001}; cmpd_struct_2_r rdata2; - hid_t file; - hid_t cmpd_m1_tid, cmpd_f1_tid, cmpd_m2_tid, cmpd_f2_tid, str_id; - hid_t space_id; - hid_t dset1_id, dset2_id; - hsize_t dim1[1]; - char filename[1024]; + hid_t file; + hid_t cmpd_m1_tid, cmpd_f1_tid, cmpd_m2_tid, cmpd_f2_tid, str_id; + hid_t space_id; + hid_t dset1_id, dset2_id; + hsize_t dim1[1]; + char filename[1024]; TESTING("unaligned VL strings in compound"); /* Create File */ h5_fixname(FILENAME[3], H5P_DEFAULT, filename, sizeof filename); - if((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED(); AT(); + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't create file!\n"); goto error; } /* end if */ /* Create memory compound datatype 1 */ - if((cmpd_m1_tid = H5Tcreate( H5T_COMPOUND, sizeof(struct cmpd_struct_1_w))) < 0) { - H5_FAILED(); AT(); + if ((cmpd_m1_tid = H5Tcreate(H5T_COMPOUND, sizeof(struct cmpd_struct_1_w))) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't create datatype!\n"); goto error; } /* end if */ - if(H5Tinsert(cmpd_m1_tid,"c1",HOFFSET(struct cmpd_struct_1_w, c1), H5T_NATIVE_CHAR) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(cmpd_m1_tid, "c1", HOFFSET(struct cmpd_struct_1_w, c1), H5T_NATIVE_CHAR) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'c1'\n"); goto error; } /* end if */ - if(H5Tinsert(cmpd_m1_tid,"c2",HOFFSET(struct cmpd_struct_1_w, c2), H5T_NATIVE_CHAR) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(cmpd_m1_tid, "c2", HOFFSET(struct cmpd_struct_1_w, c2), H5T_NATIVE_CHAR) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'c2'\n"); goto error; } /* end if */ str_id = H5Tcopy(H5T_C_S1); - if(H5Tset_size(str_id,H5T_VARIABLE) < 0) { - H5_FAILED(); AT(); + if (H5Tset_size(str_id, H5T_VARIABLE) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't set size for VL string\n"); goto error; } /* end if */ - if(H5Tinsert(cmpd_m1_tid, "vl_string", HOFFSET(cmpd_struct_1_w, str), str_id) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(cmpd_m1_tid, "vl_string", HOFFSET(cmpd_struct_1_w, str), str_id) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'vl_string'\n"); goto error; } /* end if */ /* Create file compound datatype 1 */ - if((cmpd_f1_tid = H5Tcreate( H5T_COMPOUND, 8 + 1 + sizeof(hvl_t))) < 0) { - H5_FAILED(); AT(); + if ((cmpd_f1_tid = H5Tcreate(H5T_COMPOUND, 8 + 1 + sizeof(hvl_t))) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't create datatype!\n"); goto error; } /* end if */ - if(H5Tinsert(cmpd_f1_tid,"c1",(size_t)0,H5T_STD_I64BE) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(cmpd_f1_tid, "c1", (size_t)0, H5T_STD_I64BE) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'c1'\n"); goto error; } /* end if */ - if(H5Tinsert(cmpd_f1_tid,"c2",(size_t)8,H5T_NATIVE_CHAR) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(cmpd_f1_tid, "c2", (size_t)8, H5T_NATIVE_CHAR) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'c2'\n"); goto error; } /* end if */ - if(H5Tinsert(cmpd_f1_tid, "vl_string",(size_t)(8 + 1), str_id) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(cmpd_f1_tid, "vl_string", (size_t)(8 + 1), str_id) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'vl_string'\n"); goto error; } /* end if */ /* Create memory compound datatype 2 */ - if((cmpd_m2_tid = H5Tcreate( H5T_COMPOUND, sizeof(struct cmpd_struct_2_w))) < 0) { - H5_FAILED(); AT(); + if ((cmpd_m2_tid = H5Tcreate(H5T_COMPOUND, sizeof(struct cmpd_struct_2_w))) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't create datatype!\n"); goto error; } /* end if */ - if(H5Tinsert(cmpd_m2_tid,"c1",HOFFSET(struct cmpd_struct_2_w, c1), H5T_NATIVE_CHAR) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(cmpd_m2_tid, "c1", HOFFSET(struct cmpd_struct_2_w, c1), H5T_NATIVE_CHAR) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'c1'\n"); goto error; } /* end if */ - if(H5Tinsert(cmpd_m2_tid,"c2",HOFFSET(struct cmpd_struct_2_w, c2), H5T_NATIVE_CHAR) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(cmpd_m2_tid, "c2", HOFFSET(struct cmpd_struct_2_w, c2), H5T_NATIVE_CHAR) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'c2'\n"); goto error; } /* end if */ - if(H5Tinsert(cmpd_m2_tid, "vl_string", HOFFSET(cmpd_struct_2_w, str), str_id) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(cmpd_m2_tid, "vl_string", HOFFSET(cmpd_struct_2_w, str), str_id) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'vl_string'\n"); goto error; } /* end if */ - if(H5Tinsert(cmpd_m2_tid,"l1",HOFFSET(struct cmpd_struct_2_w, l1), H5T_NATIVE_LONG) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(cmpd_m2_tid, "l1", HOFFSET(struct cmpd_struct_2_w, l1), H5T_NATIVE_LONG) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'l1'\n"); goto error; } /* end if */ - if(H5Tinsert(cmpd_m2_tid,"l2",HOFFSET(struct cmpd_struct_2_w, l2), H5T_NATIVE_LONG) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(cmpd_m2_tid, "l2", HOFFSET(struct cmpd_struct_2_w, l2), H5T_NATIVE_LONG) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'l2'\n"); goto error; } /* end if */ - if(H5Tinsert(cmpd_m2_tid,"l3",HOFFSET(struct cmpd_struct_2_w, l3), H5T_NATIVE_LONG) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(cmpd_m2_tid, "l3", HOFFSET(struct cmpd_struct_2_w, l3), H5T_NATIVE_LONG) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'l3'\n"); goto error; } /* end if */ - if(H5Tinsert(cmpd_m2_tid,"l4",HOFFSET(struct cmpd_struct_2_w, l4), H5T_NATIVE_LONG) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(cmpd_m2_tid, "l4", HOFFSET(struct cmpd_struct_2_w, l4), H5T_NATIVE_LONG) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'l4'\n"); goto error; } /* end if */ /* Create file compound datatype 2 */ - if((cmpd_f2_tid = H5Tcreate( H5T_COMPOUND, 8 + 1 + sizeof(hvl_t) + 4*sizeof(long))) < 0) { - H5_FAILED(); AT(); + if ((cmpd_f2_tid = H5Tcreate(H5T_COMPOUND, 8 + 1 + sizeof(hvl_t) + 4 * sizeof(long))) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't create datatype!\n"); goto error; } /* end if */ - if(H5Tinsert(cmpd_f2_tid,"c1",(size_t)0,H5T_STD_I64BE) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(cmpd_f2_tid, "c1", (size_t)0, H5T_STD_I64BE) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'c1'\n"); goto error; } /* end if */ - if(H5Tinsert(cmpd_f2_tid,"c2",(size_t)8,H5T_NATIVE_CHAR) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(cmpd_f2_tid, "c2", (size_t)8, H5T_NATIVE_CHAR) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'c2'\n"); goto error; } /* end if */ - if(H5Tinsert(cmpd_f2_tid, "vl_string", (size_t)(8 + 1), str_id) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(cmpd_f2_tid, "vl_string", (size_t)(8 + 1), str_id) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'vl_string'\n"); goto error; } /* end if */ - if(H5Tinsert(cmpd_f2_tid,"l1",8 + 1 + sizeof(hvl_t),H5T_NATIVE_LONG) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(cmpd_f2_tid, "l1", 8 + 1 + sizeof(hvl_t), H5T_NATIVE_LONG) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'l1'\n"); goto error; } /* end if */ - if(H5Tinsert(cmpd_f2_tid,"l2",8 + 1 + sizeof(hvl_t) + sizeof(long),H5T_NATIVE_LONG) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(cmpd_f2_tid, "l2", 8 + 1 + sizeof(hvl_t) + sizeof(long), H5T_NATIVE_LONG) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'l2'\n"); goto error; } /* end if */ - if(H5Tinsert(cmpd_f2_tid,"l3",8 + 1 + sizeof(hvl_t) + 2*sizeof(long),H5T_NATIVE_LONG) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(cmpd_f2_tid, "l3", 8 + 1 + sizeof(hvl_t) + 2 * sizeof(long), H5T_NATIVE_LONG) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'l3'\n"); goto error; } /* end if */ - if(H5Tinsert(cmpd_f2_tid,"l4",8 + 1 + sizeof(hvl_t) + 3*sizeof(long),H5T_NATIVE_LONG) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(cmpd_f2_tid, "l4", 8 + 1 + sizeof(hvl_t) + 3 * sizeof(long), H5T_NATIVE_LONG) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'l4'\n"); goto error; } /* end if */ dim1[0] = 1; - if((space_id = H5Screate_simple(1, dim1, NULL)) < 0) { - H5_FAILED(); AT(); + if ((space_id = H5Screate_simple(1, dim1, NULL)) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't create space\n"); goto error; } /* end if */ - if((dset1_id = H5Dcreate2(file, "Dataset1", cmpd_f1_tid, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED(); AT(); + if ((dset1_id = H5Dcreate2(file, "Dataset1", cmpd_f1_tid, space_id, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't create dataset\n"); goto error; } /* end if */ - if((dset2_id = H5Dcreate2(file, "Dataset2", cmpd_f2_tid, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED(); AT(); + if ((dset2_id = H5Dcreate2(file, "Dataset2", cmpd_f2_tid, space_id, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't create dataset\n"); goto error; } /* end if */ - if(H5Dwrite(dset1_id, cmpd_m1_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata1) < 0) { - H5_FAILED(); AT(); + if (H5Dwrite(dset1_id, cmpd_m1_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata1) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't write data\n"); goto error; } /* end if */ - if(H5Dwrite(dset2_id, cmpd_m2_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata2) < 0) { - H5_FAILED(); AT(); + if (H5Dwrite(dset2_id, cmpd_m2_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata2) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't write data\n"); goto error; } /* end if */ - if(H5Dread(dset1_id, cmpd_m1_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata1) < 0) { - H5_FAILED(); AT(); + if (H5Dread(dset1_id, cmpd_m1_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata1) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't read data\n"); goto error; } /* end if */ - if(H5Dread(dset2_id, cmpd_m2_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata2) < 0) { - H5_FAILED(); AT(); + if (H5Dread(dset2_id, cmpd_m2_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata2) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't read data\n"); goto error; } /* end if */ - if(rdata1.c1 != wdata1.c1 || rdata1.c2 != wdata1.c2 || HDstrcmp(rdata1.str, wdata1.str)) { - H5_FAILED(); AT(); + if (rdata1.c1 != wdata1.c1 || rdata1.c2 != wdata1.c2 || HDstrcmp(rdata1.str, wdata1.str)) { + H5_FAILED(); + AT(); HDprintf("incorrect read data\n"); goto error; } /* end if */ - if(rdata2.c1 != wdata2.c1 || rdata2.c2 != wdata2.c2 || HDstrcmp(rdata2.str, wdata2.str) || - rdata2.l1 != wdata2.l1 || rdata2.l2 != wdata2.l2 || rdata2.l3 != wdata2.l3 || rdata2.l4 != wdata2.l4) { - H5_FAILED(); AT(); + if (rdata2.c1 != wdata2.c1 || rdata2.c2 != wdata2.c2 || HDstrcmp(rdata2.str, wdata2.str) || + rdata2.l1 != wdata2.l1 || rdata2.l2 != wdata2.l2 || rdata2.l3 != wdata2.l3 || + rdata2.l4 != wdata2.l4) { + H5_FAILED(); + AT(); HDprintf("incorrect read data\n"); goto error; } /* end if */ - if(H5Treclaim(cmpd_m1_tid, space_id, H5P_DEFAULT, &rdata1) < 0) { - H5_FAILED(); AT(); + if (H5Treclaim(cmpd_m1_tid, space_id, H5P_DEFAULT, &rdata1) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't reclaim read data\n"); goto error; } /* end if */ rdata1.str = NULL; - if(H5Treclaim(cmpd_m2_tid, space_id, H5P_DEFAULT, &rdata2) < 0) { - H5_FAILED(); AT(); + if (H5Treclaim(cmpd_m2_tid, space_id, H5P_DEFAULT, &rdata2) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't reclaim read data\n"); goto error; } /* end if */ rdata2.str = NULL; - if(H5Dclose(dset1_id) < 0) + if (H5Dclose(dset1_id) < 0) goto error; - if(H5Dclose(dset2_id) < 0) + if (H5Dclose(dset2_id) < 0) goto error; - if(H5Tclose(cmpd_f1_tid) < 0) + if (H5Tclose(cmpd_f1_tid) < 0) goto error; - if(H5Tclose(cmpd_f2_tid) < 0) + if (H5Tclose(cmpd_f2_tid) < 0) goto error; - if(H5Tclose(str_id) < 0) + if (H5Tclose(str_id) < 0) goto error; - if(H5Sclose(space_id) < 0) + if (H5Sclose(space_id) < 0) goto error; - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) goto error; - - if((file = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) { - H5_FAILED(); AT(); + if ((file = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) { + H5_FAILED(); + AT(); HDprintf("cannot open file\n"); goto error; } /* end if */ - if((dset1_id = H5Dopen2(file, "Dataset1", H5P_DEFAULT)) < 0) { - H5_FAILED(); AT(); + if ((dset1_id = H5Dopen2(file, "Dataset1", H5P_DEFAULT)) < 0) { + H5_FAILED(); + AT(); HDprintf("cannot open dataset\n"); goto error; } /* end if */ - if((dset2_id = H5Dopen2(file, "Dataset2", H5P_DEFAULT)) < 0) { - H5_FAILED(); AT(); + if ((dset2_id = H5Dopen2(file, "Dataset2", H5P_DEFAULT)) < 0) { + H5_FAILED(); + AT(); HDprintf("cannot open dataset\n"); goto error; } /* end if */ - if((space_id = H5Dget_space(dset2_id)) < 0) { - H5_FAILED(); AT(); + if ((space_id = H5Dget_space(dset2_id)) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't get space\n"); goto error; } /* end if */ rdata1.c1 = rdata1.c2 = 0; - if(rdata1.str) HDfree(rdata1.str); + if (rdata1.str) + HDfree(rdata1.str); rdata2.c1 = rdata2.c2 = 0; rdata2.l1 = rdata2.l2 = rdata2.l3 = rdata2.l4 = 0; - if(rdata2.str) { + if (rdata2.str) { HDfree(rdata2.str); rdata2.str = NULL; } /* end if */ - if(H5Dread(dset1_id, cmpd_m1_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata1) < 0) { - H5_FAILED(); AT(); + if (H5Dread(dset1_id, cmpd_m1_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata1) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't read data\n"); goto error; } /* end if */ - if(H5Dread(dset2_id, cmpd_m2_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata2) < 0) { - H5_FAILED(); AT(); + if (H5Dread(dset2_id, cmpd_m2_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata2) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't read data\n"); goto error; } /* end if */ - if(rdata1.c1!=wdata1.c1 || rdata1.c2!=wdata1.c2 || strcmp(rdata1.str, wdata1.str)) { - H5_FAILED(); AT(); + if (rdata1.c1 != wdata1.c1 || rdata1.c2 != wdata1.c2 || strcmp(rdata1.str, wdata1.str)) { + H5_FAILED(); + AT(); HDprintf("incorrect read data\n"); goto error; } /* end if */ - if(rdata2.c1 != wdata2.c1 || rdata2.c2 != wdata2.c2 || HDstrcmp(rdata2.str, wdata2.str) || - rdata2.l1 != wdata2.l1 || rdata2.l2 != wdata2.l2 || rdata2.l3 != wdata2.l3 || rdata2.l4 != wdata2.l4) { - H5_FAILED(); AT(); + if (rdata2.c1 != wdata2.c1 || rdata2.c2 != wdata2.c2 || HDstrcmp(rdata2.str, wdata2.str) || + rdata2.l1 != wdata2.l1 || rdata2.l2 != wdata2.l2 || rdata2.l3 != wdata2.l3 || + rdata2.l4 != wdata2.l4) { + H5_FAILED(); + AT(); HDprintf("incorrect read data\n"); goto error; } /* end if */ - if(H5Treclaim(cmpd_m1_tid, space_id, H5P_DEFAULT, &rdata1) < 0) { - H5_FAILED(); AT(); + if (H5Treclaim(cmpd_m1_tid, space_id, H5P_DEFAULT, &rdata1) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't reclaim read data\n"); goto error; } /* end if */ rdata1.str = NULL; - if(H5Treclaim(cmpd_m2_tid, space_id, H5P_DEFAULT, &rdata2) < 0) { - H5_FAILED(); AT(); + if (H5Treclaim(cmpd_m2_tid, space_id, H5P_DEFAULT, &rdata2) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't reclaim read data\n"); goto error; } /* end if */ rdata2.str = NULL; - if(H5Dclose(dset1_id) < 0) + if (H5Dclose(dset1_id) < 0) goto error; - if(H5Dclose(dset2_id) < 0) + if (H5Dclose(dset2_id) < 0) goto error; - if(H5Sclose(space_id) < 0) + if (H5Sclose(space_id) < 0) goto error; - if(H5Tclose(cmpd_m1_tid) < 0) + if (H5Tclose(cmpd_m1_tid) < 0) goto error; - if(H5Tclose(cmpd_m2_tid) < 0) + if (H5Tclose(cmpd_m2_tid) < 0) goto error; - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) goto error; PASSED(); return 0; - error: +error: return 1; } /* end test_compound_14() */ - /*------------------------------------------------------------------------- * Function: test_compound_15 * @@ -2913,8 +3127,8 @@ static int test_compound_15(void) { typedef struct cmpd_struct { - int i1; - int i2; + int i1; + int i2; } cmpd_struct; cmpd_struct wdata1 = {1254, 5471}; @@ -2931,82 +3145,95 @@ test_compound_15(void) /* Create File */ h5_fixname(FILENAME[3], H5P_DEFAULT, filename, sizeof filename); - if((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED(); AT(); + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't create file!\n"); goto error; } /* end if */ /* Create file compound datatype */ - if((cmpd_f_tid = H5Tcreate( H5T_COMPOUND, sizeof(struct cmpd_struct))) < 0) { - H5_FAILED(); AT(); + if ((cmpd_f_tid = H5Tcreate(H5T_COMPOUND, sizeof(struct cmpd_struct))) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't create datatype!\n"); goto error; } /* end if */ - if(H5Tinsert(cmpd_f_tid,"i1",HOFFSET(struct cmpd_struct,i1),H5T_NATIVE_INT) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(cmpd_f_tid, "i1", HOFFSET(struct cmpd_struct, i1), H5T_NATIVE_INT) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'i1'\n"); goto error; } /* end if */ - if(H5Tinsert(cmpd_f_tid,"i2",HOFFSET(struct cmpd_struct,i2),H5T_NATIVE_INT) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(cmpd_f_tid, "i2", HOFFSET(struct cmpd_struct, i2), H5T_NATIVE_INT) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'i2'\n"); goto error; } /* end if */ /* Create memory compound datatype */ - if((cmpd_m_tid = H5Tcreate( H5T_COMPOUND, sizeof(struct cmpd_struct))) < 0) { - H5_FAILED(); AT(); + if ((cmpd_m_tid = H5Tcreate(H5T_COMPOUND, sizeof(struct cmpd_struct))) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't create datatype!\n"); goto error; } /* end if */ - if(H5Tinsert(cmpd_m_tid,"i1",(size_t)0,H5T_NATIVE_INT) < 0) { - H5_FAILED(); AT(); + if (H5Tinsert(cmpd_m_tid, "i1", (size_t)0, H5T_NATIVE_INT) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't insert field 'i1'\n"); goto error; } /* end if */ /* Create space, dataset, write wdata1 */ dim1[0] = 1; - if((space_id = H5Screate_simple(1, dim1, NULL)) < 0) { - H5_FAILED(); AT(); + if ((space_id = H5Screate_simple(1, dim1, NULL)) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't create space\n"); goto error; } /* end if */ - if((dset_id = H5Dcreate2(file, "Dataset", cmpd_f_tid, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED(); AT(); + if ((dset_id = H5Dcreate2(file, "Dataset", cmpd_f_tid, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < + 0) { + H5_FAILED(); + AT(); HDprintf("Can't create dataset\n"); goto error; } /* end if */ - if(H5Dwrite(dset_id, cmpd_f_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata1) < 0) { - H5_FAILED(); AT(); + if (H5Dwrite(dset_id, cmpd_f_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata1) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't write data\n"); goto error; } /* end if */ /* Write wdata2. The use of cmpd_m_tid here should cause only the first * element of wdata2 to be written. */ - if(H5Dwrite(dset_id, cmpd_m_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata2) < 0) { - H5_FAILED(); AT(); + if (H5Dwrite(dset_id, cmpd_m_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata2) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't write data\n"); goto error; } /* end if */ /* Read data */ - if(H5Dread(dset_id, cmpd_f_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata) < 0) { - H5_FAILED(); AT(); + if (H5Dread(dset_id, cmpd_f_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't read data\n"); goto error; } /* end if */ /* Check for correctness of read data */ - if(rdata.i1 != wdata2[0] || rdata.i2 != wdata1.i2) { - H5_FAILED(); AT(); + if (rdata.i1 != wdata2[0] || rdata.i2 != wdata1.i2) { + H5_FAILED(); + AT(); HDprintf("incorrect read data\n"); goto error; } /* end if */ @@ -3017,39 +3244,40 @@ test_compound_15(void) rdata.i2 = wdata2[1]; /* Read data */ - if(H5Dread(dset_id, cmpd_m_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata) < 0) { - H5_FAILED(); AT(); + if (H5Dread(dset_id, cmpd_m_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata) < 0) { + H5_FAILED(); + AT(); HDprintf("Can't read data\n"); goto error; } /* end if */ /* Check for correctness of read data */ - if(rdata.i1 != wdata2[0] || rdata.i2 != wdata2[1]) { - H5_FAILED(); AT(); + if (rdata.i1 != wdata2[0] || rdata.i2 != wdata2[1]) { + H5_FAILED(); + AT(); HDprintf("incorrect read data\n"); goto error; } /* end if */ /* Close */ - if(H5Dclose(dset_id) < 0) + if (H5Dclose(dset_id) < 0) goto error; - if(H5Tclose(cmpd_f_tid) < 0) + if (H5Tclose(cmpd_f_tid) < 0) goto error; - if(H5Tclose(cmpd_m_tid) < 0) + if (H5Tclose(cmpd_m_tid) < 0) goto error; - if(H5Sclose(space_id) < 0) + if (H5Sclose(space_id) < 0) goto error; - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) goto error; PASSED(); return 0; - error: +error: return 1; } /* end test_compound_15() */ - /*------------------------------------------------------------------------- * Function: test_compound_16 * @@ -3072,8 +3300,8 @@ static int test_compound_16(void) { typedef struct cmpd_struct { - int i1; - int i2; + int i1; + int i2; } cmpd_struct; cmpd_struct wdata1 = {1254, 5471}; @@ -3083,56 +3311,78 @@ test_compound_16(void) hid_t space_id; hid_t dset_id; hid_t open_dtypes[2] = {0, 0}; - hsize_t dim1[1] = {1}; + hsize_t dim1[1] = {1}; char filename[1024]; TESTING("visibility of internally registered type ids"); /* Create File */ h5_fixname(FILENAME[3], H5P_DEFAULT, filename, sizeof filename); - if((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR /* Copy and commit integer datatype */ - if((int_id = H5Tcopy(H5T_NATIVE_INT)) < 0) TEST_ERROR - if(H5Tcommit2(file, "int", int_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if ((int_id = H5Tcopy(H5T_NATIVE_INT)) < 0) + TEST_ERROR + if (H5Tcommit2(file, "int", int_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR /* Create file compound datatype */ - if((cmpd_f_tid = H5Tcreate(H5T_COMPOUND, 2 * sizeof(int) + 2)) < 0) TEST_ERROR - if(H5Tinsert(cmpd_f_tid, "i1", (size_t)0, int_id) < 0) TEST_ERROR - if(H5Tinsert(cmpd_f_tid, "i2", sizeof(int) + 1, int_id) < 0) TEST_ERROR + if ((cmpd_f_tid = H5Tcreate(H5T_COMPOUND, 2 * sizeof(int) + 2)) < 0) + TEST_ERROR + if (H5Tinsert(cmpd_f_tid, "i1", (size_t)0, int_id) < 0) + TEST_ERROR + if (H5Tinsert(cmpd_f_tid, "i2", sizeof(int) + 1, int_id) < 0) + TEST_ERROR /* Create memory compound datatype */ - if((cmpd_m_tid = H5Tcreate(H5T_COMPOUND, sizeof(struct cmpd_struct))) < 0) TEST_ERROR - if(H5Tinsert(cmpd_m_tid, "i1", HOFFSET(struct cmpd_struct, i1), int_id) < 0) TEST_ERROR - if(H5Tinsert(cmpd_m_tid, "i2", HOFFSET(struct cmpd_struct, i2), int_id) < 0) TEST_ERROR + if ((cmpd_m_tid = H5Tcreate(H5T_COMPOUND, sizeof(struct cmpd_struct))) < 0) + TEST_ERROR + if (H5Tinsert(cmpd_m_tid, "i1", HOFFSET(struct cmpd_struct, i1), int_id) < 0) + TEST_ERROR + if (H5Tinsert(cmpd_m_tid, "i2", HOFFSET(struct cmpd_struct, i2), int_id) < 0) + TEST_ERROR /* Create space, dataset, write wdata1 */ - if((space_id = H5Screate_simple(1, dim1, NULL)) < 0) TEST_ERROR - if((dset_id = H5Dcreate2(file, "Dataset", cmpd_f_tid, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Dwrite(dset_id, cmpd_m_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata1) < 0) TEST_ERROR + if ((space_id = H5Screate_simple(1, dim1, NULL)) < 0) + TEST_ERROR + if ((dset_id = H5Dcreate2(file, "Dataset", cmpd_f_tid, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < + 0) + TEST_ERROR + if (H5Dwrite(dset_id, cmpd_m_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata1) < 0) + TEST_ERROR /* Check behavior of H5Fget_obj_count */ - if((obj_count = H5Fget_obj_count(file, H5F_OBJ_DATATYPE)) != 1) { - H5_FAILED(); AT(); + if ((obj_count = H5Fget_obj_count(file, H5F_OBJ_DATATYPE)) != 1) { + H5_FAILED(); + AT(); HDprintf(" H5Fget_obj_count returned: %zd; expected: 1\n", obj_count); goto error; } /* Check behavior of H5Fget_obj_ids */ - if(H5Fget_obj_ids(file, H5F_OBJ_DATATYPE, (size_t)2, open_dtypes) < 0) TEST_ERROR - if(open_dtypes[1]) { - H5_FAILED(); AT(); + if (H5Fget_obj_ids(file, H5F_OBJ_DATATYPE, (size_t)2, open_dtypes) < 0) + TEST_ERROR + if (open_dtypes[1]) { + H5_FAILED(); + AT(); HDprintf(" H5Fget_obj_ids returned as second id: %lld; expected: 0\n", (long long)open_dtypes[1]); goto error; } /* Close */ - if(H5Dclose(dset_id) < 0) TEST_ERROR - if(H5Sclose(space_id) < 0) TEST_ERROR - if(H5Tclose(cmpd_f_tid) < 0) TEST_ERROR - if(H5Tclose(cmpd_m_tid) < 0) TEST_ERROR - if(H5Tclose(int_id) < 0) TEST_ERROR - if(H5Fclose(file) < 0) TEST_ERROR + if (H5Dclose(dset_id) < 0) + TEST_ERROR + if (H5Sclose(space_id) < 0) + TEST_ERROR + if (H5Tclose(cmpd_f_tid) < 0) + TEST_ERROR + if (H5Tclose(cmpd_m_tid) < 0) + TEST_ERROR + if (H5Tclose(int_id) < 0) + TEST_ERROR + if (H5Fclose(file) < 0) + TEST_ERROR PASSED(); return 0; @@ -3141,7 +3391,6 @@ error: return 1; } /* end test_compound_16() */ - /*------------------------------------------------------------------------- * Function: test_compound_17 * @@ -3164,98 +3413,134 @@ error: static int test_compound_17(void) { - hid_t file; - hid_t cmpd_int, arr_int, cmpd_ext, arr_ext, tmp_dt; - hsize_t dims[1] = {2}; - char filename[1024]; + hid_t file; + hid_t cmpd_int, arr_int, cmpd_ext, arr_ext, tmp_dt; + hsize_t dims[1] = {2}; + char filename[1024]; TESTING("that H5Tpack removes trailing bytes"); /* Create inner compound datatype. This type will be "packed" according * to the internal field, but will have trailing space at the end. */ - if((cmpd_int = H5Tcreate(H5T_COMPOUND, (size_t)4)) < 0) TEST_ERROR - if(H5Tinsert(cmpd_int, "c", (size_t)0, H5T_NATIVE_CHAR) < 0) TEST_ERROR + if ((cmpd_int = H5Tcreate(H5T_COMPOUND, (size_t)4)) < 0) + TEST_ERROR + if (H5Tinsert(cmpd_int, "c", (size_t)0, H5T_NATIVE_CHAR) < 0) + TEST_ERROR /* Create inner array datatype */ - if((arr_int = H5Tarray_create2(cmpd_int, 1, dims)) < 0) TEST_ERROR + if ((arr_int = H5Tarray_create2(cmpd_int, 1, dims)) < 0) + TEST_ERROR /* Create outer compound datatype. This type will be truly packed, with no * trailing space. However, the internal compound contained within is not * packed. */ - if((cmpd_ext = H5Tcreate(H5T_COMPOUND, (size_t)8)) < 0) TEST_ERROR - if(H5Tinsert(cmpd_ext, "arr", (size_t)0, arr_int) < 0) TEST_ERROR + if ((cmpd_ext = H5Tcreate(H5T_COMPOUND, (size_t)8)) < 0) + TEST_ERROR + if (H5Tinsert(cmpd_ext, "arr", (size_t)0, arr_int) < 0) + TEST_ERROR /* Create outer array datatype */ - if((arr_ext = H5Tarray_create2(cmpd_ext, 1, dims)) < 0) TEST_ERROR + if ((arr_ext = H5Tarray_create2(cmpd_ext, 1, dims)) < 0) + TEST_ERROR /* Try packing the internal array. Size should be 2 after packing. */ - if((tmp_dt = H5Tcopy(arr_int)) < 0) TEST_ERROR - if(H5Tpack(tmp_dt) < 0) TEST_ERROR - if(2 != H5Tget_size(tmp_dt)) { - H5_FAILED(); AT(); + if ((tmp_dt = H5Tcopy(arr_int)) < 0) + TEST_ERROR + if (H5Tpack(tmp_dt) < 0) + TEST_ERROR + if (2 != H5Tget_size(tmp_dt)) { + H5_FAILED(); + AT(); HDprintf(" Size after packing: %u; expected: 2\n", (unsigned)H5Tget_size(tmp_dt)); goto error; } - if(H5Tclose(tmp_dt) < 0) TEST_ERROR + if (H5Tclose(tmp_dt) < 0) + TEST_ERROR /* Try packing the external array. Size should be 4 after packing. */ - if((tmp_dt = H5Tcopy(arr_ext)) < 0) TEST_ERROR - if(H5Tpack(tmp_dt) < 0) TEST_ERROR - if(4 != H5Tget_size(tmp_dt)) { - H5_FAILED(); AT(); + if ((tmp_dt = H5Tcopy(arr_ext)) < 0) + TEST_ERROR + if (H5Tpack(tmp_dt) < 0) + TEST_ERROR + if (4 != H5Tget_size(tmp_dt)) { + H5_FAILED(); + AT(); HDprintf(" Size after packing: %u; expected: 4\n", (unsigned)H5Tget_size(tmp_dt)); goto error; } - if(H5Tclose(tmp_dt) < 0) TEST_ERROR + if (H5Tclose(tmp_dt) < 0) + TEST_ERROR /* Now we will commit arr_int and arr_ext to a file, and verify that they * are still packed correctly after opening them from the file */ /* Create File */ h5_fixname(FILENAME[3], H5P_DEFAULT, filename, sizeof filename); - if((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR /* Commit the datatypes. Note that they are still unpacked. */ - if(H5Tcommit2(file, "arr_int", arr_int, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR - if(H5Tcommit2(file, "arr_ext", arr_ext, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + if (H5Tcommit2(file, "arr_int", arr_int, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR + if (H5Tcommit2(file, "arr_ext", arr_ext, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR /* Close IDs */ - if(H5Tclose(cmpd_int) < 0) TEST_ERROR - if(H5Tclose(arr_int) < 0) TEST_ERROR - if(H5Tclose(cmpd_ext) < 0) TEST_ERROR - if(H5Tclose(arr_ext) < 0) TEST_ERROR - if(H5Fclose(file) < 0) TEST_ERROR + if (H5Tclose(cmpd_int) < 0) + TEST_ERROR + if (H5Tclose(arr_int) < 0) + TEST_ERROR + if (H5Tclose(cmpd_ext) < 0) + TEST_ERROR + if (H5Tclose(arr_ext) < 0) + TEST_ERROR + if (H5Fclose(file) < 0) + TEST_ERROR /* Reopen file */ - if((file = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) TEST_ERROR + if ((file = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) + TEST_ERROR /* Open committed array datatypes */ - if((arr_int = H5Topen2(file, "arr_int", H5P_DEFAULT)) < 0) TEST_ERROR - if((arr_ext = H5Topen2(file, "arr_ext", H5P_DEFAULT)) < 0) TEST_ERROR + if ((arr_int = H5Topen2(file, "arr_int", H5P_DEFAULT)) < 0) + TEST_ERROR + if ((arr_ext = H5Topen2(file, "arr_ext", H5P_DEFAULT)) < 0) + TEST_ERROR /* Try packing the internal array. Size should be 2 after packing. */ - if((tmp_dt = H5Tcopy(arr_int)) < 0) TEST_ERROR - if(H5Tpack(tmp_dt) < 0) TEST_ERROR - if(2 != H5Tget_size(tmp_dt)) { - H5_FAILED(); AT(); + if ((tmp_dt = H5Tcopy(arr_int)) < 0) + TEST_ERROR + if (H5Tpack(tmp_dt) < 0) + TEST_ERROR + if (2 != H5Tget_size(tmp_dt)) { + H5_FAILED(); + AT(); HDprintf(" Size after packing: %u; expected: 2\n", (unsigned)H5Tget_size(tmp_dt)); goto error; } - if(H5Tclose(tmp_dt) < 0) TEST_ERROR + if (H5Tclose(tmp_dt) < 0) + TEST_ERROR /* Try packing the external array. Size should be 4 after packing. */ - if((tmp_dt = H5Tcopy(arr_ext)) < 0) TEST_ERROR - if(H5Tpack(tmp_dt) < 0) TEST_ERROR - if(4 != H5Tget_size(tmp_dt)) { - H5_FAILED(); AT(); + if ((tmp_dt = H5Tcopy(arr_ext)) < 0) + TEST_ERROR + if (H5Tpack(tmp_dt) < 0) + TEST_ERROR + if (4 != H5Tget_size(tmp_dt)) { + H5_FAILED(); + AT(); HDprintf(" Size after packing: %u; expected: 4\n", (unsigned)H5Tget_size(tmp_dt)); goto error; } - if(H5Tclose(tmp_dt) < 0) TEST_ERROR + if (H5Tclose(tmp_dt) < 0) + TEST_ERROR /* Close IDs */ - if(H5Tclose(arr_int) < 0) TEST_ERROR - if(H5Tclose(arr_ext) < 0) TEST_ERROR - if(H5Fclose(file) < 0) TEST_ERROR + if (H5Tclose(arr_int) < 0) + TEST_ERROR + if (H5Tclose(arr_ext) < 0) + TEST_ERROR + if (H5Fclose(file) < 0) + TEST_ERROR PASSED(); return 0; @@ -3264,7 +3549,6 @@ error: return 1; } /* end test_compound_17() */ - /*------------------------------------------------------------------------- * Function: test_compound_18 * @@ -3282,13 +3566,13 @@ error: static int test_compound_18(void) { - hid_t file = -1; - hid_t gid = -1; - hid_t did = -1; - hid_t aid = -1; - hid_t tid = -1; - hid_t sid = -1; - hsize_t dim = 1; + hid_t file = -1; + hid_t gid = -1; + hid_t did = -1; + hid_t aid = -1; + hid_t tid = -1; + hid_t sid = -1; + hsize_t dim = 1; const char *testfile = H5_get_srcdir_filename(TESTFILE); /* Corrected test file name */ char filename[1024]; herr_t ret; @@ -3302,17 +3586,17 @@ test_compound_18(void) /* Attempt to create file with compound datatype that has no fields */ /* Create File */ h5_fixname(FILENAME[3], H5P_DEFAULT, filename, sizeof filename); - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Create a dataspace to use */ sid = H5Screate_simple(1, &dim, NULL); HDassert(sid > 0); /* Create a dataset with the bad compound datatype */ - H5E_BEGIN_TRY { - did = H5Dcreate2(file, "dataset", tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); - } H5E_END_TRY; - if(did > 0) { + H5E_BEGIN_TRY { did = H5Dcreate2(file, "dataset", tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } + H5E_END_TRY; + if (did > 0) { H5Dclose(did); FAIL_PUTS_ERROR("created dataset with bad compound datatype") } /* end if */ @@ -3322,66 +3606,68 @@ test_compound_18(void) HDassert(gid > 0); /* Create an attribute with the bad compound datatype */ - H5E_BEGIN_TRY { - aid = H5Acreate2(gid, "attr", tid, sid, H5P_DEFAULT, H5P_DEFAULT); - } H5E_END_TRY; - if(aid > 0) { + H5E_BEGIN_TRY { aid = H5Acreate2(gid, "attr", tid, sid, H5P_DEFAULT, H5P_DEFAULT); } + H5E_END_TRY; + if (aid > 0) { H5Aclose(aid); FAIL_PUTS_ERROR("created attribute with bad compound datatype") } /* end if */ /* Commit the datatype */ - H5E_BEGIN_TRY { - ret = H5Tcommit2(file, "cmpnd", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); - } H5E_END_TRY; - if(ret >= 0) { + H5E_BEGIN_TRY { ret = H5Tcommit2(file, "cmpnd", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } + H5E_END_TRY; + if (ret >= 0) { FAIL_PUTS_ERROR("committed named datatype with bad compound datatype") } /* end if */ /* Close IDs */ - if(H5Tclose(tid) < 0) FAIL_STACK_ERROR - if(H5Sclose(sid) < 0) FAIL_STACK_ERROR - if(H5Gclose(gid) < 0) FAIL_STACK_ERROR - if(H5Fclose(file) < 0) FAIL_STACK_ERROR - + if (H5Tclose(tid) < 0) + FAIL_STACK_ERROR + if (H5Sclose(sid) < 0) + FAIL_STACK_ERROR + if (H5Gclose(gid) < 0) + FAIL_STACK_ERROR + if (H5Fclose(file) < 0) + FAIL_STACK_ERROR /* Open Generated File */ /* (generated with gen_bad_compound.c) */ - if((file = H5Fopen(testfile, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((file = H5Fopen(testfile, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Try to open the datatype */ - H5E_BEGIN_TRY { - tid = H5Topen2(file, "cmpnd", H5P_DEFAULT); - } H5E_END_TRY; - if(tid > 0) { + H5E_BEGIN_TRY { tid = H5Topen2(file, "cmpnd", H5P_DEFAULT); } + H5E_END_TRY; + if (tid > 0) { H5Tclose(tid); FAIL_PUTS_ERROR("opened named datatype with bad compound datatype") } /* end if */ /* Try to open the dataset */ - H5E_BEGIN_TRY { - did = H5Dopen2(file, "dataset", H5P_DEFAULT); - } H5E_END_TRY; - if(did > 0) { + H5E_BEGIN_TRY { did = H5Dopen2(file, "dataset", H5P_DEFAULT); } + H5E_END_TRY; + if (did > 0) { H5Dclose(did); FAIL_PUTS_ERROR("opened dataset with bad compound datatype") } /* end if */ /* Open the group with the attribute */ - if((gid = H5Gopen2(file, "group", H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid = H5Gopen2(file, "group", H5P_DEFAULT)) < 0) + TEST_ERROR /* Try to open the dataset */ - H5E_BEGIN_TRY { - aid = H5Aopen(gid, "attr", H5P_DEFAULT); - } H5E_END_TRY; - if(aid > 0) { + H5E_BEGIN_TRY { aid = H5Aopen(gid, "attr", H5P_DEFAULT); } + H5E_END_TRY; + if (aid > 0) { H5Aclose(aid); FAIL_PUTS_ERROR("opened attribute with bad compound datatype") } /* end if */ /* Close IDs */ - if(H5Gclose(gid) < 0) FAIL_STACK_ERROR - if(H5Fclose(file) < 0) FAIL_STACK_ERROR + if (H5Gclose(gid) < 0) + FAIL_STACK_ERROR + if (H5Fclose(file) < 0) + FAIL_STACK_ERROR PASSED(); return 0; @@ -3390,7 +3676,6 @@ error: return 1; } /* end test_compound_18() */ - /*------------------------------------------------------------------------- * Function: test_query * @@ -3419,175 +3704,175 @@ test_query(void) long c; double d; }; - hid_t file=-1, tid1=-1, tid2=-1; - char filename[1024]; - char compnd_type[]="Compound_type", enum_type[]="Enum_type"; - short enum_val; - char enum_name[16]; + hid_t file = -1, tid1 = -1, tid2 = -1; + char filename[1024]; + char compnd_type[] = "Compound_type", enum_type[] = "Enum_type"; + short enum_val; + char enum_name[16]; TESTING("query functions of compound and enumeration types"); /* Create File */ h5_fixname(FILENAME[2], H5P_DEFAULT, filename, sizeof filename); - if((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto error; /* Create a compound datatype */ - if((tid1=H5Tcreate(H5T_COMPOUND, sizeof(struct s1))) < 0) { + if ((tid1 = H5Tcreate(H5T_COMPOUND, sizeof(struct s1))) < 0) { H5_FAILED(); HDprintf("Can't create datatype!\n"); goto error; } /* end if */ - if(H5Tinsert(tid1, "a", HOFFSET(struct s1, a), H5T_NATIVE_INT) < 0) { + if (H5Tinsert(tid1, "a", HOFFSET(struct s1, a), H5T_NATIVE_INT) < 0) { H5_FAILED(); HDprintf("Can't insert field 'a'\n"); goto error; } /* end if */ - if(H5Tinsert(tid1, "b", HOFFSET(struct s1, b), H5T_NATIVE_FLOAT) < 0) { + if (H5Tinsert(tid1, "b", HOFFSET(struct s1, b), H5T_NATIVE_FLOAT) < 0) { H5_FAILED(); HDprintf("Can't insert field 'b'\n"); goto error; } /* end if */ - if(H5Tinsert(tid1, "c", HOFFSET(struct s1, c), H5T_NATIVE_LONG) < 0) { + if (H5Tinsert(tid1, "c", HOFFSET(struct s1, c), H5T_NATIVE_LONG) < 0) { H5_FAILED(); HDprintf("Can't insert field 'c'\n"); goto error; } /* end if */ - if(H5Tinsert(tid1, "d", HOFFSET(struct s1, d), H5T_NATIVE_DOUBLE) < 0) { + if (H5Tinsert(tid1, "d", HOFFSET(struct s1, d), H5T_NATIVE_DOUBLE) < 0) { H5_FAILED(); HDprintf("Can't insert field 'd'\n"); goto error; } /* end if */ /* Create a enumerate datatype */ - if((tid2=H5Tcreate(H5T_ENUM, sizeof(short))) < 0) { + if ((tid2 = H5Tcreate(H5T_ENUM, sizeof(short))) < 0) { H5_FAILED(); HDprintf("Can't create enumerate type\n"); goto error; } /* end if */ - if(H5Tenum_insert(tid2, "RED", (enum_val=10,&enum_val)) < 0) { + if (H5Tenum_insert(tid2, "RED", (enum_val = 10, &enum_val)) < 0) { H5_FAILED(); HDprintf("Can't insert field into enumeration type\n"); goto error; } /* end if */ - if(H5Tenum_insert(tid2, "GREEN", (enum_val=11,&enum_val)) < 0) { + if (H5Tenum_insert(tid2, "GREEN", (enum_val = 11, &enum_val)) < 0) { H5_FAILED(); HDprintf("Can't insert field into enumeration type\n"); goto error; } /* end if */ - if(H5Tenum_insert(tid2, "BLUE", (enum_val=12,&enum_val)) < 0) { + if (H5Tenum_insert(tid2, "BLUE", (enum_val = 12, &enum_val)) < 0) { H5_FAILED(); HDprintf("Can't insert field into enumeration type\n"); goto error; } /* end if */ - if(H5Tenum_insert(tid2, "ORANGE", (enum_val=13,&enum_val)) < 0) { + if (H5Tenum_insert(tid2, "ORANGE", (enum_val = 13, &enum_val)) < 0) { H5_FAILED(); HDprintf("Can't insert field into enumeration type\n"); goto error; } /* end if */ - if(H5Tenum_insert(tid2, "YELLOW", (enum_val=14,&enum_val)) < 0) { + if (H5Tenum_insert(tid2, "YELLOW", (enum_val = 14, &enum_val)) < 0) { H5_FAILED(); HDprintf("Can't insert field into enumeration type\n"); goto error; } /* end if */ /* Query member number and member index by name, for compound type. */ - if(H5Tget_nmembers(tid1)!=4) { + if (H5Tget_nmembers(tid1) != 4) { H5_FAILED(); HDprintf("Can't get member number\n"); goto error; } /* end if */ - if(H5Tget_member_index(tid1, "c")!=2) { + if (H5Tget_member_index(tid1, "c") != 2) { H5_FAILED(); HDprintf("Can't get correct index number\n"); goto error; } /* end if */ /* Query member number and member index by member name, for enumeration type. */ - if(H5Tget_nmembers(tid2) != 5) { + if (H5Tget_nmembers(tid2) != 5) { H5_FAILED(); HDprintf("Can't get member number\n"); goto error; } /* end if */ - if(H5Tget_member_index(tid2, "ORANGE") != 3) { + if (H5Tget_member_index(tid2, "ORANGE") != 3) { H5_FAILED(); HDprintf("Can't get correct index number\n"); goto error; } /* end if */ /* Commit compound datatype and close it */ - if(H5Tcommit2(file, compnd_type, tid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { + if (H5Tcommit2(file, compnd_type, tid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); HDprintf("Can't commit compound datatype\n"); goto error; } /* end if */ - if(H5Tclose(tid1) < 0) { + if (H5Tclose(tid1) < 0) { H5_FAILED(); HDprintf("Can't close datatype\n"); goto error; } /* end if */ /* Commit enumeration datatype and close it */ - if(H5Tcommit2(file, enum_type, tid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { + if (H5Tcommit2(file, enum_type, tid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); HDprintf("Can't commit compound datatype\n"); goto error; } /* end if */ - if(H5Tclose(tid2) < 0) { + if (H5Tclose(tid2) < 0) { H5_FAILED(); HDprintf("Can't close datatype\n"); goto error; } /* end if */ /* Open the dataytpe for query */ - if((tid1 = H5Topen2(file, compnd_type, H5P_DEFAULT)) < 0) + if ((tid1 = H5Topen2(file, compnd_type, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if((tid2 = H5Topen2(file, enum_type, H5P_DEFAULT)) < 0) + if ((tid2 = H5Topen2(file, enum_type, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR /* Query member number and member index by name, for compound type */ - if(H5Tget_nmembers(tid1) != 4) { + if (H5Tget_nmembers(tid1) != 4) { H5_FAILED(); HDprintf("Can't get member number\n"); goto error; } /* end if */ - if(H5Tget_member_index(tid1, "c") != 2) { + if (H5Tget_member_index(tid1, "c") != 2) { H5_FAILED(); HDprintf("Can't get correct index number\n"); goto error; } /* end if */ /* Query member number and member index by member name, for enumeration type */ - if(H5Tget_nmembers(tid2)!=5) { + if (H5Tget_nmembers(tid2) != 5) { H5_FAILED(); HDprintf("Can't get member number\n"); goto error; } /* end if */ - if(H5Tget_member_index(tid2, "ORANGE")!=3) { + if (H5Tget_member_index(tid2, "ORANGE") != 3) { H5_FAILED(); HDprintf("Can't get correct index number\n"); goto error; } /* end if */ /* Query member value by member name, for enumeration type */ - if(H5Tenum_valueof (tid2, "ORANGE", &enum_val) < 0) { + if (H5Tenum_valueof(tid2, "ORANGE", &enum_val) < 0) { H5_FAILED(); HDprintf("Can't get value for enumerate member\n"); goto error; } /* end if */ - if(enum_val!=13) { + if (enum_val != 13) { H5_FAILED(); HDprintf("Incorrect value for enum member\n"); goto error; } /* end if */ /* Query member value by member index, for enumeration type */ - if(H5Tget_member_value (tid2, 2, &enum_val) < 0) { + if (H5Tget_member_value(tid2, 2, &enum_val) < 0) { H5_FAILED(); HDprintf("Can't get value for enum member\n"); goto error; } /* end if */ - if(enum_val!=12) { + if (enum_val != 12) { H5_FAILED(); HDprintf("Incorrect value for enum member\n"); goto error; @@ -3595,30 +3880,30 @@ test_query(void) /* Query member name by member value, for enumeration type */ enum_val = 14; - if(H5Tenum_nameof(tid2, &enum_val, enum_name, (size_t)16) < 0) { + if (H5Tenum_nameof(tid2, &enum_val, enum_name, (size_t)16) < 0) { H5_FAILED(); HDprintf("Can't get name for enum member\n"); goto error; } /* end if */ - if(strcmp("YELLOW", enum_name)) { + if (strcmp("YELLOW", enum_name)) { H5_FAILED(); HDprintf("Incorrect name for enum member\n"); goto error; } /* end if */ /* Close datatype and file */ - if(H5Tclose(tid1) < 0) { + if (H5Tclose(tid1) < 0) { H5_FAILED(); HDprintf("Can't close datatype\n"); goto error; } /* end if */ - if(H5Tclose(tid2) < 0) { + if (H5Tclose(tid2) < 0) { H5_FAILED(); HDprintf("Can't close datatype\n"); goto error; } /* end if */ - if(H5Fclose(file) < 0) { + if (H5Fclose(file) < 0) { H5_FAILED(); HDprintf("Can't close file\n"); goto error; @@ -3627,16 +3912,17 @@ test_query(void) PASSED(); return 0; - error: - H5E_BEGIN_TRY { - H5Tclose (tid1); - H5Tclose (tid2); - H5Fclose (file); - } H5E_END_TRY; +error: + H5E_BEGIN_TRY + { + H5Tclose(tid1); + H5Tclose(tid2); + H5Fclose(file); + } + H5E_END_TRY; return 1; } - /*------------------------------------------------------------------------- * Function: test_transient * @@ -3654,118 +3940,131 @@ test_query(void) *------------------------------------------------------------------------- */ static int -test_transient (hid_t fapl) +test_transient(hid_t fapl) { - static hsize_t ds_size[2] = {10, 20}; - hid_t file=-1, type=-1, space=-1, dset=-1, t2=-1; - char filename[1024]; - hid_t ret_id; /* Generic hid_t return value */ - herr_t status; + static hsize_t ds_size[2] = {10, 20}; + hid_t file = -1, type = -1, space = -1, dset = -1, t2 = -1; + char filename[1024]; + hid_t ret_id; /* Generic hid_t return value */ + herr_t status; TESTING("transient datatypes"); h5_fixname(FILENAME[0], fapl, filename, sizeof filename); - if ((file=H5Fcreate (filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) { - goto error; + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) { + goto error; } - if ((space = H5Screate_simple (2, ds_size, ds_size)) < 0) goto error; + if ((space = H5Screate_simple(2, ds_size, ds_size)) < 0) + goto error; /* Predefined types cannot be modified or closed */ - H5E_BEGIN_TRY { - status = H5Tset_precision(H5T_NATIVE_INT, (size_t)256); - } H5E_END_TRY; - if (status>=0) { - H5_FAILED(); - HDputs (" Predefined types should not be modifiable!"); - goto error; + H5E_BEGIN_TRY { status = H5Tset_precision(H5T_NATIVE_INT, (size_t)256); } + H5E_END_TRY; + if (status >= 0) { + H5_FAILED(); + HDputs(" Predefined types should not be modifiable!"); + goto error; } - H5E_BEGIN_TRY { - status = H5Tclose (H5T_NATIVE_INT); - } H5E_END_TRY; - if (status>=0) { - H5_FAILED(); - HDputs (" Predefined types should not be closable!"); - goto error; + H5E_BEGIN_TRY { status = H5Tclose(H5T_NATIVE_INT); } + H5E_END_TRY; + if (status >= 0) { + H5_FAILED(); + HDputs(" Predefined types should not be closable!"); + goto error; } /* Copying a predefined type results in a modifiable copy */ - if((type=H5Tcopy(H5T_NATIVE_INT)) < 0) goto error; - if(H5Tset_precision(type, (size_t)256) < 0) goto error; + if ((type = H5Tcopy(H5T_NATIVE_INT)) < 0) + goto error; + if (H5Tset_precision(type, (size_t)256) < 0) + goto error; /* It should not be possible to create an attribute for a transient type */ - H5E_BEGIN_TRY { - ret_id = H5Acreate2(type, "attr1", H5T_NATIVE_INT, space, H5P_DEFAULT, H5P_DEFAULT); - } H5E_END_TRY; - if (ret_id>=0) { - H5_FAILED(); - HDputs (" Attributes should not be allowed for transient types!"); - goto error; + H5E_BEGIN_TRY { ret_id = H5Acreate2(type, "attr1", H5T_NATIVE_INT, space, H5P_DEFAULT, H5P_DEFAULT); } + H5E_END_TRY; + if (ret_id >= 0) { + H5_FAILED(); + HDputs(" Attributes should not be allowed for transient types!"); + goto error; } /* Create a dataset from a transient datatype */ - if(H5Tclose(type) < 0) goto error; - if((type = H5Tcopy(H5T_NATIVE_INT)) < 0) goto error; - if((dset = H5Dcreate2(file, "dset1", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) - goto error; + if (H5Tclose(type) < 0) + goto error; + if ((type = H5Tcopy(H5T_NATIVE_INT)) < 0) + goto error; + if ((dset = H5Dcreate2(file, "dset1", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + goto error; /* The type returned from a dataset should not be modifiable */ - if((t2 = H5Dget_type(dset)) < 0) goto error; - H5E_BEGIN_TRY { - status = H5Tset_precision(t2, (size_t)256); - } H5E_END_TRY; - if(status >= 0) { - H5_FAILED(); - HDputs (" Dataset datatypes should not be modifiable!"); - goto error; + if ((t2 = H5Dget_type(dset)) < 0) + goto error; + H5E_BEGIN_TRY { status = H5Tset_precision(t2, (size_t)256); } + H5E_END_TRY; + if (status >= 0) { + H5_FAILED(); + HDputs(" Dataset datatypes should not be modifiable!"); + goto error; } - if(H5Tclose(t2) < 0) goto error; + if (H5Tclose(t2) < 0) + goto error; /* * Close the dataset and reopen it, testing that it's type is still * read-only. */ - if(H5Dclose(dset) < 0) goto error; - if((dset = H5Dopen2(file, "dset1", H5P_DEFAULT)) < 0) goto error; - if((t2 = H5Dget_type(dset)) < 0) goto error; - H5E_BEGIN_TRY { - status = H5Tset_precision(t2, (size_t)256); - } H5E_END_TRY; - if(status >= 0) { - H5_FAILED(); - HDputs (" Dataset datatypes should not be modifiable!"); - goto error; + if (H5Dclose(dset) < 0) + goto error; + if ((dset = H5Dopen2(file, "dset1", H5P_DEFAULT)) < 0) + goto error; + if ((t2 = H5Dget_type(dset)) < 0) + goto error; + H5E_BEGIN_TRY { status = H5Tset_precision(t2, (size_t)256); } + H5E_END_TRY; + if (status >= 0) { + H5_FAILED(); + HDputs(" Dataset datatypes should not be modifiable!"); + goto error; } - if(H5Tclose(t2) < 0) goto error; + if (H5Tclose(t2) < 0) + goto error; /* * Get the dataset datatype by applying H5Tcopy() to the dataset. The * result should be modifiable. */ - if((t2=H5Tcopy(dset)) < 0) goto error; - if(H5Tset_precision(t2, (size_t)256) < 0) goto error; - if(H5Tclose(t2) < 0) goto error; - + if ((t2 = H5Tcopy(dset)) < 0) + goto error; + if (H5Tset_precision(t2, (size_t)256) < 0) + goto error; + if (H5Tclose(t2) < 0) + goto error; - if(H5Dclose(dset) < 0) goto error; - if(H5Fclose(file) < 0) goto error; - if(H5Tclose(type) < 0) goto error; - if(H5Sclose(space) < 0) goto error; + if (H5Dclose(dset) < 0) + goto error; + if (H5Fclose(file) < 0) + goto error; + if (H5Tclose(type) < 0) + goto error; + if (H5Sclose(space) < 0) + goto error; PASSED(); return 0; - error: - H5E_BEGIN_TRY { - H5Tclose (t2); - H5Tclose (type); - H5Sclose (space); - H5Dclose (dset); - H5Fclose (file); - } H5E_END_TRY; +error: + H5E_BEGIN_TRY + { + H5Tclose(t2); + H5Tclose(type); + H5Sclose(space); + H5Dclose(dset); + H5Fclose(file); + } + H5E_END_TRY; return 1; } - /*------------------------------------------------------------------------- * Function: test_named * @@ -3783,227 +4082,280 @@ test_transient (hid_t fapl) *------------------------------------------------------------------------- */ static int -test_named (hid_t fapl) +test_named(hid_t fapl) { - hid_t file=-1, type=-1, space=-1, dset=-1, t2=-1, t3=-1, attr1=-1; - herr_t status; - static hsize_t ds_size[2] = {10, 20}; - size_t i,j; - unsigned attr_data[10][20]; - char filename[1024]; + hid_t file = -1, type = -1, space = -1, dset = -1, t2 = -1, t3 = -1, attr1 = -1; + herr_t status; + static hsize_t ds_size[2] = {10, 20}; + size_t i, j; + unsigned attr_data[10][20]; + char filename[1024]; TESTING("named datatypes"); h5_fixname(FILENAME[1], fapl, filename, sizeof filename); - if ((file=H5Fcreate (filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) { - goto error; + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) { + goto error; } - if ((space = H5Screate_simple (2, ds_size, ds_size)) < 0) goto error; + if ((space = H5Screate_simple(2, ds_size, ds_size)) < 0) + goto error; /* Predefined types cannot be committed */ - H5E_BEGIN_TRY { - status = H5Tcommit2(file, "test_named_1 (should not exist)", H5T_NATIVE_INT, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); - } H5E_END_TRY; - if(status >= 0) { - H5_FAILED(); - HDputs (" Predefined types should not be committable!"); - goto error; + H5E_BEGIN_TRY + { + status = H5Tcommit2(file, "test_named_1 (should not exist)", H5T_NATIVE_INT, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT); + } + H5E_END_TRY; + if (status >= 0) { + H5_FAILED(); + HDputs(" Predefined types should not be committable!"); + goto error; } /* Copy a predefined datatype and commit the copy */ - if((type = H5Tcopy(H5T_NATIVE_INT)) < 0) goto error; - if(H5Tcommit2(file, "native-int", type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) goto error; - if((status = H5Tcommitted(type)) < 0) goto error; - if(0 == status) { - H5_FAILED(); - HDputs (" H5Tcommitted() returned false!"); - goto error; + if ((type = H5Tcopy(H5T_NATIVE_INT)) < 0) + goto error; + if (H5Tcommit2(file, "native-int", type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) + goto error; + if ((status = H5Tcommitted(type)) < 0) + goto error; + if (0 == status) { + H5_FAILED(); + HDputs(" H5Tcommitted() returned false!"); + goto error; } /* We should not be able to modify a type after it has been committed. */ - H5E_BEGIN_TRY { - status = H5Tset_precision (type, (size_t)256); - } H5E_END_TRY; - if (status>=0) { - H5_FAILED(); - HDputs (" Committed type is not constant!"); - goto error; + H5E_BEGIN_TRY { status = H5Tset_precision(type, (size_t)256); } + H5E_END_TRY; + if (status >= 0) { + H5_FAILED(); + HDputs(" Committed type is not constant!"); + goto error; } /* We should not be able to re-commit a committed type */ - H5E_BEGIN_TRY { - status = H5Tcommit2(file, "test_named_2 (should not exist)", type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); - } H5E_END_TRY; - if(status >= 0) { - H5_FAILED(); - HDputs (" Committed types should not be recommitted!"); - goto error; + H5E_BEGIN_TRY + { + status = + H5Tcommit2(file, "test_named_2 (should not exist)", type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + } + H5E_END_TRY; + if (status >= 0) { + H5_FAILED(); + HDputs(" Committed types should not be recommitted!"); + goto error; } /* It should be possible to define an attribute for the named type */ - if((attr1 = H5Acreate2(type, "attr1", H5T_NATIVE_UCHAR, space, - H5P_DEFAULT, H5P_DEFAULT)) < 0) goto error; - for(i = 0; i < (size_t)ds_size[0]; i++) - for(j = 0; j < (size_t)ds_size[1]; j++) + if ((attr1 = H5Acreate2(type, "attr1", H5T_NATIVE_UCHAR, space, H5P_DEFAULT, H5P_DEFAULT)) < 0) + goto error; + for (i = 0; i < (size_t)ds_size[0]; i++) + for (j = 0; j < (size_t)ds_size[1]; j++) attr_data[i][j] = (unsigned)(i * ds_size[1] + j); - if(H5Awrite(attr1, H5T_NATIVE_UINT, attr_data) < 0) goto error; - if(H5Aclose(attr1) < 0) goto error; + if (H5Awrite(attr1, H5T_NATIVE_UINT, attr_data) < 0) + goto error; + if (H5Aclose(attr1) < 0) + goto error; /* * Copying a committed type should result in a transient type which is * not locked. */ - if((t2 = H5Tcopy(type)) < 0) goto error; - if((status = H5Tcommitted(t2)) < 0) goto error; - if(status) { - H5_FAILED(); - HDputs (" Copying a named type should result in a transient type!"); - goto error; + if ((t2 = H5Tcopy(type)) < 0) + goto error; + if ((status = H5Tcommitted(t2)) < 0) + goto error; + if (status) { + H5_FAILED(); + HDputs(" Copying a named type should result in a transient type!"); + goto error; } - if(H5Tset_precision(t2, (size_t)256) < 0) goto error; - if(H5Tclose(t2) < 0) goto error; + if (H5Tset_precision(t2, (size_t)256) < 0) + goto error; + if (H5Tclose(t2) < 0) + goto error; /* * Close the committed type and reopen it. It should return a named type. */ - if(H5Tclose(type) < 0) goto error; - if((type = H5Topen2(file, "native-int", H5P_DEFAULT)) < 0) + if (H5Tclose(type) < 0) + goto error; + if ((type = H5Topen2(file, "native-int", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if((status = H5Tcommitted(type)) < 0) goto error; - if(!status) { - H5_FAILED(); - HDputs (" Opened named types should be named types!"); - goto error; + if ((status = H5Tcommitted(type)) < 0) + goto error; + if (!status) { + H5_FAILED(); + HDputs(" Opened named types should be named types!"); + goto error; } /* Create a dataset that uses the named type */ - if((dset = H5Dcreate2(file, "dset1", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) - goto error; + if ((dset = H5Dcreate2(file, "dset1", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + goto error; /* Get the dataset's datatype and make sure it's a named type */ - if((t2 = H5Dget_type(dset)) < 0) goto error; - if((status = H5Tcommitted(t2)) < 0) goto error; - if(!status) { - H5_FAILED(); - HDputs (" Dataset type should be a named type!"); - goto error; + if ((t2 = H5Dget_type(dset)) < 0) + goto error; + if ((status = H5Tcommitted(t2)) < 0) + goto error; + if (!status) { + H5_FAILED(); + HDputs(" Dataset type should be a named type!"); + goto error; } /* Close the dataset, then close its type, then reopen the dataset */ - if(H5Dclose(dset) < 0) goto error; - if(H5Tclose(t2) < 0) goto error; - if((dset = H5Dopen2(file, "dset1", H5P_DEFAULT)) < 0) goto error; + if (H5Dclose(dset) < 0) + goto error; + if (H5Tclose(t2) < 0) + goto error; + if ((dset = H5Dopen2(file, "dset1", H5P_DEFAULT)) < 0) + goto error; /* Get the dataset's type and make sure it's named */ - if((t2 = H5Dget_type(dset)) < 0) goto error; - if((status = H5Tcommitted(t2)) < 0) goto error; - if(!status) { - H5_FAILED(); - HDputs (" Dataset type should be a named type!"); - goto error; + if ((t2 = H5Dget_type(dset)) < 0) + goto error; + if ((status = H5Tcommitted(t2)) < 0) + goto error; + if (!status) { + H5_FAILED(); + HDputs(" Dataset type should be a named type!"); + goto error; } /* * Close the dataset and create another with the type returned from the * first dataset. */ - if(H5Dclose(dset) < 0) goto error; - if((dset = H5Dcreate2(file, "dset2", t2, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto error; + if (H5Dclose(dset) < 0) + goto error; + if ((dset = H5Dcreate2(file, "dset2", t2, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + goto error; /* Reopen the second dataset and make sure the type is shared */ - if(H5Tclose(t2) < 0) goto error; - if(H5Dclose(dset) < 0) goto error; - if((dset = H5Dopen2(file, "dset2", H5P_DEFAULT)) < 0) goto error; - if((t2 = H5Dget_type(dset)) < 0) goto error; - if((status = H5Tcommitted(t2)) < 0) goto error; - if(!status) { - H5_FAILED(); - HDputs (" Dataset type should be a named type!"); - goto error; + if (H5Tclose(t2) < 0) + goto error; + if (H5Dclose(dset) < 0) + goto error; + if ((dset = H5Dopen2(file, "dset2", H5P_DEFAULT)) < 0) + goto error; + if ((t2 = H5Dget_type(dset)) < 0) + goto error; + if ((status = H5Tcommitted(t2)) < 0) + goto error; + if (!status) { + H5_FAILED(); + HDputs(" Dataset type should be a named type!"); + goto error; } - if(H5Tclose(t2) < 0) goto error; + if (H5Tclose(t2) < 0) + goto error; /* * Get the dataset datatype by applying H5Tcopy() to the dataset. The * result should be modifiable. */ - if((t2 = H5Tcopy(dset)) < 0) goto error; - if(H5Tset_precision(t2, (size_t)256) < 0) goto error; - if(H5Tclose(t2) < 0) goto error; - if(H5Dclose(dset) < 0) goto error; + if ((t2 = H5Tcopy(dset)) < 0) + goto error; + if (H5Tset_precision(t2, (size_t)256) < 0) + goto error; + if (H5Tclose(t2) < 0) + goto error; + if (H5Dclose(dset) < 0) + goto error; /* * Copy of committed type used as dataset type should not be name type */ - if((t2 = H5Tcopy(type)) < 0) goto error; - if((status = H5Tcommitted(t2)) < 0) goto error; - if(status) { - H5_FAILED(); - HDputs (" Copied type should not be a named type!"); - goto error; + if ((t2 = H5Tcopy(type)) < 0) + goto error; + if ((status = H5Tcommitted(t2)) < 0) + goto error; + if (status) { + H5_FAILED(); + HDputs(" Copied type should not be a named type!"); + goto error; } - if((dset = H5Dcreate2(file, "dset3", t2, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto error; - if((t3 = H5Dget_type(dset)) < 0) goto error; - if((status = H5Tcommitted(t3)) < 0) goto error; - if(status) { - H5_FAILED(); - HDputs (" Datatype from dataset using copied type should not be a named type!"); - goto error; + if ((dset = H5Dcreate2(file, "dset3", t2, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + goto error; + if ((t3 = H5Dget_type(dset)) < 0) + goto error; + if ((status = H5Tcommitted(t3)) < 0) + goto error; + if (status) { + H5_FAILED(); + HDputs(" Datatype from dataset using copied type should not be a named type!"); + goto error; } - if(H5Tclose(t3) < 0) goto error; - if(H5Dclose(dset) < 0) goto error; + if (H5Tclose(t3) < 0) + goto error; + if (H5Dclose(dset) < 0) + goto error; /* Close */ - if(H5Tclose(type) < 0) goto error; - if(H5Sclose(space) < 0) goto error; - if(H5Fclose(file) < 0) goto error; + if (H5Tclose(type) < 0) + goto error; + if (H5Sclose(space) < 0) + goto error; + if (H5Fclose(file) < 0) + goto error; /* Reopen file with read only access */ if ((file = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0) goto error; /* Verify that H5Tcommit2 returns an error */ - if((type = H5Tcopy(H5T_NATIVE_INT)) < 0) goto error; - H5E_BEGIN_TRY { - status = H5Tcommit2(file, "test_named_3 (should not exist)", type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); - } H5E_END_TRY; - if(status >= 0) { + if ((type = H5Tcopy(H5T_NATIVE_INT)) < 0) + goto error; + H5E_BEGIN_TRY + { + status = + H5Tcommit2(file, "test_named_3 (should not exist)", type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + } + H5E_END_TRY; + if (status >= 0) { H5_FAILED(); - HDputs (" Types should not be committable to a read-only file!"); + HDputs(" Types should not be committable to a read-only file!"); goto error; } /* Verify that H5Tcommit_anon returns an error */ - if((type = H5Tcopy(H5T_NATIVE_INT)) < 0) goto error; - H5E_BEGIN_TRY { - status = H5Tcommit_anon(file, type, H5P_DEFAULT, H5P_DEFAULT); - } H5E_END_TRY; - if(status >= 0) { + if ((type = H5Tcopy(H5T_NATIVE_INT)) < 0) + goto error; + H5E_BEGIN_TRY { status = H5Tcommit_anon(file, type, H5P_DEFAULT, H5P_DEFAULT); } + H5E_END_TRY; + if (status >= 0) { H5_FAILED(); - HDputs (" Types should not be committable to a read-only file!"); + HDputs(" Types should not be committable to a read-only file!"); goto error; } /* Close */ - if(H5Tclose(type) < 0) goto error; - if(H5Fclose(file) < 0) goto error; + if (H5Tclose(type) < 0) + goto error; + if (H5Fclose(file) < 0) + goto error; PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Tclose(t3); - H5Tclose(t2); - H5Tclose(type); - H5Sclose(space); - H5Dclose(dset); - H5Fclose(file); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Tclose(t3); + H5Tclose(t2); + H5Tclose(type); + H5Sclose(space); + H5Dclose(dset); + H5Fclose(file); + } + H5E_END_TRY; return 1; } - /*------------------------------------------------------------------------- * Function: mkstr * @@ -4020,19 +4372,18 @@ error: static hid_t mkstr(size_t len, H5T_str_t strpad) { - hid_t t; + hid_t t; - if((t = H5Tcopy(H5T_C_S1)) < 0) + if ((t = H5Tcopy(H5T_C_S1)) < 0) return -1; - if(H5Tset_size(t, len) < 0) + if (H5Tset_size(t, len) < 0) return -1; - if(H5Tset_strpad(t, strpad) < 0) + if (H5Tset_strpad(t, strpad) < 0) return -1; return t; } - /*------------------------------------------------------------------------- * Function: test_str_create * @@ -4050,45 +4401,65 @@ static int test_str_create(void) { hid_t fixed_str1, fixed_str2; - hid_t vlen_str1, vlen_str2; + hid_t vlen_str1, vlen_str2; htri_t is_vl_str = FALSE; size_t query_size, str_size = 10; TESTING("string type creation using H5Tcreate"); /* Create fixed-length string in two ways and make sure they are the same */ - if((fixed_str1 = mkstr(str_size, H5T_STR_NULLTERM)) < 0) goto error; + if ((fixed_str1 = mkstr(str_size, H5T_STR_NULLTERM)) < 0) + goto error; - if((fixed_str2 = H5Tcreate(H5T_STRING, str_size)) < 0) goto error; - if(H5Tset_strpad(fixed_str2, H5T_STR_NULLTERM) < 0) goto error; + if ((fixed_str2 = H5Tcreate(H5T_STRING, str_size)) < 0) + goto error; + if (H5Tset_strpad(fixed_str2, H5T_STR_NULLTERM) < 0) + goto error; - if(!H5Tequal(fixed_str1, fixed_str2)) goto error; + if (!H5Tequal(fixed_str1, fixed_str2)) + goto error; - if((query_size = H5Tget_size(fixed_str1)) == 0) goto error; - if(query_size != str_size) goto error; + if ((query_size = H5Tget_size(fixed_str1)) == 0) + goto error; + if (query_size != str_size) + goto error; - if((query_size = H5Tget_size(fixed_str2)) == 0) goto error; - if(query_size != str_size) goto error; + if ((query_size = H5Tget_size(fixed_str2)) == 0) + goto error; + if (query_size != str_size) + goto error; - if(H5Tclose(fixed_str1) < 0) goto error; - if(H5Tclose(fixed_str2) < 0) goto error; + if (H5Tclose(fixed_str1) < 0) + goto error; + if (H5Tclose(fixed_str2) < 0) + goto error; /* Create variable-length string in two ways and make sure they are the same */ - if((vlen_str1 = mkstr((size_t)H5T_VARIABLE, H5T_STR_NULLTERM)) < 0) goto error; + if ((vlen_str1 = mkstr((size_t)H5T_VARIABLE, H5T_STR_NULLTERM)) < 0) + goto error; - if((vlen_str2 = H5Tcreate(H5T_STRING, (size_t)H5T_VARIABLE)) < 0) goto error; - if(H5Tset_strpad(vlen_str2, H5T_STR_NULLTERM) < 0) goto error; + if ((vlen_str2 = H5Tcreate(H5T_STRING, (size_t)H5T_VARIABLE)) < 0) + goto error; + if (H5Tset_strpad(vlen_str2, H5T_STR_NULLTERM) < 0) + goto error; - if(!H5Tequal(vlen_str1, vlen_str2)) goto error; + if (!H5Tequal(vlen_str1, vlen_str2)) + goto error; - if((is_vl_str = H5Tis_variable_str(vlen_str1)) < 0) goto error; - if(!is_vl_str) goto error; + if ((is_vl_str = H5Tis_variable_str(vlen_str1)) < 0) + goto error; + if (!is_vl_str) + goto error; - if((is_vl_str = H5Tis_variable_str(vlen_str2)) < 0) goto error; - if(!is_vl_str) goto error; + if ((is_vl_str = H5Tis_variable_str(vlen_str2)) < 0) + goto error; + if (!is_vl_str) + goto error; - if(H5Tclose(vlen_str1) < 0) goto error; - if(H5Tclose(vlen_str2) < 0) goto error; + if (H5Tclose(vlen_str1) < 0) + goto error; + if (H5Tclose(vlen_str2) < 0) + goto error; PASSED(); return 0; @@ -4098,7 +4469,6 @@ error: return 1; } - /*------------------------------------------------------------------------- * Function: test_conv_str_1 * @@ -4115,9 +4485,9 @@ error: static int test_conv_str_1(void) { - char *buf = NULL; - hid_t src_type = -1; - hid_t dst_type = -1; + char *buf = NULL; + hid_t src_type = -1; + hid_t dst_type = -1; TESTING("string conversions"); @@ -4125,74 +4495,95 @@ test_conv_str_1(void) * Convert a null-terminated string to a shorter and longer null * terminated string. */ - if((src_type = mkstr((size_t)10, H5T_STR_NULLTERM)) < 0) goto error; - if((dst_type = mkstr((size_t)5, H5T_STR_NULLTERM)) < 0) goto error; - if(NULL == (buf = (char*)HDcalloc((size_t)2, (size_t)10))) goto error; + if ((src_type = mkstr((size_t)10, H5T_STR_NULLTERM)) < 0) + goto error; + if ((dst_type = mkstr((size_t)5, H5T_STR_NULLTERM)) < 0) + goto error; + if (NULL == (buf = (char *)HDcalloc((size_t)2, (size_t)10))) + goto error; HDmemcpy(buf, "abcdefghi\0abcdefghi\0", (size_t)20); - if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; + if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) + goto error; if (HDmemcmp(buf, "abcd\0abcd\0abcdefghi\0", (size_t)20)) { - H5_FAILED(); - HDputs(" Truncated C-string test failed"); - goto error; + H5_FAILED(); + HDputs(" Truncated C-string test failed"); + goto error; } - if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; + if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) + goto error; if (HDmemcmp(buf, "abcd\0\0\0\0\0\0abcd\0\0\0\0\0\0", (size_t)20)) { - H5_FAILED(); - HDputs(" Extended C-string test failed"); - goto error; + H5_FAILED(); + HDputs(" Extended C-string test failed"); + goto error; } HDfree(buf); buf = NULL; - if (H5Tclose(src_type) < 0) goto error; - if (H5Tclose(dst_type) < 0) goto error; + if (H5Tclose(src_type) < 0) + goto error; + if (H5Tclose(dst_type) < 0) + goto error; /* * Convert a null padded string to a shorter and then longer string. */ - if((src_type = mkstr((size_t)10, H5T_STR_NULLPAD)) < 0) goto error; - if((dst_type = mkstr((size_t)5, H5T_STR_NULLPAD)) < 0) goto error; - if(NULL == (buf = (char*)HDcalloc((size_t)2, (size_t)10))) goto error; + if ((src_type = mkstr((size_t)10, H5T_STR_NULLPAD)) < 0) + goto error; + if ((dst_type = mkstr((size_t)5, H5T_STR_NULLPAD)) < 0) + goto error; + if (NULL == (buf = (char *)HDcalloc((size_t)2, (size_t)10))) + goto error; HDmemcpy(buf, "abcdefghijabcdefghij", (size_t)20); - if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; + if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) + goto error; if (HDmemcmp(buf, "abcdeabcdeabcdefghij", (size_t)20)) { - H5_FAILED(); - HDputs(" Truncated C buffer test failed"); - goto error; + H5_FAILED(); + HDputs(" Truncated C buffer test failed"); + goto error; } - if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; + if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) + goto error; if (HDmemcmp(buf, "abcde\0\0\0\0\0abcde\0\0\0\0\0", (size_t)20)) { - H5_FAILED(); - HDputs(" Extended C buffer test failed"); - goto error; + H5_FAILED(); + HDputs(" Extended C buffer test failed"); + goto error; } HDfree(buf); buf = NULL; - if (H5Tclose(src_type) < 0) goto error; - if (H5Tclose(dst_type) < 0) goto error; + if (H5Tclose(src_type) < 0) + goto error; + if (H5Tclose(dst_type) < 0) + goto error; /* * Convert a space-padded string to a shorter and then longer string. */ - if((src_type = mkstr((size_t)10, H5T_STR_SPACEPAD)) < 0) goto error; - if((dst_type = mkstr((size_t)5, H5T_STR_SPACEPAD)) < 0) goto error; - if(NULL == (buf = (char*)HDcalloc((size_t)2, (size_t)10))) goto error; + if ((src_type = mkstr((size_t)10, H5T_STR_SPACEPAD)) < 0) + goto error; + if ((dst_type = mkstr((size_t)5, H5T_STR_SPACEPAD)) < 0) + goto error; + if (NULL == (buf = (char *)HDcalloc((size_t)2, (size_t)10))) + goto error; HDmemcpy(buf, "abcdefghijabcdefghij", (size_t)20); - if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; + if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) + goto error; if (HDmemcmp(buf, "abcdeabcdeabcdefghij", (size_t)20)) { - H5_FAILED(); - HDputs(" Truncated Fortran-string test failed"); - goto error; + H5_FAILED(); + HDputs(" Truncated Fortran-string test failed"); + goto error; } - if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; + if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) + goto error; if (HDmemcmp(buf, "abcde abcde ", (size_t)20)) { - H5_FAILED(); - HDputs(" Extended Fortran-string test failed"); - goto error; + H5_FAILED(); + HDputs(" Extended Fortran-string test failed"); + goto error; } HDfree(buf); buf = NULL; - if (H5Tclose(src_type) < 0) goto error; - if (H5Tclose(dst_type) < 0) goto error; + if (H5Tclose(src_type) < 0) + goto error; + if (H5Tclose(dst_type) < 0) + goto error; /* * What happens if a null-terminated string is not null terminated? If @@ -4200,146 +4591,189 @@ test_conv_str_1(void) * the destination is a different size or type of string then the right * thing should happen. */ - if((src_type = mkstr((size_t)10, H5T_STR_NULLTERM)) < 0) goto error; - if((dst_type = mkstr((size_t)10, H5T_STR_NULLTERM)) < 0) goto error; - if(NULL == (buf = (char*)HDcalloc((size_t)2, (size_t)10))) goto error; + if ((src_type = mkstr((size_t)10, H5T_STR_NULLTERM)) < 0) + goto error; + if ((dst_type = mkstr((size_t)10, H5T_STR_NULLTERM)) < 0) + goto error; + if (NULL == (buf = (char *)HDcalloc((size_t)2, (size_t)10))) + goto error; HDmemcpy(buf, "abcdefghijabcdefghij", (size_t)20); - if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; + if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) + goto error; if (HDmemcmp(buf, "abcdefghijabcdefghij", (size_t)20)) { - H5_FAILED(); - HDputs(" Non-terminated string test 1"); - goto error; + H5_FAILED(); + HDputs(" Non-terminated string test 1"); + goto error; } H5Tclose(dst_type); - if((dst_type = mkstr((size_t)5, H5T_STR_NULLTERM)) < 0) goto error; + if ((dst_type = mkstr((size_t)5, H5T_STR_NULLTERM)) < 0) + goto error; HDmemcpy(buf, "abcdefghijabcdefghij", (size_t)20); - if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; + if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) + goto error; if (HDmemcmp(buf, "abcd\0abcd\0abcdefghij", (size_t)20)) { - H5_FAILED(); - HDputs(" Non-terminated string test 2"); - goto error; + H5_FAILED(); + HDputs(" Non-terminated string test 2"); + goto error; } HDmemcpy(buf, "abcdeabcdexxxxxxxxxx", (size_t)20); - if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; + if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) + goto error; if (HDmemcmp(buf, "abcde\0\0\0\0\0abcde\0\0\0\0\0", (size_t)20)) { - H5_FAILED(); - HDputs(" Non-terminated string test 2"); - goto error; + H5_FAILED(); + HDputs(" Non-terminated string test 2"); + goto error; } HDfree(buf); buf = NULL; - if (H5Tclose(src_type) < 0) goto error; - if (H5Tclose(dst_type) < 0) goto error; + if (H5Tclose(src_type) < 0) + goto error; + if (H5Tclose(dst_type) < 0) + goto error; /* * Test C string to Fortran and vice versa. */ - if((src_type = mkstr((size_t)10, H5T_STR_NULLTERM)) < 0) goto error; - if((dst_type = mkstr((size_t)10, H5T_STR_SPACEPAD)) < 0) goto error; - if(NULL == (buf = (char*)HDcalloc((size_t)2, (size_t)10))) goto error; + if ((src_type = mkstr((size_t)10, H5T_STR_NULLTERM)) < 0) + goto error; + if ((dst_type = mkstr((size_t)10, H5T_STR_SPACEPAD)) < 0) + goto error; + if (NULL == (buf = (char *)HDcalloc((size_t)2, (size_t)10))) + goto error; HDmemcpy(buf, "abcdefghi\0abcdefghi\0", (size_t)20); - if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; + if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) + goto error; if (HDmemcmp(buf, "abcdefghi abcdefghi ", (size_t)20)) { - H5_FAILED(); - HDputs(" C string to Fortran test 1"); - goto error; + H5_FAILED(); + HDputs(" C string to Fortran test 1"); + goto error; } - if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; + if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) + goto error; if (HDmemcmp(buf, "abcdefghi\0abcdefghi\0", (size_t)20)) { - H5_FAILED(); - HDputs(" Fortran to C string test 1"); - goto error; + H5_FAILED(); + HDputs(" Fortran to C string test 1"); + goto error; } - if (H5Tclose(dst_type) < 0) goto error; - if((dst_type = mkstr((size_t)5, H5T_STR_SPACEPAD)) < 0) goto error; + if (H5Tclose(dst_type) < 0) + goto error; + if ((dst_type = mkstr((size_t)5, H5T_STR_SPACEPAD)) < 0) + goto error; HDmemcpy(buf, "abcdefgh\0\0abcdefgh\0\0", (size_t)20); - if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; + if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) + goto error; if (HDmemcmp(buf, "abcdeabcdeabcdefgh\0\0", (size_t)20)) { - H5_FAILED(); - HDputs(" C string to Fortran test 2"); - goto error; + H5_FAILED(); + HDputs(" C string to Fortran test 2"); + goto error; } - if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; + if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) + goto error; if (HDmemcmp(buf, "abcde\0\0\0\0\0abcde\0\0\0\0\0", (size_t)20)) { - H5_FAILED(); - HDputs(" Fortran to C string test 2"); - goto error; + H5_FAILED(); + HDputs(" Fortran to C string test 2"); + goto error; } - if (H5Tclose(src_type) < 0) goto error; - if (H5Tclose(dst_type) < 0) goto error; - if((src_type = mkstr((size_t)5, H5T_STR_NULLTERM)) < 0) goto error; - if((dst_type = mkstr((size_t)10, H5T_STR_SPACEPAD)) < 0) goto error; + if (H5Tclose(src_type) < 0) + goto error; + if (H5Tclose(dst_type) < 0) + goto error; + if ((src_type = mkstr((size_t)5, H5T_STR_NULLTERM)) < 0) + goto error; + if ((dst_type = mkstr((size_t)10, H5T_STR_SPACEPAD)) < 0) + goto error; HDmemcpy(buf, "abcd\0abcd\0xxxxxxxxxx", (size_t)20); - if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; + if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) + goto error; if (HDmemcmp(buf, "abcd abcd ", (size_t)20)) { - H5_FAILED(); - HDputs(" C string to Fortran test 3"); - goto error; + H5_FAILED(); + HDputs(" C string to Fortran test 3"); + goto error; } - if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; + if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) + goto error; if (HDmemcmp(buf, "abcd\0abcd\0abcd ", (size_t)20)) { - H5_FAILED(); - HDputs(" Fortran to C string test 3"); - goto error; + H5_FAILED(); + HDputs(" Fortran to C string test 3"); + goto error; } HDfree(buf); buf = NULL; - if (H5Tclose(src_type) < 0) goto error; - if (H5Tclose(dst_type) < 0) goto error; + if (H5Tclose(src_type) < 0) + goto error; + if (H5Tclose(dst_type) < 0) + goto error; /* * Test C buffer to Fortran and vice versa. */ - if((src_type = mkstr((size_t)10, H5T_STR_NULLPAD)) < 0) goto error; - if((dst_type = mkstr((size_t)10, H5T_STR_SPACEPAD)) < 0) goto error; - if(NULL == (buf = (char*)HDcalloc((size_t)2, (size_t)10))) goto error; + if ((src_type = mkstr((size_t)10, H5T_STR_NULLPAD)) < 0) + goto error; + if ((dst_type = mkstr((size_t)10, H5T_STR_SPACEPAD)) < 0) + goto error; + if (NULL == (buf = (char *)HDcalloc((size_t)2, (size_t)10))) + goto error; HDmemcpy(buf, "abcdefghijabcdefghij", (size_t)20); - if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; + if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) + goto error; if (HDmemcmp(buf, "abcdefghijabcdefghij", (size_t)20)) { - H5_FAILED(); - HDputs(" C buffer to Fortran test 1"); - goto error; + H5_FAILED(); + HDputs(" C buffer to Fortran test 1"); + goto error; } - if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; + if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) + goto error; if (HDmemcmp(buf, "abcdefghijabcdefghij", (size_t)20)) { - H5_FAILED(); - HDputs(" Fortran to C buffer test 1"); - goto error; + H5_FAILED(); + HDputs(" Fortran to C buffer test 1"); + goto error; } - if (H5Tclose(dst_type) < 0) goto error; - if((dst_type = mkstr((size_t)5, H5T_STR_SPACEPAD)) < 0) goto error; + if (H5Tclose(dst_type) < 0) + goto error; + if ((dst_type = mkstr((size_t)5, H5T_STR_SPACEPAD)) < 0) + goto error; HDmemcpy(buf, "abcdefgh\0\0abcdefgh\0\0", (size_t)20); - if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; + if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) + goto error; if (HDmemcmp(buf, "abcdeabcdeabcdefgh\0\0", (size_t)20)) { - H5_FAILED(); - HDputs(" C buffer to Fortran test 2"); - goto error; + H5_FAILED(); + HDputs(" C buffer to Fortran test 2"); + goto error; } - if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; + if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) + goto error; if (HDmemcmp(buf, "abcde\0\0\0\0\0abcde\0\0\0\0\0", (size_t)20)) { - H5_FAILED(); - HDputs(" Fortran to C buffer test 2"); - goto error; + H5_FAILED(); + HDputs(" Fortran to C buffer test 2"); + goto error; } - if (H5Tclose(src_type) < 0) goto error; - if (H5Tclose(dst_type) < 0) goto error; - if((src_type = mkstr((size_t)5, H5T_STR_NULLPAD)) < 0) goto error; - if((dst_type = mkstr((size_t)10, H5T_STR_SPACEPAD)) < 0) goto error; + if (H5Tclose(src_type) < 0) + goto error; + if (H5Tclose(dst_type) < 0) + goto error; + if ((src_type = mkstr((size_t)5, H5T_STR_NULLPAD)) < 0) + goto error; + if ((dst_type = mkstr((size_t)10, H5T_STR_SPACEPAD)) < 0) + goto error; HDmemcpy(buf, "abcd\0abcd\0xxxxxxxxxx", (size_t)20); - if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; + if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) + goto error; if (HDmemcmp(buf, "abcd abcd ", (size_t)20)) { - H5_FAILED(); - HDputs(" C buffer to Fortran test 3"); - goto error; + H5_FAILED(); + HDputs(" C buffer to Fortran test 3"); + goto error; } - if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; + if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) + goto error; if (HDmemcmp(buf, "abcd\0abcd\0abcd ", (size_t)20)) { - H5_FAILED(); - HDputs(" Fortran to C buffer test 3"); - goto error; + H5_FAILED(); + HDputs(" Fortran to C buffer test 3"); + goto error; } - if(H5Tclose(src_type) < 0) goto error; - if(H5Tclose(dst_type) < 0) goto error; + if (H5Tclose(src_type) < 0) + goto error; + if (H5Tclose(dst_type) < 0) + goto error; HDfree(buf); PASSED(); @@ -4351,12 +4785,14 @@ test_conv_str_1(void) return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Tclose(src_type); H5Tclose(dst_type); - } H5E_END_TRY; + } + H5E_END_TRY; - if(buf) + if (buf) HDfree(buf); /* Restore the default error handler (set in h5_reset()) */ @@ -4367,7 +4803,6 @@ error: return 1; } - /*------------------------------------------------------------------------- * Function: test_conv_str_2 * @@ -4384,24 +4819,27 @@ error: static int test_conv_str_2(void) { - char *buf = NULL, s[80]; + char * buf = NULL, s[80]; hid_t c_type = -1; - hid_t f_type = -1; - const size_t nelmts = NTESTELEM; - size_t i, j, nchars; - int ret_value = 1; + hid_t f_type = -1; + const size_t nelmts = NTESTELEM; + size_t i, j, nchars; + int ret_value = 1; /* * Initialize types and buffer. */ - if((c_type = mkstr((size_t)8, H5T_STR_NULLPAD)) < 0) goto error; - if((f_type = mkstr((size_t)8, H5T_STR_SPACEPAD)) < 0) goto error; - if(NULL == (buf = (char*)HDcalloc(nelmts, (size_t)8))) goto error; - for(i = 0; i < nelmts; i++) { - nchars = (size_t)(HDrand() % 8); - for(j = 0; j < nchars; j++) - buf[i * 8 + j] = (char)('a' + HDrand() % 26); - while(j < nchars) + if ((c_type = mkstr((size_t)8, H5T_STR_NULLPAD)) < 0) + goto error; + if ((f_type = mkstr((size_t)8, H5T_STR_SPACEPAD)) < 0) + goto error; + if (NULL == (buf = (char *)HDcalloc(nelmts, (size_t)8))) + goto error; + for (i = 0; i < nelmts; i++) { + nchars = (size_t)(HDrand() % 8); + for (j = 0; j < nchars; j++) + buf[i * 8 + j] = (char)('a' + HDrand() % 26); + while (j < nchars) buf[i * 8 + j++] = '\0'; } /* end for */ @@ -4409,21 +4847,23 @@ test_conv_str_2(void) HDsprintf(s, "Testing random string conversion speed"); HDprintf("%-70s", s); HDfflush(stdout); - if(H5Tconvert(c_type, f_type, nelmts, buf, NULL, H5P_DEFAULT) < 0) + if (H5Tconvert(c_type, f_type, nelmts, buf, NULL, H5P_DEFAULT) < 0) goto error; - if(H5Tconvert(f_type, c_type, nelmts, buf, NULL, H5P_DEFAULT) < 0) + if (H5Tconvert(f_type, c_type, nelmts, buf, NULL, H5P_DEFAULT) < 0) goto error; PASSED(); ret_value = 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Tclose(c_type); H5Tclose(f_type); - } H5E_END_TRY; + } + H5E_END_TRY; - if(buf) + if (buf) HDfree(buf); /* Restore the default error handler (set in h5_reset()) */ @@ -4434,7 +4874,6 @@ error: return ret_value; } - /*------------------------------------------------------------------------- * Function: test_conv_str_3 * @@ -4452,81 +4891,83 @@ error: static int test_conv_str_3(void) { - char *buf=NULL; - hid_t type = -1; - hid_t super = -1; - const size_t nelmts = NTESTELEM; - size_t i, j, nchars; - int ret_value = 1; - size_t size; - H5T_pad_t inpad; - H5T_sign_t sign; - char *tag = NULL; - herr_t ret; + char * buf = NULL; + hid_t type = -1; + hid_t super = -1; + const size_t nelmts = NTESTELEM; + size_t i, j, nchars; + int ret_value = 1; + size_t size; + H5T_pad_t inpad; + H5T_sign_t sign; + char * tag = NULL; + herr_t ret; TESTING("some type functions for string"); /* * Initialize types and buffer. */ - if((type = mkstr((size_t)8, H5T_STR_NULLPAD)) < 0) goto error; - if(NULL == (buf = (char*)HDcalloc(nelmts, (size_t)8))) + if ((type = mkstr((size_t)8, H5T_STR_NULLPAD)) < 0) + goto error; + if (NULL == (buf = (char *)HDcalloc(nelmts, (size_t)8))) FAIL_PUTS_ERROR("Allocation failed."); - for(i = 0; i < nelmts; i++) { - nchars = (size_t)(HDrand() % 8); - for(j = 0; j < nchars; j++) - buf[i * 8 + j] = (char)('a' + HDrand() % 26); - while(j < nchars) + for (i = 0; i < nelmts; i++) { + nchars = (size_t)(HDrand() % 8); + for (j = 0; j < nchars; j++) + buf[i * 8 + j] = (char)('a' + HDrand() % 26); + while (j < nchars) buf[i * 8 + j++] = '\0'; } /* end for */ - if(H5Tget_precision(type) == 0) FAIL_STACK_ERROR - if(H5Tget_size(type) == 0) FAIL_STACK_ERROR - if(H5Tset_pad(type, H5T_PAD_ZERO, H5T_PAD_ONE) < 0) FAIL_STACK_ERROR - if(H5Tget_cset(type) < 0) FAIL_STACK_ERROR - if(H5Tget_strpad(type) < 0) FAIL_STACK_ERROR - if(H5Tset_offset(type, (size_t)0) < 0) FAIL_STACK_ERROR - if(H5Tget_order(type) < 0) FAIL_STACK_ERROR - - H5E_BEGIN_TRY { - ret = H5Tset_precision(type, nelmts); - } H5E_END_TRY; - if(ret >= 0) { + if (H5Tget_precision(type) == 0) + FAIL_STACK_ERROR + if (H5Tget_size(type) == 0) + FAIL_STACK_ERROR + if (H5Tset_pad(type, H5T_PAD_ZERO, H5T_PAD_ONE) < 0) + FAIL_STACK_ERROR + if (H5Tget_cset(type) < 0) + FAIL_STACK_ERROR + if (H5Tget_strpad(type) < 0) + FAIL_STACK_ERROR + if (H5Tset_offset(type, (size_t)0) < 0) + FAIL_STACK_ERROR + if (H5Tget_order(type) < 0) + FAIL_STACK_ERROR + + H5E_BEGIN_TRY { ret = H5Tset_precision(type, nelmts); } + H5E_END_TRY; + if (ret >= 0) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ - H5E_BEGIN_TRY { - size = H5Tget_ebias(type); - } H5E_END_TRY; - if(size > 0) { + H5E_BEGIN_TRY { size = H5Tget_ebias(type); } + H5E_END_TRY; + if (size > 0) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ - H5E_BEGIN_TRY { - inpad = H5Tget_inpad(type); - } H5E_END_TRY; - if(inpad > -1) { + H5E_BEGIN_TRY { inpad = H5Tget_inpad(type); } + H5E_END_TRY; + if (inpad > -1) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ - H5E_BEGIN_TRY { - sign = H5Tget_sign(type); - } H5E_END_TRY; - if(sign > -1) { + H5E_BEGIN_TRY { sign = H5Tget_sign(type); } + H5E_END_TRY; + if (sign > -1) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ - H5E_BEGIN_TRY { - tag = H5Tget_tag(type); - } H5E_END_TRY; - if(tag) { + H5E_BEGIN_TRY { tag = H5Tget_tag(type); } + H5E_END_TRY; + if (tag) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ - H5E_BEGIN_TRY { - super = H5Tget_super(type); - } H5E_END_TRY; - if(super >= 0) { + H5E_BEGIN_TRY { super = H5Tget_super(type); } + H5E_END_TRY; + if (super >= 0) { FAIL_PUTS_ERROR("Operation not allowed for this type."); } /* end if */ @@ -4534,14 +4975,16 @@ test_conv_str_3(void) ret_value = 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Tclose(type); H5Tclose(super); - } H5E_END_TRY; + } + H5E_END_TRY; - if(buf) + if (buf) HDfree(buf); - if(tag) + if (tag) H5free_memory(tag); /* Technically allocated by API call */ /* Restore the default error handler (set in h5_reset()) */ @@ -4549,10 +4992,9 @@ error: reset_hdf5(); - return ret_value; /* Number of errors */ + return ret_value; /* Number of errors */ } - /*------------------------------------------------------------------------- * Function: test_conv_enum_1 * @@ -4572,52 +5014,58 @@ error: static int test_conv_enum_1(void) { - const size_t nelmts=NTESTELEM; - int i, val, *buf=NULL; - hid_t t1 = -1; - hid_t t2 = -1; - char s[80]; - int ret_value = 1; - size_t u; + const size_t nelmts = NTESTELEM; + int i, val, *buf = NULL; + hid_t t1 = -1; + hid_t t2 = -1; + char s[80]; + int ret_value = 1; + size_t u; /* Build the datatypes */ - if((t1 = H5Tcreate(H5T_ENUM, sizeof(int))) < 0) goto error; - if((t2 = H5Tenum_create(H5T_NATIVE_INT)) < 0) goto error; + if ((t1 = H5Tcreate(H5T_ENUM, sizeof(int))) < 0) + goto error; + if ((t2 = H5Tenum_create(H5T_NATIVE_INT)) < 0) + goto error; s[1] = '\0'; - for(i = 0; i < 26; i++) { - s[0] = (char)('A' + i); - H5Tenum_insert(t1, s, &i); - H5Tenum_insert(t2, s, (val = i * 1000 + i, &val)); + for (i = 0; i < 26; i++) { + s[0] = (char)('A' + i); + H5Tenum_insert(t1, s, &i); + H5Tenum_insert(t2, s, (val = i * 1000 + i, &val)); } /* end for */ /* Initialize the buffer */ - if(NULL == (buf = (int*)HDmalloc(nelmts * MAX(H5Tget_size(t1), H5Tget_size(t2))))) + if (NULL == (buf = (int *)HDmalloc(nelmts * MAX(H5Tget_size(t1), H5Tget_size(t2))))) goto error; - for(u = 0; u < nelmts; u++) + for (u = 0; u < nelmts; u++) buf[u] = HDrand() % 26; /* Conversions */ HDsprintf(s, "Testing random enum conversion O(N)"); HDprintf("%-70s", s); HDfflush(stdout); - if(H5Tconvert(t1, t2, nelmts, buf, NULL, H5P_DEFAULT) < 0) goto error; + if (H5Tconvert(t1, t2, nelmts, buf, NULL, H5P_DEFAULT) < 0) + goto error; PASSED(); HDsprintf(s, "Testing random enum conversion O(N log N)"); HDprintf("%-70s", s); HDfflush(stdout); - if(H5Tconvert(t2, t1, nelmts, buf, NULL, H5P_DEFAULT) < 0) goto error; + if (H5Tconvert(t2, t1, nelmts, buf, NULL, H5P_DEFAULT) < 0) + goto error; PASSED(); ret_value = 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Tclose(t1); H5Tclose(t2); - } H5E_END_TRY; + } + H5E_END_TRY; - if(buf) + if (buf) HDfree(buf); /* Restore the default error handler (set in h5_reset()) */ @@ -4628,7 +5076,6 @@ error: return ret_value; } - /*------------------------------------------------------------------------- * Function: test_conv_enum_2 * @@ -4644,16 +5091,9 @@ error: static int test_conv_enum_2(void) { - hid_t srctype=-1, dsttype=-1, oddsize=-1; - int *data=NULL, i, nerrors=0; - const char *mname[] = { "RED", - "GREEN", - "BLUE", - "YELLOW", - "PINK", - "PURPLE", - "ORANGE", - "WHITE" }; + hid_t srctype = -1, dsttype = -1, oddsize = -1; + int * data = NULL, i, nerrors = 0; + const char *mname[] = {"RED", "GREEN", "BLUE", "YELLOW", "PINK", "PURPLE", "ORANGE", "WHITE"}; TESTING("non-native enumeration type conversion"); @@ -4661,7 +5101,7 @@ test_conv_enum_2(void) oddsize = H5Tcopy(H5T_STD_I32BE); H5Tset_size(oddsize, (size_t)3); /*reduce to 24 bits, not corresponding to any native size*/ srctype = H5Tenum_create(oddsize); - for (i=7; i>=0; --i) { + for (i = 7; i >= 0; --i) { char pattern[3]; pattern[2] = (char)i; pattern[0] = pattern[1] = 0; @@ -4671,27 +5111,26 @@ test_conv_enum_2(void) /* Destination enum type */ dsttype = H5Tenum_create(H5T_NATIVE_INT); HDassert(H5Tget_size(dsttype) > H5Tget_size(srctype)); - for (i=0; i<8; i++) + for (i = 0; i < 8; i++) H5Tenum_insert(dsttype, mname[i], &i); /* Source data */ - data = (int*)HDmalloc(NTESTELEM*sizeof(int)); - for (i=0; i<NTESTELEM; i++) { - ((char*)data)[i*3+2] = (char)(i % 8); - ((char*)data)[i*3+0] = 0; - ((char*)data)[i*3+1] = 0; + data = (int *)HDmalloc(NTESTELEM * sizeof(int)); + for (i = 0; i < NTESTELEM; i++) { + ((char *)data)[i * 3 + 2] = (char)(i % 8); + ((char *)data)[i * 3 + 0] = 0; + ((char *)data)[i * 3 + 1] = 0; } /* Convert to destination type */ H5Tconvert(srctype, dsttype, (size_t)NTESTELEM, data, NULL, H5P_DEFAULT); /* Check results */ - for (i=0; i<NTESTELEM; i++) { - if (data[i] != i%8) { + for (i = 0; i < NTESTELEM; i++) { + if (data[i] != i % 8) { if (!nerrors++) { H5_FAILED(); - HDprintf("element %d is %d but should have been %d\n", - i, data[i], i%8); + HDprintf("element %d is %d but should have been %d\n", i, data[i], i % 8); } } } @@ -4704,8 +5143,7 @@ test_conv_enum_2(void) /* Failure */ if (nerrors) { - HDprintf("total of %d conversion errors out of %d elements for enums\n", - nerrors, NTESTELEM); + HDprintf("total of %d conversion errors out of %d elements for enums\n", nerrors, NTESTELEM); return 1; } @@ -4713,7 +5151,6 @@ test_conv_enum_2(void) return 0; } - /*------------------------------------------------------------------------- * Function: test_conv_bitfield * @@ -4729,8 +5166,8 @@ test_conv_enum_2(void) static int test_conv_bitfield(void) { - unsigned char buf[4]; - hid_t st=-1, dt=-1; + unsigned char buf[4]; + hid_t st = -1, dt = -1; TESTING("bitfield conversions"); @@ -4739,12 +5176,13 @@ test_conv_bitfield(void) * 1010101010101010 * ________________1010101010101010 */ - st = H5Tcopy(H5T_STD_B16LE); - dt = H5Tcopy(H5T_STD_B32LE); + st = H5Tcopy(H5T_STD_B16LE); + dt = H5Tcopy(H5T_STD_B32LE); buf[0] = buf[1] = 0xAA; buf[2] = buf[3] = 0x55; /*irrelevant*/ - if (H5Tconvert(st, dt, (size_t)1, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (buf[0]!=0xAA || buf[1]!=0xAA || buf[2]!=0 || buf[3]!=0) { + if (H5Tconvert(st, dt, (size_t)1, buf, NULL, H5P_DEFAULT) < 0) + goto error; + if (buf[0] != 0xAA || buf[1] != 0xAA || buf[2] != 0 || buf[3] != 0) { H5_FAILED(); HDprintf(" s=0xaaaa, d=0x%02x%02x%02x%02x (test 1)\n", buf[3], buf[2], buf[1], buf[0]); goto error; @@ -4760,9 +5198,12 @@ test_conv_bitfield(void) H5Tset_offset(st, (size_t)2); H5Tset_precision(dt, (size_t)12); H5Tset_offset(dt, (size_t)10); - buf[0] = 0xA8; buf[1] = 0x2A; buf[2] = buf[3] = 0; - if (H5Tconvert(st, dt, (size_t)1, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (buf[0]!=0 || buf[1]!=0xA8 || buf[2]!=0x2A || buf[3]!=0) { + buf[0] = 0xA8; + buf[1] = 0x2A; + buf[2] = buf[3] = 0; + if (H5Tconvert(st, dt, (size_t)1, buf, NULL, H5P_DEFAULT) < 0) + goto error; + if (buf[0] != 0 || buf[1] != 0xA8 || buf[2] != 0x2A || buf[3] != 0) { H5_FAILED(); HDprintf(" s=0x2AA8 d=0x%02x%02x%02x%02x (test 2)\n", buf[3], buf[2], buf[1], buf[0]); goto error; @@ -4773,9 +5214,12 @@ test_conv_bitfield(void) * be filled with ones. */ H5Tset_pad(dt, H5T_PAD_ONE, H5T_PAD_ONE); - buf[0] = 0xA8; buf[1] = 0x2A; buf[2] = buf[3] = 0; - if (H5Tconvert(st, dt, (size_t)1, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (buf[0]!=0xff || buf[1]!=0xAB || buf[2]!=0xEA || buf[3]!=0xff) { + buf[0] = 0xA8; + buf[1] = 0x2A; + buf[2] = buf[3] = 0; + if (H5Tconvert(st, dt, (size_t)1, buf, NULL, H5P_DEFAULT) < 0) + goto error; + if (buf[0] != 0xff || buf[1] != 0xAB || buf[2] != 0xEA || buf[3] != 0xff) { H5_FAILED(); HDprintf(" s=0x2AA8 d=0x%02x%02x%02x%02x (test 3)\n", buf[3], buf[2], buf[1], buf[0]); goto error; @@ -4803,7 +5247,6 @@ error: return 1; } - /*------------------------------------------------------------------------- * Function: test_bitfield_funcs * @@ -4820,92 +5263,92 @@ error: static int test_bitfield_funcs(void) { - hid_t type=-1, ntype=-1, super=-1; - size_t size; - char* tag=0; - H5T_pad_t inpad; - H5T_cset_t cset; - H5T_str_t strpad; - herr_t ret; - int retval=-1; + hid_t type = -1, ntype = -1, super = -1; + size_t size; + char * tag = 0; + H5T_pad_t inpad; + H5T_cset_t cset; + H5T_str_t strpad; + herr_t ret; + int retval = -1; TESTING("some type functions for bitfield"); /* * First create a bitfield type. */ - if((type = H5Tcopy(H5T_STD_B32LE)) < 0) goto error; + if ((type = H5Tcopy(H5T_STD_B32LE)) < 0) + goto error; /* * Offset a 12-byte value in the middle of a 16 and 32 byte * field. Pad unused bits with ones. * ____ ____ __10 1010 1010 10__ ____ ____ */ - if(H5Tset_precision(type, (size_t)12) < 0) goto error; - if(H5Tset_offset(type, (size_t)10) < 0) goto error; - if(H5Tset_pad(type, H5T_PAD_ONE, H5T_PAD_ONE)) goto error; - if((size=H5Tget_size(type))==0) goto error; - if(H5Tset_order(type, H5T_ORDER_BE) < 0) goto error; - if((ntype = H5Tget_native_type(type, H5T_DIR_ASCEND)) < 0) goto error; - - H5E_BEGIN_TRY { - size=H5Tget_ebias(type); - } H5E_END_TRY; - if (size>0) { + if (H5Tset_precision(type, (size_t)12) < 0) + goto error; + if (H5Tset_offset(type, (size_t)10) < 0) + goto error; + if (H5Tset_pad(type, H5T_PAD_ONE, H5T_PAD_ONE)) + goto error; + if ((size = H5Tget_size(type)) == 0) + goto error; + if (H5Tset_order(type, H5T_ORDER_BE) < 0) + goto error; + if ((ntype = H5Tget_native_type(type, H5T_DIR_ASCEND)) < 0) + goto error; + + H5E_BEGIN_TRY { size = H5Tget_ebias(type); } + H5E_END_TRY; + if (size > 0) { H5_FAILED(); HDprintf("Operation not allowed for this type.\n"); goto error; } /* end if */ - H5E_BEGIN_TRY { - inpad=H5Tget_inpad(type); - } H5E_END_TRY; - if (inpad>-1) { + H5E_BEGIN_TRY { inpad = H5Tget_inpad(type); } + H5E_END_TRY; + if (inpad > -1) { H5_FAILED(); HDprintf("Operation not allowed for this type.\n"); goto error; } /* end if */ - H5E_BEGIN_TRY { - cset=H5Tget_cset(type); - } H5E_END_TRY; - if (cset>-1) { + H5E_BEGIN_TRY { cset = H5Tget_cset(type); } + H5E_END_TRY; + if (cset > -1) { H5_FAILED(); HDprintf("Operation not allowed for this type.\n"); goto error; } /* end if */ - H5E_BEGIN_TRY { - strpad=H5Tget_strpad(type); - } H5E_END_TRY; - if (strpad>-1) { + H5E_BEGIN_TRY { strpad = H5Tget_strpad(type); } + H5E_END_TRY; + if (strpad > -1) { H5_FAILED(); HDprintf("Operation not allowed for this type.\n"); goto error; } /* end if */ - H5E_BEGIN_TRY { - ret=H5Tset_sign(type, H5T_SGN_2); - } H5E_END_TRY; - if(ret>=0) { + H5E_BEGIN_TRY { ret = H5Tset_sign(type, H5T_SGN_2); } + H5E_END_TRY; + if (ret >= 0) { H5_FAILED(); HDprintf("Operation not allowed for this type.\n"); goto error; } /* end if */ - H5E_BEGIN_TRY { - tag = H5Tget_tag(type); - } H5E_END_TRY; + H5E_BEGIN_TRY { tag = H5Tget_tag(type); } + H5E_END_TRY; if (tag) { H5_FAILED(); HDprintf("Operation not allowed for this type.\n"); goto error; } /* end if */ - H5E_BEGIN_TRY { - super = H5Tget_super(type); - } H5E_END_TRY; - if (super>=0) { + H5E_BEGIN_TRY { super = H5Tget_super(type); } + H5E_END_TRY; + if (super >= 0) { H5_FAILED(); HDprintf("Operation not allowed for this type.\n"); goto error; @@ -4914,11 +5357,13 @@ test_bitfield_funcs(void) retval = 0; error: - if (retval == -1) retval = 1; + if (retval == -1) + retval = 1; H5free_memory(tag); H5Tclose(ntype); H5Tclose(type); - if (retval == 0) PASSED(); + if (retval == 0) + PASSED(); /* Restore the default error handler (set in h5_reset()) */ h5_restore_err(); @@ -4928,7 +5373,6 @@ error: return retval; } - /*------------------------------------------------------------------------- * Function: convert_opaque * @@ -4943,16 +5387,15 @@ error: */ static herr_t convert_opaque(hid_t H5_ATTR_UNUSED st, hid_t H5_ATTR_UNUSED dt, H5T_cdata_t *cdata, - size_t H5_ATTR_UNUSED nelmts, size_t H5_ATTR_UNUSED buf_stride, - size_t H5_ATTR_UNUSED bkg_stride, void H5_ATTR_UNUSED *_buf, - void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dset_xfer_plid) + size_t H5_ATTR_UNUSED nelmts, size_t H5_ATTR_UNUSED buf_stride, + size_t H5_ATTR_UNUSED bkg_stride, void H5_ATTR_UNUSED *_buf, void H5_ATTR_UNUSED *bkg, + hid_t H5_ATTR_UNUSED dset_xfer_plid) { - if (H5T_CONV_CONV==cdata->command) + if (H5T_CONV_CONV == cdata->command) num_opaque_conversions_g++; return 0; } - /*------------------------------------------------------------------------- * Function: test_opaque * @@ -4981,17 +5424,16 @@ test_opaque(void) /* Test some type functions with opaque type */ num_errors += opaque_funcs(); - if(num_errors) + if (num_errors) goto error; PASSED(); return 0; - error: +error: return num_errors; } - /*------------------------------------------------------------------------- * Function: opaque_check * @@ -5008,28 +5450,30 @@ static int opaque_check(int tag_it) { #define OPAQUE_NELMTS 1000 - hid_t st=-1, dt=-1; - herr_t status; - char buf[1]; /*not really used*/ - int saved; + hid_t st = -1, dt = -1; + herr_t status; + char buf[1]; /*not really used*/ + int saved; saved = num_opaque_conversions_g = 0; /* Build source and destination types */ - if ((st=H5Tcreate(H5T_OPAQUE, (size_t)4)) < 0) goto error; - if (H5Tset_tag(st, "opaque source type") < 0) goto error; + if ((st = H5Tcreate(H5T_OPAQUE, (size_t)4)) < 0) + goto error; + if (H5Tset_tag(st, "opaque source type") < 0) + goto error; - if ((dt=H5Tcreate(H5T_OPAQUE, (size_t)4)) < 0) goto error; + if ((dt = H5Tcreate(H5T_OPAQUE, (size_t)4)) < 0) + goto error; if (tag_it) { if (H5Tset_tag(dt, "opaque destination type") < 0) goto error; } /* Make sure that we can't convert between the types yet */ - H5E_BEGIN_TRY { - status = H5Tconvert(st, dt, (size_t)OPAQUE_NELMTS, buf, NULL, H5P_DEFAULT); - } H5E_END_TRY; - if (status>=0) { + H5E_BEGIN_TRY { status = H5Tconvert(st, dt, (size_t)OPAQUE_NELMTS, buf, NULL, H5P_DEFAULT); } + H5E_END_TRY; + if (status >= 0) { H5_FAILED(); HDprintf(" opaque conversion should have failed but succeeded\n"); goto error; @@ -5040,8 +5484,9 @@ opaque_check(int tag_it) goto error; /* Try the conversion again, this time it should work */ - if (H5Tconvert(st, dt, (size_t)OPAQUE_NELMTS, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (saved+1 != num_opaque_conversions_g) { + if (H5Tconvert(st, dt, (size_t)OPAQUE_NELMTS, buf, NULL, H5P_DEFAULT) < 0) + goto error; + if (saved + 1 != num_opaque_conversions_g) { H5_FAILED(); HDprintf(" unexpected number of opaque conversions\n"); goto error; @@ -5055,14 +5500,15 @@ opaque_check(int tag_it) H5Tclose(dt); return 0; - error: - if (st>0) H5Tclose(st); - if (dt>0) H5Tclose(dt); +error: + if (st > 0) + H5Tclose(st); + if (dt > 0) + H5Tclose(dt); H5_FAILED(); return 1; } - /*------------------------------------------------------------------------- * Function: opaque_long * @@ -5079,26 +5525,29 @@ opaque_check(int tag_it) static int opaque_long(void) { - char *long_tag = NULL; - hid_t dt = -1; - herr_t ret; + char * long_tag = NULL; + hid_t dt = -1; + herr_t ret; /* Build opaque type */ - if((dt=H5Tcreate(H5T_OPAQUE, (size_t)4)) < 0) TEST_ERROR + if ((dt = H5Tcreate(H5T_OPAQUE, (size_t)4)) < 0) + TEST_ERROR /* Create long tag */ - if(NULL == (long_tag = (char *)HDmalloc((size_t)(16384 + 1)))) TEST_ERROR + if (NULL == (long_tag = (char *)HDmalloc((size_t)(16384 + 1)))) + TEST_ERROR HDmemset(long_tag, 'a', (size_t)16384); long_tag[16384] = '\0'; /* Set opaque type's tag */ - H5E_BEGIN_TRY { - ret = H5Tset_tag(dt, long_tag); - } H5E_END_TRY; - if(ret != FAIL) TEST_ERROR + H5E_BEGIN_TRY { ret = H5Tset_tag(dt, long_tag); } + H5E_END_TRY; + if (ret != FAIL) + TEST_ERROR /* Close datatype */ - if(H5Tclose(dt) < 0) TEST_ERROR + if (H5Tclose(dt) < 0) + TEST_ERROR /* Release memory for tag */ HDfree(long_tag); @@ -5106,15 +5555,14 @@ opaque_long(void) return 0; error: - if(dt>0) + if (dt > 0) H5Tclose(dt); - if(long_tag) + if (long_tag) HDfree(long_tag); H5_FAILED(); return 1; } - /*------------------------------------------------------------------------- * Function: opaque_funcs * @@ -5131,102 +5579,97 @@ error: static int opaque_funcs(void) { - hid_t type = -1, super=-1; - size_t size; - H5T_pad_t inpad; - H5T_cset_t cset; - H5T_str_t strpad; - H5T_sign_t sign; - herr_t ret; + hid_t type = -1, super = -1; + size_t size; + H5T_pad_t inpad; + H5T_cset_t cset; + H5T_str_t strpad; + H5T_sign_t sign; + herr_t ret; /* Build opaque type */ - if ((type=H5Tcreate(H5T_OPAQUE, (size_t)4)) < 0) TEST_ERROR - if (H5Tset_tag(type, "opaque source type") < 0) TEST_ERROR + if ((type = H5Tcreate(H5T_OPAQUE, (size_t)4)) < 0) + TEST_ERROR + if (H5Tset_tag(type, "opaque source type") < 0) + TEST_ERROR - if ((size=H5Tget_size(type))==0) goto error; + if ((size = H5Tget_size(type)) == 0) + goto error; - H5E_BEGIN_TRY { - ret=H5Tset_precision(type, (size_t)32); - } H5E_END_TRY; - if (ret>=0) { + H5E_BEGIN_TRY { ret = H5Tset_precision(type, (size_t)32); } + H5E_END_TRY; + if (ret >= 0) { HDprintf("Operation not allowed for this type.\n"); TEST_ERROR } /* end if */ - H5E_BEGIN_TRY { - ret=H5Tset_pad(type, H5T_PAD_ZERO, H5T_PAD_ONE); - } H5E_END_TRY; - if (ret>=0) { + H5E_BEGIN_TRY { ret = H5Tset_pad(type, H5T_PAD_ZERO, H5T_PAD_ONE); } + H5E_END_TRY; + if (ret >= 0) { HDprintf("Operation not allowed for this type.\n"); TEST_ERROR } /* end if */ - H5E_BEGIN_TRY { - size=H5Tget_ebias(type); - } H5E_END_TRY; - if (size>0) { + H5E_BEGIN_TRY { size = H5Tget_ebias(type); } + H5E_END_TRY; + if (size > 0) { HDprintf("Operation not allowed for this type.\n"); TEST_ERROR } /* end if */ - H5E_BEGIN_TRY { - inpad=H5Tget_inpad(type); - } H5E_END_TRY; - if (inpad>-1) { + H5E_BEGIN_TRY { inpad = H5Tget_inpad(type); } + H5E_END_TRY; + if (inpad > -1) { HDprintf("Operation not allowed for this type.\n"); TEST_ERROR } /* end if */ - H5E_BEGIN_TRY { - cset=H5Tget_cset(type); - } H5E_END_TRY; - if (cset>-1) { + H5E_BEGIN_TRY { cset = H5Tget_cset(type); } + H5E_END_TRY; + if (cset > -1) { HDprintf("Operation not allowed for this type.\n"); TEST_ERROR } /* end if */ - H5E_BEGIN_TRY { - strpad=H5Tget_strpad(type); - } H5E_END_TRY; - if (strpad>-1) { + H5E_BEGIN_TRY { strpad = H5Tget_strpad(type); } + H5E_END_TRY; + if (strpad > -1) { HDprintf("Operation not allowed for this type.\n"); TEST_ERROR } /* end if */ - H5E_BEGIN_TRY { - ret=H5Tset_offset(type, (size_t)16); - } H5E_END_TRY; - if (ret>=0) { + H5E_BEGIN_TRY { ret = H5Tset_offset(type, (size_t)16); } + H5E_END_TRY; + if (ret >= 0) { HDprintf("Operation not allowed for this type.\n"); TEST_ERROR } /* end if */ - H5E_BEGIN_TRY { - sign = H5Tget_sign(type); - } H5E_END_TRY; - if (sign>-1) { + H5E_BEGIN_TRY { sign = H5Tget_sign(type); } + H5E_END_TRY; + if (sign > -1) { HDprintf("Operation not allowed for this type.\n"); TEST_ERROR } /* end if */ - H5E_BEGIN_TRY { - super = H5Tget_super(type); - } H5E_END_TRY; - if (super>=0) { + H5E_BEGIN_TRY { super = H5Tget_super(type); } + H5E_END_TRY; + if (super >= 0) { HDprintf("Operation not allowed for this type.\n"); TEST_ERROR } /* end if */ /* Close datatype */ - if(H5Tclose(type) < 0) TEST_ERROR + if (H5Tclose(type) < 0) + TEST_ERROR return 0; - error: - if (type>0) H5Tclose(type); +error: + if (type > 0) + H5Tclose(type); return 1; } - /*------------------------------------------------------------------------- * Function: test_encode * @@ -5257,24 +5700,24 @@ test_encode(void) long c; double d; }; - hid_t file=-1, tid1=-1, tid2=-1, tid3=-1; - hid_t decoded_tid1=-1, decoded_tid2=-1, decoded_tid3=-1; - char filename[1024]; - char compnd_type[]="Compound_type", enum_type[]="Enum_type"; - char vlstr_type[]="VLstring_type"; - short enum_val; - size_t cmpd_buf_size = 0; - size_t enum_buf_size = 0; - size_t vlstr_buf_size = 0; - unsigned char *cmpd_buf=NULL, *enum_buf=NULL, *vlstr_buf=NULL; - hid_t ret_id; - herr_t ret; + hid_t file = -1, tid1 = -1, tid2 = -1, tid3 = -1; + hid_t decoded_tid1 = -1, decoded_tid2 = -1, decoded_tid3 = -1; + char filename[1024]; + char compnd_type[] = "Compound_type", enum_type[] = "Enum_type"; + char vlstr_type[] = "VLstring_type"; + short enum_val; + size_t cmpd_buf_size = 0; + size_t enum_buf_size = 0; + size_t vlstr_buf_size = 0; + unsigned char *cmpd_buf = NULL, *enum_buf = NULL, *vlstr_buf = NULL; + hid_t ret_id; + herr_t ret; TESTING("functions of encoding and decoding datatypes"); /* Create File */ h5_fixname(FILENAME[5], H5P_DEFAULT, filename, sizeof filename); - if((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto error; /*----------------------------------------------------------------------- @@ -5282,71 +5725,71 @@ test_encode(void) *----------------------------------------------------------------------- */ /* Create a compound datatype */ - if((tid1=H5Tcreate(H5T_COMPOUND, sizeof(struct s1))) < 0) { + if ((tid1 = H5Tcreate(H5T_COMPOUND, sizeof(struct s1))) < 0) { H5_FAILED(); HDprintf("Can't create datatype!\n"); goto error; } /* end if */ - if(H5Tinsert(tid1, "a", HOFFSET(struct s1, a), H5T_NATIVE_INT) < 0) { + if (H5Tinsert(tid1, "a", HOFFSET(struct s1, a), H5T_NATIVE_INT) < 0) { H5_FAILED(); HDprintf("Can't insert field 'a'\n"); goto error; } /* end if */ - if(H5Tinsert(tid1, "b", HOFFSET(struct s1, b), H5T_NATIVE_FLOAT) < 0) { + if (H5Tinsert(tid1, "b", HOFFSET(struct s1, b), H5T_NATIVE_FLOAT) < 0) { H5_FAILED(); HDprintf("Can't insert field 'b'\n"); goto error; } /* end if */ - if(H5Tinsert(tid1, "c", HOFFSET(struct s1, c), H5T_NATIVE_LONG) < 0) { + if (H5Tinsert(tid1, "c", HOFFSET(struct s1, c), H5T_NATIVE_LONG) < 0) { H5_FAILED(); HDprintf("Can't insert field 'c'\n"); goto error; } /* end if */ - if(H5Tinsert(tid1, "d", HOFFSET(struct s1, d), H5T_NATIVE_DOUBLE) < 0) { + if (H5Tinsert(tid1, "d", HOFFSET(struct s1, d), H5T_NATIVE_DOUBLE) < 0) { H5_FAILED(); HDprintf("Can't insert field 'd'\n"); goto error; } /* end if */ /* Create a enumerate datatype */ - if((tid2=H5Tcreate(H5T_ENUM, sizeof(short))) < 0) { + if ((tid2 = H5Tcreate(H5T_ENUM, sizeof(short))) < 0) { H5_FAILED(); HDprintf("Can't create enumerate type\n"); goto error; } /* end if */ - if(H5Tenum_insert(tid2, "RED", (enum_val=0,&enum_val)) < 0) { + if (H5Tenum_insert(tid2, "RED", (enum_val = 0, &enum_val)) < 0) { H5_FAILED(); HDprintf("Can't insert field into enumeration type\n"); goto error; } /* end if */ - if(H5Tenum_insert(tid2, "GREEN", (enum_val=1,&enum_val)) < 0) { + if (H5Tenum_insert(tid2, "GREEN", (enum_val = 1, &enum_val)) < 0) { H5_FAILED(); HDprintf("Can't insert field into enumeration type\n"); goto error; } /* end if */ - if(H5Tenum_insert(tid2, "BLUE", (enum_val=2,&enum_val)) < 0) { + if (H5Tenum_insert(tid2, "BLUE", (enum_val = 2, &enum_val)) < 0) { H5_FAILED(); HDprintf("Can't insert field into enumeration type\n"); goto error; } /* end if */ - if(H5Tenum_insert(tid2, "ORANGE", (enum_val=3,&enum_val)) < 0) { + if (H5Tenum_insert(tid2, "ORANGE", (enum_val = 3, &enum_val)) < 0) { H5_FAILED(); HDprintf("Can't insert field into enumeration type\n"); goto error; } /* end if */ - if(H5Tenum_insert(tid2, "YELLOW", (enum_val=4,&enum_val)) < 0) { + if (H5Tenum_insert(tid2, "YELLOW", (enum_val = 4, &enum_val)) < 0) { H5_FAILED(); HDprintf("Can't insert field into enumeration type\n"); goto error; } /* end if */ /* Create a variable-length string type */ - if((tid3 = H5Tcopy(H5T_C_S1)) < 0) { + if ((tid3 = H5Tcopy(H5T_C_S1)) < 0) { H5_FAILED(); HDprintf("Can't copy a string type\n"); goto error; } /* end if */ - if(H5Tset_size(tid3, H5T_VARIABLE) < 0) { + if (H5Tset_size(tid3, H5T_VARIABLE) < 0) { H5_FAILED(); HDprintf("Can't the string type to be variable-length\n"); goto error; @@ -5357,128 +5800,125 @@ test_encode(void) *----------------------------------------------------------------------- */ /* Encode compound type in a buffer */ - if(H5Tencode(tid1, NULL, &cmpd_buf_size) < 0) { + if (H5Tencode(tid1, NULL, &cmpd_buf_size) < 0) { H5_FAILED(); HDprintf("Can't encode compound type\n"); goto error; } /* end if */ - if(cmpd_buf_size>0) - cmpd_buf = (unsigned char*)HDcalloc((size_t)1, cmpd_buf_size); + if (cmpd_buf_size > 0) + cmpd_buf = (unsigned char *)HDcalloc((size_t)1, cmpd_buf_size); /* Try decoding bogus buffer */ - H5E_BEGIN_TRY { - ret_id = H5Tdecode(cmpd_buf); - } H5E_END_TRY; - if(ret_id!=FAIL) { + H5E_BEGIN_TRY { ret_id = H5Tdecode(cmpd_buf); } + H5E_END_TRY; + if (ret_id != FAIL) { H5_FAILED(); HDprintf("Decoded bogus buffer!\n"); goto error; } - if(H5Tencode(tid1, cmpd_buf, &cmpd_buf_size) < 0) { + if (H5Tencode(tid1, cmpd_buf, &cmpd_buf_size) < 0) { H5_FAILED(); HDprintf("Can't encode compound type\n"); goto error; } /* end if */ /* Decode from the compound buffer and return an object handle */ - if((decoded_tid1 = H5Tdecode(cmpd_buf)) < 0) + if ((decoded_tid1 = H5Tdecode(cmpd_buf)) < 0) FAIL_PUTS_ERROR("Can't decode compound type\n") /* Verify that the datatype was copied exactly */ - if(H5Tequal(decoded_tid1, tid1)<=0) { + if (H5Tequal(decoded_tid1, tid1) <= 0) { H5_FAILED(); HDprintf("Datatype wasn't encoded & decoded identically\n"); goto error; } /* end if */ /* Query member number and member index by name, for compound type. */ - if(H5Tget_nmembers(decoded_tid1)!=4) { + if (H5Tget_nmembers(decoded_tid1) != 4) { H5_FAILED(); HDprintf("Can't get member number\n"); goto error; } /* end if */ - if(H5Tget_member_index(decoded_tid1, "c")!=2) { + if (H5Tget_member_index(decoded_tid1, "c") != 2) { H5_FAILED(); HDprintf("Can't get correct index number\n"); goto error; } /* end if */ - /* Encode enumerate type in a buffer */ - if(H5Tencode(tid2, NULL, &enum_buf_size) < 0) { + if (H5Tencode(tid2, NULL, &enum_buf_size) < 0) { H5_FAILED(); HDprintf("Can't encode enumerate type\n"); goto error; } /* end if */ - if(enum_buf_size>0) - enum_buf = (unsigned char*)HDcalloc((size_t)1, enum_buf_size); + if (enum_buf_size > 0) + enum_buf = (unsigned char *)HDcalloc((size_t)1, enum_buf_size); - if(H5Tencode(tid2, enum_buf, &enum_buf_size) < 0) { + if (H5Tencode(tid2, enum_buf, &enum_buf_size) < 0) { H5_FAILED(); HDprintf("Can't encode enumerate type\n"); goto error; } /* end if */ /* Decode from the enumerate buffer and return an object handle */ - if((decoded_tid2=H5Tdecode(enum_buf)) < 0) { + if ((decoded_tid2 = H5Tdecode(enum_buf)) < 0) { H5_FAILED(); HDprintf("Can't decode enumerate type\n"); goto error; } /* end if */ /* Verify that the datatype was copied exactly */ - if(H5Tequal(decoded_tid2, tid2)<=0) { + if (H5Tequal(decoded_tid2, tid2) <= 0) { H5_FAILED(); HDprintf("Datatype wasn't encoded & decoded identically\n"); goto error; } /* end if */ /* Query member number and member index by name, for enumeration type. */ - if(H5Tget_nmembers(decoded_tid2)!=5) { + if (H5Tget_nmembers(decoded_tid2) != 5) { H5_FAILED(); HDprintf("Can't get member number\n"); goto error; } /* end if */ - if(H5Tget_member_index(decoded_tid2, "ORANGE") != 3) { + if (H5Tget_member_index(decoded_tid2, "ORANGE") != 3) { H5_FAILED(); HDprintf("Can't get correct index number\n"); goto error; } /* end if */ - /* Encode VL string type in a buffer */ - if(H5Tencode(tid3, NULL, &vlstr_buf_size) < 0) { + if (H5Tencode(tid3, NULL, &vlstr_buf_size) < 0) { H5_FAILED(); HDprintf("Can't encode VL string type\n"); goto error; } /* end if */ - if(vlstr_buf_size>0) - vlstr_buf = (unsigned char*)HDcalloc((size_t)1, vlstr_buf_size); + if (vlstr_buf_size > 0) + vlstr_buf = (unsigned char *)HDcalloc((size_t)1, vlstr_buf_size); - if(H5Tencode(tid3, vlstr_buf, &vlstr_buf_size) < 0) { + if (H5Tencode(tid3, vlstr_buf, &vlstr_buf_size) < 0) { H5_FAILED(); HDprintf("Can't encode VL string type\n"); goto error; } /* end if */ /* Decode from the VL string buffer and return an object handle */ - if((decoded_tid3=H5Tdecode(vlstr_buf)) < 0) { + if ((decoded_tid3 = H5Tdecode(vlstr_buf)) < 0) { H5_FAILED(); HDprintf("Can't decode VL string type\n"); goto error; } /* end if */ /* Verify that the datatype was copied exactly */ - if(H5Tequal(decoded_tid3, tid3)<=0) { + if (H5Tequal(decoded_tid3, tid3) <= 0) { H5_FAILED(); HDprintf("Datatype wasn't encoded & decoded identically\n"); goto error; } /* end if */ - if(!H5Tis_variable_str(decoded_tid3)) { + if (!H5Tis_variable_str(decoded_tid3)) { H5_FAILED(); HDprintf("Datatype wasn't encoded & decoded identically\n"); goto error; @@ -5489,17 +5929,17 @@ test_encode(void) *----------------------------------------------------------------------- */ /* Commit compound datatype and close it */ - if(H5Tcommit2(file, compnd_type, tid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { + if (H5Tcommit2(file, compnd_type, tid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); HDprintf("Can't commit compound datatype\n"); goto error; } /* end if */ - if(H5Tclose(tid1) < 0) { + if (H5Tclose(tid1) < 0) { H5_FAILED(); HDprintf("Can't close datatype\n"); goto error; } /* end if */ - if(H5Tclose(decoded_tid1) < 0) { + if (H5Tclose(decoded_tid1) < 0) { H5_FAILED(); HDprintf("Can't close datatype\n"); goto error; @@ -5508,17 +5948,17 @@ test_encode(void) cmpd_buf_size = 0; /* Commit enumeration datatype and close it */ - if(H5Tcommit2(file, enum_type, tid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { + if (H5Tcommit2(file, enum_type, tid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); HDprintf("Can't commit compound datatype\n"); goto error; } /* end if */ - if(H5Tclose(tid2) < 0) { + if (H5Tclose(tid2) < 0) { H5_FAILED(); HDprintf("Can't close datatype\n"); goto error; } /* end if */ - if(H5Tclose(decoded_tid2) < 0) { + if (H5Tclose(decoded_tid2) < 0) { H5_FAILED(); HDprintf("Can't close datatype\n"); goto error; @@ -5527,17 +5967,17 @@ test_encode(void) enum_buf_size = 0; /* Commit enumeration datatype and close it */ - if(H5Tcommit2(file, vlstr_type, tid3, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { + if (H5Tcommit2(file, vlstr_type, tid3, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); HDprintf("Can't commit vl string datatype\n"); goto error; } /* end if */ - if(H5Tclose(tid3) < 0) { + if (H5Tclose(tid3) < 0) { H5_FAILED(); HDprintf("Can't close datatype\n"); goto error; } /* end if */ - if(H5Tclose(decoded_tid3) < 0) { + if (H5Tclose(decoded_tid3) < 0) { H5_FAILED(); HDprintf("Can't close datatype\n"); goto error; @@ -5546,11 +5986,11 @@ test_encode(void) vlstr_buf_size = 0; /* Open the dataytpe for query */ - if((tid1 = H5Topen2(file, compnd_type, H5P_DEFAULT)) < 0) + if ((tid1 = H5Topen2(file, compnd_type, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if((tid2 = H5Topen2(file, enum_type, H5P_DEFAULT)) < 0) + if ((tid2 = H5Topen2(file, enum_type, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if((tid3 = H5Topen2(file, vlstr_type, H5P_DEFAULT)) < 0) + if ((tid3 = H5Topen2(file, vlstr_type, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR /*----------------------------------------------------------------------- @@ -5558,104 +5998,104 @@ test_encode(void) *----------------------------------------------------------------------- */ /* Encode compound type in a buffer */ - if(H5Tencode(tid1, NULL, &cmpd_buf_size) < 0) { + if (H5Tencode(tid1, NULL, &cmpd_buf_size) < 0) { H5_FAILED(); HDprintf("Can't encode compound type\n"); goto error; } /* end if */ - if(cmpd_buf_size>0) - cmpd_buf = (unsigned char*)HDcalloc((size_t)1, cmpd_buf_size); + if (cmpd_buf_size > 0) + cmpd_buf = (unsigned char *)HDcalloc((size_t)1, cmpd_buf_size); - if(H5Tencode(tid1, cmpd_buf, &cmpd_buf_size) < 0) { + if (H5Tencode(tid1, cmpd_buf, &cmpd_buf_size) < 0) { H5_FAILED(); HDprintf("Can't encode compound type\n"); goto error; } /* end if */ /* Decode from the compound buffer and return an object handle */ - if((decoded_tid1 = H5Tdecode(cmpd_buf)) < 0) + if ((decoded_tid1 = H5Tdecode(cmpd_buf)) < 0) FAIL_PUTS_ERROR("Can't decode compound type\n") /* Verify that the datatype was copied exactly */ - if(H5Tequal(decoded_tid1, tid1)<=0) { + if (H5Tequal(decoded_tid1, tid1) <= 0) { H5_FAILED(); HDprintf("Datatype wasn't encoded & decoded identically\n"); goto error; } /* end if */ /* Query member number and member index by name, for compound type. */ - if(H5Tget_nmembers(decoded_tid1)!=4) { + if (H5Tget_nmembers(decoded_tid1) != 4) { H5_FAILED(); HDprintf("Can't get member number\n"); goto error; } /* end if */ - if(H5Tget_member_index(decoded_tid1, "c")!=2) { + if (H5Tget_member_index(decoded_tid1, "c") != 2) { H5_FAILED(); HDprintf("Can't get correct index number\n"); goto error; } /* end if */ /* Encode enumerate type in a buffer */ - if(H5Tencode(tid2, NULL, &enum_buf_size) < 0) { + if (H5Tencode(tid2, NULL, &enum_buf_size) < 0) { H5_FAILED(); HDprintf("Can't encode enumerate type\n"); goto error; } /* end if */ - if(enum_buf_size>0) - enum_buf = (unsigned char*)HDcalloc((size_t)1, enum_buf_size); + if (enum_buf_size > 0) + enum_buf = (unsigned char *)HDcalloc((size_t)1, enum_buf_size); - if(H5Tencode(tid2, enum_buf, &enum_buf_size) < 0) { + if (H5Tencode(tid2, enum_buf, &enum_buf_size) < 0) { H5_FAILED(); HDprintf("Can't encode enumerate type\n"); goto error; } /* end if */ /* Decode from the enumerate buffer and return an object handle */ - if((decoded_tid2=H5Tdecode(enum_buf)) < 0) { + if ((decoded_tid2 = H5Tdecode(enum_buf)) < 0) { H5_FAILED(); HDprintf("Can't decode enumerate type\n"); goto error; } /* end if */ /* Verify that the datatype was copied exactly */ - if(H5Tequal(decoded_tid2, tid2)<=0) { + if (H5Tequal(decoded_tid2, tid2) <= 0) { H5_FAILED(); HDprintf("Datatype wasn't encoded & decoded identically\n"); goto error; } /* end if */ /* Query member number and member index by name, for enumeration type. */ - if(H5Tget_nmembers(decoded_tid2)!=5) { + if (H5Tget_nmembers(decoded_tid2) != 5) { H5_FAILED(); HDprintf("Can't get member number\n"); goto error; } /* end if */ - if(H5Tget_member_index(decoded_tid2, "ORANGE")!=3) { + if (H5Tget_member_index(decoded_tid2, "ORANGE") != 3) { H5_FAILED(); HDprintf("Can't get correct index number\n"); goto error; } /* end if */ /* Encode VL string type in a buffer */ - if(H5Tencode(tid3, NULL, &vlstr_buf_size) < 0) { + if (H5Tencode(tid3, NULL, &vlstr_buf_size) < 0) { H5_FAILED(); HDprintf("Can't encode VL string type\n"); goto error; } /* end if */ - if(vlstr_buf_size > 0) - vlstr_buf = (unsigned char*)HDcalloc((size_t)1, vlstr_buf_size); + if (vlstr_buf_size > 0) + vlstr_buf = (unsigned char *)HDcalloc((size_t)1, vlstr_buf_size); - if(H5Tencode(tid3, vlstr_buf, &vlstr_buf_size) < 0) { + if (H5Tencode(tid3, vlstr_buf, &vlstr_buf_size) < 0) { H5_FAILED(); HDprintf("Can't encode VL string type\n"); goto error; } /* end if */ /* Decode from the VL string buffer and return an object handle */ - if((decoded_tid3=H5Tdecode(vlstr_buf)) < 0) { + if ((decoded_tid3 = H5Tdecode(vlstr_buf)) < 0) { H5_FAILED(); HDprintf("Can't decode VL string type\n"); goto error; @@ -5663,12 +6103,12 @@ test_encode(void) HDfree(vlstr_buf); /* Verify that the datatype was copied exactly */ - if(H5Tequal(decoded_tid3, tid3)<=0) { + if (H5Tequal(decoded_tid3, tid3) <= 0) { H5_FAILED(); HDprintf("Datatype wasn't encoded & decoded identically\n"); goto error; } /* end if */ - if(!H5Tis_variable_str(decoded_tid3)) { + if (!H5Tis_variable_str(decoded_tid3)) { H5_FAILED(); HDprintf("Datatype wasn't encoded & decoded identically\n"); goto error; @@ -5680,19 +6120,19 @@ test_encode(void) */ /* Make sure the reference counts for the decoded datatypes are one. */ - if(H5Iget_ref(decoded_tid1) != 1) { + if (H5Iget_ref(decoded_tid1) != 1) { H5_FAILED(); HDprintf("Decoded datatype has incorrect reference count\n"); goto error; } /* end if */ - if(H5Iget_ref(decoded_tid2) != 1) { + if (H5Iget_ref(decoded_tid2) != 1) { H5_FAILED(); HDprintf("Decoded datatype has incorrect reference count\n"); goto error; } /* end if */ - if(H5Iget_ref(decoded_tid3) != 1) { + if (H5Iget_ref(decoded_tid3) != 1) { H5_FAILED(); HDprintf("Decoded datatype has incorrect reference count\n"); goto error; @@ -5700,47 +6140,44 @@ test_encode(void) /* Make sure the reference counts for the decoded datatypes can be * decremented and the datatypes are closed. */ - if(H5Idec_ref(decoded_tid1) != 0) { + if (H5Idec_ref(decoded_tid1) != 0) { H5_FAILED(); HDprintf("Decoded datatype can't close\n"); goto error; } /* end if */ - if(H5Idec_ref(decoded_tid2) != 0) { + if (H5Idec_ref(decoded_tid2) != 0) { H5_FAILED(); HDprintf("Decoded datatype can't close\n"); goto error; } /* end if */ - if(H5Idec_ref(decoded_tid3) != 0) { + if (H5Idec_ref(decoded_tid3) != 0) { H5_FAILED(); HDprintf("Decoded datatype can't close\n"); goto error; } /* end if */ /* Make sure the decoded datatypes are already closed. */ - H5E_BEGIN_TRY { - ret = H5Tclose(decoded_tid1); - } H5E_END_TRY; - if(ret!=FAIL) { + H5E_BEGIN_TRY { ret = H5Tclose(decoded_tid1); } + H5E_END_TRY; + if (ret != FAIL) { H5_FAILED(); HDprintf("Decoded datatype should have been closed\n"); goto error; } - H5E_BEGIN_TRY { - ret = H5Tclose(decoded_tid2); - } H5E_END_TRY; - if(ret!=FAIL) { + H5E_BEGIN_TRY { ret = H5Tclose(decoded_tid2); } + H5E_END_TRY; + if (ret != FAIL) { H5_FAILED(); HDprintf("Decoded datatype should have been closed\n"); goto error; } - H5E_BEGIN_TRY { - ret = H5Tclose(decoded_tid3); - } H5E_END_TRY; - if(ret!=FAIL) { + H5E_BEGIN_TRY { ret = H5Tclose(decoded_tid3); } + H5E_END_TRY; + if (ret != FAIL) { H5_FAILED(); HDprintf("Decoded datatype should have been closed\n"); goto error; @@ -5751,23 +6188,23 @@ test_encode(void) *----------------------------------------------------------------------- */ /* Close datatype and file */ - if(H5Tclose(tid1) < 0) { + if (H5Tclose(tid1) < 0) { H5_FAILED(); HDprintf("Can't close datatype\n"); goto error; } /* end if */ - if(H5Tclose(tid2) < 0) { + if (H5Tclose(tid2) < 0) { H5_FAILED(); HDprintf("Can't close datatype\n"); goto error; } /* end if */ - if(H5Tclose(tid3) < 0) { + if (H5Tclose(tid3) < 0) { H5_FAILED(); HDprintf("Can't close datatype\n"); goto error; } /* end if */ - if(H5Fclose(file) < 0) { + if (H5Fclose(file) < 0) { H5_FAILED(); HDprintf("Can't close file\n"); goto error; @@ -5779,20 +6216,21 @@ test_encode(void) PASSED(); return 0; - error: - H5E_BEGIN_TRY { - H5Tclose (tid1); - H5Tclose (tid2); - H5Tclose (tid3); - H5Tclose (decoded_tid1); - H5Tclose (decoded_tid2); - H5Tclose (decoded_tid3); - H5Fclose (file); - } H5E_END_TRY; +error: + H5E_BEGIN_TRY + { + H5Tclose(tid1); + H5Tclose(tid2); + H5Tclose(tid3); + H5Tclose(decoded_tid1); + H5Tclose(decoded_tid2); + H5Tclose(decoded_tid3); + H5Fclose(file); + } + H5E_END_TRY; return 1; } - /*------------------------------------------------------------------------- * Function: test_latest * @@ -5816,155 +6254,153 @@ test_latest(void) long c; double d; }; - hid_t file = (-1); /* File ID */ - hid_t tid1 = (-1), tid2 = (-1); /* Datatype ID */ - hid_t fapl = (-1); /* File access property list */ - H5O_native_info_t oi; /* Stat buffer for committed datatype */ - hsize_t old_dtype_oh_size; /* Size of object header with "old" format */ - hsize_t new_dtype_oh_size; /* Size of object header with "new" format */ - char filename[1024]; /* Buffer for filename */ - const char compnd_type[] = "Compound_type"; /* Name of committed datatype */ + hid_t file = (-1); /* File ID */ + hid_t tid1 = (-1), tid2 = (-1); /* Datatype ID */ + hid_t fapl = (-1); /* File access property list */ + H5O_native_info_t oi; /* Stat buffer for committed datatype */ + hsize_t old_dtype_oh_size; /* Size of object header with "old" format */ + hsize_t new_dtype_oh_size; /* Size of object header with "new" format */ + char filename[1024]; /* Buffer for filename */ + const char compnd_type[] = "Compound_type"; /* Name of committed datatype */ TESTING("encoding datatypes with the 'use the latest format' flag"); /* Create a compound datatype */ - if((tid1 = H5Tcreate(H5T_COMPOUND, sizeof(struct s1))) < 0) + if ((tid1 = H5Tcreate(H5T_COMPOUND, sizeof(struct s1))) < 0) FAIL_STACK_ERROR - if(H5Tinsert(tid1, "a", HOFFSET(struct s1, a), H5T_NATIVE_INT) < 0) + if (H5Tinsert(tid1, "a", HOFFSET(struct s1, a), H5T_NATIVE_INT) < 0) FAIL_STACK_ERROR - if(H5Tinsert(tid1, "b", HOFFSET(struct s1, b), H5T_NATIVE_FLOAT) < 0) + if (H5Tinsert(tid1, "b", HOFFSET(struct s1, b), H5T_NATIVE_FLOAT) < 0) FAIL_STACK_ERROR - if(H5Tinsert(tid1, "c", HOFFSET(struct s1, c), H5T_NATIVE_LONG) < 0) + if (H5Tinsert(tid1, "c", HOFFSET(struct s1, c), H5T_NATIVE_LONG) < 0) FAIL_STACK_ERROR - if(H5Tinsert(tid1, "d", HOFFSET(struct s1, d), H5T_NATIVE_DOUBLE) < 0) + if (H5Tinsert(tid1, "d", HOFFSET(struct s1, d), H5T_NATIVE_DOUBLE) < 0) FAIL_STACK_ERROR /* Create file using default FAPL */ h5_fixname(FILENAME[5], H5P_DEFAULT, filename, sizeof filename); - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR /* Make a copy of the datatype, to commit */ - if((tid2 = H5Tcopy(tid1)) < 0) + if ((tid2 = H5Tcopy(tid1)) < 0) FAIL_STACK_ERROR /* Commit compound datatype */ - if(H5Tcommit2(file, compnd_type, tid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) + if (H5Tcommit2(file, compnd_type, tid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR /* Get information about datatype on disk */ - if(H5Oget_native_info_by_name(file, compnd_type, &oi, H5O_NATIVE_INFO_HDR, H5P_DEFAULT) < 0) + if (H5Oget_native_info_by_name(file, compnd_type, &oi, H5O_NATIVE_INFO_HDR, H5P_DEFAULT) < 0) FAIL_STACK_ERROR old_dtype_oh_size = oi.hdr.space.total; /* Close datatype */ - if(H5Tclose(tid2) < 0) + if (H5Tclose(tid2) < 0) FAIL_STACK_ERROR /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) FAIL_STACK_ERROR /* Check that datatype has been encoded/decoded correctly */ - if((file = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) + if ((file = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR /* Open the dataytpe for query */ - if((tid2 = H5Topen2(file, compnd_type, H5P_DEFAULT)) < 0) + if ((tid2 = H5Topen2(file, compnd_type, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR /* Verify that the datatype was encoded/decoded correctly */ - if(H5Tequal(tid1, tid2) <= 0) + if (H5Tequal(tid1, tid2) <= 0) FAIL_STACK_ERROR /* Get information about datatype on disk */ - if(H5Oget_native_info_by_name(file, compnd_type, &oi, H5O_NATIVE_INFO_HDR, H5P_DEFAULT) < 0) + if (H5Oget_native_info_by_name(file, compnd_type, &oi, H5O_NATIVE_INFO_HDR, H5P_DEFAULT) < 0) FAIL_STACK_ERROR /* Check that the object header info is still the same */ - if(old_dtype_oh_size != oi.hdr.space.total) + if (old_dtype_oh_size != oi.hdr.space.total) TEST_ERROR /* Close datatype */ - if(H5Tclose(tid2) < 0) + if (H5Tclose(tid2) < 0) FAIL_STACK_ERROR /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) FAIL_STACK_ERROR - /* Set the 'use the latest format' bounds in the FAPL */ - if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) + if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) FAIL_STACK_ERROR - if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) + if (H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) FAIL_STACK_ERROR /* Create file using default FAPL */ h5_fixname(FILENAME[5], 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) FAIL_STACK_ERROR /* Make a copy of the datatype, to commit */ - if((tid2 = H5Tcopy(tid1)) < 0) + if ((tid2 = H5Tcopy(tid1)) < 0) FAIL_STACK_ERROR /* Commit compound datatype */ - if(H5Tcommit2(file, compnd_type, tid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) + if (H5Tcommit2(file, compnd_type, tid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR /* Get information about datatype on disk */ - if(H5Oget_native_info_by_name(file, compnd_type, &oi, H5O_NATIVE_INFO_HDR, H5P_DEFAULT) < 0) + if (H5Oget_native_info_by_name(file, compnd_type, &oi, H5O_NATIVE_INFO_HDR, H5P_DEFAULT) < 0) FAIL_STACK_ERROR new_dtype_oh_size = oi.hdr.space.total; /* Check that the new format is smaller than the old format */ - if(old_dtype_oh_size <= new_dtype_oh_size) + if (old_dtype_oh_size <= new_dtype_oh_size) TEST_ERROR /* Close datatype */ - if(H5Tclose(tid2) < 0) + if (H5Tclose(tid2) < 0) FAIL_STACK_ERROR /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) FAIL_STACK_ERROR /* Check that datatype has been encoded/decoded correctly */ - if((file = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0) + if ((file = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0) FAIL_STACK_ERROR /* Open the dataytpe for query */ - if((tid2 = H5Topen2(file, compnd_type, H5P_DEFAULT)) < 0) + if ((tid2 = H5Topen2(file, compnd_type, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR /* Verify that the datatype was encoded/decoded correctly */ - if(H5Tequal(tid1, tid2) <= 0) + if (H5Tequal(tid1, tid2) <= 0) FAIL_STACK_ERROR /* Get information about datatype on disk */ - if(H5Oget_native_info_by_name(file, compnd_type, &oi, H5O_NATIVE_INFO_HDR, H5P_DEFAULT) < 0) + if (H5Oget_native_info_by_name(file, compnd_type, &oi, H5O_NATIVE_INFO_HDR, H5P_DEFAULT) < 0) FAIL_STACK_ERROR /* Check that the object header info is still the same */ - if(new_dtype_oh_size != oi.hdr.space.total) + if (new_dtype_oh_size != oi.hdr.space.total) TEST_ERROR /* Close datatype */ - if(H5Tclose(tid2) < 0) + if (H5Tclose(tid2) < 0) FAIL_STACK_ERROR /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) FAIL_STACK_ERROR - /* Close FAPL */ - if(H5Pclose(fapl) < 0) + if (H5Pclose(fapl) < 0) FAIL_STACK_ERROR /* Close datatype */ - if(H5Tclose(tid1) < 0) + if (H5Tclose(tid1) < 0) FAIL_STACK_ERROR PASSED(); @@ -5972,45 +6408,46 @@ test_latest(void) return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Tclose(tid2); H5Tclose(tid1); H5Fclose(file); H5Pclose(fapl); - } H5E_END_TRY; + } + H5E_END_TRY; return 1; } /* end test_latest() */ typedef struct { - unsigned num_range_hi; /* Number of H5T_CONV_EXCEPT_RANGE_HI exceptions seen */ - unsigned num_range_low; /* Number of H5T_CONV_EXCEPT_RANGE_LOW exceptions seen */ - unsigned num_precision; /* Number of H5T_CONV_EXCEPT_PRECISION exceptions seen */ - unsigned num_truncate; /* Number of H5T_CONV_EXCEPT_TRUNCATE exceptions seen */ - unsigned num_other; /* Number of other exceptions seen */ + unsigned num_range_hi; /* Number of H5T_CONV_EXCEPT_RANGE_HI exceptions seen */ + unsigned num_range_low; /* Number of H5T_CONV_EXCEPT_RANGE_LOW exceptions seen */ + unsigned num_precision; /* Number of H5T_CONV_EXCEPT_PRECISION exceptions seen */ + unsigned num_truncate; /* Number of H5T_CONV_EXCEPT_TRUNCATE exceptions seen */ + unsigned num_other; /* Number of other exceptions seen */ } except_info_t; static H5T_conv_ret_t conv_except(H5T_conv_except_t except_type, hid_t H5_ATTR_UNUSED src_id, hid_t H5_ATTR_UNUSED dst_id, - void H5_ATTR_UNUSED *src_buf, void H5_ATTR_UNUSED *dst_buf, void *_user_data) + void H5_ATTR_UNUSED *src_buf, void H5_ATTR_UNUSED *dst_buf, void *_user_data) { except_info_t *user_data = (except_info_t *)_user_data; - if(except_type == H5T_CONV_EXCEPT_RANGE_HI) + if (except_type == H5T_CONV_EXCEPT_RANGE_HI) user_data->num_range_hi++; - else if(except_type == H5T_CONV_EXCEPT_RANGE_LOW) + else if (except_type == H5T_CONV_EXCEPT_RANGE_LOW) user_data->num_range_low++; - else if(except_type == H5T_CONV_EXCEPT_PRECISION) + else if (except_type == H5T_CONV_EXCEPT_PRECISION) user_data->num_precision++; - else if(except_type == H5T_CONV_EXCEPT_TRUNCATE) + else if (except_type == H5T_CONV_EXCEPT_TRUNCATE) user_data->num_truncate++; else user_data->num_other++; - return(H5T_CONV_UNHANDLED); + return (H5T_CONV_UNHANDLED); } - /*------------------------------------------------------------------------- * Function: test_int_float_except * @@ -6036,123 +6473,149 @@ conv_except(H5T_conv_except_t except_type, hid_t H5_ATTR_UNUSED src_id, hid_t H5 static int test_int_float_except(void) { -#if H5_SIZEOF_INT==4 && H5_SIZEOF_FLOAT==4 - float buf[CONVERT_SIZE] = {(float)INT_MIN - 172.0f, (float)INT_MAX - 32.0f, (float)INT_MAX - 68.0f, (float)4.5f}; - int buf_int[CONVERT_SIZE] = {INT_MIN, INT_MAX, INT_MAX-127, 4}; - float buf_float[CONVERT_SIZE] = {(float)INT_MIN, (float)INT_MAX + 1.0f, (float)INT_MAX - 127.0f, 4}; - int *intp; /* Pointer to buffer, as integers */ - int buf2[CONVERT_SIZE] = {INT_MIN, INT_MAX, INT_MAX - 72, 0}; - float buf2_float[CONVERT_SIZE] = {(float)INT_MIN, (float)INT_MAX, (float)INT_MAX - 127.0f, (float)0.0f}; - int buf2_int[CONVERT_SIZE] = {INT_MIN, INT_MAX, INT_MAX - 127, 0}; - float *floatp; /* Pointer to buffer #2, as floats */ - hid_t dxpl; /* Dataset transfer property list */ - except_info_t e; /* Exception information */ - unsigned u; /* Local index variables */ -#endif /* H5_SIZEOF_INT==4 && H5_SIZEOF_FLOAT==4 */ +#if H5_SIZEOF_INT == 4 && H5_SIZEOF_FLOAT == 4 + float buf[CONVERT_SIZE] = {(float)INT_MIN - 172.0f, (float)INT_MAX - 32.0f, (float)INT_MAX - 68.0f, + (float)4.5f}; + int buf_int[CONVERT_SIZE] = {INT_MIN, INT_MAX, INT_MAX - 127, 4}; + float buf_float[CONVERT_SIZE] = {(float)INT_MIN, (float)INT_MAX + 1.0f, (float)INT_MAX - 127.0f, 4}; + int * intp; /* Pointer to buffer, as integers */ + int buf2[CONVERT_SIZE] = {INT_MIN, INT_MAX, INT_MAX - 72, 0}; + float buf2_float[CONVERT_SIZE] = {(float)INT_MIN, (float)INT_MAX, (float)INT_MAX - 127.0f, (float)0.0f}; + int buf2_int[CONVERT_SIZE] = {INT_MIN, INT_MAX, INT_MAX - 127, 0}; + float *floatp; /* Pointer to buffer #2, as floats */ + hid_t dxpl; /* Dataset transfer property list */ + except_info_t e; /* Exception information */ + unsigned u; /* Local index variables */ +#endif /* H5_SIZEOF_INT==4 && H5_SIZEOF_FLOAT==4 */ TESTING("exceptions for int <-> float conversions"); -#if H5_SIZEOF_INT==4 && H5_SIZEOF_FLOAT==4 +#if H5_SIZEOF_INT == 4 && H5_SIZEOF_FLOAT == 4 /* Create dataset transfer property list */ - if((dxpl = H5Pcreate(H5P_DATASET_XFER) ) < 0) TEST_ERROR + if ((dxpl = H5Pcreate(H5P_DATASET_XFER)) < 0) + TEST_ERROR /* Set the conversion exception handler in the DXPL */ - if(H5Pset_type_conv_cb(dxpl, conv_except, &e) < 0) TEST_ERROR + if (H5Pset_type_conv_cb(dxpl, conv_except, &e) < 0) + TEST_ERROR /* Convert buffer */ HDmemset(&e, 0, sizeof(except_info_t)); - if(H5Tconvert(H5T_NATIVE_FLOAT, H5T_NATIVE_INT, (size_t)CONVERT_SIZE, buf, NULL, dxpl) < 0) TEST_ERROR + if (H5Tconvert(H5T_NATIVE_FLOAT, H5T_NATIVE_INT, (size_t)CONVERT_SIZE, buf, NULL, dxpl) < 0) + TEST_ERROR /* Check the buffer after conversion, as integers */ - for(u = 0; u < CONVERT_SIZE; u++) { + for (u = 0; u < CONVERT_SIZE; u++) { intp = (int *)&buf[u]; - if(*intp != buf_int[u]) TEST_ERROR + if (*intp != buf_int[u]) + TEST_ERROR } /* end for */ /* Check for proper exceptions */ - if(e.num_range_hi != 1) TEST_ERROR - if(e.num_range_low != 1) TEST_ERROR - if(e.num_precision != 0) TEST_ERROR - if(e.num_truncate != 1) TEST_ERROR - if(e.num_other != 0) TEST_ERROR + if (e.num_range_hi != 1) + TEST_ERROR + if (e.num_range_low != 1) + TEST_ERROR + if (e.num_precision != 0) + TEST_ERROR + if (e.num_truncate != 1) + TEST_ERROR + if (e.num_other != 0) + TEST_ERROR /* Convert buffer */ HDmemset(&e, 0, sizeof(except_info_t)); - if(H5Tconvert(H5T_NATIVE_INT, H5T_NATIVE_FLOAT, (size_t)CONVERT_SIZE, - buf, NULL, dxpl) < 0) TEST_ERROR + if (H5Tconvert(H5T_NATIVE_INT, H5T_NATIVE_FLOAT, (size_t)CONVERT_SIZE, buf, NULL, dxpl) < 0) + TEST_ERROR /* Check the buffer after conversion, as floats */ - for(u = 0; u < CONVERT_SIZE; u++) { + for (u = 0; u < CONVERT_SIZE; u++) { floatp = (float *)&buf[u]; - if(!H5_FLT_ABS_EQUAL(*floatp, buf_float[u])) TEST_ERROR + if (!H5_FLT_ABS_EQUAL(*floatp, buf_float[u])) + TEST_ERROR } /* end for */ /* Check for proper exceptions */ - if(e.num_range_hi != 0) TEST_ERROR - if(e.num_range_low != 0) TEST_ERROR - if(e.num_precision != 1) TEST_ERROR - if(e.num_truncate != 0) TEST_ERROR - if(e.num_other != 0) TEST_ERROR - + if (e.num_range_hi != 0) + TEST_ERROR + if (e.num_range_low != 0) + TEST_ERROR + if (e.num_precision != 1) + TEST_ERROR + if (e.num_truncate != 0) + TEST_ERROR + if (e.num_other != 0) + TEST_ERROR /* Work on second buffer */ /* Convert second buffer */ HDmemset(&e, 0, sizeof(except_info_t)); - if(H5Tconvert(H5T_NATIVE_INT, H5T_NATIVE_FLOAT, (size_t)CONVERT_SIZE, buf2, NULL, dxpl) < 0) + if (H5Tconvert(H5T_NATIVE_INT, H5T_NATIVE_FLOAT, (size_t)CONVERT_SIZE, buf2, NULL, dxpl) < 0) TEST_ERROR /* Check the buffer after conversion, as floats */ - for(u = 0; u < CONVERT_SIZE; u++) { + for (u = 0; u < CONVERT_SIZE; u++) { floatp = (float *)&buf2[u]; - if(!H5_FLT_ABS_EQUAL(*floatp, buf2_float[u])) TEST_ERROR + if (!H5_FLT_ABS_EQUAL(*floatp, buf2_float[u])) + TEST_ERROR } /* end for */ /* Check for proper exceptions */ - if(e.num_range_hi != 0) TEST_ERROR - if(e.num_range_low != 0) TEST_ERROR - if(e.num_precision != 2) TEST_ERROR - if(e.num_truncate != 0) TEST_ERROR - if(e.num_other != 0) TEST_ERROR + if (e.num_range_hi != 0) + TEST_ERROR + if (e.num_range_low != 0) + TEST_ERROR + if (e.num_precision != 2) + TEST_ERROR + if (e.num_truncate != 0) + TEST_ERROR + if (e.num_other != 0) + TEST_ERROR /* Convert buffer */ HDmemset(&e, 0, sizeof(except_info_t)); - if(H5Tconvert(H5T_NATIVE_FLOAT, H5T_NATIVE_INT, (size_t)CONVERT_SIZE, buf2, NULL, dxpl) < 0) + if (H5Tconvert(H5T_NATIVE_FLOAT, H5T_NATIVE_INT, (size_t)CONVERT_SIZE, buf2, NULL, dxpl) < 0) TEST_ERROR /* Check the buffer after conversion, as integers */ - for(u = 0; u < CONVERT_SIZE; u++) { + for (u = 0; u < CONVERT_SIZE; u++) { intp = (int *)&buf2[u]; - if(*intp != buf2_int[u]) TEST_ERROR + if (*intp != buf2_int[u]) + TEST_ERROR } /* end for */ /* Check for proper exceptions */ - if(e.num_range_hi != 1) TEST_ERROR - if(e.num_range_low != 0) TEST_ERROR - if(e.num_precision != 0) TEST_ERROR - if(e.num_truncate != 0) TEST_ERROR - if(e.num_other != 0) TEST_ERROR + if (e.num_range_hi != 1) + TEST_ERROR + if (e.num_range_low != 0) + TEST_ERROR + if (e.num_precision != 0) + TEST_ERROR + if (e.num_truncate != 0) + TEST_ERROR + if (e.num_other != 0) + TEST_ERROR /* Close DXPL */ - if(H5Pclose(dxpl) < 0) TEST_ERROR + if (H5Pclose(dxpl) < 0) + TEST_ERROR PASSED(); -#else /* H5_SIZEOF_INT==4 && H5_SIZEOF_FLOAT==4 */ +#else /* H5_SIZEOF_INT==4 && H5_SIZEOF_FLOAT==4 */ SKIPPED(); HDputs(" Test skipped due to int or float not 4 bytes."); #endif /* H5_SIZEOF_INT==4 && H5_SIZEOF_FLOAT==4 */ return 0; -#if H5_SIZEOF_INT==4 && H5_SIZEOF_FLOAT==4 +#if H5_SIZEOF_INT == 4 && H5_SIZEOF_FLOAT == 4 error: - H5E_BEGIN_TRY { - H5Pclose (dxpl); - } H5E_END_TRY; + H5E_BEGIN_TRY { H5Pclose(dxpl); } + H5E_END_TRY; return 1; #endif /* H5_SIZEOF_INT==4 && H5_SIZEOF_FLOAT==4 */ } /* end test_int_float_except() */ - /*------------------------------------------------------------------------- * Function: test_set_order * @@ -6170,150 +6633,222 @@ error: static int test_set_order(void) { - hid_t dtype; /* Datatype ID */ - H5T_order_t order; /* Byte order */ - hsize_t dims[2] = {3, 4}; /* Array dimenstions */ - herr_t ret; /* Generic return value */ + hid_t dtype; /* Datatype ID */ + H5T_order_t order; /* Byte order */ + hsize_t dims[2] = {3, 4}; /* Array dimenstions */ + herr_t ret; /* Generic return value */ TESTING("H5Tset/get_order"); /* Integer */ - if ((dtype = H5Tcopy(H5T_STD_I32BE)) < 0) TEST_ERROR - if (H5T_ORDER_BE != H5Tget_order(dtype)) TEST_ERROR; + if ((dtype = H5Tcopy(H5T_STD_I32BE)) < 0) + TEST_ERROR + if (H5T_ORDER_BE != H5Tget_order(dtype)) + TEST_ERROR; H5E_BEGIN_TRY - ret = H5Tset_order(dtype, H5T_ORDER_NONE); + ret = H5Tset_order(dtype, H5T_ORDER_NONE); H5E_END_TRY - if (ret >= 0) TEST_ERROR - if (H5Tset_order(dtype, H5T_ORDER_LE) < 0) TEST_ERROR - if (H5T_ORDER_LE != H5Tget_order(dtype)) TEST_ERROR; - if (H5Tclose(dtype) < 0) TEST_ERROR + if (ret >= 0) + TEST_ERROR + if (H5Tset_order(dtype, H5T_ORDER_LE) < 0) + TEST_ERROR + if (H5T_ORDER_LE != H5Tget_order(dtype)) + TEST_ERROR; + if (H5Tclose(dtype) < 0) + TEST_ERROR /* Float */ - if ((dtype = H5Tcopy(H5T_IEEE_F64LE)) < 0) TEST_ERROR - if (H5T_ORDER_LE != H5Tget_order(dtype)) TEST_ERROR; + if ((dtype = H5Tcopy(H5T_IEEE_F64LE)) < 0) + TEST_ERROR + if (H5T_ORDER_LE != H5Tget_order(dtype)) + TEST_ERROR; H5E_BEGIN_TRY - ret = H5Tset_order(dtype, H5T_ORDER_NONE); + ret = H5Tset_order(dtype, H5T_ORDER_NONE); H5E_END_TRY - if (ret >= 0) TEST_ERROR - if (H5Tset_order(dtype, H5T_ORDER_BE) < 0) TEST_ERROR - if (H5T_ORDER_BE != H5Tget_order(dtype)) TEST_ERROR; - if (H5Tclose(dtype) < 0) TEST_ERROR + if (ret >= 0) + TEST_ERROR + if (H5Tset_order(dtype, H5T_ORDER_BE) < 0) + TEST_ERROR + if (H5T_ORDER_BE != H5Tget_order(dtype)) + TEST_ERROR; + if (H5Tclose(dtype) < 0) + TEST_ERROR /* Time */ - if ((dtype = H5Tcopy(H5T_UNIX_D64BE)) < 0) TEST_ERROR - if (H5T_ORDER_BE != H5Tget_order(dtype)) TEST_ERROR; + if ((dtype = H5Tcopy(H5T_UNIX_D64BE)) < 0) + TEST_ERROR + if (H5T_ORDER_BE != H5Tget_order(dtype)) + TEST_ERROR; H5E_BEGIN_TRY - ret = H5Tset_order(dtype, H5T_ORDER_NONE); + ret = H5Tset_order(dtype, H5T_ORDER_NONE); H5E_END_TRY - if (ret >= 0) TEST_ERROR - if (H5Tset_order(dtype, H5T_ORDER_LE) < 0) TEST_ERROR - if (H5T_ORDER_LE != H5Tget_order(dtype)) TEST_ERROR; - if (H5Tclose(dtype) < 0) TEST_ERROR + if (ret >= 0) + TEST_ERROR + if (H5Tset_order(dtype, H5T_ORDER_LE) < 0) + TEST_ERROR + if (H5T_ORDER_LE != H5Tget_order(dtype)) + TEST_ERROR; + if (H5Tclose(dtype) < 0) + TEST_ERROR /* Fixed length string */ - if ((dtype = H5Tcopy(H5T_C_S1)) < 0) TEST_ERROR - if (H5Tset_size(dtype, (size_t)5) < 0) TEST_ERROR - if (H5T_ORDER_NONE != H5Tget_order(dtype)) TEST_ERROR; - if (H5Tset_order(dtype, H5T_ORDER_NONE) < 0) TEST_ERROR; - if (H5T_ORDER_NONE != H5Tget_order(dtype)) TEST_ERROR; + if ((dtype = H5Tcopy(H5T_C_S1)) < 0) + TEST_ERROR + if (H5Tset_size(dtype, (size_t)5) < 0) + TEST_ERROR + if (H5T_ORDER_NONE != H5Tget_order(dtype)) + TEST_ERROR; + if (H5Tset_order(dtype, H5T_ORDER_NONE) < 0) + TEST_ERROR; + if (H5T_ORDER_NONE != H5Tget_order(dtype)) + TEST_ERROR; /* Variable length string */ - if (H5Tset_size(dtype, H5T_VARIABLE) < 0) TEST_ERROR + if (H5Tset_size(dtype, H5T_VARIABLE) < 0) + TEST_ERROR H5E_BEGIN_TRY - ret = H5Tset_order(dtype, H5T_ORDER_NONE); + ret = H5Tset_order(dtype, H5T_ORDER_NONE); H5E_END_TRY - if (ret >= 0) TEST_ERROR - if (H5Tset_order(dtype, H5T_ORDER_BE) < 0) TEST_ERROR - if (H5T_ORDER_BE != H5Tget_order(dtype)) TEST_ERROR; - if (H5Tclose(dtype) < 0) TEST_ERROR + if (ret >= 0) + TEST_ERROR + if (H5Tset_order(dtype, H5T_ORDER_BE) < 0) + TEST_ERROR + if (H5T_ORDER_BE != H5Tget_order(dtype)) + TEST_ERROR; + if (H5Tclose(dtype) < 0) + TEST_ERROR /* Bitfield */ - if ((dtype = H5Tcopy(H5T_STD_B16LE)) < 0) TEST_ERROR - if (H5T_ORDER_LE != H5Tget_order(dtype)) TEST_ERROR; + if ((dtype = H5Tcopy(H5T_STD_B16LE)) < 0) + TEST_ERROR + if (H5T_ORDER_LE != H5Tget_order(dtype)) + TEST_ERROR; H5E_BEGIN_TRY - ret = H5Tset_order(dtype, H5T_ORDER_NONE); + ret = H5Tset_order(dtype, H5T_ORDER_NONE); H5E_END_TRY - if (ret >= 0) TEST_ERROR - if (H5Tset_order(dtype, H5T_ORDER_BE) < 0) TEST_ERROR - if (H5T_ORDER_BE != H5Tget_order(dtype)) TEST_ERROR; - if (H5Tclose(dtype) < 0) TEST_ERROR + if (ret >= 0) + TEST_ERROR + if (H5Tset_order(dtype, H5T_ORDER_BE) < 0) + TEST_ERROR + if (H5T_ORDER_BE != H5Tget_order(dtype)) + TEST_ERROR; + if (H5Tclose(dtype) < 0) + TEST_ERROR /* Opaque - No effect on the order */ - if ((dtype = H5Tcreate(H5T_OPAQUE, (size_t)96)) < 0) TEST_ERROR - if (H5T_ORDER_NONE != H5Tget_order(dtype)) TEST_ERROR; - if (H5Tset_order(dtype, H5T_ORDER_NONE) < 0) TEST_ERROR - if (H5Tset_order(dtype, H5T_ORDER_BE) < 0) TEST_ERROR - if (H5T_ORDER_NONE != H5Tget_order(dtype)) TEST_ERROR; - if (H5Tclose(dtype) < 0) TEST_ERROR + if ((dtype = H5Tcreate(H5T_OPAQUE, (size_t)96)) < 0) + TEST_ERROR + if (H5T_ORDER_NONE != H5Tget_order(dtype)) + TEST_ERROR; + if (H5Tset_order(dtype, H5T_ORDER_NONE) < 0) + TEST_ERROR + if (H5Tset_order(dtype, H5T_ORDER_BE) < 0) + TEST_ERROR + if (H5T_ORDER_NONE != H5Tget_order(dtype)) + TEST_ERROR; + if (H5Tclose(dtype) < 0) + TEST_ERROR /* Compound */ - if ((dtype = H5Tcreate(H5T_COMPOUND, (size_t)48)) < 0) TEST_ERROR + if ((dtype = H5Tcreate(H5T_COMPOUND, (size_t)48)) < 0) + TEST_ERROR H5E_BEGIN_TRY - ret = H5Tset_order(dtype, H5T_ORDER_BE); + ret = H5Tset_order(dtype, H5T_ORDER_BE); H5E_END_TRY - if (ret >= 0) TEST_ERROR - if ((order = H5Tget_order(dtype)) == H5T_ORDER_ERROR) TEST_ERROR - if (order != H5T_ORDER_NONE) TEST_ERROR - if (H5Tclose(dtype) < 0) TEST_ERROR + if (ret >= 0) + TEST_ERROR + if ((order = H5Tget_order(dtype)) == H5T_ORDER_ERROR) + TEST_ERROR + if (order != H5T_ORDER_NONE) + TEST_ERROR + if (H5Tclose(dtype) < 0) + TEST_ERROR /* Object reference */ - if ((dtype = H5Tcopy(H5T_STD_REF_OBJ)) < 0) TEST_ERROR - if (H5T_ORDER_NONE != H5Tget_order(dtype)) TEST_ERROR; - if (H5Tset_order(dtype, H5T_ORDER_NONE) < 0) TEST_ERROR; - if (H5T_ORDER_NONE != H5Tget_order(dtype)) TEST_ERROR; - if (H5Tclose(dtype) < 0) TEST_ERROR + if ((dtype = H5Tcopy(H5T_STD_REF_OBJ)) < 0) + TEST_ERROR + if (H5T_ORDER_NONE != H5Tget_order(dtype)) + TEST_ERROR; + if (H5Tset_order(dtype, H5T_ORDER_NONE) < 0) + TEST_ERROR; + if (H5T_ORDER_NONE != H5Tget_order(dtype)) + TEST_ERROR; + if (H5Tclose(dtype) < 0) + TEST_ERROR /* Region reference */ - if ((dtype = H5Tcopy(H5T_STD_REF_DSETREG)) < 0) TEST_ERROR - if (H5T_ORDER_NONE != H5Tget_order(dtype)) TEST_ERROR; - if (H5Tset_order(dtype, H5T_ORDER_NONE) < 0) TEST_ERROR; - if (H5T_ORDER_NONE != H5Tget_order(dtype)) TEST_ERROR; - if (H5Tclose(dtype) < 0) TEST_ERROR + if ((dtype = H5Tcopy(H5T_STD_REF_DSETREG)) < 0) + TEST_ERROR + if (H5T_ORDER_NONE != H5Tget_order(dtype)) + TEST_ERROR; + if (H5Tset_order(dtype, H5T_ORDER_NONE) < 0) + TEST_ERROR; + if (H5T_ORDER_NONE != H5Tget_order(dtype)) + TEST_ERROR; + if (H5Tclose(dtype) < 0) + TEST_ERROR /* Enum */ - if ((dtype = H5Tenum_create(H5T_STD_I16BE)) < 0) TEST_ERROR - if (H5T_ORDER_BE != H5Tget_order(dtype)) TEST_ERROR; + if ((dtype = H5Tenum_create(H5T_STD_I16BE)) < 0) + TEST_ERROR + if (H5T_ORDER_BE != H5Tget_order(dtype)) + TEST_ERROR; H5E_BEGIN_TRY - ret = H5Tset_order(dtype, H5T_ORDER_NONE); + ret = H5Tset_order(dtype, H5T_ORDER_NONE); H5E_END_TRY - if (ret >= 0) TEST_ERROR - if (H5Tset_order(dtype, H5T_ORDER_LE) < 0) TEST_ERROR - if (H5T_ORDER_LE != H5Tget_order(dtype)) TEST_ERROR; - if (H5Tclose(dtype) < 0) TEST_ERROR + if (ret >= 0) + TEST_ERROR + if (H5Tset_order(dtype, H5T_ORDER_LE) < 0) + TEST_ERROR + if (H5T_ORDER_LE != H5Tget_order(dtype)) + TEST_ERROR; + if (H5Tclose(dtype) < 0) + TEST_ERROR /* Vlen */ - if ((dtype = H5Tvlen_create(H5T_STD_U64LE)) < 0) TEST_ERROR - if (H5T_ORDER_LE != H5Tget_order(dtype)) TEST_ERROR; + if ((dtype = H5Tvlen_create(H5T_STD_U64LE)) < 0) + TEST_ERROR + if (H5T_ORDER_LE != H5Tget_order(dtype)) + TEST_ERROR; H5E_BEGIN_TRY - ret = H5Tset_order(dtype, H5T_ORDER_NONE); + ret = H5Tset_order(dtype, H5T_ORDER_NONE); H5E_END_TRY - if (ret >= 0) TEST_ERROR - if (H5Tset_order(dtype, H5T_ORDER_BE) < 0) TEST_ERROR - if (H5T_ORDER_BE != H5Tget_order(dtype)) TEST_ERROR; - if (H5Tclose(dtype) < 0) TEST_ERROR + if (ret >= 0) + TEST_ERROR + if (H5Tset_order(dtype, H5T_ORDER_BE) < 0) + TEST_ERROR + if (H5T_ORDER_BE != H5Tget_order(dtype)) + TEST_ERROR; + if (H5Tclose(dtype) < 0) + TEST_ERROR /* Array */ - if ((dtype = H5Tarray_create2(H5T_IEEE_F64BE, 2, dims)) < 0) TEST_ERROR - if (H5T_ORDER_BE != H5Tget_order(dtype)) TEST_ERROR; + if ((dtype = H5Tarray_create2(H5T_IEEE_F64BE, 2, dims)) < 0) + TEST_ERROR + if (H5T_ORDER_BE != H5Tget_order(dtype)) + TEST_ERROR; H5E_BEGIN_TRY - ret = H5Tset_order(dtype, H5T_ORDER_NONE); + ret = H5Tset_order(dtype, H5T_ORDER_NONE); H5E_END_TRY - if (ret >= 0) TEST_ERROR - if (H5Tset_order(dtype, H5T_ORDER_LE) < 0) TEST_ERROR - if (H5T_ORDER_LE != H5Tget_order(dtype)) TEST_ERROR; - if (H5Tclose(dtype) < 0) TEST_ERROR + if (ret >= 0) + TEST_ERROR + if (H5Tset_order(dtype, H5T_ORDER_LE) < 0) + TEST_ERROR + if (H5T_ORDER_LE != H5Tget_order(dtype)) + TEST_ERROR; + if (H5Tclose(dtype) < 0) + TEST_ERROR PASSED(); return 0; error: H5E_BEGIN_TRY - H5Tclose (dtype); + H5Tclose(dtype); H5E_END_TRY; return 1; } /* end test_set_order() */ - /*------------------------------------------------------------------------- * Function: test_set_order_compound * @@ -6331,127 +6866,157 @@ error: static int test_set_order_compound(hid_t fapl) { - typedef struct { /* Struct with atomic fields */ + typedef struct { /* Struct with atomic fields */ int i; char c; short s; float f; } atomic_cmpd; - typedef struct { /* Struct with complex fields */ + typedef struct { /* Struct with complex fields */ atomic_cmpd a; hvl_t vl; double b[3][4]; atomic_cmpd d[3][4]; } complex_cmpd; - hid_t file = -1; - hid_t cmpd = -1, memb_cmpd = -1, memb_array1 = -1, memb_array2 = -1, cmpd_array = -1; - hid_t vl_id = -1; - hsize_t dims[2] = {3, 4}; /* Array dimenstions */ - char filename[1024]; - herr_t ret; /* Generic return value */ + hid_t file = -1; + hid_t cmpd = -1, memb_cmpd = -1, memb_array1 = -1, memb_array2 = -1, cmpd_array = -1; + hid_t vl_id = -1; + hsize_t dims[2] = {3, 4}; /* Array dimenstions */ + char filename[1024]; + herr_t ret; /* Generic return value */ TESTING("H5Tset/get_order for compound type"); - if((memb_cmpd = H5Tcreate(H5T_COMPOUND, sizeof(atomic_cmpd))) < 0) FAIL_STACK_ERROR - if(H5Tinsert(memb_cmpd, "i", HOFFSET(atomic_cmpd, i), H5T_NATIVE_INT) < 0) FAIL_STACK_ERROR - if(H5Tinsert(memb_cmpd, "c", HOFFSET(atomic_cmpd, c), H5T_NATIVE_CHAR) < 0) FAIL_STACK_ERROR - if(H5Tinsert(memb_cmpd, "s", HOFFSET(atomic_cmpd, s), H5T_NATIVE_SHORT) < 0) FAIL_STACK_ERROR - if(H5Tinsert(memb_cmpd, "f", HOFFSET(atomic_cmpd, f), H5T_NATIVE_FLOAT) < 0) FAIL_STACK_ERROR + if ((memb_cmpd = H5Tcreate(H5T_COMPOUND, sizeof(atomic_cmpd))) < 0) + FAIL_STACK_ERROR + if (H5Tinsert(memb_cmpd, "i", HOFFSET(atomic_cmpd, i), H5T_NATIVE_INT) < 0) + FAIL_STACK_ERROR + if (H5Tinsert(memb_cmpd, "c", HOFFSET(atomic_cmpd, c), H5T_NATIVE_CHAR) < 0) + FAIL_STACK_ERROR + if (H5Tinsert(memb_cmpd, "s", HOFFSET(atomic_cmpd, s), H5T_NATIVE_SHORT) < 0) + FAIL_STACK_ERROR + if (H5Tinsert(memb_cmpd, "f", HOFFSET(atomic_cmpd, f), H5T_NATIVE_FLOAT) < 0) + FAIL_STACK_ERROR /* Set the order to little-endian. */ - if(H5Tset_order(memb_cmpd, H5T_ORDER_BE) < 0) FAIL_STACK_ERROR + if (H5Tset_order(memb_cmpd, H5T_ORDER_BE) < 0) + FAIL_STACK_ERROR /* Create the array datatypes */ memb_array1 = H5Tarray_create2(H5T_NATIVE_DOUBLE, 2, dims); memb_array2 = H5Tarray_create2(memb_cmpd, 2, dims); /* Set the order to big-endian. */ - if(H5Tset_order(memb_array1, H5T_ORDER_LE) < 0) FAIL_STACK_ERROR + if (H5Tset_order(memb_array1, H5T_ORDER_LE) < 0) + FAIL_STACK_ERROR /* Create a variable-length datatype */ - if((vl_id = H5Tvlen_create(H5T_NATIVE_UINT)) < 0) FAIL_STACK_ERROR + if ((vl_id = H5Tvlen_create(H5T_NATIVE_UINT)) < 0) + FAIL_STACK_ERROR /* Create a compound type using the types above. */ - if((cmpd = H5Tcreate(H5T_COMPOUND, sizeof(complex_cmpd))) < 0) FAIL_STACK_ERROR - if(H5Tinsert(cmpd, "a", HOFFSET(complex_cmpd, a), memb_cmpd) < 0) FAIL_STACK_ERROR - if(H5Tinsert(cmpd, "vl_type", HOFFSET(complex_cmpd, vl), vl_id) < 0) FAIL_STACK_ERROR - if(H5Tinsert(cmpd, "b", HOFFSET(complex_cmpd, b), memb_array1) < 0) FAIL_STACK_ERROR - if(H5Tinsert(cmpd, "d", HOFFSET(complex_cmpd, d), memb_array2) < 0) FAIL_STACK_ERROR + if ((cmpd = H5Tcreate(H5T_COMPOUND, sizeof(complex_cmpd))) < 0) + FAIL_STACK_ERROR + if (H5Tinsert(cmpd, "a", HOFFSET(complex_cmpd, a), memb_cmpd) < 0) + FAIL_STACK_ERROR + if (H5Tinsert(cmpd, "vl_type", HOFFSET(complex_cmpd, vl), vl_id) < 0) + FAIL_STACK_ERROR + if (H5Tinsert(cmpd, "b", HOFFSET(complex_cmpd, b), memb_array1) < 0) + FAIL_STACK_ERROR + if (H5Tinsert(cmpd, "d", HOFFSET(complex_cmpd, d), memb_array2) < 0) + FAIL_STACK_ERROR /* The order should be mixed now. */ - if(H5Tget_order(cmpd) != H5T_ORDER_MIXED) FAIL_STACK_ERROR + if (H5Tget_order(cmpd) != H5T_ORDER_MIXED) + FAIL_STACK_ERROR /* Create an array of the compound type above */ cmpd_array = H5Tarray_create2(cmpd, 2, dims); /* The order of the array type should be the same as the compound type */ - if(H5Tget_order(cmpd_array) != H5T_ORDER_MIXED) FAIL_STACK_ERROR + if (H5Tget_order(cmpd_array) != H5T_ORDER_MIXED) + FAIL_STACK_ERROR /* Verify that the order can't be 'none'. */ H5E_BEGIN_TRY - ret = H5Tset_order(cmpd, H5T_ORDER_NONE); + ret = H5Tset_order(cmpd, H5T_ORDER_NONE); H5E_END_TRY - if(ret >= 0) TEST_ERROR + if (ret >= 0) + TEST_ERROR /* Verify that the order can't be 'mixed'. */ H5E_BEGIN_TRY - ret = H5Tset_order(cmpd, H5T_ORDER_MIXED); + ret = H5Tset_order(cmpd, H5T_ORDER_MIXED); H5E_END_TRY - if(ret >= 0) TEST_ERROR + if (ret >= 0) + TEST_ERROR /* Change the order of the compound type to big-endian*/ - if(H5Tset_order(cmpd, H5T_ORDER_BE) < 0) FAIL_STACK_ERROR + if (H5Tset_order(cmpd, H5T_ORDER_BE) < 0) + FAIL_STACK_ERROR /* Verify that the order of the compound type is big-endian */ - if(H5Tget_order(cmpd) != H5T_ORDER_BE) FAIL_STACK_ERROR + if (H5Tget_order(cmpd) != H5T_ORDER_BE) + FAIL_STACK_ERROR /* Change the order of the array type to little-endian*/ - if(H5Tset_order(cmpd_array, H5T_ORDER_LE) < 0) FAIL_STACK_ERROR + if (H5Tset_order(cmpd_array, H5T_ORDER_LE) < 0) + FAIL_STACK_ERROR /* Verify that the order of the array type is little-endian */ - if(H5Tget_order(cmpd_array) != H5T_ORDER_LE) FAIL_STACK_ERROR + if (H5Tget_order(cmpd_array) != H5T_ORDER_LE) + FAIL_STACK_ERROR /* Create file */ h5_fixname(FILENAME[1], fapl, filename, sizeof filename); - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Commit the data type */ - if(H5Tcommit2(file, "compound", cmpd, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Tcommit2(file, "compound", cmpd, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Verify that committed type can't change order */ H5E_BEGIN_TRY - ret = H5Tset_order(cmpd, H5T_ORDER_LE); + ret = H5Tset_order(cmpd, H5T_ORDER_LE); H5E_END_TRY - if(ret >= 0) TEST_ERROR + if (ret >= 0) + TEST_ERROR - if(H5Tclose(memb_cmpd) < 0) FAIL_STACK_ERROR - if(H5Tclose(memb_array1) < 0) FAIL_STACK_ERROR - if(H5Tclose(memb_array2) < 0) FAIL_STACK_ERROR - if(H5Tclose(vl_id) < 0) FAIL_STACK_ERROR - if(H5Tclose(cmpd) < 0) FAIL_STACK_ERROR - if(H5Tclose(cmpd_array) < 0) FAIL_STACK_ERROR - if(H5Fclose(file) < 0) FAIL_STACK_ERROR + if (H5Tclose(memb_cmpd) < 0) + FAIL_STACK_ERROR + if (H5Tclose(memb_array1) < 0) + FAIL_STACK_ERROR + if (H5Tclose(memb_array2) < 0) + FAIL_STACK_ERROR + if (H5Tclose(vl_id) < 0) + FAIL_STACK_ERROR + if (H5Tclose(cmpd) < 0) + FAIL_STACK_ERROR + if (H5Tclose(cmpd_array) < 0) + FAIL_STACK_ERROR + if (H5Fclose(file) < 0) + FAIL_STACK_ERROR PASSED(); return 0; error: H5E_BEGIN_TRY - H5Tclose(memb_cmpd); - H5Tclose(memb_array1); - H5Tclose(memb_array2); - H5Tclose(vl_id); - H5Tclose(cmpd); - H5Tclose(cmpd_array); + H5Tclose(memb_cmpd); + H5Tclose(memb_array1); + H5Tclose(memb_array2); + H5Tclose(vl_id); + H5Tclose(cmpd); + H5Tclose(cmpd_array); H5Fclose(file); H5E_END_TRY; return 1; } /* end test_set_order_compound() */ - /*------------------------------------------------------------------------- * Function: test_named_indirect_reopen * @@ -6468,201 +7033,268 @@ error: static int test_named_indirect_reopen(hid_t fapl) { - hid_t file=-1, type=-1, reopened_type=-1, strtype=-1, dset=-1, space=-1; - static hsize_t dims[1] = {3}; - size_t dt_size; - int enum_value; - const char *tag = "opaque_tag"; - char *tag_ret = NULL; - char filename[1024]; + hid_t file = -1, type = -1, reopened_type = -1, strtype = -1, dset = -1, space = -1; + static hsize_t dims[1] = {3}; + size_t dt_size; + int enum_value; + const char * tag = "opaque_tag"; + char * tag_ret = NULL; + char filename[1024]; TESTING("indirectly reopening committed datatypes"); /* Create file, dataspace */ h5_fixname(FILENAME[1], fapl, filename, sizeof filename); - if ((file=H5Fcreate (filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR - if ((space = H5Screate_simple (1, dims, dims)) < 0) TEST_ERROR + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + TEST_ERROR + if ((space = H5Screate_simple(1, dims, dims)) < 0) + TEST_ERROR /* * Compound */ /* Create compound type */ - if((strtype = H5Tcopy(H5T_C_S1)) < 0) TEST_ERROR - if(H5Tset_size(strtype, H5T_VARIABLE) < 0) TEST_ERROR - if((type = H5Tcreate(H5T_COMPOUND, sizeof(char *))) < 0) TEST_ERROR - if(H5Tinsert(type, "vlstr", (size_t)0, strtype) < 0) TEST_ERROR - if(H5Tclose(strtype) < 0) TEST_ERROR + if ((strtype = H5Tcopy(H5T_C_S1)) < 0) + TEST_ERROR + if (H5Tset_size(strtype, H5T_VARIABLE) < 0) + TEST_ERROR + if ((type = H5Tcreate(H5T_COMPOUND, sizeof(char *))) < 0) + TEST_ERROR + if (H5Tinsert(type, "vlstr", (size_t)0, strtype) < 0) + TEST_ERROR + if (H5Tclose(strtype) < 0) + TEST_ERROR /* Get size of compound type */ - if((dt_size = H5Tget_size(type)) == 0) TEST_ERROR + if ((dt_size = H5Tget_size(type)) == 0) + TEST_ERROR /* Commit compound type and verify the size doesn't change */ - if(H5Tcommit2(file, "cmpd_type", type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR - if(dt_size != H5Tget_size(type)) TEST_ERROR + if (H5Tcommit2(file, "cmpd_type", type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR + if (dt_size != H5Tget_size(type)) + TEST_ERROR /* Create dataset with compound type */ - if((dset = H5Dcreate2(file, "cmpd_dset", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((dset = H5Dcreate2(file, "cmpd_dset", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR /* Indirectly reopen type and verify that the size doesn't change */ - if((reopened_type = H5Dget_type(dset)) < 0) TEST_ERROR - if(dt_size != H5Tget_size(reopened_type)) TEST_ERROR + if ((reopened_type = H5Dget_type(dset)) < 0) + TEST_ERROR + if (dt_size != H5Tget_size(reopened_type)) + TEST_ERROR /* Close types and dataset */ - if(H5Tclose(type) < 0) TEST_ERROR - if(H5Tclose(reopened_type) < 0) TEST_ERROR - if(H5Dclose(dset) < 0) TEST_ERROR + if (H5Tclose(type) < 0) + TEST_ERROR + if (H5Tclose(reopened_type) < 0) + TEST_ERROR + if (H5Dclose(dset) < 0) + TEST_ERROR /* * Enum */ /* Create enum type */ - if((type = H5Tenum_create(H5T_NATIVE_INT)) < 0) TEST_ERROR + if ((type = H5Tenum_create(H5T_NATIVE_INT)) < 0) + TEST_ERROR enum_value = 0; - if(H5Tenum_insert(type, "val1", &enum_value) < 0) TEST_ERROR + if (H5Tenum_insert(type, "val1", &enum_value) < 0) + TEST_ERROR enum_value = 1; - if(H5Tenum_insert(type, "val2", &enum_value) < 0) TEST_ERROR + if (H5Tenum_insert(type, "val2", &enum_value) < 0) + TEST_ERROR /* Get size of enum type */ - if((dt_size = H5Tget_size(type)) == 0) TEST_ERROR + if ((dt_size = H5Tget_size(type)) == 0) + TEST_ERROR /* Commit enum type and verify the size doesn't change */ - if(H5Tcommit2(file, "enum_type", type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR - if(dt_size != H5Tget_size(type)) TEST_ERROR + if (H5Tcommit2(file, "enum_type", type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR + if (dt_size != H5Tget_size(type)) + TEST_ERROR /* Create dataset with enum type */ - if((dset = H5Dcreate2(file, "enum_dset", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((dset = H5Dcreate2(file, "enum_dset", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR /* Indirectly reopen type and verify that the size doesn't change */ - if((reopened_type = H5Dget_type(dset)) < 0) TEST_ERROR - if(dt_size != H5Tget_size(reopened_type)) TEST_ERROR + if ((reopened_type = H5Dget_type(dset)) < 0) + TEST_ERROR + if (dt_size != H5Tget_size(reopened_type)) + TEST_ERROR /* Close types and dataset */ - if(H5Tclose(type) < 0) TEST_ERROR - if(H5Tclose(reopened_type) < 0) TEST_ERROR - if(H5Dclose(dset) < 0) TEST_ERROR + if (H5Tclose(type) < 0) + TEST_ERROR + if (H5Tclose(reopened_type) < 0) + TEST_ERROR + if (H5Dclose(dset) < 0) + TEST_ERROR /* * Vlen */ /* Create vlen type */ - if((type = H5Tvlen_create(H5T_NATIVE_INT)) < 0) TEST_ERROR + if ((type = H5Tvlen_create(H5T_NATIVE_INT)) < 0) + TEST_ERROR /* Get size of vlen type */ - if((dt_size = H5Tget_size(type)) == 0) TEST_ERROR + if ((dt_size = H5Tget_size(type)) == 0) + TEST_ERROR /* Commit vlen type and verify the size doesn't change */ - if(H5Tcommit2(file, "vlen_type", type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR - if(dt_size != H5Tget_size(type)) TEST_ERROR + if (H5Tcommit2(file, "vlen_type", type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR + if (dt_size != H5Tget_size(type)) + TEST_ERROR /* Create dataset with vlen type */ - if((dset = H5Dcreate2(file, "vlen_dset", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((dset = H5Dcreate2(file, "vlen_dset", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR /* Indirectly reopen type and verify that the size doesn't change */ - if((reopened_type = H5Dget_type(dset)) < 0) TEST_ERROR - if(dt_size != H5Tget_size(reopened_type)) TEST_ERROR + if ((reopened_type = H5Dget_type(dset)) < 0) + TEST_ERROR + if (dt_size != H5Tget_size(reopened_type)) + TEST_ERROR /* Close types and dataset */ - if(H5Tclose(type) < 0) TEST_ERROR - if(H5Tclose(reopened_type) < 0) TEST_ERROR - if(H5Dclose(dset) < 0) TEST_ERROR + if (H5Tclose(type) < 0) + TEST_ERROR + if (H5Tclose(reopened_type) < 0) + TEST_ERROR + if (H5Dclose(dset) < 0) + TEST_ERROR /* * Opaque */ /* Create opaque type */ - if((type = H5Tcreate(H5T_OPAQUE, (size_t)13)) < 0) TEST_ERROR - if(H5Tset_tag(type, tag) < 0) TEST_ERROR + if ((type = H5Tcreate(H5T_OPAQUE, (size_t)13)) < 0) + TEST_ERROR + if (H5Tset_tag(type, tag) < 0) + TEST_ERROR /* Get size of opaque type */ - if((dt_size = H5Tget_size(type)) == 0) TEST_ERROR + if ((dt_size = H5Tget_size(type)) == 0) + TEST_ERROR /* Commit opaque type and verify the size and tag don't change */ - if(H5Tcommit2(file, "opaque_type", type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR - if(dt_size != H5Tget_size(type)) TEST_ERROR - if(NULL == (tag_ret = H5Tget_tag(type))) TEST_ERROR - if(HDstrcmp(tag, tag_ret)) TEST_ERROR + if (H5Tcommit2(file, "opaque_type", type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR + if (dt_size != H5Tget_size(type)) + TEST_ERROR + if (NULL == (tag_ret = H5Tget_tag(type))) + TEST_ERROR + if (HDstrcmp(tag, tag_ret)) + TEST_ERROR H5free_memory(tag_ret); tag_ret = NULL; /* Create dataset with opaque type */ - if((dset = H5Dcreate2(file, "opaque_dset", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((dset = H5Dcreate2(file, "opaque_dset", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR /* Indirectly reopen type and verify that the size and tag don't change */ - if((reopened_type = H5Dget_type(dset)) < 0) TEST_ERROR - if(dt_size != H5Tget_size(reopened_type)) TEST_ERROR - if(NULL == (tag_ret = H5Tget_tag(type))) TEST_ERROR - if(HDstrcmp(tag, tag_ret)) TEST_ERROR + if ((reopened_type = H5Dget_type(dset)) < 0) + TEST_ERROR + if (dt_size != H5Tget_size(reopened_type)) + TEST_ERROR + if (NULL == (tag_ret = H5Tget_tag(type))) + TEST_ERROR + if (HDstrcmp(tag, tag_ret)) + TEST_ERROR H5free_memory(tag_ret); tag_ret = NULL; /* Close types and dataset */ - if(H5Tclose(type) < 0) TEST_ERROR - if(H5Tclose(reopened_type) < 0) TEST_ERROR - if(H5Dclose(dset) < 0) TEST_ERROR + if (H5Tclose(type) < 0) + TEST_ERROR + if (H5Tclose(reopened_type) < 0) + TEST_ERROR + if (H5Dclose(dset) < 0) + TEST_ERROR /* * Array */ /* Create array type */ - if((type = H5Tarray_create2(H5T_NATIVE_INT, 1, dims)) < 0) TEST_ERROR + if ((type = H5Tarray_create2(H5T_NATIVE_INT, 1, dims)) < 0) + TEST_ERROR /* Get size of array type */ - if((dt_size = H5Tget_size(type)) == 0) TEST_ERROR + if ((dt_size = H5Tget_size(type)) == 0) + TEST_ERROR /* Commit array type and verify the size doesn't change */ - if(H5Tcommit2(file, "array_type", type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR - if(dt_size != H5Tget_size(type)) TEST_ERROR + if (H5Tcommit2(file, "array_type", type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) + TEST_ERROR + if (dt_size != H5Tget_size(type)) + TEST_ERROR /* Create dataset with array type */ - if((dset = H5Dcreate2(file, "array_dset", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if ((dset = H5Dcreate2(file, "array_dset", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR /* Indirectly reopen type and verify that the size doesn't change */ - if((reopened_type = H5Dget_type(dset)) < 0) TEST_ERROR - if(dt_size != H5Tget_size(reopened_type)) TEST_ERROR + if ((reopened_type = H5Dget_type(dset)) < 0) + TEST_ERROR + if (dt_size != H5Tget_size(reopened_type)) + TEST_ERROR /* Close types and dataset */ - if(H5Tclose(type) < 0) TEST_ERROR - if(H5Tclose(reopened_type) < 0) TEST_ERROR - if(H5Dclose(dset) < 0) TEST_ERROR + if (H5Tclose(type) < 0) + TEST_ERROR + if (H5Tclose(reopened_type) < 0) + TEST_ERROR + if (H5Dclose(dset) < 0) + TEST_ERROR /* Close file and dataspace */ - if(H5Sclose(space) < 0) TEST_ERROR - if(H5Fclose(file) < 0) TEST_ERROR + if (H5Sclose(space) < 0) + TEST_ERROR + if (H5Fclose(file) < 0) + TEST_ERROR PASSED(); return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Tclose(type); H5Tclose(strtype); H5Tclose(reopened_type); H5Sclose(space); H5Dclose(dset); - H5Fclose(file); - } H5E_END_TRY; - if(tag_ret) + H5Fclose(file); + } + H5E_END_TRY; + if (tag_ret) H5free_memory(tag_ret); return 1; } /* end test_named_indirect_reopen() */ -static void create_del_obj_named_test_file(const char *filename, hid_t fapl, - H5F_libver_t low, H5F_libver_t high) +static void +create_del_obj_named_test_file(const char *filename, hid_t fapl, H5F_libver_t low, H5F_libver_t high) { - hid_t file; /* File ID */ - hid_t type; /* Datatype ID */ - hid_t space; /* Dataspace ID */ - hid_t attr; /* Attribute ID */ - hid_t dset; /* Dataset ID */ - hid_t fcpl; /* File creation property list ID */ - hid_t my_fapl; /* Copy of file access property list ID */ - hid_t dcpl; /* Dataset creation property list ID */ - unsigned use_at_least_v18;/* Whether to use old or new format */ - herr_t H5_ATTR_NDEBUG_UNUSED status; /* Generic return value */ + hid_t file; /* File ID */ + hid_t type; /* Datatype ID */ + hid_t space; /* Dataspace ID */ + hid_t attr; /* Attribute ID */ + hid_t dset; /* Dataset ID */ + hid_t fcpl; /* File creation property list ID */ + hid_t my_fapl; /* Copy of file access property list ID */ + hid_t dcpl; /* Dataset creation property list ID */ + unsigned use_at_least_v18; /* Whether to use old or new format */ + herr_t H5_ATTR_NDEBUG_UNUSED status; /* Generic return value */ /* Make copy of FAPL */ my_fapl = H5Pcopy(fapl); @@ -6681,7 +7313,7 @@ static void create_del_obj_named_test_file(const char *filename, hid_t fapl, fcpl = H5Pcreate(H5P_FILE_CREATE); HDassert(fcpl > 0); - if(use_at_least_v18) { + if (use_at_least_v18) { /* Use dense link storage for all links in root group */ status = H5Pset_link_phase_change(fcpl, 0, 0); HDassert(status >= 0); @@ -6715,7 +7347,7 @@ static void create_del_obj_named_test_file(const char *filename, hid_t fapl, dcpl = H5Pcreate(H5P_DATASET_CREATE); HDassert(dcpl > 0); - if(use_at_least_v18) { + if (use_at_least_v18) { /* Use dense attribute storage for all attributes on dataset */ status = H5Pset_attr_phase_change(dcpl, 0, 0); HDassert(status >= 0); @@ -6734,7 +7366,8 @@ static void create_del_obj_named_test_file(const char *filename, hid_t fapl, HDassert(status >= 0); /* Create attribute */ - attr = H5Acreate_by_name(file, DEL_OBJ_NAMED_DATASET, DEL_OBJ_NAMED_ATTRIBUTE, type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + attr = H5Acreate_by_name(file, DEL_OBJ_NAMED_DATASET, DEL_OBJ_NAMED_ATTRIBUTE, type, space, H5P_DEFAULT, + H5P_DEFAULT, H5P_DEFAULT); HDassert(attr > 0); /* Close dataspace */ @@ -6754,7 +7387,6 @@ static void create_del_obj_named_test_file(const char *filename, hid_t fapl, HDassert(status >= 0); } /* end create_del_obj_named_test_file() */ - /*------------------------------------------------------------------------- * Function: test_delete_obj_named * @@ -6772,24 +7404,25 @@ static void create_del_obj_named_test_file(const char *filename, hid_t fapl, static int test_delete_obj_named(hid_t fapl) { - hid_t filea1 = -1, filea2 = -1, fileb = -1; /* File IDs */ - hid_t attr = -1; /* Attribute ID */ - hid_t dset = -1; /* Dataset ID */ - hid_t fapl2 = -1; /* File access property list ID */ - H5F_libver_t low, high; /* File format bounds */ - char filename[1024], filename2[1024]; + hid_t filea1 = -1, filea2 = -1, fileb = -1; /* File IDs */ + hid_t attr = -1; /* Attribute ID */ + hid_t dset = -1; /* Dataset ID */ + hid_t fapl2 = -1; /* File access property list ID */ + H5F_libver_t low, high; /* File format bounds */ + char filename[1024], filename2[1024]; TESTING("deleting objects that use named datatypes"); /* Set up filenames & FAPLs */ - if((fapl2 = H5Pcopy(fapl)) < 0) FAIL_STACK_ERROR + if ((fapl2 = H5Pcopy(fapl)) < 0) + FAIL_STACK_ERROR h5_fixname(FILENAME[8], fapl, filename, sizeof filename); h5_fixname(FILENAME[9], fapl2, filename2, sizeof filename2); /* Loop through all valid the combinations of low/high library format bounds, to test delete objects that use named datatypes through different file IDs */ - for(low = H5F_LIBVER_EARLIEST; low < H5F_LIBVER_NBOUNDS; low++) { - for(high = H5F_LIBVER_EARLIEST; high < H5F_LIBVER_NBOUNDS; high++) { + for (low = H5F_LIBVER_EARLIEST; low < H5F_LIBVER_NBOUNDS; low++) { + for (high = H5F_LIBVER_EARLIEST; high < H5F_LIBVER_NBOUNDS; high++) { /* Skip invalid low/high combination */ if ((high == H5F_LIBVER_EARLIEST) || (low > high)) @@ -6799,60 +7432,81 @@ test_delete_obj_named(hid_t fapl) create_del_obj_named_test_file(filename, fapl, low, high); /* Test deleting dataset opened through different file ID */ - if((filea1 = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) FAIL_STACK_ERROR - if((filea2 = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) FAIL_STACK_ERROR + if ((filea1 = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) + FAIL_STACK_ERROR + if ((filea2 = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) + FAIL_STACK_ERROR - if((dset = H5Dopen2(filea1, DEL_OBJ_NAMED_DATASET, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if(H5Dclose(dset) < 0) FAIL_STACK_ERROR + if ((dset = H5Dopen2(filea1, DEL_OBJ_NAMED_DATASET, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if (H5Dclose(dset) < 0) + FAIL_STACK_ERROR - if(H5Fclose(filea1) < 0) FAIL_STACK_ERROR + if (H5Fclose(filea1) < 0) + FAIL_STACK_ERROR - if((fileb = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, fapl2)) < 0) FAIL_STACK_ERROR + if ((fileb = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, fapl2)) < 0) + FAIL_STACK_ERROR - if(H5Ldelete(filea2, DEL_OBJ_NAMED_DATASET, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(filea2, DEL_OBJ_NAMED_DATASET, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR - if(H5Fclose(filea2) < 0) FAIL_STACK_ERROR - if(H5Fclose(fileb) < 0) FAIL_STACK_ERROR + if (H5Fclose(filea2) < 0) + FAIL_STACK_ERROR + if (H5Fclose(fileb) < 0) + FAIL_STACK_ERROR /* Create test file, with attribute that uses committed datatype */ create_del_obj_named_test_file(filename, fapl, low, high); /* Test deleting attribute opened through different file ID */ - if((filea1 = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) FAIL_STACK_ERROR - if((filea2 = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) FAIL_STACK_ERROR - - if((attr = H5Aopen_by_name(filea1, DEL_OBJ_NAMED_DATASET, DEL_OBJ_NAMED_ATTRIBUTE, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if(H5Aclose(attr) < 0) FAIL_STACK_ERROR - - if(H5Fclose(filea1) < 0) FAIL_STACK_ERROR - - if((fileb = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, fapl2)) < 0) FAIL_STACK_ERROR - - if(H5Adelete_by_name(filea2, DEL_OBJ_NAMED_DATASET, DEL_OBJ_NAMED_ATTRIBUTE, H5P_DEFAULT) < 0) FAIL_STACK_ERROR - - if(H5Fclose(filea2) < 0) FAIL_STACK_ERROR - if(H5Fclose(fileb) < 0) FAIL_STACK_ERROR + if ((filea1 = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) + FAIL_STACK_ERROR + if ((filea2 = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) + FAIL_STACK_ERROR + + if ((attr = H5Aopen_by_name(filea1, DEL_OBJ_NAMED_DATASET, DEL_OBJ_NAMED_ATTRIBUTE, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if (H5Aclose(attr) < 0) + FAIL_STACK_ERROR + + if (H5Fclose(filea1) < 0) + FAIL_STACK_ERROR + + if ((fileb = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, fapl2)) < 0) + FAIL_STACK_ERROR + + if (H5Adelete_by_name(filea2, DEL_OBJ_NAMED_DATASET, DEL_OBJ_NAMED_ATTRIBUTE, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + + if (H5Fclose(filea2) < 0) + FAIL_STACK_ERROR + if (H5Fclose(fileb) < 0) + FAIL_STACK_ERROR } /* end high */ - } /* end low */ + } /* end low */ - if(H5Pclose(fapl2) < 0) FAIL_STACK_ERROR + if (H5Pclose(fapl2) < 0) + FAIL_STACK_ERROR PASSED(); return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Tclose(attr); H5Dclose(dset); H5Pclose(fapl2); H5Fclose(filea1); H5Fclose(filea2); H5Fclose(fileb); - } H5E_END_TRY; + } + H5E_END_TRY; return 1; } /* end test_delete_obj_named() */ - /*------------------------------------------------------------------------- * Function: test_delete_obj_named_fileid * @@ -6870,27 +7524,28 @@ error: static int test_delete_obj_named_fileid(hid_t fapl) { - hid_t filea1 = -1, filea2 = -1, fileb = -1; /* File IDs */ - hid_t dset_fid = -1; /* File ID from dataset */ - hid_t type_fid = -1; /* File ID from datatype */ - hid_t attr_fid = -1; /* File ID from attribute */ - hid_t type = -1; /* Datatype ID */ - hid_t attr = -1; /* Attribute ID */ - hid_t dset = -1; /* Dataset ID */ - hid_t fapl2 = -1; /* File access property list ID */ - H5F_libver_t low, high; /* File format bounds */ - char filename[1024], filename2[1024]; + hid_t filea1 = -1, filea2 = -1, fileb = -1; /* File IDs */ + hid_t dset_fid = -1; /* File ID from dataset */ + hid_t type_fid = -1; /* File ID from datatype */ + hid_t attr_fid = -1; /* File ID from attribute */ + hid_t type = -1; /* Datatype ID */ + hid_t attr = -1; /* Attribute ID */ + hid_t dset = -1; /* Dataset ID */ + hid_t fapl2 = -1; /* File access property list ID */ + H5F_libver_t low, high; /* File format bounds */ + char filename[1024], filename2[1024]; TESTING("deleting objects that use named datatypes"); /* Set up filenames & FAPLs */ - if((fapl2 = H5Pcopy(fapl)) < 0) FAIL_STACK_ERROR + if ((fapl2 = H5Pcopy(fapl)) < 0) + FAIL_STACK_ERROR h5_fixname(FILENAME[8], fapl, filename, sizeof filename); h5_fixname(FILENAME[9], fapl2, filename2, sizeof filename2); /* Loop through all the combinations of low/high library format bounds */ - for(low = H5F_LIBVER_EARLIEST; low < H5F_LIBVER_NBOUNDS; low++) { - for(high = H5F_LIBVER_EARLIEST; high < H5F_LIBVER_NBOUNDS; high++) { + for (low = H5F_LIBVER_EARLIEST; low < H5F_LIBVER_NBOUNDS; low++) { + for (high = H5F_LIBVER_EARLIEST; high < H5F_LIBVER_NBOUNDS; high++) { /* Skip invalid low/high combination */ if ((high == H5F_LIBVER_EARLIEST) || (low > high)) @@ -6900,111 +7555,146 @@ test_delete_obj_named_fileid(hid_t fapl) create_del_obj_named_test_file(filename, fapl, low, high); /* Test getting file ID for dataset opened through different file ID */ - if((filea1 = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) FAIL_STACK_ERROR + if ((filea1 = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) + FAIL_STACK_ERROR - if((filea2 = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) FAIL_STACK_ERROR + if ((filea2 = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) + FAIL_STACK_ERROR - if((dset = H5Dopen2(filea1, DEL_OBJ_NAMED_DATASET, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((dset = H5Dopen2(filea1, DEL_OBJ_NAMED_DATASET, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Verify file ID from dataset matches correct file */ dset_fid = H5Iget_file_id(dset); - if(!H5F__same_file_test(dset_fid, filea1)) TEST_ERROR + if (!H5F__same_file_test(dset_fid, filea1)) + TEST_ERROR H5Fclose(dset_fid); /* Verify file ID from datatype (from dataset) matches correct file */ - type = H5Dget_type(dset); + type = H5Dget_type(dset); type_fid = H5Iget_file_id(type); - if(!H5F__same_file_test(type_fid, filea1)) TEST_ERROR + if (!H5F__same_file_test(type_fid, filea1)) + TEST_ERROR H5Fclose(type_fid); H5Tclose(type); - if(H5Dclose(dset) < 0) FAIL_STACK_ERROR + if (H5Dclose(dset) < 0) + FAIL_STACK_ERROR - if(H5Fclose(filea1) < 0) FAIL_STACK_ERROR + if (H5Fclose(filea1) < 0) + FAIL_STACK_ERROR - if((fileb = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, fapl2)) < 0) FAIL_STACK_ERROR + if ((fileb = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, fapl2)) < 0) + FAIL_STACK_ERROR - if((filea1 = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) FAIL_STACK_ERROR + if ((filea1 = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) + FAIL_STACK_ERROR - if((dset = H5Dopen2(filea1, DEL_OBJ_NAMED_DATASET, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((dset = H5Dopen2(filea1, DEL_OBJ_NAMED_DATASET, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Verify file ID from dataset matches correct file */ dset_fid = H5Iget_file_id(dset); - if(!H5F__same_file_test(dset_fid, filea1)) TEST_ERROR + if (!H5F__same_file_test(dset_fid, filea1)) + TEST_ERROR H5Fclose(dset_fid); /* Verify file ID from datatype (from dataset) matches correct file */ - type = H5Dget_type(dset); + type = H5Dget_type(dset); type_fid = H5Iget_file_id(type); - if(!H5F__same_file_test(type_fid, filea1)) TEST_ERROR + if (!H5F__same_file_test(type_fid, filea1)) + TEST_ERROR H5Fclose(type_fid); H5Tclose(type); - if(H5Dclose(dset) < 0) FAIL_STACK_ERROR - - if(H5Fclose(filea1) < 0) FAIL_STACK_ERROR - if(H5Fclose(filea2) < 0) FAIL_STACK_ERROR - if(H5Fclose(fileb) < 0) FAIL_STACK_ERROR + if (H5Dclose(dset) < 0) + FAIL_STACK_ERROR + if (H5Fclose(filea1) < 0) + FAIL_STACK_ERROR + if (H5Fclose(filea2) < 0) + FAIL_STACK_ERROR + if (H5Fclose(fileb) < 0) + FAIL_STACK_ERROR /* Create test file, with attribute that uses committed datatype */ create_del_obj_named_test_file(filename, fapl, low, high); /* Test getting file ID for attribute opened through different file ID */ - if((filea1 = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) FAIL_STACK_ERROR - if((filea2 = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) FAIL_STACK_ERROR + if ((filea1 = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) + FAIL_STACK_ERROR + if ((filea2 = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) + FAIL_STACK_ERROR - if((attr = H5Aopen_by_name(filea1, DEL_OBJ_NAMED_DATASET, DEL_OBJ_NAMED_ATTRIBUTE, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((attr = H5Aopen_by_name(filea1, DEL_OBJ_NAMED_DATASET, DEL_OBJ_NAMED_ATTRIBUTE, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Verify file ID from dataset matches correct file */ attr_fid = H5Iget_file_id(attr); - if(!H5F__same_file_test(attr_fid, filea1)) TEST_ERROR + if (!H5F__same_file_test(attr_fid, filea1)) + TEST_ERROR H5Fclose(attr_fid); /* Verify file ID from datatype (from dataset) matches correct file */ - type = H5Aget_type(attr); + type = H5Aget_type(attr); type_fid = H5Iget_file_id(type); - if(!H5F__same_file_test(type_fid, filea1)) TEST_ERROR + if (!H5F__same_file_test(type_fid, filea1)) + TEST_ERROR H5Fclose(type_fid); H5Tclose(type); - if(H5Aclose(attr) < 0) FAIL_STACK_ERROR + if (H5Aclose(attr) < 0) + FAIL_STACK_ERROR - if(H5Fclose(filea1) < 0) FAIL_STACK_ERROR + if (H5Fclose(filea1) < 0) + FAIL_STACK_ERROR - if((fileb = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, fapl2)) < 0) FAIL_STACK_ERROR + if ((fileb = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, fapl2)) < 0) + FAIL_STACK_ERROR - if((filea1 = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) FAIL_STACK_ERROR + if ((filea1 = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) + FAIL_STACK_ERROR - if((attr = H5Aopen_by_name(filea1, DEL_OBJ_NAMED_DATASET, DEL_OBJ_NAMED_ATTRIBUTE, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((attr = H5Aopen_by_name(filea1, DEL_OBJ_NAMED_DATASET, DEL_OBJ_NAMED_ATTRIBUTE, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Verify file ID from dataset matches correct file */ attr_fid = H5Iget_file_id(attr); - if(!H5F__same_file_test(attr_fid, filea1)) TEST_ERROR + if (!H5F__same_file_test(attr_fid, filea1)) + TEST_ERROR H5Fclose(attr_fid); /* Verify file ID from datatype (from dataset) matches correct file */ - type = H5Aget_type(attr); + type = H5Aget_type(attr); type_fid = H5Iget_file_id(type); - if(!H5F__same_file_test(type_fid, filea1)) TEST_ERROR + if (!H5F__same_file_test(type_fid, filea1)) + TEST_ERROR H5Fclose(type_fid); H5Tclose(type); - if(H5Aclose(attr) < 0) FAIL_STACK_ERROR + if (H5Aclose(attr) < 0) + FAIL_STACK_ERROR - if(H5Fclose(filea1) < 0) FAIL_STACK_ERROR - if(H5Fclose(filea2) < 0) FAIL_STACK_ERROR - if(H5Fclose(fileb) < 0) FAIL_STACK_ERROR + if (H5Fclose(filea1) < 0) + FAIL_STACK_ERROR + if (H5Fclose(filea2) < 0) + FAIL_STACK_ERROR + if (H5Fclose(fileb) < 0) + FAIL_STACK_ERROR } /* end high */ - } /* end low */ + } /* end low */ - if(H5Pclose(fapl2) < 0) FAIL_STACK_ERROR + if (H5Pclose(fapl2) < 0) + FAIL_STACK_ERROR PASSED(); return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Aclose(attr); H5Tclose(type); H5Dclose(dset); @@ -7014,11 +7704,11 @@ error: H5Fclose(fileb); H5Fclose(attr_fid); H5Fclose(type_fid); - } H5E_END_TRY; + } + H5E_END_TRY; return 1; } /* end test_delete_obj_named_fileid() */ - /*------------------------------------------------------------------------- * Function: test_deprec * @@ -7036,138 +7726,148 @@ error: static int test_deprec(hid_t fapl) { - hid_t file = -1; /* File ID */ - hid_t type = -1; /* Datatype ID */ - unsigned rank = 2; /* Rank for array datatype */ - hsize_t dims[2] = {3, 3}; /* Dimensions for array datatype */ - int perm[2] = {0, 1}; /* Dimensions permutations for array datatype */ - hsize_t rdims[2]= {0, 0}; /* Dimensions for querying array datatype */ - int rperm[2] = {-2, -2}; /* Dimensions permutations for array datatype */ - hbool_t dim_mismatch; /* Whether any dimensions didn't match */ - char filename[1024]; - unsigned u; /* Local index variable */ - herr_t status; /* Generic routine value */ + hid_t file = -1; /* File ID */ + hid_t type = -1; /* Datatype ID */ + unsigned rank = 2; /* Rank for array datatype */ + hsize_t dims[2] = {3, 3}; /* Dimensions for array datatype */ + int perm[2] = {0, 1}; /* Dimensions permutations for array datatype */ + hsize_t rdims[2] = {0, 0}; /* Dimensions for querying array datatype */ + int rperm[2] = {-2, -2}; /* Dimensions permutations for array datatype */ + hbool_t dim_mismatch; /* Whether any dimensions didn't match */ + char filename[1024]; + unsigned u; /* Local index variable */ + herr_t status; /* Generic routine value */ TESTING("deprected API routines for datatypes"); /* Create an array datatype with an atomic base type */ /* (dimension permutations allowed, but not stored) */ - if((type = H5Tarray_create1(H5T_NATIVE_INT, (int)rank, dims, perm)) < 0) + if ((type = H5Tarray_create1(H5T_NATIVE_INT, (int)rank, dims, perm)) < 0) FAIL_STACK_ERROR /* Make certain that the correct classes can be detected */ - if(H5Tdetect_class(type, H5T_ARRAY) != TRUE) + if (H5Tdetect_class(type, H5T_ARRAY) != TRUE) FAIL_STACK_ERROR - if(H5Tdetect_class(type, H5T_INTEGER) != TRUE) + if (H5Tdetect_class(type, H5T_INTEGER) != TRUE) FAIL_STACK_ERROR /* Get the array dimensions */ /* (Query the dimension permutations, which is allowed, but ignored) */ - if(H5Tget_array_dims1(type, rdims, rperm) < 0) + if (H5Tget_array_dims1(type, rdims, rperm) < 0) FAIL_STACK_ERROR /* Check the array dimensions */ dim_mismatch = FALSE; - for(u = 0; u < rank; u++) - if(rdims[u] != dims[u]) { - TestErrPrintf("Array dimension information doesn't match!, rdims1[%u]=%d, tdims1[%u]=%d\n", u, (int)rdims[u], u, (int)dims[u]); + for (u = 0; u < rank; u++) + if (rdims[u] != dims[u]) { + TestErrPrintf("Array dimension information doesn't match!, rdims1[%u]=%d, tdims1[%u]=%d\n", u, + (int)rdims[u], u, (int)dims[u]); dim_mismatch = TRUE; } /* end if */ - if(dim_mismatch) - FAIL_PUTS_ERROR(" Dimensions didn't match!") + if (dim_mismatch) + FAIL_PUTS_ERROR(" Dimensions didn't match!") /* Check the array dimension permutations */ dim_mismatch = FALSE; - for(u = 0; u < rank; u++) - if(rperm[u] != -2) { - TestErrPrintf("Array dimension permutation information was modified!, rdims1[%u]=%d, tdims1[%u]=%d\n", u, rperm[u], u, perm[u]); + for (u = 0; u < rank; u++) + if (rperm[u] != -2) { + TestErrPrintf( + "Array dimension permutation information was modified!, rdims1[%u]=%d, tdims1[%u]=%d\n", u, + rperm[u], u, perm[u]); dim_mismatch = TRUE; } /* end if */ - if(dim_mismatch) - FAIL_PUTS_ERROR(" Dimension permutations modified!") + if (dim_mismatch) + FAIL_PUTS_ERROR(" Dimension permutations modified!") /* Close the datatype */ - if(H5Tclose(type) < 0) + if (H5Tclose(type) < 0) FAIL_STACK_ERROR - h5_fixname(FILENAME[1], 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) FAIL_STACK_ERROR /* Predefined types cannot be committed */ - H5E_BEGIN_TRY { - status = H5Tcommit1(file, "test_named_1 (should not exist)", H5T_NATIVE_INT); - } H5E_END_TRY; - if(status >= 0) + H5E_BEGIN_TRY { status = H5Tcommit1(file, "test_named_1 (should not exist)", H5T_NATIVE_INT); } + H5E_END_TRY; + if (status >= 0) FAIL_PUTS_ERROR(" Predefined types should not be committable!") /* Copy a predefined datatype and commit the copy */ - if((type = H5Tcopy(H5T_NATIVE_INT)) < 0) FAIL_STACK_ERROR - if(H5Tcommit1(file, "native-int", type) < 0) FAIL_STACK_ERROR - if((status = H5Tcommitted(type)) < 0) FAIL_STACK_ERROR - if(0 == status) + if ((type = H5Tcopy(H5T_NATIVE_INT)) < 0) + FAIL_STACK_ERROR + if (H5Tcommit1(file, "native-int", type) < 0) + FAIL_STACK_ERROR + if ((status = H5Tcommitted(type)) < 0) + FAIL_STACK_ERROR + if (0 == status) FAIL_PUTS_ERROR(" H5Tcommitted() returned false!") /* We should not be able to modify a type after it has been committed. */ - H5E_BEGIN_TRY { - status = H5Tset_precision(type, (size_t)256); - } H5E_END_TRY; - if(status >= 0) + H5E_BEGIN_TRY { status = H5Tset_precision(type, (size_t)256); } + H5E_END_TRY; + if (status >= 0) FAIL_PUTS_ERROR(" Committed type is not constant!") /* We should not be able to re-commit a committed type */ - H5E_BEGIN_TRY { - status = H5Tcommit1(file, "test_named_2 (should not exist)", type); - } H5E_END_TRY; - if(status >= 0) + H5E_BEGIN_TRY { status = H5Tcommit1(file, "test_named_2 (should not exist)", type); } + H5E_END_TRY; + if (status >= 0) FAIL_PUTS_ERROR(" Committed types should not be recommitted!") /* * Close the committed type and reopen it. It should return a named type. */ - if(H5Tclose(type) < 0) FAIL_STACK_ERROR - if((type = H5Topen1(file, "native-int")) < 0) FAIL_STACK_ERROR - if((status = H5Tcommitted(type)) < 0) FAIL_STACK_ERROR - if(!status) + if (H5Tclose(type) < 0) + FAIL_STACK_ERROR + if ((type = H5Topen1(file, "native-int")) < 0) + FAIL_STACK_ERROR + if ((status = H5Tcommitted(type)) < 0) + FAIL_STACK_ERROR + if (!status) FAIL_PUTS_ERROR(" Opened named types should be named types!") /* Close */ - if(H5Tclose(type) < 0) FAIL_STACK_ERROR - if(H5Fclose(file) < 0) FAIL_STACK_ERROR + if (H5Tclose(type) < 0) + FAIL_STACK_ERROR + if (H5Fclose(file) < 0) + FAIL_STACK_ERROR /* Reopen file with read only access */ if ((file = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0) goto error; /* Verify that H5Tcommit2 returns an error */ - if((type = H5Tcopy(H5T_NATIVE_INT)) < 0) goto error; - H5E_BEGIN_TRY { - status = H5Tcommit1(file, "test_named_3 (should not exist)", type); - } H5E_END_TRY; - if(status >= 0) { + if ((type = H5Tcopy(H5T_NATIVE_INT)) < 0) + goto error; + H5E_BEGIN_TRY { status = H5Tcommit1(file, "test_named_3 (should not exist)", type); } + H5E_END_TRY; + if (status >= 0) { H5_FAILED(); - HDputs (" Types should not be committable to a read-only file!"); + HDputs(" Types should not be committable to a read-only file!"); goto error; } /* Close */ - if(H5Tclose(type) < 0) goto error; - if(H5Fclose(file) < 0) goto error; + if (H5Tclose(type) < 0) + goto error; + if (H5Fclose(file) < 0) + goto error; PASSED(); return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Tclose(type); H5Fclose(file); - } H5E_END_TRY; + } + H5E_END_TRY; return 1; } /* end test_deprec() */ #endif /* H5_NO_DEPRECATED_SYMBOLS */ - /*------------------------------------------------------------------------- * Function: test_utf_ascii_conv * @@ -7184,20 +7884,20 @@ error: static int test_utf_ascii_conv(void) { - hid_t fid = -1; - hid_t did = -1; - hid_t utf8_vtid = -1; - hid_t ascii_vtid = -1; - hid_t utf8_tid = -1; - hid_t ascii_tid = -1; - hid_t sid = -1; - const char *utf8_w = "foo!"; - char *ascii_r = NULL; - const char *ascii_w = "bar!"; - char *utf8_r = NULL; + hid_t fid = -1; + hid_t did = -1; + hid_t utf8_vtid = -1; + hid_t ascii_vtid = -1; + hid_t utf8_tid = -1; + hid_t ascii_tid = -1; + hid_t sid = -1; + const char *utf8_w = "foo!"; + char * ascii_r = NULL; + const char *ascii_w = "bar!"; + char * utf8_r = NULL; char filename[1024]; - char ascii2[4], utf8_2[4]; - herr_t status; + char ascii2[4], utf8_2[4]; + herr_t status; TESTING("string conversion between ASCII and UTF"); @@ -7205,168 +7905,193 @@ test_utf_ascii_conv(void) * Test VL string conversion from UTF8 to ASCII ************************************************/ /* Create a variable-length string */ - if((utf8_vtid = H5Tcopy(H5T_C_S1)) < 0) FAIL_STACK_ERROR + if ((utf8_vtid = H5Tcopy(H5T_C_S1)) < 0) + FAIL_STACK_ERROR - if((status = H5Tset_size(utf8_vtid, H5T_VARIABLE)) < 0) FAIL_STACK_ERROR + if ((status = H5Tset_size(utf8_vtid, H5T_VARIABLE)) < 0) + FAIL_STACK_ERROR /* Set the character set for the string to UTF-8 */ - if((status = H5Tset_cset(utf8_vtid, H5T_CSET_UTF8)) < 0) FAIL_STACK_ERROR + if ((status = H5Tset_cset(utf8_vtid, H5T_CSET_UTF8)) < 0) + FAIL_STACK_ERROR /* Create a variable-length string */ - if((ascii_vtid = H5Tcopy(H5T_C_S1)) < 0) FAIL_STACK_ERROR + if ((ascii_vtid = H5Tcopy(H5T_C_S1)) < 0) + FAIL_STACK_ERROR - if((status = H5Tset_size(ascii_vtid, H5T_VARIABLE)) < 0) FAIL_STACK_ERROR + if ((status = H5Tset_size(ascii_vtid, H5T_VARIABLE)) < 0) + FAIL_STACK_ERROR /* Set the character set for the string to ASCII (should already be so) */ - if((status = H5Tset_cset(ascii_vtid, H5T_CSET_ASCII) < 0)) FAIL_STACK_ERROR + if ((status = H5Tset_cset(ascii_vtid, H5T_CSET_ASCII) < 0)) + FAIL_STACK_ERROR /* Test conversion in memory */ - H5E_BEGIN_TRY { - status = H5Tconvert(utf8_vtid, ascii_vtid, 1, &utf8_w, NULL, H5P_DEFAULT); - } H5E_END_TRY - if(status >= 0) + H5E_BEGIN_TRY { status = H5Tconvert(utf8_vtid, ascii_vtid, 1, &utf8_w, NULL, H5P_DEFAULT); } + H5E_END_TRY + if (status >= 0) FAIL_STACK_ERROR /* Create a file */ h5_fixname(FILENAME[10], H5P_DEFAULT, filename, sizeof filename); - if((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Create a scalar dataspace for the dataset */ - if((sid = H5Screate(H5S_SCALAR)) < 0) FAIL_STACK_ERROR + if ((sid = H5Screate(H5S_SCALAR)) < 0) + FAIL_STACK_ERROR /* Create a dataset of UTF8 string type */ - if((did = H5Dcreate2(fid, UTF8_DATASET, utf8_vtid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((did = H5Dcreate2(fid, UTF8_DATASET, utf8_vtid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Write the UTF8 string, as UTF8 */ - if((status = H5Dwrite(did, utf8_vtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &utf8_w)) < 0) FAIL_STACK_ERROR + if ((status = H5Dwrite(did, utf8_vtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &utf8_w)) < 0) + FAIL_STACK_ERROR /* Read the UTF8 string, as ASCII, supposed to fail */ - H5E_BEGIN_TRY { - status = H5Dread(did, ascii_vtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &ascii_r); - } H5E_END_TRY - if(status >= 0) + H5E_BEGIN_TRY { status = H5Dread(did, ascii_vtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &ascii_r); } + H5E_END_TRY + if (status >= 0) FAIL_STACK_ERROR /* Close the dataset */ - if((status = H5Dclose(did)) < 0) FAIL_STACK_ERROR + if ((status = H5Dclose(did)) < 0) + FAIL_STACK_ERROR /************************************************ * Test VL string conversion from ASCII to UTF8 ************************************************/ /* Test conversion in memory */ - H5E_BEGIN_TRY { - status = H5Tconvert(ascii_vtid, utf8_vtid, 1, &ascii_w, NULL, H5P_DEFAULT); - } H5E_END_TRY - if(status >= 0) + H5E_BEGIN_TRY { status = H5Tconvert(ascii_vtid, utf8_vtid, 1, &ascii_w, NULL, H5P_DEFAULT); } + H5E_END_TRY + if (status >= 0) FAIL_STACK_ERROR /* Create a dataset of ASCII string type */ - if((did = H5Dcreate2(fid, ASCII_DATASET, ascii_vtid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((did = H5Dcreate2(fid, ASCII_DATASET, ascii_vtid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Write the ASCII string, as ASCII */ - if((status = H5Dwrite(did, ascii_vtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &ascii_w)) < 0) FAIL_STACK_ERROR + if ((status = H5Dwrite(did, ascii_vtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &ascii_w)) < 0) + FAIL_STACK_ERROR /* Read the ASCII string, as UTF8, supposed to fail */ - H5E_BEGIN_TRY { - status = H5Dread(did, utf8_vtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &utf8_r); - } H5E_END_TRY - if(status >= 0) + H5E_BEGIN_TRY { status = H5Dread(did, utf8_vtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &utf8_r); } + H5E_END_TRY + if (status >= 0) FAIL_STACK_ERROR /* Close the dataset */ - if((status = H5Dclose(did)) < 0) FAIL_STACK_ERROR + if ((status = H5Dclose(did)) < 0) + FAIL_STACK_ERROR /* Close the UTF8 VL-string datatype */ - if((status = H5Tclose(utf8_vtid)) < 0) FAIL_STACK_ERROR + if ((status = H5Tclose(utf8_vtid)) < 0) + FAIL_STACK_ERROR /* Close the ASCII VL-string datatype */ - if((status = H5Tclose(ascii_vtid)) < 0) FAIL_STACK_ERROR + if ((status = H5Tclose(ascii_vtid)) < 0) + FAIL_STACK_ERROR /********************************************************** * Test fixed-length string conversion from UTF8 to ASCII **********************************************************/ /* Create a fixed-length UTF8 string */ - if((utf8_tid = H5Tcopy(H5T_C_S1)) < 0) FAIL_STACK_ERROR + if ((utf8_tid = H5Tcopy(H5T_C_S1)) < 0) + FAIL_STACK_ERROR - if((status = H5Tset_size(utf8_tid, 4)) < 0) FAIL_STACK_ERROR + if ((status = H5Tset_size(utf8_tid, 4)) < 0) + FAIL_STACK_ERROR /* Set the character set for the string to UTF-8 */ - if((status = H5Tset_cset(utf8_tid, H5T_CSET_UTF8)) < 0) FAIL_STACK_ERROR + if ((status = H5Tset_cset(utf8_tid, H5T_CSET_UTF8)) < 0) + FAIL_STACK_ERROR /* Create a fixed-length ASCII string */ - if((ascii_tid = H5Tcopy(H5T_C_S1)) < 0) FAIL_STACK_ERROR + if ((ascii_tid = H5Tcopy(H5T_C_S1)) < 0) + FAIL_STACK_ERROR - if((status = H5Tset_size(ascii_tid, 4)) < 0) FAIL_STACK_ERROR + if ((status = H5Tset_size(ascii_tid, 4)) < 0) + FAIL_STACK_ERROR /* Set the character set for the string to ASCII (should already be so) */ - if((status = H5Tset_cset(ascii_tid, H5T_CSET_ASCII) < 0)) FAIL_STACK_ERROR + if ((status = H5Tset_cset(ascii_tid, H5T_CSET_ASCII) < 0)) + FAIL_STACK_ERROR /* Test conversion in memory */ - H5E_BEGIN_TRY { - status = H5Tconvert(utf8_tid, ascii_tid, 1, utf8_2, NULL, H5P_DEFAULT); - } H5E_END_TRY - if(status >= 0) + H5E_BEGIN_TRY { status = H5Tconvert(utf8_tid, ascii_tid, 1, utf8_2, NULL, H5P_DEFAULT); } + H5E_END_TRY + if (status >= 0) FAIL_STACK_ERROR /* Create a dataset */ - if((did = H5Dcreate2(fid, UTF8_DATASET2, utf8_tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((did = H5Dcreate2(fid, UTF8_DATASET2, utf8_tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Write the UTF8 string, as UTF8 */ - if((status = H5Dwrite(did, utf8_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &utf8_w)) < 0) FAIL_STACK_ERROR + if ((status = H5Dwrite(did, utf8_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &utf8_w)) < 0) + FAIL_STACK_ERROR /* Read the UTF8 string as ASCII, supposed to fail */ - H5E_BEGIN_TRY { - status = H5Dread(did, ascii_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &ascii2); - } H5E_END_TRY - if(status >= 0) + H5E_BEGIN_TRY { status = H5Dread(did, ascii_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &ascii2); } + H5E_END_TRY + if (status >= 0) FAIL_STACK_ERROR /* Close the dataset */ - if((status = H5Dclose(did)) < 0) FAIL_STACK_ERROR + if ((status = H5Dclose(did)) < 0) + FAIL_STACK_ERROR /********************************************************** * Test fixed-length string conversion from ASCII to UTF8 **********************************************************/ /* Test conversion in memory */ - H5E_BEGIN_TRY { - status = H5Tconvert(ascii_tid, utf8_tid, 1, ascii2, NULL, H5P_DEFAULT); - } H5E_END_TRY - if(status >= 0) + H5E_BEGIN_TRY { status = H5Tconvert(ascii_tid, utf8_tid, 1, ascii2, NULL, H5P_DEFAULT); } + H5E_END_TRY + if (status >= 0) FAIL_STACK_ERROR /* Create a dataset */ - if((did = H5Dcreate2(fid, ASCII_DATASET2, ascii_tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((did = H5Dcreate2(fid, ASCII_DATASET2, ascii_tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Write the ASCII string, as ASCII */ - if((status = H5Dwrite(did, ascii_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &ascii_w)) < 0) FAIL_STACK_ERROR + if ((status = H5Dwrite(did, ascii_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &ascii_w)) < 0) + FAIL_STACK_ERROR /* Read the UTF8 string as ASCII, supposed to fail */ - H5E_BEGIN_TRY { - status = H5Dread(did, utf8_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &utf8_2); - } H5E_END_TRY - if(status >= 0) + H5E_BEGIN_TRY { status = H5Dread(did, utf8_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &utf8_2); } + H5E_END_TRY + if (status >= 0) FAIL_STACK_ERROR /* Close the dataset */ - if((status = H5Dclose(did)) < 0) FAIL_STACK_ERROR + if ((status = H5Dclose(did)) < 0) + FAIL_STACK_ERROR /* Close the UTF8 string datatype */ - if((status = H5Tclose(utf8_tid)) < 0) FAIL_STACK_ERROR + if ((status = H5Tclose(utf8_tid)) < 0) + FAIL_STACK_ERROR /* Close the ASCII string datatype */ - if((status = H5Tclose(ascii_tid)) < 0) FAIL_STACK_ERROR + if ((status = H5Tclose(ascii_tid)) < 0) + FAIL_STACK_ERROR /* Close the dataspace */ - if((status = H5Sclose(sid)) < 0) FAIL_STACK_ERROR + if ((status = H5Sclose(sid)) < 0) + FAIL_STACK_ERROR /* Close the file */ - if((status = H5Fclose(fid)) < 0) FAIL_STACK_ERROR + if ((status = H5Fclose(fid)) < 0) + FAIL_STACK_ERROR PASSED(); return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Tclose(utf8_vtid); H5Tclose(ascii_vtid); H5Tclose(utf8_tid); @@ -7374,7 +8099,8 @@ error: H5Dclose(did); H5Sclose(sid); H5Fclose(fid); - } H5E_END_TRY; + } + H5E_END_TRY; return 1; } @@ -7395,125 +8121,132 @@ error: * the library will only use basic version * *************************************************************************/ -static herr_t verify_version(hid_t dtype, H5F_libver_t low, unsigned *highest_version) +static herr_t +verify_version(hid_t dtype, H5F_libver_t low, unsigned *highest_version) { - hid_t base_dtype = -1; - hid_t mem_dtype = -1; - H5T_t *dtypep = NULL; /* Internal structure of a datatype */ - H5T_class_t type_cls = H5T_NO_CLASS; /* Temporary var for datatype class */ - int nmembers = 0; - unsigned i; - herr_t ret = SUCCEED; /* Generic return value */ + hid_t base_dtype = -1; + hid_t mem_dtype = -1; + H5T_t * dtypep = NULL; /* Internal structure of a datatype */ + H5T_class_t type_cls = H5T_NO_CLASS; /* Temporary var for datatype class */ + int nmembers = 0; + unsigned i; + herr_t ret = SUCCEED; /* Generic return value */ dtypep = (H5T_t *)H5I_object(dtype); - if (dtypep == NULL) TEST_ERROR + if (dtypep == NULL) + TEST_ERROR /* Carry out the verification according to the class of the datatype. For compound datatype, its members will be verified, recursively. For array datatype, its element datatype will be verified, recursively.*/ type_cls = dtypep->shared->type; - switch (type_cls) - { - case H5T_ARRAY: - { - H5T_t *base_dtypep = NULL; /* Internal structure of a datatype */ + switch (type_cls) { + case H5T_ARRAY: { + H5T_t *base_dtypep = NULL; /* Internal structure of a datatype */ - if (low == H5F_LIBVER_EARLIEST) - VERIFY(dtypep->shared->version, H5O_DTYPE_VERSION_2, "H5O_dtype_ver_bounds"); - else - VERIFY(dtypep->shared->version, H5O_dtype_ver_bounds[low], "H5O_dtype_ver_bounds"); + if (low == H5F_LIBVER_EARLIEST) + VERIFY(dtypep->shared->version, H5O_DTYPE_VERSION_2, "H5O_dtype_ver_bounds"); + else + VERIFY(dtypep->shared->version, H5O_dtype_ver_bounds[low], "H5O_dtype_ver_bounds"); - /* Get the base datatype of this array type */ - base_dtype = H5Tget_super(dtype); - CHECK(base_dtype, FAIL, "H5Tget_super"); + /* Get the base datatype of this array type */ + base_dtype = H5Tget_super(dtype); + CHECK(base_dtype, FAIL, "H5Tget_super"); - /* Get the base type's internal structure for version */ - base_dtypep = (H5T_t *)H5I_object(base_dtype); - if (base_dtypep == NULL) TEST_ERROR + /* Get the base type's internal structure for version */ + base_dtypep = (H5T_t *)H5I_object(base_dtype); + if (base_dtypep == NULL) + TEST_ERROR /* Reset highest version if this datatype has higher version than its outer type */ - if (*highest_version < base_dtypep->shared->version) - *highest_version = base_dtypep->shared->version; - - /* Verify the base datatype recursively */ - ret = verify_version(base_dtype, low, highest_version); - - /* Close the member datatype before checking for failure */ - if ((H5Tclose(base_dtype)) < 0) TEST_ERROR - - /* Check if verify_version fails */ - if (ret < 0) TEST_ERROR + if (*highest_version < base_dtypep->shared->version) + *highest_version = base_dtypep->shared->version; - break; - } - case H5T_COMPOUND: - { - H5T_t *mem_dtypep = NULL; /* Internal structure of a datatype */ - /* Get the number of members of this compound type */ - if ((nmembers = H5Tget_nmembers(dtype)) < 0) TEST_ERROR - - /* Go through all its member datatypes */ - for (i = 0; i < (unsigned)nmembers; i++) - { - /* Get the member datatype to verify it recursively */ - mem_dtype = H5Tget_member_type(dtype, i); - if (mem_dtype < 0) TEST_ERROR - - /* Get the member type's internal structure for version */ - mem_dtypep = (H5T_t *)H5I_object(mem_dtype); - if (mem_dtypep == NULL) TEST_ERROR - - /* Reset highest version if this datatype has higher version than - its outer type */ - if (*highest_version < mem_dtypep->shared->version) - *highest_version = mem_dtypep->shared->version; - - /* Verify the datatype recursively */ - ret = verify_version(mem_dtype, low, highest_version); + /* Verify the base datatype recursively */ + ret = verify_version(base_dtype, low, highest_version); /* Close the member datatype before checking for failure */ - if ((H5Tclose(mem_dtype)) < 0) TEST_ERROR + if ((H5Tclose(base_dtype)) < 0) + TEST_ERROR /* Check if verify_version fails */ - if (ret < 0) TEST_ERROR + if (ret < 0) + TEST_ERROR + + break; + } + case H5T_COMPOUND: { + H5T_t *mem_dtypep = NULL; /* Internal structure of a datatype */ + /* Get the number of members of this compound type */ + if ((nmembers = H5Tget_nmembers(dtype)) < 0) + TEST_ERROR + + /* Go through all its member datatypes */ + for (i = 0; i < (unsigned)nmembers; i++) { + /* Get the member datatype to verify it recursively */ + mem_dtype = H5Tget_member_type(dtype, i); + if (mem_dtype < 0) + TEST_ERROR + + /* Get the member type's internal structure for version */ + mem_dtypep = (H5T_t *)H5I_object(mem_dtype); + if (mem_dtypep == NULL) + TEST_ERROR + + /* Reset highest version if this datatype has higher version than + its outer type */ + if (*highest_version < mem_dtypep->shared->version) + *highest_version = mem_dtypep->shared->version; + + /* Verify the datatype recursively */ + ret = verify_version(mem_dtype, low, highest_version); + + /* Close the member datatype before checking for failure */ + if ((H5Tclose(mem_dtype)) < 0) + TEST_ERROR + + /* Check if verify_version fails */ + if (ret < 0) + TEST_ERROR + } + /* If this compound datatype contains a datatype of higher version, it + will be promoted to that version, thus, verify with highest version */ + if (*highest_version > H5O_dtype_ver_bounds[low]) + VERIFY(dtypep->shared->version, *highest_version, "verify_version"); + else + VERIFY(dtypep->shared->version, H5O_dtype_ver_bounds[low], "verify_version"); + break; } - /* If this compound datatype contains a datatype of higher version, it - will be promoted to that version, thus, verify with highest version */ - if (*highest_version > H5O_dtype_ver_bounds[low]) - VERIFY(dtypep->shared->version, *highest_version, "verify_version"); - else + case H5T_ENUM: VERIFY(dtypep->shared->version, H5O_dtype_ver_bounds[low], "verify_version"); - break; - } - case H5T_ENUM: - VERIFY(dtypep->shared->version, H5O_dtype_ver_bounds[low], "verify_version"); - break; - case H5T_VLEN: - case H5T_FLOAT: - case H5T_INTEGER: - VERIFY(dtypep->shared->version, H5O_dtype_ver_bounds[H5F_LIBVER_EARLIEST], "verify_version"); - break; - case H5T_NCLASSES: - case H5T_NO_CLASS: - case H5T_TIME: - case H5T_STRING: - case H5T_BITFIELD: - case H5T_OPAQUE: - case H5T_REFERENCE: - default: - TEST_ERROR + break; + case H5T_VLEN: + case H5T_FLOAT: + case H5T_INTEGER: + VERIFY(dtypep->shared->version, H5O_dtype_ver_bounds[H5F_LIBVER_EARLIEST], "verify_version"); + break; + case H5T_NCLASSES: + case H5T_NO_CLASS: + case H5T_TIME: + case H5T_STRING: + case H5T_BITFIELD: + case H5T_OPAQUE: + case H5T_REFERENCE: + default: + TEST_ERROR } /* end switch */ error: - H5E_BEGIN_TRY { - H5Tclose(base_dtype); - H5Tclose(mem_dtype); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Tclose(base_dtype); + H5Tclose(mem_dtype); + } + H5E_END_TRY; return ret; } /* end of verify_version */ - /*------------------------------------------------------------------------- * Function: test_versionbounds * @@ -7538,139 +8271,162 @@ error: * *------------------------------------------------------------------------- */ -#define VERFNAME "tverbounds_dtype.h5" -#define VERDSNAME "dataset 1" -#define ARRAY_RANK 1 -#define ARRAY_LEN 10 +#define VERFNAME "tverbounds_dtype.h5" +#define VERDSNAME "dataset 1" +#define ARRAY_RANK 1 +#define ARRAY_LEN 10 static int test_versionbounds(void) { - typedef struct { /* Struct for the simple compound type */ - int single_int; + typedef struct { /* Struct for the simple compound type */ + int single_int; char char_arr[ARRAY_LEN]; } simple_cmp_t; - typedef struct { /* Struct for the inner compound type */ + typedef struct { /* Struct for the inner compound type */ simple_cmp_t inner_arr[ARRAY_LEN]; - hvl_t vlen_float; + hvl_t vlen_float; } inner_cmp_t; - typedef struct { /* Struct for the outer compound type */ + typedef struct { /* Struct for the outer compound type */ inner_cmp_t inner_cmp; - color_t enum_color; + color_t enum_color; } outer_cmp_t; - hid_t file = -1; /* File ID */ - hid_t space = -1; /* Dataspace ID */ - hid_t dset = -1; /* Dataset ID */ - hid_t fcpl = -1; /* File creation property list ID */ - hid_t fapl = -1; /* Copy of file access property list ID */ - hid_t dcpl = -1; /* Dataset creation property list ID */ - hid_t dset_dtype = -1; /* Dataset's datatype */ - hid_t arr_chartype = -1; /* Array of characters datatype */ - hid_t vlen_floattype = -1; /* Vlen of float datatype */ - hid_t enum_type = -1; /* Enumeration datatype */ - hid_t outer_cmp_type = -1; /* Outer compound datatype */ - hid_t inner_cmp_type = -1; /* Inner compound datatype */ - hid_t simple_cmp_type = -1;/* Simple cmpd dtype, contains no other cmpd */ - hid_t outer_arr_type = -1; /* Outermost array datatype */ - hid_t inner_arr_type = -1; /* Inner array datatype */ - H5F_t *filep = NULL; /* Pointer to internal structure of a file */ - H5T_t *dtypep = NULL; /* Pointer to internal structure of a datatype */ - hsize_t arr_dim[] = {ARRAY_LEN}; /* Length of the array */ - int low, high; /* Indices for iterating over versions */ - H5F_libver_t versions[] = {H5F_LIBVER_EARLIEST, H5F_LIBVER_V18, H5F_LIBVER_V110, H5F_LIBVER_V112, H5F_LIBVER_V114}; - int versions_count = 5; /* Number of version bounds in the array */ - unsigned highest_version; /* Highest version in nested datatypes */ - color_t enum_val; /* Enum type index */ - herr_t ret = 0; /* Generic return value */ + hid_t file = -1; /* File ID */ + hid_t space = -1; /* Dataspace ID */ + hid_t dset = -1; /* Dataset ID */ + hid_t fcpl = -1; /* File creation property list ID */ + hid_t fapl = -1; /* Copy of file access property list ID */ + hid_t dcpl = -1; /* Dataset creation property list ID */ + hid_t dset_dtype = -1; /* Dataset's datatype */ + hid_t arr_chartype = -1; /* Array of characters datatype */ + hid_t vlen_floattype = -1; /* Vlen of float datatype */ + hid_t enum_type = -1; /* Enumeration datatype */ + hid_t outer_cmp_type = -1; /* Outer compound datatype */ + hid_t inner_cmp_type = -1; /* Inner compound datatype */ + hid_t simple_cmp_type = -1; /* Simple cmpd dtype, contains no other cmpd */ + hid_t outer_arr_type = -1; /* Outermost array datatype */ + hid_t inner_arr_type = -1; /* Inner array datatype */ + H5F_t * filep = NULL; /* Pointer to internal structure of a file */ + H5T_t * dtypep = NULL; /* Pointer to internal structure of a datatype */ + hsize_t arr_dim[] = {ARRAY_LEN}; /* Length of the array */ + int low, high; /* Indices for iterating over versions */ + H5F_libver_t versions[] = {H5F_LIBVER_EARLIEST, H5F_LIBVER_V18, H5F_LIBVER_V110, H5F_LIBVER_V112, + H5F_LIBVER_V114}; + int versions_count = 5; /* Number of version bounds in the array */ + unsigned highest_version; /* Highest version in nested datatypes */ + color_t enum_val; /* Enum type index */ + herr_t ret = 0; /* Generic return value */ TESTING("version bounds with nested datatypes"); /* Create a file access property list */ - if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) TEST_ERROR + if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) + TEST_ERROR /* Create a file creation property list */ - if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) TEST_ERROR + if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) + TEST_ERROR /* Create a scalar dataspace */ - if ((space = H5Screate(H5S_SCALAR)) < 0) TEST_ERROR + if ((space = H5Screate(H5S_SCALAR)) < 0) + TEST_ERROR /* Create a dataset creation property list */ - if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR + if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR /* Create an array datatype of chars */ arr_chartype = H5Tarray_create2(H5T_NATIVE_CHAR, ARRAY_RANK, arr_dim); - if (arr_chartype < 0) TEST_ERROR + if (arr_chartype < 0) + TEST_ERROR /* Create the simple compound datatype that has an integer and an array of chars */ simple_cmp_type = H5Tcreate(H5T_COMPOUND, sizeof(simple_cmp_t)); - if (simple_cmp_type < 0) TEST_ERROR + if (simple_cmp_type < 0) + TEST_ERROR /* Insert integer field */ ret = H5Tinsert(simple_cmp_type, "single_int", HOFFSET(simple_cmp_t, single_int), H5T_NATIVE_INT); - if (ret < 0) TEST_ERROR + if (ret < 0) + TEST_ERROR /* Insert array field */ ret = H5Tinsert(simple_cmp_type, "char_arr", HOFFSET(simple_cmp_t, char_arr), arr_chartype); - if (ret < 0) TEST_ERROR + if (ret < 0) + TEST_ERROR /* Create an array datatype containing simple compound datatype */ inner_arr_type = H5Tarray_create2(simple_cmp_type, ARRAY_RANK, arr_dim); - if (inner_arr_type < 0) TEST_ERROR + if (inner_arr_type < 0) + TEST_ERROR /* Create a VL datatype of floats */ vlen_floattype = H5Tvlen_create(H5T_NATIVE_FLOAT); - if (vlen_floattype < 0) TEST_ERROR + if (vlen_floattype < 0) + TEST_ERROR /* Create the innermost compound datatype that houses inner_arr_type and vlen_floattype */ inner_cmp_type = H5Tcreate(H5T_COMPOUND, sizeof(inner_cmp_t)); - if (inner_cmp_type < 0) TEST_ERROR + if (inner_cmp_type < 0) + TEST_ERROR /* Insert integer field */ ret = H5Tinsert(inner_cmp_type, "inner_arr", HOFFSET(inner_cmp_t, inner_arr), inner_arr_type); - if (ret < 0) TEST_ERROR + if (ret < 0) + TEST_ERROR /* Insert integer field */ ret = H5Tinsert(inner_cmp_type, "vlen_float", HOFFSET(inner_cmp_t, vlen_float), vlen_floattype); - if (ret < 0) TEST_ERROR + if (ret < 0) + TEST_ERROR /* Create a enumerate datatype */ enum_type = H5Tcreate(H5T_ENUM, sizeof(color_t)); - if (enum_type < 0) TEST_ERROR + if (enum_type < 0) + TEST_ERROR enum_val = E1_RED; - ret = H5Tenum_insert(enum_type, "RED", &enum_val); - if (ret < 0) TEST_ERROR + ret = H5Tenum_insert(enum_type, "RED", &enum_val); + if (ret < 0) + TEST_ERROR enum_val = E1_GREEN; - ret = H5Tenum_insert(enum_type, "GREEN", &enum_val); - if (ret < 0) TEST_ERROR + ret = H5Tenum_insert(enum_type, "GREEN", &enum_val); + if (ret < 0) + TEST_ERROR enum_val = E1_BLUE; - ret = H5Tenum_insert(enum_type, "BLUE", &enum_val); - if (ret < 0) TEST_ERROR + ret = H5Tenum_insert(enum_type, "BLUE", &enum_val); + if (ret < 0) + TEST_ERROR enum_val = E1_ORANGE; - ret = H5Tenum_insert(enum_type, "ORANGE", &enum_val); - if (ret < 0) TEST_ERROR + ret = H5Tenum_insert(enum_type, "ORANGE", &enum_val); + if (ret < 0) + TEST_ERROR enum_val = E1_YELLOW; - ret = H5Tenum_insert(enum_type, "YELLOW", &enum_val); - if (ret < 0) TEST_ERROR + ret = H5Tenum_insert(enum_type, "YELLOW", &enum_val); + if (ret < 0) + TEST_ERROR /* Create the outer compound datatype that contains the inner compound datatype and the enum datatype */ outer_cmp_type = H5Tcreate(H5T_COMPOUND, sizeof(outer_cmp_t)); - if (ret < 0) TEST_ERROR + if (ret < 0) + TEST_ERROR /* Insert integer field */ ret = H5Tinsert(outer_cmp_type, "inner_cmp", HOFFSET(outer_cmp_t, inner_cmp), inner_cmp_type); - if (ret < 0) TEST_ERROR + if (ret < 0) + TEST_ERROR /* Insert enum field */ ret = H5Tinsert(outer_cmp_type, "enum_color", HOFFSET(outer_cmp_t, enum_color), enum_type); - if (ret < 0) TEST_ERROR + if (ret < 0) + TEST_ERROR /* Create an array datatype containing the outer compound datatype */ if ((outer_arr_type = H5Tarray_create2(outer_cmp_type, ARRAY_RANK, arr_dim)) < 0) @@ -7680,60 +8436,71 @@ test_versionbounds(void) skipping invalid combinations */ /* Create the file, create and write to a dataset with compound datatype */ /* Verify the dataset's datatype and its members */ - for(low = 0; low < versions_count; low++) { + for (low = 0; low < versions_count; low++) { - for(high = 0; high < versions_count; high++) { + for (high = 0; high < versions_count; high++) { /* Set version bounds */ - H5E_BEGIN_TRY { - ret = H5Pset_libver_bounds(fapl, versions[low], versions[high]); - } H5E_END_TRY; + H5E_BEGIN_TRY { ret = H5Pset_libver_bounds(fapl, versions[low], versions[high]); } + H5E_END_TRY; if (ret < 0) /* Invalid low/high combinations */ continue; /* Create a file */ file = H5Fcreate(VERFNAME, H5F_ACC_TRUNC, fcpl, fapl); - if (file < 0) TEST_ERROR + if (file < 0) + TEST_ERROR /* Get the internal file pointer if the create succeeds */ - if ((filep = (H5F_t *)H5I_object(file)) == NULL) TEST_ERROR + if ((filep = (H5F_t *)H5I_object(file)) == NULL) + TEST_ERROR /* Create dataset using the array type */ dset = H5Dcreate2(file, VERDSNAME, outer_arr_type, space, H5P_DEFAULT, dcpl, H5P_DEFAULT); - if (dset < 0) TEST_ERROR + if (dset < 0) + TEST_ERROR /* Get the dataset's datatype */ - if ((dset_dtype = H5Dget_type(dset)) < 0) TEST_ERROR + if ((dset_dtype = H5Dget_type(dset)) < 0) + TEST_ERROR /* Get the version of this datatype */ dtypep = (H5T_t *)H5I_object(dset_dtype); - if (dtypep == NULL) TEST_ERROR + if (dtypep == NULL) + TEST_ERROR highest_version = dtypep->shared->version; /* Verify version of the datatype recursevily */ ret = verify_version(dset_dtype, versions[low], &highest_version); /* Close the dataset's datatype */ - if (H5Tclose(dset_dtype) < 0) TEST_ERROR + if (H5Tclose(dset_dtype) < 0) + TEST_ERROR /* Close dataset and file */ - if (H5Dclose(dset) < 0) TEST_ERROR - if (H5Fclose(file) < 0) TEST_ERROR + if (H5Dclose(dset) < 0) + TEST_ERROR + if (H5Fclose(file) < 0) + TEST_ERROR } /* for high */ - } /* for low */ + } /* for low */ /* Close dataspace and property lists */ - if (H5Sclose(space) < 0) TEST_ERROR - if (H5Pclose(fcpl) < 0) TEST_ERROR - if (H5Pclose(fapl) < 0) TEST_ERROR + if (H5Sclose(space) < 0) + TEST_ERROR + if (H5Pclose(fcpl) < 0) + TEST_ERROR + if (H5Pclose(fapl) < 0) + TEST_ERROR PASSED(); return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Dclose(dset); H5Sclose(space); H5Tclose(dset_dtype); @@ -7741,11 +8508,11 @@ error: H5Pclose(fcpl); H5Pclose(fapl); H5Fclose(file); - } H5E_END_TRY; + } + H5E_END_TRY; return 1; } /* end test_versionbounds() */ - /*------------------------------------------------------------------------- * Function: main * @@ -7762,8 +8529,8 @@ error: int main(void) { - long nerrors = 0; - hid_t fapl = H5I_INVALID_HID; + long nerrors = 0; + hid_t fapl = H5I_INVALID_HID; /* Set the random # seed */ HDsrandom((unsigned)HDtime(NULL)); @@ -7771,7 +8538,7 @@ main(void) reset_hdf5(); fapl = h5_fileaccess(); - if(ALIGNMENT) + if (ALIGNMENT) HDprintf("Testing non-aligned conversions (ALIGNMENT=%d)....\n", ALIGNMENT); /* Do the tests */ @@ -7826,8 +8593,8 @@ main(void) nerrors += test_utf_ascii_conv(); nerrors += test_versionbounds(); - if(nerrors) { - HDprintf("***** %lu FAILURE%s! *****\n", nerrors, 1==nerrors?"":"S"); + if (nerrors) { + HDprintf("***** %lu FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S"); HDexit(EXIT_FAILURE); } @@ -7835,4 +8602,3 @@ main(void) return 0; } - |