diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-09-05 20:11:52 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-05 20:11:52 (GMT) |
| commit | 920869796031ed4ee9c1fbea8aaccda3592a88b3 (patch) | |
| tree | 30f007ff79b87a79c882d9149cdbfcb797be92e1 /test/objcopy.c | |
| parent | ae1379094b71c51342772397af5caca088862a61 (diff) | |
| download | hdf5-920869796031ed4ee9c1fbea8aaccda3592a88b3.zip hdf5-920869796031ed4ee9c1fbea8aaccda3592a88b3.tar.gz hdf5-920869796031ed4ee9c1fbea8aaccda3592a88b3.tar.bz2 | |
Convert hbool_t --> bool in test (#3494)
Diffstat (limited to 'test/objcopy.c')
| -rw-r--r-- | test/objcopy.c | 496 |
1 files changed, 245 insertions, 251 deletions
diff --git a/test/objcopy.c b/test/objcopy.c index 8848ab1..13b6783 100644 --- a/test/objcopy.c +++ b/test/objcopy.c @@ -204,28 +204,28 @@ token_insert(H5O_info2_t *oi) * * Purpose: Check if a token has already been encountered * - * Return: Success: TRUE/FALSE + * Return: Success: true/false * Failure: (can't fail) * *------------------------------------------------------------------------- */ -static H5_ATTR_PURE hbool_t +static H5_ATTR_PURE bool token_lookup(hid_t loc_id, H5O_info2_t *oi) { size_t n; int token_cmp; if (oi->rc < 2) - return FALSE; /*only one link possible*/ + return false; /*only one link possible*/ for (n = 0; n < idtab_g.nobjs; n++) { if (H5Otoken_cmp(loc_id, &idtab_g.obj[n], &oi->token, &token_cmp) < 0) - return FALSE; + return false; if (!token_cmp) - return TRUE; + return true; } - return FALSE; + return false; } /* end token_lookup() */ /*------------------------------------------------------------------------- @@ -738,7 +738,7 @@ done: * * Purpose: Compare two attributes to check that they are equal * - * Return: TRUE if attributes are equal/FALSE if they are different + * Return: true if attributes are equal/false if they are different * *------------------------------------------------------------------------- */ @@ -790,7 +790,7 @@ compare_attribute(hid_t aid, hid_t aid2, hid_t pid, const void *wbuf, hid_t obj_ TEST_ERROR; /* Compare the datatypes */ - if (H5Tequal(tid, tid2) != TRUE) + if (H5Tequal(tid, tid2) != true) TEST_ERROR; /* Determine the size of datatype (for later) */ @@ -808,7 +808,7 @@ compare_attribute(hid_t aid, hid_t aid2, hid_t pid, const void *wbuf, hid_t obj_ TEST_ERROR; /* Compare the dataspaces */ - if (H5Sextent_equal(sid, sid2) != TRUE) + if (H5Sextent_equal(sid, sid2) != true) TEST_ERROR; /* Determine the number of elements in dataspace (for later) */ @@ -843,10 +843,10 @@ compare_attribute(hid_t aid, hid_t aid2, hid_t pid, const void *wbuf, hid_t obj_ TEST_ERROR; /* Reclaim vlen data, if necessary */ - if (H5Tdetect_class(tid, H5T_VLEN) == TRUE) + if (H5Tdetect_class(tid, H5T_VLEN) == true) if (H5Treclaim(tid, sid, H5P_DEFAULT, rbuf) < 0) TEST_ERROR; - if (H5Tdetect_class(tid2, H5T_VLEN) == TRUE) + if (H5Tdetect_class(tid2, H5T_VLEN) == true) if (H5Treclaim(tid2, sid2, H5P_DEFAULT, rbuf2) < 0) TEST_ERROR; @@ -872,7 +872,7 @@ compare_attribute(hid_t aid, hid_t aid2, hid_t pid, const void *wbuf, hid_t obj_ if (H5Tclose(tid2) < 0) TEST_ERROR; - return TRUE; + return true; error: if (rbuf) @@ -887,7 +887,7 @@ error: H5Tclose(tid); } H5E_END_TRY - return FALSE; + return false; } /* end compare_attribute() */ /*------------------------------------------------------------------------- @@ -895,7 +895,7 @@ error: * * Purpose: Compare "standard" attributes on two objects to check that they are equal * - * Return: TRUE if objects have same attributes/FALSE if they are different + * Return: true if objects have same attributes/false if they are different * * Note: This isn't very general, the attributes are assumed to be * those written in test_copy_attach_attributes(). @@ -962,7 +962,7 @@ compare_std_attributes(hid_t oid, hid_t oid2, hid_t pid) } /* end if */ /* Objects should be the same. :-) */ - return TRUE; + return true; error: H5E_BEGIN_TRY @@ -971,7 +971,7 @@ error: H5Aclose(aid); } H5E_END_TRY - return FALSE; + return false; } /* end compare_std_attributes() */ /*------------------------------------------------------------------------- @@ -979,7 +979,7 @@ error: * * Purpose: Compare two buffers of data to check that they are equal * - * Return: TRUE if buffer are equal/FALSE if they are different + * Return: true if buffer are equal/false if they are different * *------------------------------------------------------------------------- */ @@ -996,7 +996,7 @@ compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts, /* If the type is a compound containing a vlen, loop over all elements for * each compound member. Compounds containing reference are not supported * yet. */ - if ((H5Tget_class(tid) == H5T_COMPOUND) && (H5Tdetect_class(tid, H5T_VLEN) == TRUE)) { + if ((H5Tget_class(tid) == H5T_COMPOUND) && (H5Tdetect_class(tid, H5T_VLEN) == true)) { hid_t memb_id; /* Member id */ const uint8_t *memb1; /* Pointer to current member */ const uint8_t *memb2; /* Pointer to current member */ @@ -1059,7 +1059,7 @@ compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts, else { /* vlens cannot currently be nested below the top layer of a * compound */ - assert(H5Tdetect_class(memb_id, H5T_VLEN) == FALSE); + assert(H5Tdetect_class(memb_id, H5T_VLEN) == false); /* Iterate over all elements, calling memcmp() for each */ for (elmt = 0; elmt < nelmts; elmt++) { @@ -1073,7 +1073,7 @@ compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts, } /* end else */ } /* end for */ } - else if (H5Tdetect_class(tid, H5T_VLEN) == TRUE) { + else if (H5Tdetect_class(tid, H5T_VLEN) == true) { const hvl_t *vl_buf1, *vl_buf2; /* Aliases for buffers to compare */ hid_t base_tid; /* Base type of vlen datatype */ size_t u; /* Local index variable */ @@ -1103,7 +1103,7 @@ compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts, if (H5Tclose(base_tid) < 0) TEST_ERROR; } /* end if */ - else if (H5Tdetect_class(tid, H5T_REFERENCE) == TRUE) { + else if (H5Tdetect_class(tid, H5T_REFERENCE) == true) { size_t u; /* Local index variable */ /* Check for "simple" reference datatype */ @@ -1151,24 +1151,24 @@ compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts, TEST_ERROR; if (H5Oclose(obj2_id) < 0) TEST_ERROR; - return TRUE; + return true; } } /* Check for types of objects handled */ switch (obj1_type) { case H5O_TYPE_DATASET: - if (compare_datasets(obj1_id, obj2_id, pid, NULL) != TRUE) + if (compare_datasets(obj1_id, obj2_id, pid, NULL) != true) TEST_ERROR; break; case H5O_TYPE_GROUP: - if (compare_groups(obj1_id, obj2_id, pid, -1, 0) != TRUE) + if (compare_groups(obj1_id, obj2_id, pid, -1, 0) != true) TEST_ERROR; break; case H5O_TYPE_NAMED_DATATYPE: - if (H5Tequal(obj1_id, obj2_id) != TRUE) + if (H5Tequal(obj1_id, obj2_id) != true) TEST_ERROR; break; @@ -1229,24 +1229,24 @@ compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts, TEST_ERROR; if (H5Oclose(obj2_id) < 0) TEST_ERROR; - return TRUE; + return true; } } /* Check for types of objects handled */ switch (obj1_type) { case H5O_TYPE_DATASET: - if (compare_datasets(obj1_id, obj2_id, pid, NULL) != TRUE) + if (compare_datasets(obj1_id, obj2_id, pid, NULL) != true) TEST_ERROR; break; case H5O_TYPE_GROUP: - if (compare_groups(obj1_id, obj2_id, pid, -1, 0) != TRUE) + if (compare_groups(obj1_id, obj2_id, pid, -1, 0) != true) TEST_ERROR; break; case H5O_TYPE_NAMED_DATATYPE: - if (H5Tequal(obj1_id, obj2_id) != TRUE) + if (H5Tequal(obj1_id, obj2_id) != true) TEST_ERROR; break; @@ -1289,10 +1289,10 @@ compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts, TEST_ERROR; /* Data should be the same. :-) */ - return TRUE; + return true; error: - return FALSE; + return false; } /* end compare_data() */ /*------------------------------------------------------------------------- @@ -1300,7 +1300,7 @@ error: * * Purpose: Compare two datasets to check that they are equal * - * Return: TRUE if datasets are equal/FALSE if they are different + * Return: true if datasets are equal/false if they are different * *------------------------------------------------------------------------- */ @@ -1339,7 +1339,7 @@ compare_datasets(hid_t did, hid_t did2, hid_t pid, const void *wbuf) TEST_ERROR; /* Compare the datatypes */ - if (H5Tequal(tid, tid2) != TRUE) + if (H5Tequal(tid, tid2) != true) TEST_ERROR; /* Determine the size of datatype (for later) */ @@ -1357,7 +1357,7 @@ compare_datasets(hid_t did, hid_t did2, hid_t pid, const void *wbuf) TEST_ERROR; /* Compare the dataspaces */ - if (H5Sextent_equal(sid, sid2) != TRUE) + if (H5Sextent_equal(sid, sid2) != true) TEST_ERROR; /* Determine the number of elements in dataspace (for later) */ @@ -1375,7 +1375,7 @@ compare_datasets(hid_t did, hid_t did2, hid_t pid, const void *wbuf) TEST_ERROR; /* Compare the rest of the dataset creation property lists */ - if (H5Pequal(dcpl, dcpl2) != TRUE) + if (H5Pequal(dcpl, dcpl2) != true) TEST_ERROR; /* Get the number of filters on dataset (for later) */ @@ -1441,10 +1441,10 @@ compare_datasets(hid_t did, hid_t did2, hid_t pid, const void *wbuf) TEST_ERROR; /* Reclaim vlen data, if necessary */ - if (H5Tdetect_class(tid, H5T_VLEN) == TRUE) + if (H5Tdetect_class(tid, H5T_VLEN) == true) if (H5Treclaim(tid, sid, H5P_DEFAULT, rbuf) < 0) TEST_ERROR; - if (H5Tdetect_class(tid2, H5T_VLEN) == TRUE) + if (H5Tdetect_class(tid2, H5T_VLEN) == true) if (H5Treclaim(tid2, sid2, H5P_DEFAULT, rbuf2) < 0) TEST_ERROR; @@ -1471,11 +1471,11 @@ compare_datasets(hid_t did, hid_t did2, hid_t pid, const void *wbuf) TEST_ERROR; /* Check if the attributes are equal */ - if (compare_std_attributes(did, did2, pid) != TRUE) + if (compare_std_attributes(did, did2, pid) != true) TEST_ERROR; /* Datasets should be the same. :-) */ - return TRUE; + return true; error: H5E_BEGIN_TRY @@ -1492,7 +1492,7 @@ error: H5Tclose(tid); } H5E_END_TRY - return FALSE; + return false; } /* end compare_datasets() */ /*------------------------------------------------------------------------- @@ -1500,7 +1500,7 @@ error: * * Purpose: Compare two groups to check that they are "equal" * - * Return: TRUE if group are equal/FALSE if they are different + * Return: true if group are equal/false if they are different * *------------------------------------------------------------------------- */ @@ -1613,19 +1613,19 @@ compare_groups(hid_t gid, hid_t gid2, hid_t pid, int depth, unsigned copy_flags) switch (oinfo.type) { case H5O_TYPE_GROUP: /* Compare groups */ - if (compare_groups(oid, oid2, pid, depth - 1, copy_flags) != TRUE) + if (compare_groups(oid, oid2, pid, depth - 1, copy_flags) != true) TEST_ERROR; break; case H5O_TYPE_DATASET: /* Compare datasets */ - if (compare_datasets(oid, oid2, pid, NULL) != TRUE) + if (compare_datasets(oid, oid2, pid, NULL) != true) TEST_ERROR; break; case H5O_TYPE_NAMED_DATATYPE: /* Compare datatypes */ - if (H5Tequal(oid, oid2) != TRUE) + if (H5Tequal(oid, oid2) != true) TEST_ERROR; break; @@ -1681,18 +1681,18 @@ compare_groups(hid_t gid, hid_t gid2, hid_t pid, int depth, unsigned copy_flags) } /* end if */ /* Check if the attributes are equal */ - if (compare_std_attributes(gid, gid2, pid) != TRUE) + if (compare_std_attributes(gid, gid2, pid) != true) TEST_ERROR; /* Groups should be the same. :-) */ - return TRUE; + return true; error: H5E_BEGIN_TRY { } H5E_END_TRY - return FALSE; + return false; } /* end compare_groups() */ /*------------------------------------------------------------------------- @@ -1701,9 +1701,9 @@ error: * Purpose: If using new format, the index array type should be NEW_TYPE * If not, the index array type should be OLD_TYPE * - * Return: TRUE if the index type retrieved for the dataset DID is + * Return: true if the index type retrieved for the dataset DID is * as expected - * FALSE if not + * false if not * *------------------------------------------------------------------------- */ @@ -1729,9 +1729,9 @@ compare_idx_type(hid_t fapl, hid_t did, H5D_chunk_index_t new_type, H5D_chunk_in else if (idx_type != old_type) TEST_ERROR; - return TRUE; + return true; error: - return FALSE; + return false; } /* compare_idx_type() */ /*------------------------------------------------------------------------- @@ -1807,7 +1807,7 @@ test_copy_named_datatype(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t d FAIL_STACK_ERROR; /* Compare the datatypes */ - if (H5Tequal(tid, tid2) != TRUE) + if (H5Tequal(tid, tid2) != true) TEST_ERROR; /* close the destination datatype */ @@ -1914,7 +1914,7 @@ test_copy_named_datatype_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_ FAIL_STACK_ERROR; /* Compare the datatypes */ - if (H5Tequal(tid, tid2) != TRUE) + if (H5Tequal(tid, tid2) != true) TEST_ERROR; /* close the destination datatype */ @@ -2029,7 +2029,7 @@ test_copy_named_datatype_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, h FAIL_STACK_ERROR; /* Compare the datatypes */ - if (H5Tequal(tid, tid2) != TRUE) + if (H5Tequal(tid, tid2) != true) TEST_ERROR; /* close the destination datatype */ @@ -2085,7 +2085,7 @@ test_copy_named_datatype_attr_self(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap hsize_t dims[2] = {3, 4}; /* Dataspace dimensions */ H5O_info2_t oinfo, oinfo2; /* Object info */ H5G_info_t ginfo; /* Group info */ - hbool_t same_type; + bool same_type; char src_filename[NAME_BUF_SIZE]; char dst_filename[NAME_BUF_SIZE]; @@ -2164,7 +2164,7 @@ test_copy_named_datatype_attr_self(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap FAIL_STACK_ERROR; /* Compare the datatypes */ - if (H5Tequal(tid, tid2) != TRUE) + if (H5Tequal(tid, tid2) != true) TEST_ERROR; /* close the source datatype */ @@ -2180,7 +2180,7 @@ test_copy_named_datatype_attr_self(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap TEST_ERROR; /* verify that the attribute's datatype is committed */ - if (H5Tcommitted(tid) != TRUE) + if (H5Tcommitted(tid) != true) TEST_ERROR; /* verify that the tokens of the datatypes are the same */ @@ -2189,16 +2189,16 @@ test_copy_named_datatype_attr_self(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap if (H5Oget_info3(tid2, &oinfo2, H5O_INFO_BASIC) < 0) TEST_ERROR; - same_type = TRUE; + same_type = true; if (oinfo.fileno == oinfo2.fileno) { int token_cmp; if (H5Otoken_cmp(tid2, &oinfo.token, &oinfo2.token, &token_cmp) < 0) TEST_ERROR; if (token_cmp) - same_type = FALSE; + same_type = false; } else - same_type = FALSE; + same_type = false; if (!same_type) FAIL_PUTS_ERROR("destination attribute does not use the same committed datatype"); @@ -2342,7 +2342,7 @@ test_copy_dataset_simple(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t d TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != true) TEST_ERROR; /* close the destination dataset */ @@ -2542,7 +2542,7 @@ test_copy_dataset_versionbounds(hid_t fcpl_src, hid_t fapl_src) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did_src, did_dst, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did_src, did_dst, H5P_DEFAULT, buf) != true) TEST_ERROR; /* Close the datasets */ @@ -2670,7 +2670,7 @@ test_copy_dataset_simple_samefile(hid_t fcpl, hid_t fapl) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != true) TEST_ERROR; /* close the destination dataset */ @@ -2715,8 +2715,7 @@ error: *------------------------------------------------------------------------- */ static int -test_copy_dataset_simple_empty(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, - hbool_t test_open) +test_copy_dataset_simple_empty(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, bool test_open) { hid_t fid_src = -1, fid_dst = -1; /* File IDs */ hid_t sid = -1; /* Dataspace ID */ @@ -2803,7 +2802,7 @@ test_copy_dataset_simple_empty(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, h TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != true) TEST_ERROR; /* close the destination dataset */ @@ -2954,7 +2953,7 @@ test_copy_dataset_compound(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != true) TEST_ERROR; /* close the destination dataset */ @@ -3329,11 +3328,11 @@ test_copy_dataset_chunked(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t TEST_ERROR; /* Check if the array index type is correct */ - if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_EARRAY, H5D_CHUNK_IDX_BTREE) != TRUE) + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_EARRAY, H5D_CHUNK_IDX_BTREE) != true) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf1d) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf1d) != true) TEST_ERROR; /* close the destination dataset */ @@ -3353,11 +3352,11 @@ test_copy_dataset_chunked(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t TEST_ERROR; /* Check if the array index type is correct */ - if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != TRUE) + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != true) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf1d) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf1d) != true) TEST_ERROR; /* close the destination dataset */ @@ -3377,11 +3376,11 @@ test_copy_dataset_chunked(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t TEST_ERROR; /* Check if the array index type is correct */ - if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_FARRAY, H5D_CHUNK_IDX_BTREE) != TRUE) + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_FARRAY, H5D_CHUNK_IDX_BTREE) != true) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf2d) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf2d) != true) TEST_ERROR; /* close the destination dataset */ @@ -3401,11 +3400,11 @@ test_copy_dataset_chunked(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t TEST_ERROR; /* Check if the array index type is correct */ - if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_NONE, H5D_CHUNK_IDX_BTREE) != TRUE) + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_NONE, H5D_CHUNK_IDX_BTREE) != true) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf2d) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf2d) != true) TEST_ERROR; /* close the destination dataset */ @@ -3425,11 +3424,11 @@ test_copy_dataset_chunked(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t TEST_ERROR; /* Check if the array index type is correct */ - if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != TRUE) + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != true) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf2d) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf2d) != true) TEST_ERROR; /* close the destination dataset */ @@ -3449,11 +3448,11 @@ test_copy_dataset_chunked(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t TEST_ERROR; /* Check if the array index type is correct */ - if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != TRUE) + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != true) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf2d) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf2d) != true) TEST_ERROR; /* close the destination dataset */ @@ -3473,11 +3472,11 @@ test_copy_dataset_chunked(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t TEST_ERROR; /* Check if the array index type is correct */ - if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != TRUE) + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != true) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf2d) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf2d) != true) TEST_ERROR; /* close the destination dataset */ @@ -3829,11 +3828,11 @@ test_copy_dataset_chunked_empty(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, TEST_ERROR; /* Check if the array index type is correct */ - if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_EARRAY, H5D_CHUNK_IDX_BTREE) != TRUE) + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_EARRAY, H5D_CHUNK_IDX_BTREE) != true) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != true) TEST_ERROR; /* close the destination dataset */ @@ -3853,11 +3852,11 @@ test_copy_dataset_chunked_empty(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, TEST_ERROR; /* Check if the array index type is correct */ - if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != TRUE) + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != true) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != true) TEST_ERROR; /* close the destination dataset */ @@ -3877,11 +3876,11 @@ test_copy_dataset_chunked_empty(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, TEST_ERROR; /* Check if the array index type is correct */ - if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_FARRAY, H5D_CHUNK_IDX_BTREE) != TRUE) + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_FARRAY, H5D_CHUNK_IDX_BTREE) != true) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != true) TEST_ERROR; /* close the destination dataset */ @@ -3901,11 +3900,11 @@ test_copy_dataset_chunked_empty(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, TEST_ERROR; /* Check if the array index type is correct */ - if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != TRUE) + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != true) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != true) TEST_ERROR; /* close the destination dataset */ @@ -3925,11 +3924,11 @@ test_copy_dataset_chunked_empty(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, TEST_ERROR; /* Check if the array index type is correct */ - if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_NONE, H5D_CHUNK_IDX_BTREE) != TRUE) + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_NONE, H5D_CHUNK_IDX_BTREE) != true) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != true) TEST_ERROR; /* close the destination dataset */ @@ -3949,11 +3948,11 @@ test_copy_dataset_chunked_empty(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, TEST_ERROR; /* Check if the array index type is correct */ - if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != TRUE) + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != true) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != true) TEST_ERROR; /* close the destination dataset */ @@ -3973,11 +3972,11 @@ test_copy_dataset_chunked_empty(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, TEST_ERROR; /* Check if the array index type is correct */ - if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != TRUE) + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != true) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != true) TEST_ERROR; /* close the destination dataset */ @@ -4279,11 +4278,11 @@ test_copy_dataset_chunked_sparse(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, TEST_ERROR; /* Check if the array index type is correct */ - if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_EARRAY, H5D_CHUNK_IDX_BTREE) != TRUE) + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_EARRAY, H5D_CHUNK_IDX_BTREE) != true) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != true) TEST_ERROR; /* close the destination dataset */ @@ -4303,11 +4302,11 @@ test_copy_dataset_chunked_sparse(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, TEST_ERROR; /* Check if the array index type is correct */ - if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_BT2, H5D_CHUNK_IDX_BTREE) != TRUE) + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_BT2, H5D_CHUNK_IDX_BTREE) != true) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != true) TEST_ERROR; /* close the destination dataset */ @@ -4327,11 +4326,11 @@ test_copy_dataset_chunked_sparse(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, TEST_ERROR; /* Check if the array index type is correct */ - if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_NONE, H5D_CHUNK_IDX_BTREE) != TRUE) + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_NONE, H5D_CHUNK_IDX_BTREE) != true) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != true) TEST_ERROR; /* close the destination dataset */ @@ -4351,11 +4350,11 @@ test_copy_dataset_chunked_sparse(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, TEST_ERROR; /* Check if the array index type is correct */ - if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_NONE, H5D_CHUNK_IDX_BTREE) != TRUE) + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_NONE, H5D_CHUNK_IDX_BTREE) != true) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != true) TEST_ERROR; /* close the destination dataset */ @@ -4671,11 +4670,11 @@ test_copy_dataset_compressed(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED, H5P_DEFAULT)) < 0) TEST_ERROR; - if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_FARRAY, H5D_CHUNK_IDX_BTREE) != TRUE) + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_FARRAY, H5D_CHUNK_IDX_BTREE) != true) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != true) TEST_ERROR; /* close the destination dataset */ @@ -4694,11 +4693,11 @@ test_copy_dataset_compressed(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED2, H5P_DEFAULT)) < 0) TEST_ERROR; - if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_FARRAY, H5D_CHUNK_IDX_BTREE) != TRUE) + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_FARRAY, H5D_CHUNK_IDX_BTREE) != true) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != true) TEST_ERROR; /* close the destination dataset */ @@ -4717,11 +4716,11 @@ test_copy_dataset_compressed(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED2_SINGLE, H5P_DEFAULT)) < 0) TEST_ERROR; - if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != TRUE) + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != true) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != true) TEST_ERROR; /* close the destination dataset */ @@ -4740,11 +4739,11 @@ test_copy_dataset_compressed(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED3_SINGLE, H5P_DEFAULT)) < 0) TEST_ERROR; - if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != TRUE) + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != true) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != true) TEST_ERROR; /* close the destination dataset */ @@ -4763,11 +4762,11 @@ test_copy_dataset_compressed(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED4_SINGLE, H5P_DEFAULT)) < 0) TEST_ERROR; - if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != TRUE) + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_SINGLE, H5D_CHUNK_IDX_BTREE) != true) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != true) TEST_ERROR; /* close the destination dataset */ @@ -4820,8 +4819,7 @@ error: *------------------------------------------------------------------------- */ static int -test_copy_dataset_no_edge_filt(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, - hbool_t test_open) +test_copy_dataset_no_edge_filt(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, bool test_open) { #ifdef H5_HAVE_FILTER_DEFLATE hid_t fid_src = -1, fid_dst = -1; /* File IDs */ @@ -4945,11 +4943,11 @@ test_copy_dataset_no_edge_filt(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, h TEST_ERROR; /* H5Pset_chunk_opts() will set layout version to 4 which will use latest indexing available */ - if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_FARRAY, H5D_CHUNK_IDX_FARRAY) != TRUE) + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_FARRAY, H5D_CHUNK_IDX_FARRAY) != true) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != true) TEST_ERROR; /* close the destination dataset */ @@ -5002,7 +5000,7 @@ error: *------------------------------------------------------------------------- */ static int -test_copy_dataset_compact(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, hbool_t test_open) +test_copy_dataset_compact(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, bool test_open) { hid_t fid_src = -1, fid_dst = -1; /* File IDs */ hid_t sid = -1; /* Dataspace ID */ @@ -5110,7 +5108,7 @@ test_copy_dataset_compact(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != true) TEST_ERROR; /* close the destination dataset */ @@ -5255,7 +5253,7 @@ test_copy_dataset_external(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != true) TEST_ERROR; /* close the destination dataset */ @@ -5397,7 +5395,7 @@ test_copy_dataset_named_dtype(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hi TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != true) TEST_ERROR; /* close the destination dataset */ @@ -5560,7 +5558,7 @@ test_copy_dataset_named_dtype_hier(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap FAIL_STACK_ERROR; /* Check if the groups are equal */ - if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) + if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != true) TEST_ERROR; /* close the destination group */ @@ -5725,7 +5723,7 @@ test_copy_dataset_named_dtype_hier_outside(hid_t fcpl_src, hid_t fcpl_dst, hid_t FAIL_STACK_ERROR; /* Check if the groups are equal */ - if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) + if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != true) TEST_ERROR; /* close the destination group */ @@ -5779,7 +5777,7 @@ error: */ static int test_copy_dataset_multi_ohdr_chunks(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, - hbool_t test_open) + bool test_open) { hid_t fid_src = -1, fid_dst = -1; /* File IDs */ hid_t sid = -1; /* Dataspace ID */ @@ -5901,7 +5899,7 @@ test_copy_dataset_multi_ohdr_chunks(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fa FAIL_STACK_ERROR; /* Check if the groups are equal */ - if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) + if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != true) TEST_ERROR; /* close the destination group */ @@ -6068,7 +6066,7 @@ test_copy_dataset_attr_named_dtype(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap FAIL_STACK_ERROR; /* Check if the groups are equal */ - if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) + if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != true) TEST_ERROR; /* close the destination group */ @@ -6205,7 +6203,7 @@ test_copy_dataset_contig_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_ TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != true) TEST_ERROR; /* close the destination dataset */ @@ -6225,7 +6223,7 @@ test_copy_dataset_contig_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_ TEST_ERROR; /* Reclaim vlen buffer */ - if (H5Tdetect_class(tid, H5T_VLEN) == TRUE) { + if (H5Tdetect_class(tid, H5T_VLEN) == true) { if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) TEST_ERROR; if (H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) @@ -6391,11 +6389,11 @@ test_copy_dataset_chunked_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_VL, H5P_DEFAULT)) < 0) TEST_ERROR; - if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_FARRAY, H5D_CHUNK_IDX_BTREE) != TRUE) + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_FARRAY, H5D_CHUNK_IDX_BTREE) != true) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != true) TEST_ERROR; /* close the destination dataset */ @@ -6414,11 +6412,11 @@ test_copy_dataset_chunked_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_VL2, H5P_DEFAULT)) < 0) TEST_ERROR; - if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_NONE, H5D_CHUNK_IDX_BTREE) != TRUE) + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_NONE, H5D_CHUNK_IDX_BTREE) != true) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != true) TEST_ERROR; /* close the destination dataset */ @@ -6438,7 +6436,7 @@ test_copy_dataset_chunked_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid TEST_ERROR; /* Reclaim vlen buffer */ - if (H5Tdetect_class(tid, H5T_VLEN) == TRUE) { + if (H5Tdetect_class(tid, H5T_VLEN) == true) { if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) TEST_ERROR; if (H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) @@ -6587,7 +6585,7 @@ test_copy_dataset_compact_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != true) TEST_ERROR; /* close the destination dataset */ @@ -6607,7 +6605,7 @@ test_copy_dataset_compact_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid TEST_ERROR; /* Reclaim vlen buffer */ - if (H5Tdetect_class(tid, H5T_VLEN) == TRUE) { + if (H5Tdetect_class(tid, H5T_VLEN) == true) { if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) TEST_ERROR; if (H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) @@ -6742,7 +6740,7 @@ test_copy_attribute_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst if ((aid2 = H5Aopen_by_idx(did2, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; - if (compare_attribute(aid, aid2, H5P_DEFAULT, NULL, did) != TRUE) + if (compare_attribute(aid, aid2, H5P_DEFAULT, NULL, did) != true) TEST_ERROR; if (H5Aclose(aid) < 0) TEST_ERROR; @@ -6944,7 +6942,7 @@ compare_attribute_compound_vlstr(hid_t loc, hid_t loc2) FAIL_STACK_ERROR; if (H5Aclose(aid2) < 0) FAIL_STACK_ERROR; - return TRUE; + return true; error: H5E_BEGIN_TRY @@ -6960,7 +6958,7 @@ error: H5Pclose(dxpl_id); } H5E_END_TRY - return FALSE; + return false; } /* compare_attribute_compound_vlstr() */ @@ -7254,7 +7252,7 @@ test_copy_dataset_compressed_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != true) TEST_ERROR; /* close the destination dataset */ @@ -7274,7 +7272,7 @@ test_copy_dataset_compressed_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, TEST_ERROR; /* Reclaim vlen buffer */ - if (H5Tdetect_class(tid, H5T_VLEN) == TRUE) { + if (H5Tdetect_class(tid, H5T_VLEN) == true) { if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) TEST_ERROR; if (H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) @@ -7389,7 +7387,7 @@ test_copy_group_empty(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_ FAIL_STACK_ERROR; /* Check if the groups are equal */ - if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) + if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != true) TEST_ERROR; /* close the destination group */ @@ -7542,7 +7540,7 @@ test_copy_root_group(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_f FAIL_STACK_ERROR; /* Check if the groups are equal */ - if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) + if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != true) TEST_ERROR; /* close the destination group */ @@ -7698,7 +7696,7 @@ test_copy_group(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) FAIL_STACK_ERROR; /* Check if the groups are equal */ - if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) + if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != true) TEST_ERROR; /* close the destination group */ @@ -7864,7 +7862,7 @@ test_copy_group_deep(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_f FAIL_STACK_ERROR; /* Check if the groups are equal */ - if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) + if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != true) TEST_ERROR; /* close the destination group */ @@ -7994,7 +7992,7 @@ test_copy_group_loop(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_f FAIL_STACK_ERROR; /* Check if the groups are equal */ - if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) + if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != true) TEST_ERROR; /* close the destination group */ @@ -8144,7 +8142,7 @@ test_copy_group_wide_loop(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t FAIL_STACK_ERROR; /* Check if the groups are equal */ - if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) + if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != true) TEST_ERROR; /* close the destination group */ @@ -8382,7 +8380,7 @@ test_copy_group_links(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_ TEST_ERROR; if ((did2 = H5Dopen2(fid_dst, NAME_LINK_SOFT, H5P_DEFAULT)) < 0) TEST_ERROR; - if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != true) TEST_ERROR; /* Delete expanded dataset, add soft link */ @@ -8415,7 +8413,7 @@ test_copy_group_links(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_ TEST_ERROR; if ((did2 = H5Dopen2(fid_dst, NAME_LINK_EXTERN, H5P_DEFAULT)) < 0) TEST_ERROR; - if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != true) TEST_ERROR; /* Delete expanded dataset, add external link */ @@ -8435,7 +8433,7 @@ test_copy_group_links(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_ } /* end if */ /* Check if the groups are equal */ - if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) + if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != true) TEST_ERROR; /* close the destination group */ @@ -8459,7 +8457,7 @@ test_copy_group_links(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_ TEST_ERROR; /* Compare the groups */ - if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) + if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != true) TEST_ERROR; /* Close groups */ @@ -8517,7 +8515,7 @@ error: *------------------------------------------------------------------------- */ static int -test_copy_soft_link(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, hbool_t test_open) +test_copy_soft_link(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, bool test_open) { hid_t fid_src = -1, fid_dst = -1; /* File IDs */ hid_t sid = -1; /* Dataspace ID */ @@ -8625,7 +8623,7 @@ test_copy_soft_link(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fa TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != true) TEST_ERROR; /* close the destination dataset */ @@ -8782,7 +8780,7 @@ test_copy_ext_link(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fap TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != true) TEST_ERROR; /* close the destination dataset */ @@ -9073,7 +9071,7 @@ test_copy_path(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != true) TEST_ERROR; /* close the destination dataset */ @@ -9155,7 +9153,7 @@ test_copy_same_file_named_datatype(hid_t fcpl_src, hid_t fapl) FAIL_STACK_ERROR; /* Compare the datatypes */ - if (H5Tequal(tid, tid2) != TRUE) + if (H5Tequal(tid, tid2) != true) TEST_ERROR; /* close the destination datatype */ @@ -9199,7 +9197,7 @@ error: *------------------------------------------------------------------------- */ static int -test_copy_old_layout(hid_t fcpl_dst, hid_t fapl, hbool_t test_open) +test_copy_old_layout(hid_t fcpl_dst, hid_t fapl, bool test_open) { hid_t fid_src = -1, fid_dst = -1; /* File IDs */ hid_t did = -1, did2 = -1; /* Dataset IDs */ @@ -9262,7 +9260,7 @@ test_copy_old_layout(hid_t fcpl_dst, hid_t fapl, hbool_t test_open) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, NULL) != true) TEST_ERROR; /* close the destination dataset */ @@ -9419,7 +9417,7 @@ test_copy_dataset_compact_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != true) TEST_ERROR; /* close the destination dataset */ @@ -9439,7 +9437,7 @@ test_copy_dataset_compact_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap TEST_ERROR; /* Reclaim vlen buffer */ - if (H5Tdetect_class(tid_copy, H5T_VLEN) == TRUE) { + if (H5Tdetect_class(tid_copy, H5T_VLEN) == true) { if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) TEST_ERROR; if (H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) @@ -9590,7 +9588,7 @@ test_copy_dataset_contig_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != true) TEST_ERROR; /* close the destination dataset */ @@ -9610,7 +9608,7 @@ test_copy_dataset_contig_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl TEST_ERROR; /* Reclaim vlen buffer */ - if (H5Tdetect_class(tid_copy, H5T_VLEN) == TRUE) { + if (H5Tdetect_class(tid_copy, H5T_VLEN) == true) { if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) TEST_ERROR; if (H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) @@ -9665,7 +9663,7 @@ error: */ static int test_copy_dataset_chunked_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, - hbool_t test_open) + bool test_open) { hid_t fid_src = -1, fid_dst = -1; /* File IDs */ hid_t tid = -1, tid_copy = -1; /* Datatype ID */ @@ -9786,7 +9784,7 @@ test_copy_dataset_chunked_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != true) TEST_ERROR; /* close the destination dataset */ @@ -9806,7 +9804,7 @@ test_copy_dataset_chunked_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap TEST_ERROR; /* Reclaim vlen buffer */ - if (H5Tdetect_class(tid_copy, H5T_VLEN) == TRUE) { + if (H5Tdetect_class(tid_copy, H5T_VLEN) == true) { if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) TEST_ERROR; if (H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) @@ -9971,7 +9969,7 @@ test_copy_dataset_compressed_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_ TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != true) TEST_ERROR; /* close the destination dataset */ @@ -9991,7 +9989,7 @@ test_copy_dataset_compressed_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_ TEST_ERROR; /* Reclaim vlen buffer */ - if (H5Tdetect_class(tid_copy, H5T_VLEN) == TRUE) { + if (H5Tdetect_class(tid_copy, H5T_VLEN) == true) { if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) TEST_ERROR; if (H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) @@ -10158,7 +10156,7 @@ test_copy_dataset_compact_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != true) TEST_ERROR; /* close the destination dataset */ @@ -10178,7 +10176,7 @@ test_copy_dataset_compact_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, TEST_ERROR; /* Reclaim vlen buffer */ - if (H5Tdetect_class(tid2, H5T_VLEN) == TRUE) { + if (H5Tdetect_class(tid2, H5T_VLEN) == true) { if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) TEST_ERROR; if (H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) @@ -10235,8 +10233,7 @@ error: *------------------------------------------------------------------------- */ static int -test_copy_dataset_contig_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, - hbool_t test_open) +test_copy_dataset_contig_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, bool test_open) { hid_t fid_src = -1, fid_dst = -1; /* File IDs */ hid_t tid = -1, tid2 = -1; /* Datatype ID */ @@ -10358,7 +10355,7 @@ test_copy_dataset_contig_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, h TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != true) TEST_ERROR; /* close the destination dataset */ @@ -10378,7 +10375,7 @@ test_copy_dataset_contig_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, h TEST_ERROR; /* Reclaim vlen buffer */ - if (H5Tdetect_class(tid2, H5T_VLEN) == TRUE) { + if (H5Tdetect_class(tid2, H5T_VLEN) == true) { if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) TEST_ERROR; if (H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) @@ -10563,11 +10560,11 @@ test_copy_dataset_chunked_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_VL_VL, H5P_DEFAULT)) < 0) TEST_ERROR; - if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_FARRAY, H5D_CHUNK_IDX_BTREE) != TRUE) + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_FARRAY, H5D_CHUNK_IDX_BTREE) != true) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != true) TEST_ERROR; /* close the destination dataset */ @@ -10586,11 +10583,11 @@ test_copy_dataset_chunked_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, if ((did2 = H5Dopen2(fid_dst, NAME_DATASET_VL_VL2, H5P_DEFAULT)) < 0) TEST_ERROR; - if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_NONE, H5D_CHUNK_IDX_BTREE) != TRUE) + if (compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_NONE, H5D_CHUNK_IDX_BTREE) != true) TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != true) TEST_ERROR; /* close the destination dataset */ @@ -10610,7 +10607,7 @@ test_copy_dataset_chunked_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, TEST_ERROR; /* Reclaim vlen buffer */ - if (H5Tdetect_class(tid2, H5T_VLEN) == TRUE) { + if (H5Tdetect_class(tid2, H5T_VLEN) == true) { if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) TEST_ERROR; if (H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) @@ -10668,7 +10665,7 @@ error: */ static int test_copy_dataset_compressed_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, - hbool_t test_open) + bool test_open) { hid_t fid_src = -1, fid_dst = -1; /* File IDs */ hid_t tid = -1, tid2 = -1; /* Datatype ID */ @@ -10794,7 +10791,7 @@ test_copy_dataset_compressed_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != true) TEST_ERROR; /* close the destination dataset */ @@ -10814,7 +10811,7 @@ test_copy_dataset_compressed_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap TEST_ERROR; /* Reclaim vlen buffer */ - if (H5Tdetect_class(tid2, H5T_VLEN) == TRUE) { + if (H5Tdetect_class(tid2, H5T_VLEN) == true) { if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) TEST_ERROR; if (H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) @@ -10977,7 +10974,7 @@ test_copy_dataset_contig_cmpd_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != true) TEST_ERROR; /* close the destination dataset */ @@ -10997,7 +10994,7 @@ test_copy_dataset_contig_cmpd_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, TEST_ERROR; /* Reclaim vlen buffer */ - if (H5Tdetect_class(tid, H5T_VLEN) == TRUE) { + if (H5Tdetect_class(tid, H5T_VLEN) == true) { if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) TEST_ERROR; if (H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) @@ -11159,7 +11156,7 @@ test_copy_dataset_chunked_cmpd_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != true) TEST_ERROR; /* close the destination dataset */ @@ -11179,7 +11176,7 @@ test_copy_dataset_chunked_cmpd_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl TEST_ERROR; /* Reclaim vlen buffer */ - if (H5Tdetect_class(tid, H5T_VLEN) == TRUE) { + if (H5Tdetect_class(tid, H5T_VLEN) == true) { if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) TEST_ERROR; if (H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) @@ -11341,7 +11338,7 @@ test_copy_dataset_compact_cmpd_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != true) TEST_ERROR; /* close the destination dataset */ @@ -11361,7 +11358,7 @@ test_copy_dataset_compact_cmpd_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl TEST_ERROR; /* Reclaim vlen buffer */ - if (H5Tdetect_class(tid, H5T_VLEN) == TRUE) { + if (H5Tdetect_class(tid, H5T_VLEN) == true) { if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) TEST_ERROR; if (H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) @@ -11889,7 +11886,7 @@ test_copy_attr_crt_order(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t d TEST_ERROR; /* Compare the attributes */ - if (compare_std_attributes(gid1, gid2, H5P_DEFAULT) != TRUE) + if (compare_std_attributes(gid1, gid2, H5P_DEFAULT) != true) TEST_ERROR; /* Close groups */ @@ -11905,7 +11902,7 @@ test_copy_attr_crt_order(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t d TEST_ERROR; /* Compare the attributes */ - if (compare_std_attributes(gid1, gid2, H5P_DEFAULT) != TRUE) + if (compare_std_attributes(gid1, gid2, H5P_DEFAULT) != true) TEST_ERROR; /* Close groups */ @@ -11948,7 +11945,7 @@ error: */ static int test_copy_committed_datatype_merge(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, - hbool_t reopen) + bool reopen) { hid_t fid_src1 = -1, fid_src2 = -1, fid_dst = -1; /* File IDs */ hid_t tid = -1; /* Datatype ID */ @@ -12264,7 +12261,7 @@ error: *------------------------------------------------------------------------- */ static int -test_copy_committed_datatype_merge_same_file(hid_t fcpl, hid_t fapl, hbool_t reopen) +test_copy_committed_datatype_merge_same_file(hid_t fcpl, hid_t fapl, bool reopen) { hid_t fid = -1; /* File ID */ hid_t tid = -1; /* Datatype ID */ @@ -12657,8 +12654,7 @@ error: *------------------------------------------------------------------------- */ static int -test_copy_committed_dt_merge_sugg(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, - hbool_t reopen) +test_copy_committed_dt_merge_sugg(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, bool reopen) { hid_t fid_src = -1, fid_dst = -1; /* File IDs */ hid_t tid = -1; /* Datatype ID */ @@ -12952,8 +12948,7 @@ error: *------------------------------------------------------------------------- */ static int -test_copy_committed_dt_merge_attr(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, - hbool_t reopen) +test_copy_committed_dt_merge_attr(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, bool reopen) { hid_t fid_src = -1, fid_dst = -1; /* File IDs */ hid_t tid = -1; /* Datatype ID */ @@ -13224,7 +13219,7 @@ error: *------------------------------------------------------------------------- */ static int -test_copy_cdt_hier_merge(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, hbool_t reopen) +test_copy_cdt_hier_merge(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, bool reopen) { hid_t fid_src = -1, fid_dst = -1; /* File IDs */ hid_t tid = -1; /* Datatype ID */ @@ -13694,7 +13689,7 @@ error: *------------------------------------------------------------------------- */ static int -test_copy_cdt_merge_cdt(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, hbool_t reopen) +test_copy_cdt_merge_cdt(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, bool reopen) { hid_t fid_src = -1, fid_dst = -1; /* File IDs */ hid_t tid1 = -1, tid2 = -1; /* Datatype IDs */ @@ -14007,7 +14002,7 @@ error: *------------------------------------------------------------------------- */ static int -test_copy_cdt_merge_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, hbool_t reopen) +test_copy_cdt_merge_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, bool reopen) { hid_t fid_src = -1, fid_dst = -1; /* File IDs */ hid_t tid = -1; /* Datatype ID */ @@ -14320,7 +14315,7 @@ error: *------------------------------------------------------------------------- */ static int -test_copy_cdt_merge_dset_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, hbool_t reopen) +test_copy_cdt_merge_dset_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, bool reopen) { hid_t fid_src = -1, fid_dst = -1; /* File IDs */ hid_t tid = -1; /* Datatype ID */ @@ -14693,7 +14688,7 @@ error: *------------------------------------------------------------------------- */ static int -test_copy_cdt_merge_all_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, hbool_t reopen) +test_copy_cdt_merge_all_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, bool reopen) { hid_t fid_src = -1, fid_dst = -1; /* File IDs */ hid_t gid = -1; /* Group ID */ @@ -15336,7 +15331,7 @@ mcdt_search_cb(void *_udata) } /* mcdt_search_cb() */ static int -test_copy_set_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, hbool_t reopen) +test_copy_set_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, bool reopen) { hid_t fid_src = -1, fid_dst = -1; /* File IDs */ hid_t tid = -1; /* Datatype ID */ @@ -15808,8 +15803,7 @@ mcdt_search_cbB(void *_udata) /* The main test function */ static int -test_copy_set_get_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, - hbool_t reopen) +test_copy_set_get_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, bool reopen) { hid_t fid_src = -1, fid_dst = -1; /* File IDs */ hid_t tid = -1; /* Datatype ID */ @@ -16307,7 +16301,7 @@ error: */ static int test_copy_option(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, unsigned flag, - hbool_t crt_intermediate_grp, const char *test_desciption) + bool crt_intermediate_grp, const char *test_desciption) { hid_t fid_src = -1, fid_dst = -1, fid_ext = -1; /* File IDs */ hid_t sid = -1; /* Dataspace ID */ @@ -16554,7 +16548,7 @@ test_copy_option(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, /* Create link creation plist to pass in intermediate group creation */ if ((lcpl_id = H5Pcreate(H5P_LINK_CREATE)) < 0) TEST_ERROR; - if (H5Pset_create_intermediate_group(lcpl_id, TRUE) < 0) + if (H5Pset_create_intermediate_group(lcpl_id, true) < 0) TEST_ERROR; if (H5Ocopy(fid_src, NAME_GROUP_TOP, fid_dst, "/new_g0/new_g00", pid, lcpl_id) < 0) @@ -16634,7 +16628,7 @@ test_copy_option(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl, } /* end else */ /* Check if the groups are equal */ - if (compare_groups(gid, gid2, pid, depth, flag) != TRUE) + if (compare_groups(gid, gid2, pid, depth, flag) != true) TEST_ERROR; if (H5Gclose(gid2) < 0) TEST_ERROR; @@ -16818,9 +16812,9 @@ test_copy_dataset_open(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did3, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did, did3, H5P_DEFAULT, buf) != true) TEST_ERROR; - if (compare_datasets(did2, did4, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did2, did4, H5P_DEFAULT, buf) != true) TEST_ERROR; /* close the copied dataset */ @@ -16845,9 +16839,9 @@ test_copy_dataset_open(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did3, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did, did3, H5P_DEFAULT, buf) != true) TEST_ERROR; - if (compare_datasets(did2, did4, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did2, did4, H5P_DEFAULT, buf) != true) TEST_ERROR; /* close the copied dataset in DST file */ @@ -16893,9 +16887,9 @@ test_copy_dataset_open(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did3, H5P_DEFAULT, newbuf) != TRUE) + if (compare_datasets(did, did3, H5P_DEFAULT, newbuf) != true) TEST_ERROR; - if (compare_datasets(did2, did4, H5P_DEFAULT, newbuf) != TRUE) + if (compare_datasets(did2, did4, H5P_DEFAULT, newbuf) != true) TEST_ERROR; /* close the copied dataset in SRC file */ @@ -16919,9 +16913,9 @@ test_copy_dataset_open(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did3, H5P_DEFAULT, newbuf) != TRUE) + if (compare_datasets(did, did3, H5P_DEFAULT, newbuf) != true) TEST_ERROR; - if (compare_datasets(did2, did4, H5P_DEFAULT, newbuf) != TRUE) + if (compare_datasets(did2, did4, H5P_DEFAULT, newbuf) != true) TEST_ERROR; /* close the copied dataset in DST file */ @@ -16977,7 +16971,7 @@ test_copy_dataset_open(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != true) TEST_ERROR; /* close the copied dataset in SRC file */ @@ -16997,7 +16991,7 @@ test_copy_dataset_open(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst TEST_ERROR; /* Check if the datasets are equal */ - if (compare_datasets(did, did2, H5P_DEFAULT, buf) != TRUE) + if (compare_datasets(did, did2, H5P_DEFAULT, buf) != true) TEST_ERROR; /* close the copied dataset in DST file */ @@ -17043,7 +17037,7 @@ test_copy_dataset_open(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst TEST_ERROR; /* Check if the groups are equal */ - if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) + if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != true) TEST_ERROR; /* close the DST dataset */ @@ -17062,7 +17056,7 @@ test_copy_dataset_open(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst TEST_ERROR; /* Check if the groups are equal */ - if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != TRUE) + if (compare_groups(gid, gid2, H5P_DEFAULT, -1, 0) != true) TEST_ERROR; /* close the group in DST file */ @@ -17130,8 +17124,8 @@ main(void) int configuration; /* Configuration of tests. */ int ExpressMode; const char *env_h5_drvr; /* File Driver value from environment */ - hbool_t same_file; /* Whether to run tests that only use one file */ - hbool_t driver_is_default_compatible; + bool same_file; /* Whether to run tests that only use one file */ + bool driver_is_default_compatible; env_h5_drvr = HDgetenv(HDF5_DRIVER); if (env_h5_drvr == NULL) @@ -17179,10 +17173,10 @@ main(void) hid_t fcpl_src; hid_t fcpl_dst; - /* Start with same_file == TRUE. Use source file settings for these + /* Start with same_file == true. Use source file settings for these * tests. Don't run with a non-default destination file setting, as * destination settings have no effect. */ - same_file = TRUE; + same_file = true; /* No need to test dense attributes with old format */ if (!(configuration & CONFIG_SRC_NEW_FORMAT) && (configuration & CONFIG_DENSE)) @@ -17200,7 +17194,7 @@ main(void) if (configuration & CONFIG_SHARE_DST) { HDputs("Testing with shared dst messages:"); fcpl_dst = fcpl_shared; - same_file = FALSE; + same_file = false; } else { HDputs("Testing without shared dst messages:"); @@ -17232,7 +17226,7 @@ main(void) if (configuration & CONFIG_DST_NEW_FORMAT) { HDputs("Testing with latest format for destination file:"); dst_fapl = fapl2; - same_file = FALSE; + same_file = false; } /* end if */ else { HDputs("Testing with oldest file format for destination file:"); @@ -17245,8 +17239,8 @@ main(void) nerrors += test_copy_dataset_simple_samefile(fcpl_src, src_fapl); /* Test with dataset opened in the file or not */ - nerrors += test_copy_dataset_simple_empty(fcpl_src, fcpl_dst, src_fapl, dst_fapl, FALSE); - nerrors += test_copy_dataset_simple_empty(fcpl_src, fcpl_dst, src_fapl, dst_fapl, TRUE); + nerrors += test_copy_dataset_simple_empty(fcpl_src, fcpl_dst, src_fapl, dst_fapl, false); + nerrors += test_copy_dataset_simple_empty(fcpl_src, fcpl_dst, src_fapl, dst_fapl, true); nerrors += test_copy_dataset_compound(fcpl_src, fcpl_dst, src_fapl, dst_fapl); nerrors += test_copy_dataset_chunked(fcpl_src, fcpl_dst, src_fapl, dst_fapl); @@ -17255,15 +17249,15 @@ main(void) nerrors += test_copy_dataset_compressed(fcpl_src, fcpl_dst, src_fapl, dst_fapl); /* Test with dataset opened in the file or not */ - nerrors += test_copy_dataset_no_edge_filt(fcpl_src, fcpl_dst, src_fapl, dst_fapl, FALSE); - nerrors += test_copy_dataset_no_edge_filt(fcpl_src, fcpl_dst, src_fapl, dst_fapl, TRUE); + nerrors += test_copy_dataset_no_edge_filt(fcpl_src, fcpl_dst, src_fapl, dst_fapl, false); + nerrors += test_copy_dataset_no_edge_filt(fcpl_src, fcpl_dst, src_fapl, dst_fapl, true); /* Test with dataset opened in the file or not */ - nerrors += test_copy_dataset_compact(fcpl_src, fcpl_dst, src_fapl, dst_fapl, FALSE); - nerrors += test_copy_dataset_compact(fcpl_src, fcpl_dst, src_fapl, dst_fapl, TRUE); + nerrors += test_copy_dataset_compact(fcpl_src, fcpl_dst, src_fapl, dst_fapl, false); + nerrors += test_copy_dataset_compact(fcpl_src, fcpl_dst, src_fapl, dst_fapl, true); - nerrors += test_copy_dataset_multi_ohdr_chunks(fcpl_src, fcpl_dst, src_fapl, dst_fapl, FALSE); - nerrors += test_copy_dataset_multi_ohdr_chunks(fcpl_src, fcpl_dst, src_fapl, dst_fapl, TRUE); + nerrors += test_copy_dataset_multi_ohdr_chunks(fcpl_src, fcpl_dst, src_fapl, dst_fapl, false); + nerrors += test_copy_dataset_multi_ohdr_chunks(fcpl_src, fcpl_dst, src_fapl, dst_fapl, true); nerrors += test_copy_dataset_attr_named_dtype(fcpl_src, fcpl_dst, src_fapl, dst_fapl); @@ -17276,8 +17270,8 @@ main(void) nerrors += test_copy_group_links(fcpl_src, fcpl_dst, src_fapl, dst_fapl); /* Test with dataset opened in the file or not */ - nerrors += test_copy_soft_link(fcpl_src, fcpl_dst, src_fapl, dst_fapl, FALSE); - nerrors += test_copy_soft_link(fcpl_src, fcpl_dst, src_fapl, dst_fapl, TRUE); + nerrors += test_copy_soft_link(fcpl_src, fcpl_dst, src_fapl, dst_fapl, false); + nerrors += test_copy_soft_link(fcpl_src, fcpl_dst, src_fapl, dst_fapl, true); nerrors += test_copy_ext_link(fcpl_src, fcpl_dst, src_fapl, dst_fapl); nerrors += test_copy_exist(fcpl_src, fcpl_dst, src_fapl, dst_fapl); @@ -17287,30 +17281,30 @@ main(void) nerrors += test_copy_attr_crt_order(fcpl_src, fcpl_dst, src_fapl, dst_fapl); - nerrors += test_copy_option(fcpl_src, fcpl_dst, src_fapl, dst_fapl, H5O_COPY_WITHOUT_ATTR_FLAG, FALSE, + nerrors += test_copy_option(fcpl_src, fcpl_dst, src_fapl, dst_fapl, H5O_COPY_WITHOUT_ATTR_FLAG, false, "H5Ocopy(): without attributes"); - nerrors += test_copy_option(fcpl_src, fcpl_dst, src_fapl, dst_fapl, 0, TRUE, + nerrors += test_copy_option(fcpl_src, fcpl_dst, src_fapl, dst_fapl, 0, true, "H5Ocopy(): with missing groups"); nerrors += test_copy_option(fcpl_src, fcpl_dst, src_fapl, dst_fapl, H5O_COPY_EXPAND_SOFT_LINK_FLAG, - FALSE, "H5Ocopy(): expand soft link"); + false, "H5Ocopy(): expand soft link"); nerrors += test_copy_option(fcpl_src, fcpl_dst, src_fapl, dst_fapl, H5O_COPY_EXPAND_EXT_LINK_FLAG, - FALSE, "H5Ocopy(): expand external link"); + false, "H5Ocopy(): expand external link"); /* Splitter VFD currently has external link-related bugs */ if (HDstrcmp(env_h5_drvr, "splitter")) { nerrors += test_copy_option(fcpl_src, fcpl_dst, src_fapl, dst_fapl, - H5O_COPY_EXPAND_SOFT_LINK_FLAG | H5O_COPY_EXPAND_EXT_LINK_FLAG, FALSE, + H5O_COPY_EXPAND_SOFT_LINK_FLAG | H5O_COPY_EXPAND_EXT_LINK_FLAG, false, "H5Ocopy(): expand soft and external links"); } nerrors += test_copy_option(fcpl_src, fcpl_dst, src_fapl, dst_fapl, H5O_COPY_SHALLOW_HIERARCHY_FLAG, - FALSE, "H5Ocopy(): shallow group copy"); + false, "H5Ocopy(): shallow group copy"); nerrors += test_copy_option(fcpl_src, fcpl_dst, src_fapl, dst_fapl, H5O_COPY_EXPAND_REFERENCE_FLAG, - FALSE, "H5Ocopy(): expand object reference"); + false, "H5Ocopy(): expand object reference"); nerrors += test_copy_option(fcpl_src, fcpl_dst, src_fapl, dst_fapl, H5O_COPY_PRESERVE_NULL_FLAG, - FALSE, "H5Ocopy(): preserve NULL messages"); + false, "H5Ocopy(): preserve NULL messages"); nerrors += test_copy_option(fcpl_src, fcpl_dst, src_fapl, dst_fapl, - H5O_COPY_WITHOUT_ATTR_FLAG | H5O_COPY_PRESERVE_NULL_FLAG, TRUE, + H5O_COPY_WITHOUT_ATTR_FLAG | H5O_COPY_PRESERVE_NULL_FLAG, true, "H5Ocopy(): preserve NULL messages"); nerrors += test_copy_dataset_open(fcpl_src, fcpl_dst, src_fapl, dst_fapl); @@ -17324,7 +17318,7 @@ main(void) nerrors += test_copy_named_datatype_vl_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl); /* Loop over reopening the file */ - for (reopen = FALSE; reopen <= TRUE; reopen++) { + for (reopen = false; reopen <= true; reopen++) { nerrors += test_copy_committed_datatype_merge(fcpl_src, fcpl_dst, src_fapl, dst_fapl, reopen); if (same_file) @@ -17358,21 +17352,21 @@ main(void) nerrors += test_copy_dataset_contig_named_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl); /* Test with dataset opened in the file or not */ - nerrors += test_copy_dataset_chunked_named_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl, FALSE); - nerrors += test_copy_dataset_chunked_named_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl, TRUE); + nerrors += test_copy_dataset_chunked_named_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl, false); + nerrors += test_copy_dataset_chunked_named_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl, true); nerrors += test_copy_dataset_compressed_named_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl); nerrors += test_copy_dataset_compact_vl_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl); /* Test with dataset opened in the file or not */ - nerrors += test_copy_dataset_contig_vl_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl, FALSE); - nerrors += test_copy_dataset_contig_vl_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl, TRUE); + nerrors += test_copy_dataset_contig_vl_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl, false); + nerrors += test_copy_dataset_contig_vl_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl, true); nerrors += test_copy_dataset_chunked_vl_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl); /* Test with dataset opened in the file or not */ - nerrors += test_copy_dataset_compressed_vl_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl, FALSE); - nerrors += test_copy_dataset_compressed_vl_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl, TRUE); + nerrors += test_copy_dataset_compressed_vl_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl, false); + nerrors += test_copy_dataset_compressed_vl_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl, true); nerrors += test_copy_dataset_contig_cmpd_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl); nerrors += test_copy_dataset_chunked_cmpd_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl); @@ -17382,8 +17376,8 @@ main(void) if (driver_is_default_compatible) { /* Test with dataset opened in the file or not */ - nerrors += test_copy_old_layout(fcpl_dst, dst_fapl, FALSE); - nerrors += test_copy_old_layout(fcpl_dst, dst_fapl, TRUE); + nerrors += test_copy_old_layout(fcpl_dst, dst_fapl, false); + nerrors += test_copy_old_layout(fcpl_dst, dst_fapl, true); } /* Test with dataset opened in the file or not */ |