diff options
Diffstat (limited to 'test/API/tattr.c')
| -rw-r--r-- | test/API/tattr.c | 538 |
1 files changed, 269 insertions, 269 deletions
diff --git a/test/API/tattr.c b/test/API/tattr.c index a1ff6c6..276d0b8 100644 --- a/test/API/tattr.c +++ b/test/API/tattr.c @@ -166,7 +166,7 @@ typedef struct { int stop; /* # of iterations to stop after */ hsize_t curr; /* Current creation order value */ size_t max_visit; /* Size of "visited attribute" flag array */ - hbool_t *visited; /* Pointer to array of "visited attribute" flags */ + bool *visited; /* Pointer to array of "visited attribute" flags */ } attr_iter_info_t; static herr_t attr_op1(hid_t loc_id, const char *name, const H5A_info_t *ainfo, void *op_data); @@ -2283,7 +2283,7 @@ test_attr_dense_create(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Add attributes, until just before converting to dense storage */ for (u = 0; u < max_compact; u++) { @@ -2303,7 +2303,7 @@ test_attr_dense_create(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Add one more attribute, to push into "dense" storage */ /* Create attribute */ @@ -2313,7 +2313,7 @@ test_attr_dense_create(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); #endif /* Write data into the attribute */ ret = H5Awrite(attr, H5T_NATIVE_UINT, &u); @@ -2436,7 +2436,7 @@ test_attr_dense_open(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Add attributes, until just before converting to dense storage */ for (u = 0; u < max_compact; u++) { @@ -2460,7 +2460,7 @@ test_attr_dense_open(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Add one more attribute, to push into "dense" storage */ /* Create attribute */ @@ -2470,7 +2470,7 @@ test_attr_dense_open(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); #endif /* Write data into the attribute */ ret = H5Awrite(attr, H5T_NATIVE_UINT, &u); @@ -2550,7 +2550,7 @@ test_attr_dense_delete(hid_t fcpl, hid_t fapl) */ fcpl = H5Pcopy(fcpl); CHECK(fcpl, FAIL, "H5Pcopy"); - ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, TRUE, 1); + ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, true, 1); CHECK(ret, FAIL, "H5Pset_file_space_strategy"); } fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl); @@ -2603,7 +2603,7 @@ test_attr_dense_delete(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Add attributes, until well into dense storage */ for (u = 0; u < (max_compact * 2); u++) { @@ -2628,7 +2628,7 @@ test_attr_dense_delete(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); #endif /* Close dataspace */ ret = H5Sclose(sid); @@ -2664,7 +2664,7 @@ test_attr_dense_delete(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); #endif /* Delete one more attribute, which should cause reversion to compact storage */ HDsnprintf(attrname, sizeof(attrname), "attr %02u", u); @@ -2673,7 +2673,7 @@ test_attr_dense_delete(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Verify attributes still left */ ret = test_attr_dense_verify(dataset, (u - 1)); @@ -2686,7 +2686,7 @@ test_attr_dense_delete(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Verify attributes still left */ ret = test_attr_dense_verify(dataset, (u - 2)); @@ -2754,7 +2754,7 @@ test_attr_dense_rename(hid_t fcpl, hid_t fapl) */ fcpl = H5Pcopy(fcpl); CHECK(fcpl, FAIL, "H5Pcopy"); - ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, TRUE, 1); + ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, true, 1); CHECK(ret, FAIL, "H5Pset_file_space_strategy"); } fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl); @@ -2794,7 +2794,7 @@ test_attr_dense_rename(hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Pget_attr_phase_change"); /* Using creation order or not */ - for (use_corder = FALSE; use_corder <= TRUE; use_corder++) { + for (use_corder = false; use_corder <= true; use_corder++) { if (use_corder) { ret = H5Pset_attr_creation_order(dcpl, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED); @@ -2807,7 +2807,7 @@ test_attr_dense_rename(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Add attributes, until well into dense storage */ for (u = 0; u < (max_compact * 2); u++) { @@ -2839,7 +2839,7 @@ test_attr_dense_rename(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); #endif /* Close Dataset */ ret = H5Dclose(dataset); @@ -2953,7 +2953,7 @@ test_attr_dense_unlink(hid_t fcpl, hid_t fapl) */ fcpl = H5Pcopy(fcpl); CHECK(fcpl, FAIL, "H5Pcopy"); - ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, TRUE, 1); + ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, true, 1); CHECK(ret, FAIL, "H5Pset_file_space_strategy"); } fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl); @@ -3000,7 +3000,7 @@ test_attr_dense_unlink(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Add attributes, until well into dense storage */ for (u = 0; u < (max_compact * 2); u++) { @@ -3025,7 +3025,7 @@ test_attr_dense_unlink(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); #endif /* Close dataspace */ ret = H5Sclose(sid); @@ -3148,7 +3148,7 @@ test_attr_dense_limits(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Add first attribute, which should be immediately in dense storage */ @@ -3169,7 +3169,7 @@ test_attr_dense_limits(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); #endif /* Add second attribute, to allow deletions to be checked easily */ @@ -3190,7 +3190,7 @@ test_attr_dense_limits(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); #endif /* Delete second attribute, attributes should still be stored densely */ @@ -3201,7 +3201,7 @@ test_attr_dense_limits(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); #endif /* Delete first attribute, attributes should not be stored densely */ @@ -3214,7 +3214,7 @@ test_attr_dense_limits(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Close dataspace */ @@ -3316,7 +3316,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Add attributes, until just before converting to dense storage */ for (u = 0; u < max_compact; u++) { @@ -3336,7 +3336,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Add one more attribute, to push into "dense" storage */ /* Create dataspace for attribute */ @@ -3350,7 +3350,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); #endif /* Open the attribute just created and get a second ID */ attr2 = H5Aopen(dataset, attrname, H5P_DEFAULT); @@ -3385,7 +3385,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); #endif /* Open first attribute for the dataset */ attr = H5Aopen(dataset, attrname, H5P_DEFAULT); @@ -3437,7 +3437,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); #endif /* Open first attribute for the dataset */ attr = H5Aopen(dataset, attrname, H5P_DEFAULT); @@ -3500,7 +3500,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); #endif /* Open first attribute for the dataset */ attr = H5Aopen_by_idx(dataset, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)4, H5P_DEFAULT, H5P_DEFAULT); @@ -3554,7 +3554,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); #endif /* Open attribute of the dataset for the first time */ attr = H5Aopen_by_idx(dataset, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)2, H5P_DEFAULT, H5P_DEFAULT); @@ -3568,7 +3568,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Open attribute for the second time */ attr2 = H5Aopen_by_idx(dataset, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)2, H5P_DEFAULT, H5P_DEFAULT); @@ -3618,7 +3618,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Open attribute of the dataset for the first time */ attr = H5Aopen_by_idx(dataset, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)3, H5P_DEFAULT, H5P_DEFAULT); @@ -3642,7 +3642,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); #endif /* Open attribute for the second time */ attr2 = H5Aopen_by_idx(dataset, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)3, H5P_DEFAULT, H5P_DEFAULT); @@ -3714,7 +3714,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl) #if 0 /* Check on group's attribute storage status */ is_dense = H5O__is_attr_dense_test(gid1); - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); #endif /* Open the hard link just created */ gid2 = H5Gopen2(fid, GROUP2_NAME, H5P_DEFAULT); @@ -3858,9 +3858,9 @@ test_attr_big(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_empty = H5O__is_attr_empty_test(dataset); - VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, true, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Add first "small" attribute, which should be in compact storage */ @@ -3877,9 +3877,9 @@ test_attr_big(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_empty = H5O__is_attr_empty_test(dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Add second "small" attribute, which should stay in compact storage */ @@ -3896,9 +3896,9 @@ test_attr_big(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_empty = H5O__is_attr_empty_test(dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Add first "big" attribute, which should push storage into dense form */ @@ -3921,9 +3921,9 @@ test_attr_big(hid_t fcpl, hid_t fapl) */ #if 0 is_empty = H5O__is_attr_empty_test(dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, (nshared_indices ? FALSE : TRUE), "H5O__is_attr_dense_test"); + VERIFY(is_dense, (nshared_indices ? false : true), "H5O__is_attr_dense_test"); #endif /* Add second "big" attribute, which should leave storage in dense form */ @@ -3945,9 +3945,9 @@ test_attr_big(hid_t fcpl, hid_t fapl) */ #if 0 is_empty = H5O__is_attr_empty_test(dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, (nshared_indices ? FALSE : TRUE), "H5O__is_attr_dense_test"); + VERIFY(is_dense, (nshared_indices ? false : true), "H5O__is_attr_dense_test"); #endif /* Delete second "small" attribute, attributes should still be stored densely */ @@ -3960,9 +3960,9 @@ test_attr_big(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_empty = H5O__is_attr_empty_test(dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, (nshared_indices ? FALSE : TRUE), "H5O__is_attr_dense_test"); + VERIFY(is_dense, (nshared_indices ? false : true), "H5O__is_attr_dense_test"); #endif /* Delete second "big" attribute, attributes should still be stored densely */ @@ -3975,9 +3975,9 @@ test_attr_big(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_empty = H5O__is_attr_empty_test(dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, (nshared_indices ? FALSE : TRUE), "H5O__is_attr_dense_test"); + VERIFY(is_dense, (nshared_indices ? false : true), "H5O__is_attr_dense_test"); #endif /* Delete first "big" attribute, attributes should _not_ be stored densely */ @@ -3990,9 +3990,9 @@ test_attr_big(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_empty = H5O__is_attr_empty_test(dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Delete first "small" attribute, should be no attributes now */ @@ -4005,7 +4005,7 @@ test_attr_big(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_empty = H5O__is_attr_empty_test(dataset); - VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, true, "H5O__is_attr_empty_test"); #endif } /* end if */ #if 0 @@ -4019,9 +4019,9 @@ test_attr_big(hid_t fcpl, hid_t fapl) * form - QAK) */ is_empty = H5O__is_attr_empty_test(dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); } /* end else */ #endif @@ -4132,7 +4132,7 @@ test_attr_null_space(hid_t fcpl, hid_t fapl) /* Compare the dataspaces */ cmp = H5Sextent_equal(attr_sid, null_sid); CHECK(cmp, FAIL, "H5Sextent_equal"); - VERIFY(cmp, TRUE, "H5Sextent_equal"); + VERIFY(cmp, true, "H5Sextent_equal"); /* Close dataspace */ ret = H5Sclose(attr_sid); @@ -4207,7 +4207,7 @@ test_attr_null_space(hid_t fcpl, hid_t fapl) /* Compare the dataspaces */ cmp = H5Sextent_equal(attr_sid, null_sid); CHECK(cmp, FAIL, "H5Sextent_equal"); - VERIFY(cmp, TRUE, "H5Sextent_equal"); + VERIFY(cmp, true, "H5Sextent_equal"); /* Close dataspace */ ret = H5Sclose(attr_sid); @@ -4387,7 +4387,7 @@ test_attr_deprec(hid_t fcpl, hid_t fapl) ** ****************************************************************/ static void -test_attr_many(hbool_t new_format, hid_t fcpl, hid_t fapl) +test_attr_many(bool new_format, hid_t fcpl, hid_t fapl) { hid_t fid; /* HDF5 File ID */ hid_t gid; /* Group ID */ @@ -4419,19 +4419,19 @@ test_attr_many(hbool_t new_format, hid_t fcpl, hid_t fapl) HDsnprintf(attrname, sizeof(attrname), "a-%06u", u); exists = H5Aexists(gid, attrname); - VERIFY(exists, FALSE, "H5Aexists"); + VERIFY(exists, false, "H5Aexists"); exists = H5Aexists_by_name(fid, GROUP1_NAME, attrname, H5P_DEFAULT); - VERIFY(exists, FALSE, "H5Aexists_by_name"); + VERIFY(exists, false, "H5Aexists_by_name"); aid = H5Acreate2(gid, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT); CHECK(aid, FAIL, "H5Acreate2"); exists = H5Aexists(gid, attrname); - VERIFY(exists, TRUE, "H5Aexists"); + VERIFY(exists, true, "H5Aexists"); exists = H5Aexists_by_name(fid, GROUP1_NAME, attrname, H5P_DEFAULT); - VERIFY(exists, TRUE, "H5Aexists_by_name"); + VERIFY(exists, true, "H5Aexists_by_name"); ret = H5Awrite(aid, H5T_NATIVE_UINT, &u); CHECK(ret, FAIL, "H5Awrite"); @@ -4440,10 +4440,10 @@ test_attr_many(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Aclose"); exists = H5Aexists(gid, attrname); - VERIFY(exists, TRUE, "H5Aexists"); + VERIFY(exists, true, "H5Aexists"); exists = H5Aexists_by_name(fid, GROUP1_NAME, attrname, H5P_DEFAULT); - VERIFY(exists, TRUE, "H5Aexists_by_name"); + VERIFY(exists, true, "H5Aexists_by_name"); } /* end for */ /* Close group */ @@ -4471,19 +4471,19 @@ test_attr_many(hbool_t new_format, hid_t fcpl, hid_t fapl) HDsnprintf(attrname, sizeof(attrname), "a-%06u", u); exists = H5Aexists(gid, attrname); - VERIFY(exists, TRUE, "H5Aexists"); + VERIFY(exists, true, "H5Aexists"); exists = H5Aexists_by_name(fid, GROUP1_NAME, attrname, H5P_DEFAULT); - VERIFY(exists, TRUE, "H5Aexists_by_name"); + VERIFY(exists, true, "H5Aexists_by_name"); aid = H5Aopen(gid, attrname, H5P_DEFAULT); CHECK(aid, FAIL, "H5Aopen"); exists = H5Aexists(gid, attrname); - VERIFY(exists, TRUE, "H5Aexists"); + VERIFY(exists, true, "H5Aexists"); exists = H5Aexists_by_name(fid, GROUP1_NAME, attrname, H5P_DEFAULT); - VERIFY(exists, TRUE, "H5Aexists_by_name"); + VERIFY(exists, true, "H5Aexists_by_name"); ret = H5Aread(aid, H5T_NATIVE_UINT, &value); CHECK(ret, FAIL, "H5Aread"); @@ -4583,9 +4583,9 @@ test_attr_corder_create_basic(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_empty = H5O__is_attr_empty_test(dataset); - VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, true, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Close Dataset */ @@ -4610,9 +4610,9 @@ test_attr_corder_create_basic(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_empty = H5O__is_attr_empty_test(dataset); - VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, true, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Retrieve dataset creation property list for group */ @@ -4722,9 +4722,9 @@ test_attr_corder_create_compact(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, true, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Create several attributes, but keep storage in compact form */ for (u = 0; u < max_compact; u++) { @@ -4746,9 +4746,9 @@ test_attr_corder_create_compact(hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5O__num_attrs_test"); VERIFY(nattrs, (u + 1), "H5O__num_attrs_test"); is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif } /* end for */ } /* end for */ @@ -4809,9 +4809,9 @@ test_attr_corder_create_compact(hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5O__num_attrs_test"); VERIFY(nattrs, max_compact, "H5O__num_attrs_test"); is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Loop through attributes, checking their creation order values */ /* (the name index is used, but the creation order value is in the same order) */ @@ -4824,7 +4824,7 @@ test_attr_corder_create_compact(hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Aget_info_by_name"); /* Verify creation order of attribute */ - VERIFY(ainfo.corder_valid, TRUE, "H5Aget_info_by_name"); + VERIFY(ainfo.corder_valid, true, "H5Aget_info_by_name"); VERIFY(ainfo.corder, u, "H5Aget_info_by_name"); } /* end for */ } /* end for */ @@ -4929,9 +4929,9 @@ test_attr_corder_create_dense(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, true, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Create several attributes, but keep storage in compact form */ for (u = 0; u < max_compact; u++) { @@ -4953,9 +4953,9 @@ test_attr_corder_create_dense(hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5O__num_attrs_test"); VERIFY(nattrs, (u + 1), "H5O__num_attrs_test"); is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif } /* end for */ @@ -4977,9 +4977,9 @@ test_attr_corder_create_dense(hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5O__num_attrs_test"); VERIFY(nattrs, (max_compact + 1), "H5O__num_attrs_test"); is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); /* Retrieve & verify # of records in the name & creation order indices */ ret = H5O__attr_dense_info_test(my_dataset, &name_count, &corder_count); @@ -5044,9 +5044,9 @@ test_attr_corder_create_dense(hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5O__num_attrs_test"); VERIFY(nattrs, (max_compact + 1), "H5O__num_attrs_test"); is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); #endif /* Loop through attributes, checking their creation order values */ /* (the name index is used, but the creation order value is in the same order) */ @@ -5059,7 +5059,7 @@ test_attr_corder_create_dense(hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Aget_info_by_name"); /* Verify creation order of attribute */ - VERIFY(ainfo.corder_valid, TRUE, "H5Aget_info_by_name"); + VERIFY(ainfo.corder_valid, true, "H5Aget_info_by_name"); VERIFY(ainfo.corder, u, "H5Aget_info_by_name"); } /* end for */ } /* end for */ @@ -5274,9 +5274,9 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, true, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif } /* end for */ @@ -5347,9 +5347,9 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5O__num_attrs_test"); VERIFY(nattrs, (u + 1), "H5O__num_attrs_test"); is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif } /* end for */ @@ -5371,9 +5371,9 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5O__num_attrs_test"); VERIFY(nattrs, (max_compact + 1), "H5O__num_attrs_test"); is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); /* Retrieve & verify # of records in the name & creation order indices */ ret = H5O__attr_dense_info_test(my_dataset, &name_count, &corder_count); @@ -5391,9 +5391,9 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5O__num_attrs_test"); VERIFY(nattrs, u, "H5O__num_attrs_test"); is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); /* Retrieve & verify # of records in the name & creation order indices */ ret = H5O__attr_dense_info_test(my_dataset, &name_count, &corder_count); @@ -5412,9 +5412,9 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5O__num_attrs_test"); VERIFY(nattrs, (min_dense - 1), "H5O__num_attrs_test"); is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Re-add attributes to get back into dense form */ for (u = (min_dense - 1); u < (max_compact + 1); u++) { @@ -5437,9 +5437,9 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5O__num_attrs_test"); VERIFY(nattrs, (max_compact + 1), "H5O__num_attrs_test"); is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); /* Retrieve & verify # of records in the name & creation order indices */ ret = H5O__attr_dense_info_test(my_dataset, &name_count, &corder_count); @@ -5496,9 +5496,9 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5O__num_attrs_test"); VERIFY(nattrs, (max_compact + 1), "H5O__num_attrs_test"); is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); /* Retrieve & verify # of records in the name & creation order indices */ ret = H5O__attr_dense_info_test(my_dataset, &name_count, &corder_count); @@ -5516,9 +5516,9 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5O__num_attrs_test"); VERIFY(nattrs, u, "H5O__num_attrs_test"); is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); /* Retrieve & verify # of records in the name & creation order indices */ ret = H5O__attr_dense_info_test(my_dataset, &name_count, &corder_count); @@ -5537,9 +5537,9 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5O__num_attrs_test"); VERIFY(nattrs, (min_dense - 1), "H5O__num_attrs_test"); is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Re-add attributes to get back into dense form */ for (u = (min_dense - 1); u < (max_compact + 1); u++) { @@ -5562,9 +5562,9 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5O__num_attrs_test"); VERIFY(nattrs, (max_compact + 1), "H5O__num_attrs_test"); is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); /* Retrieve & verify # of records in the name & creation order indices */ ret = H5O__attr_dense_info_test(my_dataset, &name_count, &corder_count); @@ -5678,7 +5678,7 @@ test_attr_corder_delete(hid_t fcpl, hid_t fapl) /* Loop to leave file open when deleting dataset, or to close & re-open file * before deleting dataset */ - for (reopen_file = FALSE; reopen_file <= TRUE; reopen_file++) { + for (reopen_file = false; reopen_file <= true; reopen_file++) { /* Create test file */ fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl); CHECK(fid, FAIL, "H5Fopen"); @@ -5712,9 +5712,9 @@ test_attr_corder_delete(hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, true, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Create attributes, until attribute storage is in dense form */ for (u = 0; u < max_compact * 2; u++) { @@ -5737,9 +5737,9 @@ test_attr_corder_delete(hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5O__num_attrs_test"); VERIFY(nattrs, (max_compact * 2), "H5O__num_attrs_test"); is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); /* Retrieve & verify # of records in the name & creation order indices */ ret = H5O__attr_dense_info_test(my_dataset, &name_count, &corder_count); @@ -5821,7 +5821,7 @@ test_attr_corder_delete(hid_t fcpl, hid_t fapl) *------------------------------------------------------------------------- */ static int -attr_info_by_idx_check(hid_t obj_id, const char *attrname, hsize_t n, hbool_t use_index) +attr_info_by_idx_check(hid_t obj_id, const char *attrname, hsize_t n, bool use_index) { char tmpname[NAME_BUF_SIZE]; /* Temporary attribute name */ H5A_info_t ainfo; /* Attribute info struct */ @@ -5957,7 +5957,7 @@ attr_info_by_idx_check(hid_t obj_id, const char *attrname, hsize_t n, hbool_t us ** ****************************************************************/ static void -test_attr_info_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) +test_attr_info_by_idx(bool new_format, hid_t fcpl, hid_t fapl) { hid_t fid; /* HDF5 File ID */ hid_t dset1, dset2, dset3; /* Dataset IDs */ @@ -6001,7 +6001,7 @@ test_attr_info_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Pget_attr_phase_change"); /* Loop over using index for creation order value */ - for (use_index = FALSE; use_index <= TRUE; use_index++) { + for (use_index = false; use_index <= true; use_index++) { /* Output message about test being performed */ if (use_index) MESSAGE(5, ("Testing Querying Attribute Info By Index w/Creation Order Index\n")) @@ -6013,7 +6013,7 @@ test_attr_info_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(fid, FAIL, "H5Fcreate"); /* Set attribute creation order tracking & indexing for object */ - if (new_format == TRUE) { + if (new_format == true) { ret = H5Pset_attr_creation_order( dcpl, (H5P_CRT_ORDER_TRACKED | (use_index ? H5P_CRT_ORDER_INDEXED : (unsigned)0))); CHECK(ret, FAIL, "H5Pset_attr_creation_order"); @@ -6048,9 +6048,9 @@ test_attr_info_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, true, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Check for query on non-existent attribute */ H5E_BEGIN_TRY @@ -6093,9 +6093,9 @@ test_attr_info_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5O__num_attrs_test"); VERIFY(nattrs, max_compact, "H5O__num_attrs_test"); is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Check for out of bound offset queries */ H5E_BEGIN_TRY @@ -6137,7 +6137,7 @@ test_attr_info_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) #if 0 /* Verify state of object */ is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O__is_attr_dense_test"); + VERIFY(is_dense, (new_format ? true : false), "H5O__is_attr_dense_test"); #endif /* Verify information for new attribute */ ret = attr_info_by_idx_check(my_dataset, attrname, (hsize_t)u, use_index); @@ -6149,9 +6149,9 @@ test_attr_info_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5O__num_attrs_test"); VERIFY(nattrs, (max_compact * 2), "H5O__num_attrs_test"); is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O__is_attr_dense_test"); + VERIFY(is_dense, (new_format ? true : false), "H5O__is_attr_dense_test"); if (new_format) { /* Retrieve & verify # of records in the name & creation order indices */ @@ -6441,7 +6441,7 @@ test_attr_get_name_invalid_buf(hid_t fcpl, hid_t fapl) ** ****************************************************************/ static void -test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) +test_attr_delete_by_idx(bool new_format, hid_t fcpl, hid_t fapl) { hid_t fid; /* HDF5 File ID */ hid_t dset1, dset2, dset3; /* Dataset IDs */ @@ -6498,7 +6498,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) /* Loop over operating in different orders */ for (order = H5_ITER_INC; order <= H5_ITER_DEC; order++) { /* Loop over using index for creation order value */ - for (use_index = FALSE; use_index <= TRUE; use_index++) { + for (use_index = false; use_index <= true; use_index++) { /* Print appropriate test message */ if (idx_type == H5_INDEX_CRT_ORDER) { if (order == H5_ITER_INC) { @@ -6542,7 +6542,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(fid, FAIL, "H5Fcreate"); /* Set attribute creation order tracking & indexing for object */ - if (new_format == TRUE) { + if (new_format == true) { ret = H5Pset_attr_creation_order( dcpl, (H5P_CRT_ORDER_TRACKED | (use_index ? H5P_CRT_ORDER_INDEXED : (unsigned)0))); CHECK(ret, FAIL, "H5Pset_attr_creation_order"); @@ -6577,9 +6577,9 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, true, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Check for deleting non-existent attribute */ H5E_BEGIN_TRY @@ -6615,9 +6615,9 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5O__num_attrs_test"); VERIFY(nattrs, max_compact, "H5O__num_attrs_test"); is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Check for out of bound deletions */ H5E_BEGIN_TRY @@ -6684,7 +6684,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) #if 0 /* Verify state of attribute storage (empty) */ is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, true, "H5O__is_attr_empty_test"); #endif } /* end for */ @@ -6726,7 +6726,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) /* Verify state of object */ if (u >= max_compact) { is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O__is_attr_dense_test"); + VERIFY(is_dense, (new_format ? true : false), "H5O__is_attr_dense_test"); } /* end if */ #endif /* Verify information for new attribute */ @@ -6739,9 +6739,9 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5O__num_attrs_test"); VERIFY(nattrs, (max_compact * 2), "H5O__num_attrs_test"); is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O__is_attr_dense_test"); + VERIFY(is_dense, (new_format ? true : false), "H5O__is_attr_dense_test"); if (new_format) { /* Retrieve & verify # of records in the name & creation order indices */ @@ -6818,7 +6818,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) #if 0 /* Verify state of attribute storage (empty) */ is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, true, "H5O__is_attr_empty_test"); #endif /* Check for deletion on empty attribute storage again */ H5E_BEGIN_TRY @@ -6869,7 +6869,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) /* Verify state of object */ if (u >= max_compact) { is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O__is_attr_dense_test"); + VERIFY(is_dense, (new_format ? true : false), "H5O__is_attr_dense_test"); } /* end if */ #endif /* Verify information for new attribute */ @@ -6989,7 +6989,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) #if 0 /* Verify state of attribute storage (empty) */ is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, true, "H5O__is_attr_empty_test"); #endif /* Check for deletion on empty attribute storage again */ H5E_BEGIN_TRY @@ -7072,7 +7072,7 @@ attr_iterate2_cb(hid_t loc_id, const char *attr_name, const H5A_info_t *info, vo return (H5_ITER_ERROR); if (op_data->visited[op_data->curr]) return (H5_ITER_ERROR); - op_data->visited[op_data->curr] = TRUE; + op_data->visited[op_data->curr] = true; /* Advance to next value, in correct direction */ if (op_data->order != H5_ITER_DEC) @@ -7162,14 +7162,14 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_attrs - 1); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); ret = H5Aiterate2(obj_id, idx_type, order, &skip, attr_iterate2_cb, iter_info); CHECK(ret, FAIL, "H5Aiterate2"); /* Verify that we visited all the attributes */ VERIFY(skip, max_attrs, "H5Aiterate2"); for (v = 0; v < max_attrs; v++) - VERIFY(iter_info->visited[v], TRUE, "H5Aiterate2"); + VERIFY(iter_info->visited[v], true, "H5Aiterate2"); /* Iterate over attributes on object */ iter_info->nskipped = (unsigned)(skip = 0); @@ -7177,14 +7177,14 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_attrs - 1); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); ret = H5Aiterate_by_name(fid, dsetname, idx_type, order, &skip, attr_iterate2_cb, iter_info, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aiterate_by_name"); /* Verify that we visited all the attributes */ VERIFY(skip, max_attrs, "H5Aiterate_by_name"); for (v = 0; v < max_attrs; v++) - VERIFY(iter_info->visited[v], TRUE, "H5Aiterate_by_name"); + VERIFY(iter_info->visited[v], true, "H5Aiterate_by_name"); /* Iterate over attributes on object */ iter_info->nskipped = (unsigned)(skip = 0); @@ -7192,14 +7192,14 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_attrs - 1); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); ret = H5Aiterate_by_name(obj_id, ".", idx_type, order, &skip, attr_iterate2_cb, iter_info, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aiterate_by_name"); /* Verify that we visited all the attributes */ VERIFY(skip, max_attrs, "H5Aiterate_by_name"); for (v = 0; v < max_attrs; v++) - VERIFY(iter_info->visited[v], TRUE, "H5Aiterate_by_name"); + VERIFY(iter_info->visited[v], true, "H5Aiterate_by_name"); #if 0 #ifndef H5_NO_DEPRECATED_SYMBOLS @@ -7209,14 +7209,14 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_attrs - 1); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); ret = H5Aiterate1(obj_id, &oskip, attr_iterate1_cb, iter_info); CHECK(ret, FAIL, "H5Aiterate1"); /* Verify that we visited all the attributes */ VERIFY(skip, max_attrs, "H5Aiterate1"); for (v = 0; v < max_attrs; v++) - VERIFY(iter_info->visited[v], TRUE, "H5Aiterate1"); + VERIFY(iter_info->visited[v], true, "H5Aiterate1"); #endif /* H5_NO_DEPRECATED_SYMBOLS */ #endif @@ -7226,7 +7226,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? skip : ((max_attrs - 1) - skip); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); ret = H5Aiterate2(obj_id, idx_type, order, &skip, attr_iterate2_cb, iter_info); CHECK(ret, FAIL, "H5Aiterate2"); @@ -7234,18 +7234,18 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx VERIFY(skip, max_attrs, "H5Aiterate2"); if (order == H5_ITER_INC) { for (v = 0; v < (max_attrs / 2); v++) - VERIFY(iter_info->visited[v + (max_attrs / 2)], TRUE, "H5Aiterate2"); + VERIFY(iter_info->visited[v + (max_attrs / 2)], true, "H5Aiterate2"); } /* end if */ else if (order == H5_ITER_DEC) { for (v = 0; v < (max_attrs / 2); v++) - VERIFY(iter_info->visited[v], TRUE, "H5Aiterate2"); + VERIFY(iter_info->visited[v], true, "H5Aiterate2"); } /* end if */ else { unsigned nvisit = 0; /* # of links visited */ assert(order == H5_ITER_NATIVE); for (v = 0; v < max_attrs; v++) - if (iter_info->visited[v] == TRUE) + if (iter_info->visited[v] == true) nvisit++; VERIFY(skip, (max_attrs / 2), "H5Aiterate2"); @@ -7257,7 +7257,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? skip : ((max_attrs - 1) - skip); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); ret = H5Aiterate_by_name(fid, dsetname, idx_type, order, &skip, attr_iterate2_cb, iter_info, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aiterate_by_name"); @@ -7265,18 +7265,18 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx VERIFY(skip, max_attrs, "H5Aiterate_by_name"); if (order == H5_ITER_INC) { for (v = 0; v < (max_attrs / 2); v++) - VERIFY(iter_info->visited[v + (max_attrs / 2)], TRUE, "H5Aiterate_by_name"); + VERIFY(iter_info->visited[v + (max_attrs / 2)], true, "H5Aiterate_by_name"); } /* end if */ else if (order == H5_ITER_DEC) { for (v = 0; v < (max_attrs / 2); v++) - VERIFY(iter_info->visited[v], TRUE, "H5Aiterate_by_name"); + VERIFY(iter_info->visited[v], true, "H5Aiterate_by_name"); } /* end if */ else { unsigned nvisit = 0; /* # of links visited */ assert(order == H5_ITER_NATIVE); for (v = 0; v < max_attrs; v++) - if (iter_info->visited[v] == TRUE) + if (iter_info->visited[v] == true) nvisit++; VERIFY(skip, (max_attrs / 2), "H5Aiterate_by_name"); @@ -7288,7 +7288,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? skip : ((max_attrs - 1) - skip); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); ret = H5Aiterate_by_name(obj_id, ".", idx_type, order, &skip, attr_iterate2_cb, iter_info, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aiterate_by_name"); @@ -7296,18 +7296,18 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx VERIFY(skip, max_attrs, "H5Aiterate_by_name"); if (order == H5_ITER_INC) { for (v = 0; v < (max_attrs / 2); v++) - VERIFY(iter_info->visited[v + (max_attrs / 2)], TRUE, "H5Aiterate_by_name"); + VERIFY(iter_info->visited[v + (max_attrs / 2)], true, "H5Aiterate_by_name"); } /* end if */ else if (order == H5_ITER_DEC) { for (v = 0; v < (max_attrs / 2); v++) - VERIFY(iter_info->visited[v], TRUE, "H5Aiterate_by_name"); + VERIFY(iter_info->visited[v], true, "H5Aiterate_by_name"); } /* end if */ else { unsigned nvisit = 0; /* # of links visited */ assert(order == H5_ITER_NATIVE); for (v = 0; v < max_attrs; v++) - if (iter_info->visited[v] == TRUE) + if (iter_info->visited[v] == true) nvisit++; VERIFY(skip, (max_attrs / 2), "H5Aiterate_by_name"); @@ -7321,7 +7321,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? (unsigned)oskip : ((max_attrs - 1) - oskip); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); ret = H5Aiterate1(obj_id, &oskip, attr_iterate1_cb, iter_info); CHECK(ret, FAIL, "H5Aiterate1"); @@ -7329,18 +7329,18 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx VERIFY(oskip, max_attrs, "H5Aiterate1"); if (order == H5_ITER_INC) { for (v = 0; v < (max_attrs / 2); v++) - VERIFY(iter_info->visited[v + (max_attrs / 2)], TRUE, "H5Aiterate1"); + VERIFY(iter_info->visited[v + (max_attrs / 2)], true, "H5Aiterate1"); } /* end if */ else if (order == H5_ITER_DEC) { for (v = 0; v < (max_attrs / 2); v++) - VERIFY(iter_info->visited[v], TRUE, "H5Aiterate1"); + VERIFY(iter_info->visited[v], true, "H5Aiterate1"); } /* end if */ else { unsigned nvisit = 0; /* # of links visited */ assert(order == H5_ITER_NATIVE); for (v = 0; v < max_attrs; v++) - if (iter_info->visited[v] == TRUE) + if (iter_info->visited[v] == true) nvisit++; VERIFY(skip, (max_attrs / 2), "H5Aiterate1"); @@ -7354,7 +7354,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_attrs - 1); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); ret = H5Aiterate2(obj_id, idx_type, order, &skip, attr_iterate2_cb, iter_info); CHECK(ret, FAIL, "H5Aiterate2"); VERIFY(ret, CORDER_ITER_STOP, "H5Aiterate2"); @@ -7366,7 +7366,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_attrs - 1); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); ret = H5Aiterate_by_name(fid, dsetname, idx_type, order, &skip, attr_iterate2_cb, iter_info, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aiterate_by_name"); VERIFY(ret, CORDER_ITER_STOP, "H5Aiterate_by_name"); @@ -7378,7 +7378,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_attrs - 1); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); ret = H5Aiterate_by_name(obj_id, ".", idx_type, order, &skip, attr_iterate2_cb, iter_info, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aiterate_by_name"); VERIFY(ret, CORDER_ITER_STOP, "H5Aiterate_by_name"); @@ -7392,7 +7392,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_attrs - 1); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); ret = H5Aiterate1(obj_id, &oskip, attr_iterate1_cb, iter_info); CHECK(ret, FAIL, "H5Aiterate1"); VERIFY(ret, CORDER_ITER_STOP, "H5Aiterate1"); @@ -7441,7 +7441,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx ** ****************************************************************/ static void -test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) +test_attr_iterate2(bool new_format, hid_t fcpl, hid_t fapl) { hid_t fid; /* HDF5 File ID */ hid_t dset1, dset2, dset3; /* Dataset IDs */ @@ -7461,7 +7461,7 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) H5_index_t idx_type; /* Type of index to operate on */ H5_iter_order_t order; /* Order within in the index */ attr_iter_info_t iter_info; /* Iterator info */ - hbool_t *visited = NULL; /* Array of flags for visiting links */ + bool *visited = NULL; /* Array of flags for visiting links */ hsize_t idx; /* Start index for iteration */ unsigned use_index; /* Use index on creation order values */ const char *dsetname; /* Name of dataset for attributes */ @@ -7494,7 +7494,7 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) /* Allocate the "visited link" array */ iter_info.max_visit = max_compact * 2; - visited = (hbool_t *)malloc(sizeof(hbool_t) * iter_info.max_visit); + visited = (bool *)malloc(sizeof(bool) * iter_info.max_visit); CHECK_PTR(visited, "malloc"); iter_info.visited = visited; @@ -7503,7 +7503,7 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) /* Loop over operating in different orders */ for (order = H5_ITER_INC; order <= H5_ITER_DEC; order++) { /* Loop over using index for creation order value */ - for (use_index = FALSE; use_index <= TRUE; use_index++) { + for (use_index = false; use_index <= true; use_index++) { /* Print appropriate test message */ if (idx_type == H5_INDEX_CRT_ORDER) { if (order == H5_ITER_INC) { @@ -7547,7 +7547,7 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(fid, FAIL, "H5Fcreate"); /* Set attribute creation order tracking & indexing for object */ - if (new_format == TRUE) { + if (new_format == true) { ret = H5Pset_attr_creation_order( dcpl, (H5P_CRT_ORDER_TRACKED | (use_index ? H5P_CRT_ORDER_INDEXED : (unsigned)0))); CHECK(ret, FAIL, "H5Pset_attr_creation_order"); @@ -7585,9 +7585,9 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, true, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Check for iterating over object with no attributes (should be OK) */ ret = H5Aiterate2(my_dataset, idx_type, order, NULL, attr_iterate2_cb, NULL); @@ -7627,9 +7627,9 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5O__num_attrs_test"); VERIFY(nattrs, max_compact, "H5O__num_attrs_test"); is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif if (vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) { @@ -7707,7 +7707,7 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) /* Verify state of object */ if (u >= max_compact) { is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O__is_attr_dense_test"); + VERIFY(is_dense, (new_format ? true : false), "H5O__is_attr_dense_test"); } /* end if */ #endif /* Verify information for new attribute */ @@ -7720,9 +7720,9 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5O__num_attrs_test"); VERIFY(nattrs, (max_compact * 2), "H5O__num_attrs_test"); is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O__is_attr_dense_test"); + VERIFY(is_dense, (new_format ? true : false), "H5O__is_attr_dense_test"); if (new_format) { /* Retrieve & verify # of records in the name & creation order indices */ @@ -7857,7 +7857,7 @@ attr_open_by_idx_check(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order, ** ****************************************************************/ static void -test_attr_open_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) +test_attr_open_by_idx(bool new_format, hid_t fcpl, hid_t fapl) { hid_t fid; /* HDF5 File ID */ hid_t dset1, dset2, dset3; /* Dataset IDs */ @@ -7910,7 +7910,7 @@ test_attr_open_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) /* Loop over operating in different orders */ for (order = H5_ITER_INC; order <= H5_ITER_DEC; order++) { /* Loop over using index for creation order value */ - for (use_index = FALSE; use_index <= TRUE; use_index++) { + for (use_index = false; use_index <= true; use_index++) { /* Print appropriate test message */ if (idx_type == H5_INDEX_CRT_ORDER) { if (order == H5_ITER_INC) { @@ -7954,7 +7954,7 @@ test_attr_open_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(fid, FAIL, "H5Fcreate"); /* Set attribute creation order tracking & indexing for object */ - if (new_format == TRUE) { + if (new_format == true) { ret = H5Pset_attr_creation_order( dcpl, (H5P_CRT_ORDER_TRACKED | (use_index ? H5P_CRT_ORDER_INDEXED : (unsigned)0))); CHECK(ret, FAIL, "H5Pset_attr_creation_order"); @@ -7989,9 +7989,9 @@ test_attr_open_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, true, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Check for opening an attribute on an object with no attributes */ H5E_BEGIN_TRY @@ -8028,9 +8028,9 @@ test_attr_open_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5O__num_attrs_test"); VERIFY(nattrs, max_compact, "H5O__num_attrs_test"); is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Check for out of bound opening an attribute on an object */ H5E_BEGIN_TRY @@ -8084,7 +8084,7 @@ test_attr_open_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) /* Verify state of object */ if (u >= max_compact) { is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O__is_attr_dense_test"); + VERIFY(is_dense, (new_format ? true : false), "H5O__is_attr_dense_test"); } /* end if */ #endif /* Verify information for new attribute */ @@ -8097,9 +8097,9 @@ test_attr_open_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5O__num_attrs_test"); VERIFY(nattrs, (max_compact * 2), "H5O__num_attrs_test"); is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O__is_attr_dense_test"); + VERIFY(is_dense, (new_format ? true : false), "H5O__is_attr_dense_test"); if (new_format) { /* Retrieve & verify # of records in the name & creation order indices */ @@ -8234,7 +8234,7 @@ attr_open_check(hid_t fid, const char *dsetname, hid_t obj_id, unsigned max_attr ** ****************************************************************/ static void -test_attr_open_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) +test_attr_open_by_name(bool new_format, hid_t fcpl, hid_t fapl) { hid_t fid; /* HDF5 File ID */ hid_t dset1, dset2, dset3; /* Dataset IDs */ @@ -8278,7 +8278,7 @@ test_attr_open_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Pget_attr_phase_change"); /* Loop over using index for creation order value */ - for (use_index = FALSE; use_index <= TRUE; use_index++) { + for (use_index = false; use_index <= true; use_index++) { /* Print appropriate test message */ if (use_index) MESSAGE(5, ("Testing Opening Attributes By Name w/Creation Order Index\n")) @@ -8290,7 +8290,7 @@ test_attr_open_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(fid, FAIL, "H5Fcreate"); /* Set attribute creation order tracking & indexing for object */ - if (new_format == TRUE) { + if (new_format == true) { ret = H5Pset_attr_creation_order( dcpl, (H5P_CRT_ORDER_TRACKED | (use_index ? H5P_CRT_ORDER_INDEXED : (unsigned)0))); CHECK(ret, FAIL, "H5Pset_attr_creation_order"); @@ -8328,9 +8328,9 @@ test_attr_open_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, true, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Check for opening a non-existent attribute on an object with no attributes */ H5E_BEGIN_TRY @@ -8379,9 +8379,9 @@ test_attr_open_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5O__num_attrs_test"); VERIFY(nattrs, max_compact, "H5O__num_attrs_test"); is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Check for opening a non-existent attribute on an object with compact attribute storage */ H5E_BEGIN_TRY @@ -8450,7 +8450,7 @@ test_attr_open_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) /* Verify state of object */ if (u >= max_compact) { is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O__is_attr_dense_test"); + VERIFY(is_dense, (new_format ? true : false), "H5O__is_attr_dense_test"); } /* end if */ #endif /* Verify information for new attribute */ @@ -8463,9 +8463,9 @@ test_attr_open_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5O__num_attrs_test"); VERIFY(nattrs, (max_compact * 2), "H5O__num_attrs_test"); is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O__is_attr_dense_test"); + VERIFY(is_dense, (new_format ? true : false), "H5O__is_attr_dense_test"); if (new_format) { /* Retrieve & verify # of records in the name & creation order indices */ @@ -8532,7 +8532,7 @@ test_attr_open_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) ** ****************************************************************/ static void -test_attr_create_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) +test_attr_create_by_name(bool new_format, hid_t fcpl, hid_t fapl) { hid_t fid; /* HDF5 File ID */ hid_t dset1, dset2, dset3; /* Dataset IDs */ @@ -8575,7 +8575,7 @@ test_attr_create_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Pget_attr_phase_change"); /* Loop over using index for creation order value */ - for (use_index = FALSE; use_index <= TRUE; use_index++) { + for (use_index = false; use_index <= true; use_index++) { /* Print appropriate test message */ if (use_index) MESSAGE(5, ("Testing Creating Attributes By Name w/Creation Order Index\n")) @@ -8587,7 +8587,7 @@ test_attr_create_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(fid, FAIL, "H5Fcreate"); /* Set attribute creation order tracking & indexing for object */ - if (new_format == TRUE) { + if (new_format == true) { ret = H5Pset_attr_creation_order( dcpl, (H5P_CRT_ORDER_TRACKED | (use_index ? H5P_CRT_ORDER_INDEXED : (unsigned)0))); CHECK(ret, FAIL, "H5Pset_attr_creation_order"); @@ -8625,9 +8625,9 @@ test_attr_create_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) #if 0 /* Check on dataset's attribute storage status */ is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, true, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Create attributes, up to limit of compact form */ for (u = 0; u < max_compact; u++) { @@ -8655,9 +8655,9 @@ test_attr_create_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5O__num_attrs_test"); VERIFY(nattrs, max_compact, "H5O__num_attrs_test"); is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Test opening attributes stored compactly */ ret = attr_open_check(fid, dsetname, my_dataset, u); @@ -8705,7 +8705,7 @@ test_attr_create_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) /* Verify state of object */ if (u >= max_compact) { is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O__is_attr_dense_test"); + VERIFY(is_dense, (new_format ? true : false), "H5O__is_attr_dense_test"); } /* end if */ #endif /* Verify information for new attribute */ @@ -8718,9 +8718,9 @@ test_attr_create_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5O__num_attrs_test"); VERIFY(nattrs, (max_compact * 2), "H5O__num_attrs_test"); is_empty = H5O__is_attr_empty_test(my_dataset); - VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test"); + VERIFY(is_empty, false, "H5O__is_attr_empty_test"); is_dense = H5O__is_attr_dense_test(my_dataset); - VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O__is_attr_dense_test"); + VERIFY(is_dense, (new_format ? true : false), "H5O__is_attr_dense_test"); if (new_format) { /* Retrieve & verify # of records in the name & creation order indices */ @@ -8916,9 +8916,9 @@ test_attr_shared_write(hid_t fcpl, hid_t fapl) #if 0 /* Check on datasets' attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); is_dense = H5O__is_attr_dense_test(dataset2); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Add attributes to each dataset, until after converting to dense storage */ for (u = 0; u < max_compact * 2; u++) { @@ -8933,7 +8933,7 @@ test_attr_shared_write(hid_t fcpl, hid_t fapl) #if 0 /* Check that attribute is not shared */ is_shared = H5A__is_shared_test(attr); - VERIFY(is_shared, FALSE, "H5A__is_shared_test"); + VERIFY(is_shared, false, "H5A__is_shared_test"); #endif /* Write data into the attribute */ attr_value = u + 1; @@ -8947,7 +8947,7 @@ test_attr_shared_write(hid_t fcpl, hid_t fapl) #if 0 /* Check that attribute is shared */ is_shared = H5A__is_shared_test(attr); - VERIFY(is_shared, TRUE, "H5A__is_shared_test"); + VERIFY(is_shared, true, "H5A__is_shared_test"); /* Check refcount for attribute */ ret = H5A__get_shared_rc_test(attr, &shared_refcount); @@ -8973,9 +8973,9 @@ test_attr_shared_write(hid_t fcpl, hid_t fapl) /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); if (u < max_compact) - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); else - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); #endif /* Alternate between creating "small" & "big" attributes */ @@ -8986,7 +8986,7 @@ test_attr_shared_write(hid_t fcpl, hid_t fapl) #if 0 /* Check that attribute is not shared */ is_shared = H5A__is_shared_test(attr); - VERIFY(is_shared, FALSE, "H5A__is_shared_test"); + VERIFY(is_shared, false, "H5A__is_shared_test"); #endif /* Write data into the attribute */ attr_value = u + 1; @@ -9000,7 +9000,7 @@ test_attr_shared_write(hid_t fcpl, hid_t fapl) #if 0 /* Check that attribute is shared */ is_shared = H5A__is_shared_test(attr); - VERIFY(is_shared, TRUE, "H5A__is_shared_test"); + VERIFY(is_shared, true, "H5A__is_shared_test"); /* Check refcount for attribute */ ret = H5A__get_shared_rc_test(attr, &shared_refcount); @@ -9026,9 +9026,9 @@ test_attr_shared_write(hid_t fcpl, hid_t fapl) /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset2); if (u < max_compact) - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); else - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); #endif } /* end for */ @@ -9265,9 +9265,9 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl) #if 0 /* Check on datasets' attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); is_dense = H5O__is_attr_dense_test(dataset2); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Add attributes to each dataset, until after converting to dense storage */ for (u = 0; u < max_compact * 2; u++) { @@ -9282,7 +9282,7 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl) #if 0 /* Check that attribute is not shared */ is_shared = H5A__is_shared_test(attr); - VERIFY(is_shared, FALSE, "H5A__is_shared_test"); + VERIFY(is_shared, false, "H5A__is_shared_test"); #endif /* Write data into the attribute */ attr_value = u + 1; @@ -9296,7 +9296,7 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl) #if 0 /* Check that attribute is shared */ is_shared = H5A__is_shared_test(attr); - VERIFY(is_shared, TRUE, "H5A__is_shared_test"); + VERIFY(is_shared, true, "H5A__is_shared_test"); /* Check refcount for attribute */ ret = H5A__get_shared_rc_test(attr, &shared_refcount); @@ -9322,9 +9322,9 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl) /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); if (u < max_compact) - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); else - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); #endif /* Alternate between creating "small" & "big" attributes */ @@ -9335,7 +9335,7 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl) #if 0 /* Check that attribute is not shared */ is_shared = H5A__is_shared_test(attr); - VERIFY(is_shared, FALSE, "H5A__is_shared_test"); + VERIFY(is_shared, false, "H5A__is_shared_test"); #endif /* Write data into the attribute */ attr_value = u + 1; @@ -9349,7 +9349,7 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl) #if 0 /* Check that attribute is shared */ is_shared = H5A__is_shared_test(attr); - VERIFY(is_shared, TRUE, "H5A__is_shared_test"); + VERIFY(is_shared, true, "H5A__is_shared_test"); /* Check refcount for attribute */ ret = H5A__get_shared_rc_test(attr, &shared_refcount); @@ -9375,9 +9375,9 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl) /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset2); if (u < max_compact) - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); else - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); #endif /* Create new attribute name */ @@ -9396,12 +9396,12 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl) if (u % 2) { /* Check that attribute is not shared */ is_shared = H5A__is_shared_test(attr); - VERIFY(is_shared, FALSE, "H5A__is_shared_test"); + VERIFY(is_shared, false, "H5A__is_shared_test"); } /* end if */ else { /* Check that attribute is shared */ is_shared = H5A__is_shared_test(attr); - VERIFY(is_shared, TRUE, "H5A__is_shared_test"); + VERIFY(is_shared, true, "H5A__is_shared_test"); /* Check refcount for attribute */ ret = H5A__get_shared_rc_test(attr, &shared_refcount); @@ -9420,12 +9420,12 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl) if (u % 2) { /* Check that attribute is not shared */ is_shared = H5A__is_shared_test(attr); - VERIFY(is_shared, FALSE, "H5A__is_shared_test"); + VERIFY(is_shared, false, "H5A__is_shared_test"); } /* end if */ else { /* Check that attribute is shared */ is_shared = H5A__is_shared_test(attr); - VERIFY(is_shared, TRUE, "H5A__is_shared_test"); + VERIFY(is_shared, true, "H5A__is_shared_test"); /* Check refcount for attribute */ ret = H5A__get_shared_rc_test(attr, &shared_refcount); @@ -9450,12 +9450,12 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl) if (u % 2) { /* Check that attribute is not shared */ is_shared = H5A__is_shared_test(attr); - VERIFY(is_shared, FALSE, "H5A__is_shared_test"); + VERIFY(is_shared, false, "H5A__is_shared_test"); } /* end if */ else { /* Check that attribute is shared */ is_shared = H5A__is_shared_test(attr); - VERIFY(is_shared, TRUE, "H5A__is_shared_test"); + VERIFY(is_shared, true, "H5A__is_shared_test"); /* Check refcount for attribute */ ret = H5A__get_shared_rc_test(attr, &shared_refcount); @@ -9474,12 +9474,12 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl) if (u % 2) { /* Check that attribute is not shared */ is_shared = H5A__is_shared_test(attr); - VERIFY(is_shared, FALSE, "H5A__is_shared_test"); + VERIFY(is_shared, false, "H5A__is_shared_test"); } /* end if */ else { /* Check that attribute is shared */ is_shared = H5A__is_shared_test(attr); - VERIFY(is_shared, TRUE, "H5A__is_shared_test"); + VERIFY(is_shared, true, "H5A__is_shared_test"); /* Check refcount for attribute */ ret = H5A__get_shared_rc_test(attr, &shared_refcount); @@ -9724,9 +9724,9 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl) #if 0 /* Check on datasets' attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); is_dense = H5O__is_attr_dense_test(dataset2); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Add attributes to each dataset, until after converting to dense storage */ for (u = 0; u < max_compact * 2; u++) { @@ -9741,7 +9741,7 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl) #if 0 /* Check that attribute is not shared */ is_shared = H5A__is_shared_test(attr); - VERIFY(is_shared, FALSE, "H5A__is_shared_test"); + VERIFY(is_shared, false, "H5A__is_shared_test"); #endif /* Write data into the attribute */ attr_value = u + 1; @@ -9755,7 +9755,7 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl) #if 0 /* Check that attribute is shared */ is_shared = H5A__is_shared_test(attr); - VERIFY(is_shared, TRUE, "H5A__is_shared_test"); + VERIFY(is_shared, true, "H5A__is_shared_test"); /* Check refcount for attribute */ ret = H5A__get_shared_rc_test(attr, &shared_refcount); @@ -9781,9 +9781,9 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl) /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); if (u < max_compact) - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); else - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); #endif /* Alternate between creating "small" & "big" attributes */ @@ -9794,7 +9794,7 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl) #if 0 /* Check that attribute is not shared */ is_shared = H5A__is_shared_test(attr); - VERIFY(is_shared, FALSE, "H5A__is_shared_test"); + VERIFY(is_shared, false, "H5A__is_shared_test"); #endif /* Write data into the attribute */ attr_value = u + 1; @@ -9808,7 +9808,7 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl) #if 0 /* Check that attribute is shared */ is_shared = H5A__is_shared_test(attr); - VERIFY(is_shared, TRUE, "H5A__is_shared_test"); + VERIFY(is_shared, true, "H5A__is_shared_test"); /* Check refcount for attribute */ ret = H5A__get_shared_rc_test(attr, &shared_refcount); @@ -9834,9 +9834,9 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl) /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset2); if (u < max_compact) - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); else - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); #endif } /* end for */ @@ -9858,12 +9858,12 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl) if (u % 2) { /* Check that attribute is not shared */ is_shared = H5A__is_shared_test(attr); - VERIFY(is_shared, FALSE, "H5A__is_shared_test"); + VERIFY(is_shared, false, "H5A__is_shared_test"); } /* end if */ else { /* Check that attribute is shared */ is_shared = H5A__is_shared_test(attr); - VERIFY(is_shared, TRUE, "H5A__is_shared_test"); + VERIFY(is_shared, true, "H5A__is_shared_test"); /* Check refcount for attribute */ ret = H5A__get_shared_rc_test(attr, &shared_refcount); @@ -10108,9 +10108,9 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl) #if 0 /* Check on datasets' attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); is_dense = H5O__is_attr_dense_test(dataset2); - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); #endif /* Add attributes to each dataset, until after converting to dense storage */ for (u = 0; u < max_compact * 2; u++) { @@ -10125,7 +10125,7 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl) #if 0 /* Check that attribute is not shared */ is_shared = H5A__is_shared_test(attr); - VERIFY(is_shared, FALSE, "H5A__is_shared_test"); + VERIFY(is_shared, false, "H5A__is_shared_test"); #endif /* Write data into the attribute */ attr_value = u + 1; @@ -10139,7 +10139,7 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl) #if 0 /* ChecFk that attribute is shared */ is_shared = H5A__is_shared_test(attr); - VERIFY(is_shared, TRUE, "H5A__is_shared_test"); + VERIFY(is_shared, true, "H5A__is_shared_test"); /* Check refcount for attribute */ ret = H5A__get_shared_rc_test(attr, &shared_refcount); @@ -10165,9 +10165,9 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl) /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); if (u < max_compact) - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); else - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); #endif /* Alternate between creating "small" & "big" attributes */ @@ -10178,7 +10178,7 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl) #if 0 /* Check that attribute is not shared */ is_shared = H5A__is_shared_test(attr); - VERIFY(is_shared, FALSE, "H5A__is_shared_test"); + VERIFY(is_shared, false, "H5A__is_shared_test"); #endif /* Write data into the attribute */ attr_value = u + 1; @@ -10192,7 +10192,7 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl) #if 0 /* Check that attribute is shared */ is_shared = H5A__is_shared_test(attr); - VERIFY(is_shared, TRUE, "H5A__is_shared_test"); + VERIFY(is_shared, true, "H5A__is_shared_test"); /* Check refcount for attribute */ ret = H5A__get_shared_rc_test(attr, &shared_refcount); @@ -10218,9 +10218,9 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl) /* Check on dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset2); if (u < max_compact) - VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, false, "H5O__is_attr_dense_test"); else - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); #endif } /* end for */ @@ -10239,7 +10239,7 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl) #if 0 /* Check on first dataset's attribute storage status */ is_dense = H5O__is_attr_dense_test(dataset); - VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test"); + VERIFY(is_dense, true, "H5O__is_attr_dense_test"); #endif /* Check ref count on attributes of first dataset */ for (u = 0; u < max_compact * 2; u++) { @@ -10253,12 +10253,12 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl) if (u % 2) { /* Check that attribute is not shared */ is_shared = H5A__is_shared_test(attr); - VERIFY(is_shared, FALSE, "H5A__is_shared_test"); + VERIFY(is_shared, false, "H5A__is_shared_test"); } /* end if */ else { /* Check that attribute is shared */ is_shared = H5A__is_shared_test(attr); - VERIFY(is_shared, TRUE, "H5A__is_shared_test"); + VERIFY(is_shared, true, "H5A__is_shared_test"); /* Check refcount for attribute */ ret = H5A__get_shared_rc_test(attr, &shared_refcount); @@ -10561,7 +10561,7 @@ test_attr_bug2(hid_t fcpl, hid_t fapl) CHECK(tid, FAIL, "H5Aget_type"); tri_ret = H5Tequal(tid, H5T_STD_I32LE); - VERIFY(tri_ret, TRUE, "H5Tequal"); + VERIFY(tri_ret, true, "H5Tequal"); /* Close IDs */ ret = H5Tclose(tid); @@ -11721,13 +11721,13 @@ test_attr(void) MESSAGE(7, ("testing with minimzied dataset object headers\n")); dcpl = H5Pcreate(H5P_DATASET_CREATE); CHECK(dcpl, FAIL, "H5Pcreate"); - ret = H5Pset_dset_no_attrs_hint(dcpl, TRUE); + ret = H5Pset_dset_no_attrs_hint(dcpl, true); CHECK_I(ret, "H5Pset_dset_no_attrs_hint"); dcpl_g = dcpl; } #endif - for (new_format = FALSE; new_format <= TRUE; new_format++) { + for (new_format = false; new_format <= true; new_format++) { hid_t my_fapl = fapl; if (new_format) @@ -11773,10 +11773,10 @@ test_attr(void) /* This next test uses its own file information */ test_attr_duplicate_ids(my_fapl); - for (use_shared = FALSE; use_shared <= TRUE; use_shared++) { + for (use_shared = false; use_shared <= true; use_shared++) { hid_t my_fcpl; - if (new_format == TRUE && use_shared) { + if (new_format == true && use_shared) { MESSAGE(7, ("testing with shared attributes\n")); my_fcpl = fcpl2; } @@ -11826,7 +11826,7 @@ test_attr(void) through a different file handle */ /* tests specific to the "new format" */ - if (new_format == TRUE) { + if (new_format == true) { /* General attribute tests */ test_attr_dense_create(my_fcpl, my_fapl); /* Test dense attribute storage creation */ test_attr_dense_open(my_fcpl, my_fapl); /* Test opening attributes in dense storage */ @@ -11857,7 +11857,7 @@ test_attr(void) w/attribute creation order info */ /* More complex tests with exclusively both "new format" and "shared" attributes */ - if (use_shared == TRUE) { + if (use_shared == true) { test_attr_shared_write( my_fcpl, my_fapl); /* Test writing to shared attributes in compact & dense storage */ |