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 | |
| 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')
132 files changed, 11527 insertions, 11544 deletions
diff --git a/test/API/H5_api_async_test.c b/test/API/H5_api_async_test.c index 282f04a..ebae012 100644 --- a/test/API/H5_api_async_test.c +++ b/test/API/H5_api_async_test.c @@ -62,7 +62,7 @@ test_one_dataset_io(void) hid_t es_id = H5I_INVALID_HID; hsize_t dims[2] = {6, 10}; size_t num_in_progress; - hbool_t op_failed; + bool op_failed; int wbuf[6][10]; int rbuf[6][10]; int i, j; @@ -328,7 +328,7 @@ test_multi_dataset_io(void) hid_t es_id = H5I_INVALID_HID; hsize_t dims[2] = {6, 10}; size_t num_in_progress; - hbool_t op_failed; + bool op_failed; char dset_name[32]; int wbuf[5][6][10]; int rbuf[5][6][10]; @@ -582,7 +582,7 @@ test_multi_file_dataset_io(void) hid_t es_id = H5I_INVALID_HID; hsize_t dims[2] = {6, 10}; size_t num_in_progress; - hbool_t op_failed; + bool op_failed; char file_name[32]; int wbuf[5][6][10]; int rbuf[5][6][10]; @@ -892,7 +892,7 @@ test_multi_file_grp_dset_io(void) hid_t es_id = H5I_INVALID_HID; hsize_t dims[2] = {6, 10}; size_t num_in_progress; - hbool_t op_failed; + bool op_failed; char file_name[32]; int wbuf[5][6][10]; int rbuf[5][6][10]; @@ -1208,7 +1208,7 @@ test_set_extent(void) hsize_t start[2] = {0, 0}; hsize_t count[2] = {1, 10}; size_t num_in_progress; - hbool_t op_failed; + bool op_failed; htri_t tri_ret; int wbuf[6][10]; int rbuf[6][10]; @@ -1413,10 +1413,10 @@ test_attribute_exists(void) hid_t space_id = H5I_INVALID_HID; hid_t es_id = H5I_INVALID_HID; hsize_t dims[2] = {6, 10}; - hbool_t exists1; - hbool_t exists2; + bool exists1; + bool exists2; size_t num_in_progress; - hbool_t op_failed; + bool op_failed; TESTING("H5Aexists()"); @@ -1479,9 +1479,9 @@ test_attribute_exists(void) /* Check if H5Aexists returned the correct values */ if (exists1) - FAIL_PUTS_ERROR(" H5Aexists returned TRUE for an attribute that should not exist"); + FAIL_PUTS_ERROR(" H5Aexists returned true for an attribute that should not exist"); if (!exists2) - FAIL_PUTS_ERROR(" H5Aexists returned FALSE for an attribute that should exist"); + FAIL_PUTS_ERROR(" H5Aexists returned false for an attribute that should exist"); /* Close */ if (H5Aclose_async(attr_id, es_id) < 0) @@ -1534,7 +1534,7 @@ test_attribute_io(void) hid_t es_id = H5I_INVALID_HID; hsize_t dims[2] = {6, 10}; size_t num_in_progress; - hbool_t op_failed; + bool op_failed; int wbuf[6][10]; int rbuf[6][10]; int i, j; @@ -1676,7 +1676,7 @@ test_attribute_io_tconv(void) hid_t es_id = H5I_INVALID_HID; hsize_t dims[2] = {6, 10}; size_t num_in_progress; - hbool_t op_failed; + bool op_failed; int wbuf[6][10]; int rbuf[6][10]; int i, j; @@ -1821,7 +1821,7 @@ test_attribute_io_compound(void) hid_t es_id = H5I_INVALID_HID; hsize_t dims[2] = {6, 10}; size_t num_in_progress; - hbool_t op_failed; + bool op_failed; tattr_cmpd_t wbuf[6][10]; tattr_cmpd_t rbuf[6][10]; tattr_cmpd_t fbuf[6][10]; @@ -2131,7 +2131,7 @@ test_group(void) H5G_info_t info2; H5G_info_t info3; size_t num_in_progress; - hbool_t op_failed; + bool op_failed; TESTING("group operations"); @@ -2288,19 +2288,19 @@ error: static int test_link(void) { - hid_t file_id = H5I_INVALID_HID; - hid_t parent_group_id = H5I_INVALID_HID; - hid_t group_id = H5I_INVALID_HID; - hid_t gcpl_id = H5I_INVALID_HID; - hid_t es_id = H5I_INVALID_HID; - hbool_t existsh1; - hbool_t existsh2; - hbool_t existsh3; - hbool_t existss1; - hbool_t existss2; - hbool_t existss3; - size_t num_in_progress; - hbool_t op_failed; + hid_t file_id = H5I_INVALID_HID; + hid_t parent_group_id = H5I_INVALID_HID; + hid_t group_id = H5I_INVALID_HID; + hid_t gcpl_id = H5I_INVALID_HID; + hid_t es_id = H5I_INVALID_HID; + bool existsh1; + bool existsh2; + bool existsh3; + bool existss1; + bool existss2; + bool existss3; + size_t num_in_progress; + bool op_failed; TESTING("link operations"); @@ -2431,17 +2431,17 @@ test_link(void) /* Check if existence returns were correct */ if (!existsh1) - FAIL_PUTS_ERROR(" link exists returned FALSE for link that should exist"); + FAIL_PUTS_ERROR(" link exists returned false for link that should exist"); if (!existss1) - FAIL_PUTS_ERROR(" link exists returned FALSE for link that should exist"); + FAIL_PUTS_ERROR(" link exists returned false for link that should exist"); if (!existsh2) - FAIL_PUTS_ERROR(" link exists returned FALSE for link that should exist"); + FAIL_PUTS_ERROR(" link exists returned false for link that should exist"); if (existss2) - FAIL_PUTS_ERROR(" link exists returned TRUE for link that should not exist"); + FAIL_PUTS_ERROR(" link exists returned true for link that should not exist"); if (existsh3) - FAIL_PUTS_ERROR(" link exists returned TRUE for link that should not exist"); + FAIL_PUTS_ERROR(" link exists returned true for link that should not exist"); if (existsh3) - FAIL_PUTS_ERROR(" link exists returned TRUE for link that should not exist"); + FAIL_PUTS_ERROR(" link exists returned true for link that should not exist"); /* Close */ if (H5Gclose_async(parent_group_id, es_id) < 0) @@ -2492,7 +2492,7 @@ test_ocopy_orefresh(void) hid_t es_id = H5I_INVALID_HID; hsize_t dims[2] = {6, 10}; size_t num_in_progress; - hbool_t op_failed; + bool op_failed; TESTING("H5Ocopy() and H5Orefresh()"); @@ -2600,11 +2600,11 @@ error: static int test_file_reopen(void) { - hid_t file_id = H5I_INVALID_HID; - hid_t reopened_file_id = H5I_INVALID_HID; - hid_t es_id = H5I_INVALID_HID; - size_t num_in_progress; - hbool_t op_failed; + hid_t file_id = H5I_INVALID_HID; + hid_t reopened_file_id = H5I_INVALID_HID; + hid_t es_id = H5I_INVALID_HID; + size_t num_in_progress; + bool op_failed; TESTING("H5Freopen()"); diff --git a/test/API/H5_api_attribute_test.c b/test/API/H5_api_attribute_test.c index 1b3ef96..badfb1a 100644 --- a/test/API/H5_api_attribute_test.c +++ b/test/API/H5_api_attribute_test.c @@ -138,12 +138,12 @@ test_create_attribute_on_root(void) goto error; } - if ((space_id = generate_random_dataspace(ATTRIBUTE_CREATE_ON_ROOT_SPACE_RANK, NULL, NULL, TRUE)) < 0) + if ((space_id = generate_random_dataspace(ATTRIBUTE_CREATE_ON_ROOT_SPACE_RANK, NULL, NULL, true)) < 0) TEST_ERROR; - if ((attr_dtype1 = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype1 = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; - if ((attr_dtype2 = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype2 = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; PASSED(); @@ -296,17 +296,17 @@ test_create_attribute_on_dataset(void) } if ((dset_space_id = - generate_random_dataspace(ATTRIBUTE_CREATE_ON_DATASET_DSET_SPACE_RANK, NULL, NULL, FALSE)) < 0) + generate_random_dataspace(ATTRIBUTE_CREATE_ON_DATASET_DSET_SPACE_RANK, NULL, NULL, false)) < 0) TEST_ERROR; if ((attr_space_id = - generate_random_dataspace(ATTRIBUTE_CREATE_ON_DATASET_ATTR_SPACE_RANK, NULL, NULL, TRUE)) < 0) + generate_random_dataspace(ATTRIBUTE_CREATE_ON_DATASET_ATTR_SPACE_RANK, NULL, NULL, true)) < 0) TEST_ERROR; - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; - if ((attr_dtype1 = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype1 = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; - if ((attr_dtype2 = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype2 = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; if ((dset_id = H5Dcreate2(group_id, ATTRIBUTE_CREATE_ON_DATASET_DSET_NAME, dset_dtype, dset_space_id, @@ -479,7 +479,7 @@ test_create_attribute_on_datatype(void) goto error; } - if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { + if ((type_id = generate_random_datatype(H5T_NO_CLASS, false)) < 0) { H5_FAILED(); printf(" couldn't create datatype\n"); goto error; @@ -492,12 +492,12 @@ test_create_attribute_on_datatype(void) goto error; } - if ((space_id = generate_random_dataspace(ATTRIBUTE_CREATE_ON_DATATYPE_SPACE_RANK, NULL, NULL, TRUE)) < 0) + if ((space_id = generate_random_dataspace(ATTRIBUTE_CREATE_ON_DATATYPE_SPACE_RANK, NULL, NULL, true)) < 0) TEST_ERROR; - if ((attr_dtype1 = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype1 = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; - if ((attr_dtype2 = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype2 = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; PASSED(); @@ -652,7 +652,7 @@ test_create_attribute_with_null_space(void) if ((space_id = H5Screate(H5S_NULL)) < 0) TEST_ERROR; - if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_CREATE_NULL_DATASPACE_TEST_ATTR_NAME, attr_dtype, space_id, @@ -763,7 +763,7 @@ test_create_attribute_with_scalar_space(void) if ((space_id = H5Screate(H5S_SCALAR)) < 0) TEST_ERROR; - if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_CREATE_SCALAR_DATASPACE_TEST_ATTR_NAME, attr_dtype, @@ -874,10 +874,10 @@ test_create_attribute_with_space_in_name(void) } if ((space_id = - generate_random_dataspace(ATTRIBUTE_CREATE_WITH_SPACE_IN_NAME_SPACE_RANK, NULL, NULL, TRUE)) < 0) + generate_random_dataspace(ATTRIBUTE_CREATE_WITH_SPACE_IN_NAME_SPACE_RANK, NULL, NULL, true)) < 0) TEST_ERROR; - if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_CREATE_WITH_SPACE_IN_NAME_ATTR_NAME, attr_dtype, space_id, @@ -978,10 +978,10 @@ test_create_attribute_invalid_params(void) goto error; } - if ((space_id = generate_random_dataspace(ATTRIBUTE_CREATE_INVALID_PARAMS_SPACE_RANK, NULL, NULL, TRUE)) < + if ((space_id = generate_random_dataspace(ATTRIBUTE_CREATE_INVALID_PARAMS_SPACE_RANK, NULL, NULL, true)) < 0) TEST_ERROR; - if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; PASSED(); @@ -1436,10 +1436,10 @@ test_open_attribute(void) goto error; } - if ((space_id = generate_random_dataspace(ATTRIBUTE_OPEN_TEST_SPACE_RANK, NULL, NULL, TRUE)) < 0) + if ((space_id = generate_random_dataspace(ATTRIBUTE_OPEN_TEST_SPACE_RANK, NULL, NULL, true)) < 0) TEST_ERROR; - if ((attr_type = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_type = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; /* Create several attributes */ @@ -1826,10 +1826,10 @@ test_open_attribute_invalid_params(void) } if ((space_id = - generate_random_dataspace(ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_SPACE_RANK, NULL, NULL, TRUE)) < 0) + generate_random_dataspace(ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_SPACE_RANK, NULL, NULL, true)) < 0) TEST_ERROR; - if ((attr_type = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_type = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME, attr_type, space_id, @@ -2342,7 +2342,7 @@ test_write_attribute(void) goto error; } - if ((space_id = generate_random_dataspace(ATTRIBUTE_WRITE_TEST_SPACE_RANK, NULL, dims, TRUE)) < 0) + if ((space_id = generate_random_dataspace(ATTRIBUTE_WRITE_TEST_SPACE_RANK, NULL, dims, true)) < 0) TEST_ERROR; if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_WRITE_TEST_ATTR_NAME, ATTRIBUTE_WRITE_TEST_ATTR_DTYPE, @@ -2475,7 +2475,7 @@ test_write_attribute_invalid_params(void) } if ((space_id = - generate_random_dataspace(ATTRIBUTE_WRITE_INVALID_PARAMS_TEST_SPACE_RANK, NULL, dims, TRUE)) < 0) + generate_random_dataspace(ATTRIBUTE_WRITE_INVALID_PARAMS_TEST_SPACE_RANK, NULL, dims, true)) < 0) TEST_ERROR; if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_WRITE_INVALID_PARAMS_TEST_ATTR_NAME, @@ -2662,7 +2662,7 @@ test_read_attribute(void) goto error; } - if ((space_id = generate_random_dataspace(ATTRIBUTE_READ_TEST_SPACE_RANK, NULL, dims, TRUE)) < 0) + if ((space_id = generate_random_dataspace(ATTRIBUTE_READ_TEST_SPACE_RANK, NULL, dims, true)) < 0) TEST_ERROR; if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_READ_TEST_ATTR_NAME, ATTRIBUTE_READ_TEST_ATTR_DTYPE, @@ -2821,7 +2821,7 @@ test_read_attribute_invalid_params(void) } if ((space_id = - generate_random_dataspace(ATTRIBUTE_READ_INVALID_PARAMS_TEST_SPACE_RANK, NULL, dims, TRUE)) < 0) + generate_random_dataspace(ATTRIBUTE_READ_INVALID_PARAMS_TEST_SPACE_RANK, NULL, dims, true)) < 0) TEST_ERROR; if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_READ_INVALID_PARAMS_TEST_ATTR_NAME, @@ -3029,7 +3029,7 @@ test_read_empty_attribute(void) goto error; } - if ((space_id = generate_random_dataspace(ATTRIBUTE_READ_EMPTY_SPACE_RANK, NULL, dims, TRUE)) < 0) + if ((space_id = generate_random_dataspace(ATTRIBUTE_READ_EMPTY_SPACE_RANK, NULL, dims, true)) < 0) TEST_ERROR; if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_READ_EMPTY_ATTR_NAME, ATTRIBUTE_READ_EMPTY_DTYPE, space_id, @@ -3216,10 +3216,10 @@ test_get_attribute_space_and_type(void) } if ((attr_space_id = - generate_random_dataspace(ATTRIBUTE_GET_SPACE_TYPE_TEST_SPACE_RANK, NULL, attr_dims, TRUE)) < 0) + generate_random_dataspace(ATTRIBUTE_GET_SPACE_TYPE_TEST_SPACE_RANK, NULL, attr_dims, true)) < 0) TEST_ERROR; - if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_SPACE_TYPE_TEST_ATTR_NAME, attr_dtype, attr_space_id, @@ -3520,10 +3520,10 @@ test_get_attribute_space_and_type_invalid_params(void) } if ((attr_space_id = generate_random_dataspace(ATTRIBUTE_GET_SPACE_TYPE_INVALID_PARAMS_TEST_SPACE_RANK, - NULL, NULL, TRUE)) < 0) + NULL, NULL, true)) < 0) TEST_ERROR; - if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_SPACE_TYPE_INVALID_PARAMS_TEST_ATTR_NAME, attr_dtype, @@ -3678,12 +3678,12 @@ test_attribute_property_lists(void) goto error; } - if ((space_id = generate_random_dataspace(ATTRIBUTE_PROPERTY_LIST_TEST_SPACE_RANK, NULL, NULL, TRUE)) < 0) + if ((space_id = generate_random_dataspace(ATTRIBUTE_PROPERTY_LIST_TEST_SPACE_RANK, NULL, NULL, true)) < 0) TEST_ERROR; - if ((attr_dtype1 = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype1 = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; - if ((attr_dtype2 = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype2 = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; if ((acpl_id1 = H5Pcreate(H5P_ATTRIBUTE_CREATE)) < 0) { @@ -3979,10 +3979,10 @@ test_get_attribute_name(void) goto error; } - if ((space_id = generate_random_dataspace(ATTRIBUTE_GET_NAME_TEST_SPACE_RANK, NULL, NULL, TRUE)) < 0) + if ((space_id = generate_random_dataspace(ATTRIBUTE_GET_NAME_TEST_SPACE_RANK, NULL, NULL, true)) < 0) TEST_ERROR; - if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; /* Create several attributes */ @@ -4463,10 +4463,10 @@ test_get_attribute_name_invalid_params(void) } if ((space_id = generate_random_dataspace(ATTRIBUTE_GET_NAME_INVALID_PARAMS_TEST_SPACE_RANK, NULL, NULL, - TRUE)) < 0) + true)) < 0) TEST_ERROR; - if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_NAME_INVALID_PARAMS_TEST_ATTRIBUTE_NAME, attr_dtype, @@ -4844,10 +4844,10 @@ test_get_attribute_info(void) goto error; } - if ((space_id = generate_random_dataspace(ATTRIBUTE_GET_INFO_TEST_SPACE_RANK, NULL, NULL, TRUE)) < 0) + if ((space_id = generate_random_dataspace(ATTRIBUTE_GET_INFO_TEST_SPACE_RANK, NULL, NULL, true)) < 0) TEST_ERROR; - if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; /* Create several attributes */ @@ -5480,10 +5480,10 @@ test_get_attribute_info_invalid_params(void) } if ((space_id = generate_random_dataspace(ATTRIBUTE_GET_INFO_INVALID_PARAMS_TEST_SPACE_RANK, NULL, NULL, - TRUE)) < 0) + true)) < 0) TEST_ERROR; - if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_INFO_INVALID_PARAMS_TEST_ATTR_NAME, attr_dtype, @@ -5938,10 +5938,10 @@ test_rename_attribute(void) goto error; } - if ((attr_space_id = generate_random_dataspace(ATTRIBUTE_RENAME_TEST_SPACE_RANK, NULL, NULL, TRUE)) < 0) + if ((attr_space_id = generate_random_dataspace(ATTRIBUTE_RENAME_TEST_SPACE_RANK, NULL, NULL, true)) < 0) TEST_ERROR; - if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_RENAME_TEST_ATTR_NAME, attr_dtype, attr_space_id, @@ -6157,10 +6157,10 @@ test_rename_attribute_invalid_params(void) } if ((attr_space_id = generate_random_dataspace(ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_SPACE_RANK, NULL, - NULL, TRUE)) < 0) + NULL, true)) < 0) TEST_ERROR; - if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_ATTR_NAME, attr_dtype, @@ -6543,10 +6543,10 @@ test_attribute_iterate_group(void) goto error; } - if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; if ((attr_space_id = - generate_random_dataspace(ATTRIBUTE_ITERATE_TEST_ATTR_SPACE_RANK, NULL, NULL, TRUE)) < 0) + generate_random_dataspace(ATTRIBUTE_ITERATE_TEST_ATTR_SPACE_RANK, NULL, NULL, true)) < 0) TEST_ERROR; /* Create some attributes with a reverse-ordering naming scheme to test creation order */ @@ -6939,16 +6939,16 @@ test_attribute_iterate_dataset(void) } } - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; - if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; if ((dset_space_id = - generate_random_dataspace(ATTRIBUTE_ITERATE_TEST_DSET_SPACE_RANK, NULL, NULL, FALSE)) < 0) + generate_random_dataspace(ATTRIBUTE_ITERATE_TEST_DSET_SPACE_RANK, NULL, NULL, false)) < 0) TEST_ERROR; if ((attr_space_id = - generate_random_dataspace(ATTRIBUTE_ITERATE_TEST_ATTR_SPACE_RANK, NULL, NULL, TRUE)) < 0) + generate_random_dataspace(ATTRIBUTE_ITERATE_TEST_ATTR_SPACE_RANK, NULL, NULL, true)) < 0) TEST_ERROR; if ((dset_id = H5Dcreate2(group_id, ATTRIBUTE_ITERATE_TEST_DSET_NAME, dset_dtype, dset_space_id, @@ -7361,13 +7361,13 @@ test_attribute_iterate_datatype(void) } } - if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((type_id = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; - if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; if ((attr_space_id = - generate_random_dataspace(ATTRIBUTE_ITERATE_TEST_ATTR_SPACE_RANK, NULL, NULL, TRUE)) < 0) + generate_random_dataspace(ATTRIBUTE_ITERATE_TEST_ATTR_SPACE_RANK, NULL, NULL, true)) < 0) TEST_ERROR; if (H5Tcommit2(group_id, ATTRIBUTE_ITERATE_TEST_DTYPE_NAME, type_id, H5P_DEFAULT, tcpl_id, H5P_DEFAULT) < @@ -7774,11 +7774,11 @@ test_attribute_iterate_invalid_params(void) goto error; } - if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; if ((attr_space_id = generate_random_dataspace(ATTRIBUTE_ITERATE_INVALID_PARAMS_TEST_ATTR_SPACE_RANK, - NULL, NULL, TRUE)) < 0) + NULL, NULL, true)) < 0) TEST_ERROR; if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_ITERATE_INVALID_PARAMS_TEST_ATTR_NAME, attr_dtype, @@ -8193,11 +8193,11 @@ test_attribute_iterate_0_attributes(void) goto error; } - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; if ((dset_space_id = generate_random_dataspace(ATTRIBUTE_ITERATE_TEST_0_ATTRIBUTES_DSET_SPACE_RANK, NULL, - NULL, FALSE)) < 0) + NULL, false)) < 0) TEST_ERROR; if ((dset_id = H5Dcreate2(group_id, ATTRIBUTE_ITERATE_TEST_0_ATTRIBUTES_DSET_NAME, dset_dtype, @@ -8395,10 +8395,10 @@ test_delete_attribute(void) goto error; } - if ((space_id = generate_random_dataspace(ATTRIBUTE_DELETION_TEST_SPACE_RANK, NULL, NULL, TRUE)) < 0) + if ((space_id = generate_random_dataspace(ATTRIBUTE_DELETION_TEST_SPACE_RANK, NULL, NULL, true)) < 0) TEST_ERROR; - if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; PASSED(); @@ -9616,10 +9616,10 @@ test_delete_attribute_invalid_params(void) } if ((space_id = generate_random_dataspace(ATTRIBUTE_DELETION_INVALID_PARAMS_TEST_SPACE_RANK, NULL, NULL, - TRUE)) < 0) + true)) < 0) TEST_ERROR; - if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_INVALID_PARAMS_TEST_ATTR_NAME, attr_dtype, @@ -10031,10 +10031,10 @@ test_attribute_exists(void) goto error; } - if ((space_id = generate_random_dataspace(ATTRIBUTE_EXISTS_TEST_SPACE_RANK, NULL, NULL, TRUE)) < 0) + if ((space_id = generate_random_dataspace(ATTRIBUTE_EXISTS_TEST_SPACE_RANK, NULL, NULL, true)) < 0) TEST_ERROR; - if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_EXISTS_TEST_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, @@ -10174,10 +10174,10 @@ test_attribute_exists_invalid_params(void) } if ((space_id = generate_random_dataspace(ATTRIBUTE_EXISTS_INVALID_PARAMS_TEST_SPACE_RANK, NULL, NULL, - TRUE)) < 0) + true)) < 0) TEST_ERROR; - if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_EXISTS_INVALID_PARAMS_TEST_ATTR_NAME, attr_dtype, space_id, @@ -10449,10 +10449,10 @@ test_attribute_many(void) goto error; } - if ((space_id = generate_random_dataspace(ATTRIBUTE_MANY_SPACE_RANK, NULL, NULL, TRUE)) < 0) + if ((space_id = generate_random_dataspace(ATTRIBUTE_MANY_SPACE_RANK, NULL, NULL, true)) < 0) TEST_ERROR; - if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; /* Create many attributes */ @@ -10557,10 +10557,10 @@ test_attribute_duplicate_id(void) goto error; } - if ((space_id = generate_random_dataspace(ATTRIBUTE_DUPLICATE_ID_SPACE_RANK, NULL, NULL, TRUE)) < 0) + if ((space_id = generate_random_dataspace(ATTRIBUTE_DUPLICATE_ID_SPACE_RANK, NULL, NULL, true)) < 0) TEST_ERROR; - if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DUPLICATE_ID_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, @@ -10675,10 +10675,10 @@ test_get_number_attributes(void) goto error; } - if ((space_id = generate_random_dataspace(ATTRIBUTE_GET_NUM_ATTRS_TEST_SPACE_RANK, NULL, NULL, TRUE)) < 0) + if ((space_id = generate_random_dataspace(ATTRIBUTE_GET_NUM_ATTRS_TEST_SPACE_RANK, NULL, NULL, true)) < 0) TEST_ERROR; - if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_NUM_ATTRS_TEST_ATTR_NAME, attr_dtype, space_id, @@ -10855,10 +10855,10 @@ test_attr_shared_dtype(void) goto error; } - if ((space_id = generate_random_dataspace(ATTRIBUTE_SHARED_DTYPE_SPACE_RANK, NULL, NULL, TRUE)) < 0) + if ((space_id = generate_random_dataspace(ATTRIBUTE_SHARED_DTYPE_SPACE_RANK, NULL, NULL, true)) < 0) TEST_ERROR; - if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; /* Commit datatype to file */ diff --git a/test/API/H5_api_dataset_test.c b/test/API/H5_api_dataset_test.c index c64769c..80d4308 100644 --- a/test/API/H5_api_dataset_test.c +++ b/test/API/H5_api_dataset_test.c @@ -179,10 +179,10 @@ test_create_dataset_under_root(void) goto error; } - if ((fspace_id = generate_random_dataspace(DATASET_CREATE_UNDER_ROOT_SPACE_RANK, NULL, NULL, FALSE)) < 0) + if ((fspace_id = generate_random_dataspace(DATASET_CREATE_UNDER_ROOT_SPACE_RANK, NULL, NULL, false)) < 0) TEST_ERROR; - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; /* Create the Dataset under the root group of the file */ @@ -261,11 +261,11 @@ test_create_dataset_under_existing_group(void) goto error; } - if ((fspace_id = generate_random_dataspace(DATASET_CREATE_UNDER_EXISTING_SPACE_RANK, NULL, NULL, FALSE)) < + if ((fspace_id = generate_random_dataspace(DATASET_CREATE_UNDER_EXISTING_SPACE_RANK, NULL, NULL, false)) < 0) TEST_ERROR; - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; if ((dset_id = H5Dcreate2(group_id, DATASET_CREATE_UNDER_EXISTING_DSET_NAME, dset_dtype, fspace_id, @@ -351,11 +351,11 @@ test_create_dataset_invalid_params(void) goto error; } - if ((fspace_id = generate_random_dataspace(DATASET_CREATE_INVALID_PARAMS_SPACE_RANK, NULL, NULL, FALSE)) < + if ((fspace_id = generate_random_dataspace(DATASET_CREATE_INVALID_PARAMS_SPACE_RANK, NULL, NULL, false)) < 0) TEST_ERROR; - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; PASSED(); @@ -605,10 +605,10 @@ test_create_anonymous_dataset(void) goto error; } - if ((fspace_id = generate_random_dataspace(DATASET_CREATE_ANONYMOUS_SPACE_RANK, NULL, NULL, FALSE)) < 0) + if ((fspace_id = generate_random_dataspace(DATASET_CREATE_ANONYMOUS_SPACE_RANK, NULL, NULL, false)) < 0) TEST_ERROR; - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; if ((dset_id = H5Dcreate_anon(group_id, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { @@ -696,10 +696,10 @@ test_create_anonymous_dataset_invalid_params(void) } if ((fspace_id = generate_random_dataspace(DATASET_CREATE_ANONYMOUS_INVALID_PARAMS_SPACE_RANK, NULL, NULL, - FALSE)) < 0) + false)) < 0) TEST_ERROR; - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; PASSED(); @@ -891,7 +891,7 @@ test_create_dataset_null_space(void) if ((fspace_id = H5Screate(H5S_NULL)) < 0) TEST_ERROR; - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; if ((dset_id = H5Dcreate2(group_id, DATASET_CREATE_NULL_DATASPACE_TEST_DSET_NAME, dset_dtype, fspace_id, @@ -988,7 +988,7 @@ test_create_dataset_scalar_space(void) if ((fspace_id = H5Screate(H5S_SCALAR)) < 0) TEST_ERROR; - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; if ((dset_id = H5Dcreate2(group_id, DATASET_CREATE_SCALAR_DATASPACE_TEST_DSET_NAME, dset_dtype, fspace_id, @@ -1184,14 +1184,14 @@ test_create_dataset_random_shapes(void) goto error; } - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; for (i = 0; i < DATASET_SHAPE_TEST_NUM_ITERATIONS; i++) { char name[100]; int ndims = rand() % DATASET_SHAPE_TEST_MAX_DIMS + 1; - if ((space_id = generate_random_dataspace(ndims, NULL, NULL, FALSE)) < 0) { + if ((space_id = generate_random_dataspace(ndims, NULL, NULL, false)) < 0) { H5_FAILED(); printf(" couldn't create dataspace\n"); goto error; @@ -1292,7 +1292,7 @@ test_create_dataset_predefined_types(void) char name[100]; if ((fspace_id = - generate_random_dataspace(DATASET_PREDEFINED_TYPE_TEST_SPACE_RANK, NULL, NULL, FALSE)) < 0) + generate_random_dataspace(DATASET_PREDEFINED_TYPE_TEST_SPACE_RANK, NULL, NULL, false)) < 0) TEST_ERROR; HDsprintf(name, "%s%zu", DATASET_PREDEFINED_TYPE_TEST_BASE_NAME, i); @@ -1400,7 +1400,7 @@ test_create_dataset_string_types(void) goto error; } - if ((fspace_id = generate_random_dataspace(DATASET_STRING_TYPE_TEST_SPACE_RANK, NULL, NULL, FALSE)) < 0) + if ((fspace_id = generate_random_dataspace(DATASET_STRING_TYPE_TEST_SPACE_RANK, NULL, NULL, false)) < 0) TEST_ERROR; PASSED(); @@ -1566,7 +1566,7 @@ test_create_dataset_compound_types(void) goto error; } - if ((fspace_id = generate_random_dataspace(DATASET_COMPOUND_TYPE_TEST_DSET_RANK, NULL, NULL, FALSE)) < 0) + if ((fspace_id = generate_random_dataspace(DATASET_COMPOUND_TYPE_TEST_DSET_RANK, NULL, NULL, false)) < 0) TEST_ERROR; num_passes = (rand() % DATASET_COMPOUND_TYPE_TEST_MAX_PASSES) + 1; @@ -1600,7 +1600,7 @@ test_create_dataset_compound_types(void) HDsnprintf(member_name, 256, "member%zu", j); - if ((type_pool[j] = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { + if ((type_pool[j] = generate_random_datatype(H5T_NO_CLASS, false)) < 0) { H5_FAILED(); printf(" couldn't create compound datatype member %zu\n", j); goto error; @@ -1753,7 +1753,7 @@ test_create_dataset_enum_types(void) TEST_ERROR; } - if ((fspace_id = generate_random_dataspace(DATASET_ENUM_TYPE_TEST_SPACE_RANK, NULL, NULL, FALSE)) < 0) + if ((fspace_id = generate_random_dataspace(DATASET_ENUM_TYPE_TEST_SPACE_RANK, NULL, NULL, false)) < 0) TEST_ERROR; if ((dset_id_native = H5Dcreate2(group_id, DATASET_ENUM_TYPE_TEST_DSET_NAME1, enum_native, fspace_id, @@ -1879,7 +1879,7 @@ test_create_dataset_array_types(void) for (i = 0; i < DATASET_ARRAY_TYPE_TEST_RANK1; i++) array_dims1[i] = (hsize_t)(rand() % MAX_DIM_SIZE + 1); - if ((array_base_type_id1 = generate_random_datatype(H5T_ARRAY, FALSE)) < 0) + if ((array_base_type_id1 = generate_random_datatype(H5T_ARRAY, false)) < 0) TEST_ERROR; if ((array_type_id1 = H5Tarray_create2(array_base_type_id1, DATASET_ARRAY_TYPE_TEST_RANK1, array_dims1)) < @@ -1892,7 +1892,7 @@ test_create_dataset_array_types(void) for (i = 0; i < DATASET_ARRAY_TYPE_TEST_RANK2; i++) array_dims2[i] = (hsize_t)(rand() % MAX_DIM_SIZE + 1); - if ((array_base_type_id2 = generate_random_datatype(H5T_ARRAY, FALSE)) < 0) + if ((array_base_type_id2 = generate_random_datatype(H5T_ARRAY, false)) < 0) TEST_ERROR; if ((array_type_id2 = H5Tarray_create2(array_base_type_id2, DATASET_ARRAY_TYPE_TEST_RANK2, array_dims2)) < @@ -1906,7 +1906,7 @@ test_create_dataset_array_types(void) for (i = 0; i < DATASET_ARRAY_TYPE_TEST_RANK3; i++) array_dims3[i] = (hsize_t)(rand() % MAX_DIM_SIZE + 1); - if ((array_base_type_id3 = generate_random_datatype(H5T_ARRAY, FALSE)) < 0) + if ((array_base_type_id3 = generate_random_datatype(H5T_ARRAY, false)) < 0) TEST_ERROR; if ((nested_type_id = H5Tarray_create2(array_base_type_id3, DATASET_ARRAY_TYPE_TEST_RANK3, array_dims3)) < @@ -1922,7 +1922,7 @@ test_create_dataset_array_types(void) goto error; } - if ((fspace_id = generate_random_dataspace(DATASET_ARRAY_TYPE_TEST_SPACE_RANK, NULL, NULL, FALSE)) < 0) + if ((fspace_id = generate_random_dataspace(DATASET_ARRAY_TYPE_TEST_SPACE_RANK, NULL, NULL, false)) < 0) TEST_ERROR; if ((dset_id1 = H5Dcreate2(group_id, DATASET_ARRAY_TYPE_TEST_DSET_NAME1, array_type_id1, fspace_id, @@ -2076,19 +2076,19 @@ test_create_dataset_creation_properties(void) } if ((fspace_id = - generate_random_dataspace(DATASET_CREATION_PROPERTIES_TEST_SHAPE_RANK, NULL, dims, FALSE)) < 0) + generate_random_dataspace(DATASET_CREATION_PROPERTIES_TEST_SHAPE_RANK, NULL, dims, false)) < 0) TEST_ERROR; if ((compact_fspace_id = - generate_random_dataspace(DATASET_CREATION_PROPERTIES_TEST_SHAPE_RANK, NULL, NULL, TRUE)) < 0) + generate_random_dataspace(DATASET_CREATION_PROPERTIES_TEST_SHAPE_RANK, NULL, NULL, true)) < 0) TEST_ERROR; /* Set chunk dims to be size of dataset - for filters test */ for (i = 0; i < DATASET_CREATION_PROPERTIES_TEST_SHAPE_RANK; i++) chunk_dims[i] = dims[i]; - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; - if ((compact_dtype = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((compact_dtype = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; PASSED(); @@ -2872,11 +2872,11 @@ test_open_dataset_invalid_params(void) goto error; } - if ((fspace_id = generate_random_dataspace(DATASET_OPEN_INVALID_PARAMS_SPACE_RANK, NULL, NULL, FALSE)) < + if ((fspace_id = generate_random_dataspace(DATASET_OPEN_INVALID_PARAMS_SPACE_RANK, NULL, NULL, false)) < 0) TEST_ERROR; - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; if ((dset_id = H5Dcreate2(group_id, DATASET_OPEN_INVALID_PARAMS_DSET_NAME, dset_dtype, fspace_id, @@ -3108,10 +3108,10 @@ test_get_dataset_space_and_type(void) } if ((dset_space_id = - generate_random_dataspace(DATASET_GET_SPACE_TYPE_TEST_SPACE_RANK, NULL, dset_dims, FALSE)) < 0) + generate_random_dataspace(DATASET_GET_SPACE_TYPE_TEST_SPACE_RANK, NULL, dset_dims, false)) < 0) TEST_ERROR; - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; if ((dset_id = H5Dcreate2(group_id, DATASET_GET_SPACE_TYPE_TEST_DSET_NAME, dset_dtype, dset_space_id, @@ -3397,10 +3397,10 @@ test_get_dataset_space_and_type_invalid_params(void) } if ((dset_space_id = generate_random_dataspace(DATASET_GET_SPACE_TYPE_INVALID_PARAMS_TEST_SPACE_RANK, - NULL, NULL, FALSE)) < 0) + NULL, NULL, false)) < 0) TEST_ERROR; - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; if ((dset_id = H5Dcreate2(group_id, DATASET_GET_SPACE_TYPE_INVALID_PARAMS_TEST_DSET_NAME, dset_dtype, @@ -3586,19 +3586,19 @@ test_dataset_property_lists(void) goto error; } - if ((space_id = generate_random_dataspace(DATASET_PROPERTY_LIST_TEST_SPACE_RANK, NULL, dims, FALSE)) < 0) + if ((space_id = generate_random_dataspace(DATASET_PROPERTY_LIST_TEST_SPACE_RANK, NULL, dims, false)) < 0) TEST_ERROR; for (i = 0; i < DATASET_PROPERTY_LIST_TEST_SPACE_RANK; i++) chunk_dims[i] = (hsize_t)(rand() % (int)dims[i] + 1); - if ((dset_dtype1 = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype1 = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; - if ((dset_dtype2 = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype2 = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; - if ((dset_dtype3 = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype3 = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; - if ((dset_dtype4 = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype4 = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; if ((dcpl_id1 = H5Pcreate(H5P_DATASET_CREATE)) < 0) { @@ -4451,7 +4451,7 @@ test_dataset_io_point_selections(void) int file_state[DATASET_IO_POINT_DIM_0][DATASET_IO_POINT_DIM_1]; int erbuf[DATASET_IO_POINT_DIM_0][DATASET_IO_POINT_DIM_1]; int buf_point[DATASET_IO_POINT_NPOINTS]; - hbool_t do_chunk; + bool do_chunk; int i, j; TESTING("point selection I/O with all selection in memory and points in file"); @@ -4492,7 +4492,7 @@ test_dataset_io_point_selections(void) TEST_ERROR; /* Perform with and without chunking */ - for (do_chunk = FALSE;; do_chunk = TRUE) { + for (do_chunk = false;; do_chunk = true) { if (do_chunk) { TESTING("point selection I/O with all selection in memory and points in file with chunking"); @@ -7146,10 +7146,10 @@ test_dataset_set_extent_chunked_unlimited(void) } if ((fspace_id = generate_random_dataspace(DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_SPACE_RANK, max_dims, - dims, FALSE)) < 0) + dims, false)) < 0) TEST_ERROR; - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) @@ -7385,7 +7385,7 @@ test_dataset_set_extent_chunked_fixed(void) if ((fspace_id2 = H5Screate_simple(DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_SPACE_RANK, dims2, NULL)) < 0) TEST_ERROR; - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) @@ -7417,14 +7417,14 @@ test_dataset_set_extent_chunked_fixed(void) } for (i = 0; i < DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_NUM_PASSES; i++) { - hbool_t skip_iterations = FALSE; - size_t j; + bool skip_iterations = false; + size_t j; for (j = 0; j < DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_SPACE_RANK; j++) { /* Ensure that the new dimensionality is less than the old dimensionality. */ do { if (dims[j] == 1) { - skip_iterations = TRUE; + skip_iterations = true; break; } else @@ -7486,14 +7486,14 @@ test_dataset_set_extent_chunked_fixed(void) * of the changes to the dataset's dimensionality. */ for (i = 0; i < DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_NUM_PASSES; i++) { - hbool_t skip_iterations = FALSE; - size_t j; + bool skip_iterations = false; + size_t j; for (j = 0; j < DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_SPACE_RANK; j++) { /* Ensure that the new dimensionality is less than the old dimensionality. */ do { if (dims2[j] == 1) { - skip_iterations = TRUE; + skip_iterations = true; break; } else @@ -8151,7 +8151,7 @@ test_dataset_set_extent_invalid_params(void) } if ((fspace_id = generate_random_dataspace(DATASET_SET_EXTENT_INVALID_PARAMS_TEST_SPACE_RANK, NULL, dims, - FALSE)) < 0) + false)) < 0) TEST_ERROR; for (i = 0; i < DATASET_SET_EXTENT_INVALID_PARAMS_TEST_SPACE_RANK; i++) { @@ -8163,7 +8163,7 @@ test_dataset_set_extent_invalid_params(void) } while (chunk_dims[i] > dims[i]); } - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; /* Create a compact dataset */ @@ -8458,9 +8458,9 @@ test_create_single_chunk_dataset(void) goto error; } - if ((fspace_id = generate_random_dataspace(DATASET_SINGLE_CHUNK_TEST_SPACE_RANK, NULL, dims, FALSE)) < 0) + if ((fspace_id = generate_random_dataspace(DATASET_SINGLE_CHUNK_TEST_SPACE_RANK, NULL, dims, false)) < 0) TEST_ERROR; - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) @@ -8640,7 +8640,7 @@ test_write_single_chunk_dataset(void) } if ((fspace_id = generate_random_dataspace(DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_SPACE_RANK, NULL, dims, - FALSE)) < 0) + false)) < 0) TEST_ERROR; if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) @@ -8859,7 +8859,7 @@ test_create_multi_chunk_dataset(void) if ((fspace_id = H5Screate_simple(DATASET_MULTI_CHUNK_TEST_SPACE_RANK, dims, NULL)) < 0) TEST_ERROR; - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) @@ -10658,7 +10658,7 @@ test_read_partial_chunk_hyperslab_selection(void) for (i = 0; i < FIXED_NCHUNKS; i++) { hsize_t start[DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_SPACE_RANK]; hsize_t count[DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_SPACE_RANK]; - hbool_t on_partial_edge_chunk = FALSE; + bool on_partial_edge_chunk = false; size_t n_chunks_per_dim = (dims[1] / chunk_dims[1]) + (((dims[1] % chunk_dims[1]) > 0) ? 1 : 0); on_partial_edge_chunk = @@ -10844,7 +10844,7 @@ test_get_vlen_buf_size(void) hid_t dataset = H5I_INVALID_HID; hid_t dspace_id = H5I_INVALID_HID; hid_t dtype_id = H5I_INVALID_HID; - hbool_t freed_wdata = FALSE; + bool freed_wdata = false; hsize_t dims1[] = {DATASET_GET_VLEN_BUF_SIZE_DSET_SPACE_DIM}; hsize_t size; /* Number of bytes which will be used */ unsigned i, j; @@ -10924,7 +10924,7 @@ test_get_vlen_buf_size(void) if (H5Treclaim(dtype_id, dspace_id, H5P_DEFAULT, wdata) < 0) TEST_ERROR; - freed_wdata = TRUE; + freed_wdata = true; if (H5Dclose(dataset) < 0) TEST_ERROR; diff --git a/test/API/H5_api_datatype_test.c b/test/API/H5_api_datatype_test.c index 5d6aa26..43baf71 100644 --- a/test/API/H5_api_datatype_test.c +++ b/test/API/H5_api_datatype_test.c @@ -114,7 +114,7 @@ test_create_committed_datatype(void) goto error; } - if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { + if ((type_id = generate_random_datatype(H5T_NO_CLASS, false)) < 0) { H5_FAILED(); printf(" couldn't create datatype to commit\n"); goto error; @@ -198,7 +198,7 @@ test_create_committed_datatype_invalid_params(void) goto error; } - if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { + if ((type_id = generate_random_datatype(H5T_NO_CLASS, false)) < 0) { H5_FAILED(); printf(" couldn't create datatype to commit\n"); goto error; @@ -416,7 +416,7 @@ test_create_anonymous_committed_datatype(void) goto error; } - if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { + if ((type_id = generate_random_datatype(H5T_NO_CLASS, false)) < 0) { H5_FAILED(); printf(" couldn't create datatype\n"); goto error; @@ -499,7 +499,7 @@ test_create_anonymous_committed_datatype_invalid_params(void) goto error; } - if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { + if ((type_id = generate_random_datatype(H5T_NO_CLASS, false)) < 0) { H5_FAILED(); printf(" couldn't create datatype\n"); goto error; @@ -801,7 +801,7 @@ error: static int test_recommit_committed_type(void) { - htri_t is_committed = FALSE; + htri_t is_committed = false; herr_t err_ret; hid_t file_id = H5I_INVALID_HID; hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID; @@ -942,7 +942,7 @@ test_open_committed_datatype(void) goto error; } - if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { + if ((type_id = generate_random_datatype(H5T_NO_CLASS, false)) < 0) { H5_FAILED(); printf(" couldn't create datatype to commit\n"); goto error; @@ -1034,7 +1034,7 @@ test_open_committed_datatype_invalid_params(void) goto error; } - if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { + if ((type_id = generate_random_datatype(H5T_NO_CLASS, false)) < 0) { H5_FAILED(); printf(" couldn't create datatype to commit\n"); goto error; @@ -1207,7 +1207,7 @@ test_reopen_committed_datatype_indirect(void) goto error; } - if ((space_id = generate_random_dataspace(DATATYPE_REOPEN_TEST_SPACE_RANK, NULL, NULL, FALSE)) < 0) + if ((space_id = generate_random_dataspace(DATATYPE_REOPEN_TEST_SPACE_RANK, NULL, NULL, false)) < 0) TEST_ERROR; PASSED(); @@ -1730,13 +1730,13 @@ test_datatype_property_lists(void) goto error; } - if ((type_id1 = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { + if ((type_id1 = generate_random_datatype(H5T_NO_CLASS, false)) < 0) { H5_FAILED(); printf(" couldn't create datatype\n"); goto error; } - if ((type_id2 = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { + if ((type_id2 = generate_random_datatype(H5T_NO_CLASS, false)) < 0) { H5_FAILED(); printf(" couldn't create datatype\n"); goto error; @@ -1945,7 +1945,7 @@ test_create_dataset_with_committed_type(void) goto error; } - if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { + if ((type_id = generate_random_datatype(H5T_NO_CLASS, false)) < 0) { H5_FAILED(); printf(" couldn't create datatype\n"); goto error; @@ -1992,7 +1992,7 @@ test_create_dataset_with_committed_type(void) goto error; } - if ((fspace_id = generate_random_dataspace(DATATYPE_CREATE_TEST_DATASET_DIMS, NULL, NULL, FALSE)) < 0) + if ((fspace_id = generate_random_dataspace(DATATYPE_CREATE_TEST_DATASET_DIMS, NULL, NULL, false)) < 0) TEST_ERROR; if ((dset_id = H5Dcreate2(group_id, DATASET_CREATE_WITH_DATATYPE_TEST_DSET_NAME, type_id, fspace_id, @@ -2089,7 +2089,7 @@ test_create_attribute_with_committed_type(void) goto error; } - if ((type_id = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) { + if ((type_id = generate_random_datatype(H5T_NO_CLASS, true)) < 0) { H5_FAILED(); printf(" couldn't create datatype\n"); goto error; @@ -2112,7 +2112,7 @@ test_create_attribute_with_committed_type(void) } if ((space_id = - generate_random_dataspace(ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_SPACE_RANK, NULL, NULL, TRUE)) < 0) + generate_random_dataspace(ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_SPACE_RANK, NULL, NULL, true)) < 0) TEST_ERROR; if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_ATTR_NAME, type_id, space_id, @@ -2220,7 +2220,7 @@ test_delete_committed_type(void) goto error; } - if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { + if ((type_id = generate_random_datatype(H5T_NO_CLASS, false)) < 0) { H5_FAILED(); printf(" couldn't create datatype\n"); goto error; @@ -2557,7 +2557,7 @@ error: static int test_cant_modify_committed_type(void) { - htri_t is_committed = FALSE; + htri_t is_committed = false; herr_t err_ret; hid_t file_id = H5I_INVALID_HID; hid_t container_group = H5I_INVALID_HID; diff --git a/test/API/H5_api_group_test.c b/test/API/H5_api_group_test.c index 7b95655..8de7b27 100644 --- a/test/API/H5_api_group_test.c +++ b/test/API/H5_api_group_test.c @@ -408,7 +408,7 @@ test_create_intermediate_group(void) /* Set up plist for creating intermediate groups */ if ((crt_intmd_lcpl_id = H5Pcreate(H5P_LINK_CREATE)) < 0) TEST_ERROR; - if (H5Pset_create_intermediate_group(crt_intmd_lcpl_id, TRUE) < 0) + if (H5Pset_create_intermediate_group(crt_intmd_lcpl_id, true) < 0) TEST_ERROR; /* Create an intermediate group using a relative path */ @@ -1495,10 +1495,10 @@ test_get_group_info(void) PART_ERROR(H5Gget_info); } - /* Assume that mounted should be FALSE in this case */ - if (group_info.mounted != FALSE) { + /* Assume that mounted should be false in this case */ + if (group_info.mounted != false) { H5_FAILED(); - printf(" group info's 'mounted' field was TRUE when it should have been FALSE\n"); + printf(" group info's 'mounted' field was true when it should have been false\n"); PART_ERROR(H5Gget_info); } @@ -1548,10 +1548,10 @@ test_get_group_info(void) PART_ERROR(H5Gget_info_by_name); } - /* Assume that mounted should be FALSE in this case */ - if (group_info.mounted != FALSE) { + /* Assume that mounted should be false in this case */ + if (group_info.mounted != false) { H5_FAILED(); - printf(" group info's 'mounted' field was TRUE when it should have been FALSE\n"); + printf(" group info's 'mounted' field was true when it should have been false\n"); PART_ERROR(H5Gget_info_by_name); } @@ -1604,10 +1604,10 @@ test_get_group_info(void) PART_ERROR(H5Gget_info_by_idx_crt_order_increasing); } - /* Assume that mounted should be FALSE in this case */ - if (group_info.mounted != FALSE) { + /* Assume that mounted should be false in this case */ + if (group_info.mounted != false) { H5_FAILED(); - printf(" group info's 'mounted' field was TRUE when it should have been FALSE\n"); + printf(" group info's 'mounted' field was true when it should have been false\n"); PART_ERROR(H5Gget_info_by_idx_crt_order_increasing); } } @@ -1661,10 +1661,10 @@ test_get_group_info(void) PART_ERROR(H5Gget_info_by_idx_crt_order_decreasing); } - /* Assume that mounted should be FALSE in this case */ - if (group_info.mounted != FALSE) { + /* Assume that mounted should be false in this case */ + if (group_info.mounted != false) { H5_FAILED(); - printf(" group info's 'mounted' field was TRUE when it should have been FALSE\n"); + printf(" group info's 'mounted' field was true when it should have been false\n"); PART_ERROR(H5Gget_info_by_idx_crt_order_decreasing); } } @@ -1712,10 +1712,10 @@ test_get_group_info(void) PART_ERROR(H5Gget_info_by_idx_name_order_increasing); } - /* Assume that mounted should be FALSE in this case */ - if (group_info.mounted != FALSE) { + /* Assume that mounted should be false in this case */ + if (group_info.mounted != false) { H5_FAILED(); - printf(" group info's 'mounted' field was TRUE when it should have been FALSE\n"); + printf(" group info's 'mounted' field was true when it should have been false\n"); PART_ERROR(H5Gget_info_by_idx_name_order_increasing); } } @@ -1763,10 +1763,10 @@ test_get_group_info(void) PART_ERROR(H5Gget_info_by_idx_name_order_decreasing); } - /* Assume that mounted should be FALSE in this case */ - if (group_info.mounted != FALSE) { + /* Assume that mounted should be false in this case */ + if (group_info.mounted != false) { H5_FAILED(); - printf(" group info's 'mounted' field was TRUE when it should have been FALSE\n"); + printf(" group info's 'mounted' field was true when it should have been false\n"); PART_ERROR(H5Gget_info_by_idx_name_order_decreasing); } } diff --git a/test/API/H5_api_link_test.c b/test/API/H5_api_link_test.c index caeafa6..9971a0a 100644 --- a/test/API/H5_api_link_test.c +++ b/test/API/H5_api_link_test.c @@ -19554,11 +19554,11 @@ test_link_iterate_hard_links(void) goto error; } - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; if ((dset_dspace = - generate_random_dataspace(LINK_ITER_HARD_LINKS_TEST_DSET_SPACE_RANK, NULL, NULL, FALSE)) < 0) + generate_random_dataspace(LINK_ITER_HARD_LINKS_TEST_DSET_SPACE_RANK, NULL, NULL, false)) < 0) TEST_ERROR; for (i = 0; i < LINK_ITER_HARD_LINKS_TEST_NUM_LINKS; i++) { @@ -20686,11 +20686,11 @@ test_link_iterate_mixed_links(void) goto error; } - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; if ((dset_dspace = - generate_random_dataspace(LINK_ITER_MIXED_LINKS_TEST_DSET_SPACE_RANK, NULL, NULL, FALSE)) < 0) + generate_random_dataspace(LINK_ITER_MIXED_LINKS_TEST_DSET_SPACE_RANK, NULL, NULL, false)) < 0) TEST_ERROR; if ((dset_id = H5Dcreate2(group_id, LINK_ITER_MIXED_LINKS_TEST_HARD_LINK_NAME, dset_dtype, dset_dspace, @@ -21158,11 +21158,11 @@ test_link_iterate_invalid_params(void) goto error; } - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; if ((dset_dspace = - generate_random_dataspace(LINK_ITER_INVALID_PARAMS_TEST_DSET_SPACE_RANK, NULL, NULL, FALSE)) < 0) + generate_random_dataspace(LINK_ITER_INVALID_PARAMS_TEST_DSET_SPACE_RANK, NULL, NULL, false)) < 0) TEST_ERROR; if ((dset_id = H5Dcreate2(group_id, LINK_ITER_INVALID_PARAMS_TEST_HARD_LINK_NAME, dset_dtype, dset_dspace, @@ -21810,11 +21810,11 @@ test_link_visit_hard_links_no_cycles(void) goto error; } - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; if ((dset_dspace = generate_random_dataspace(LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_DSET_SPACE_RANK, NULL, - NULL, FALSE)) < 0) + NULL, false)) < 0) TEST_ERROR; for (i = 0; i < LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_NUM_SUBGROUPS; i++) { @@ -23044,11 +23044,11 @@ test_link_visit_mixed_links_no_cycles(void) goto error; } - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; if ((fspace_id = generate_random_dataspace(LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_SPACE_RANK, NULL, - NULL, FALSE)) < 0) + NULL, false)) < 0) TEST_ERROR; if ((dset_id = H5Dcreate2(subgroup1, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME, dset_dtype, @@ -25104,11 +25104,11 @@ test_link_visit_invalid_params(void) goto error; } - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; if ((fspace_id = generate_random_dataspace(LINK_VISIT_INVALID_PARAMS_TEST_DSET_SPACE_RANK, NULL, NULL, - FALSE)) < 0) + false)) < 0) TEST_ERROR; if ((dset_id = H5Dcreate2(subgroup1, LINK_VISIT_INVALID_PARAMS_TEST_DSET_NAME, dset_dtype, fspace_id, @@ -26071,7 +26071,7 @@ error: static herr_t link_visit_hard_links_no_cycles_cb(hid_t group_id, const char *name, const H5L_info2_t *info, void *op_data) { - hbool_t is_subgroup_link; + bool is_subgroup_link; size_t *i = (size_t *)op_data; size_t counter_val = *((size_t *)op_data); size_t test_iteration; @@ -26174,7 +26174,7 @@ done: static herr_t link_visit_soft_links_no_cycles_cb(hid_t group_id, const char *name, const H5L_info2_t *info, void *op_data) { - hbool_t is_subgroup_link; + bool is_subgroup_link; size_t *i = (size_t *)op_data; size_t counter_val = *((size_t *)op_data); size_t test_iteration; @@ -26288,7 +26288,7 @@ static herr_t link_visit_external_links_no_cycles_cb(hid_t group_id, const char *name, const H5L_info2_t *info, void *op_data) { - hbool_t is_subgroup_link; + bool is_subgroup_link; size_t *i = (size_t *)op_data; size_t counter_val = *((size_t *)op_data); size_t test_iteration; @@ -26559,7 +26559,7 @@ done: static herr_t link_visit_hard_links_cycles_cb(hid_t group_id, const char *name, const H5L_info2_t *info, void *op_data) { - hbool_t is_subgroup_link; + bool is_subgroup_link; size_t *i = (size_t *)op_data; size_t counter_val = *((size_t *)op_data); size_t test_iteration; @@ -26662,7 +26662,7 @@ done: static herr_t link_visit_soft_links_cycles_cb(hid_t group_id, const char *name, const H5L_info2_t *info, void *op_data) { - hbool_t is_subgroup_link; + bool is_subgroup_link; size_t *i = (size_t *)op_data; size_t counter_val = *((size_t *)op_data); size_t test_iteration; @@ -26775,7 +26775,7 @@ done: static herr_t link_visit_external_links_cycles_cb(hid_t group_id, const char *name, const H5L_info2_t *info, void *op_data) { - hbool_t is_subgroup_link; + bool is_subgroup_link; size_t *i = (size_t *)op_data; size_t counter_val = *((size_t *)op_data); size_t test_iteration; diff --git a/test/API/H5_api_misc_test.c b/test/API/H5_api_misc_test.c index 2e53804..6643465 100644 --- a/test/API/H5_api_misc_test.c +++ b/test/API/H5_api_misc_test.c @@ -60,11 +60,11 @@ test_open_link_without_leading_slash(void) goto error; } - if ((space_id = generate_random_dataspace(OPEN_LINK_WITHOUT_SLASH_DSET_SPACE_RANK, NULL, NULL, FALSE)) < + if ((space_id = generate_random_dataspace(OPEN_LINK_WITHOUT_SLASH_DSET_SPACE_RANK, NULL, NULL, false)) < 0) TEST_ERROR; - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; if ((dset_id = H5Dcreate2(container_group, OPEN_LINK_WITHOUT_SLASH_DSET_NAME, dset_dtype, space_id, @@ -235,13 +235,13 @@ test_object_creation_by_absolute_path(void) /* Try to create a dataset nested at the end of this group chain by using an absolute pathname */ if ((fspace_id = generate_random_dataspace(OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_DSET_SPACE_RANK, - NULL, NULL, FALSE)) < 0) { + NULL, NULL, false)) < 0) { H5_FAILED(); printf(" failed to generate dataspace\n"); PART_ERROR(H5Dcreate_using_absolute_path); } - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) { H5_FAILED(); printf(" failed to generate datatype\n"); PART_ERROR(H5Dcreate_using_absolute_path); @@ -284,7 +284,7 @@ test_object_creation_by_absolute_path(void) TESTING_2("creation of committed datatype using absolute pathname"); /* Try to create a committed datatype in the same fashion as the preceding dataset */ - if ((dtype_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { + if ((dtype_id = generate_random_datatype(H5T_NO_CLASS, false)) < 0) { H5_FAILED(); printf(" couldn't create datatype\n"); PART_ERROR(H5Tcommit_using_absolute_path); @@ -411,20 +411,20 @@ test_absolute_vs_relative_path(void) } if ((fspace_id = generate_random_dataspace(ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET_SPACE_RANK, NULL, NULL, - FALSE)) < 0) + false)) < 0) TEST_ERROR; - if ((dset_dtype1 = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype1 = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; - if ((dset_dtype2 = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype2 = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; - if ((dset_dtype3 = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype3 = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; - if ((dset_dtype4 = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype4 = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; - if ((dset_dtype5 = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype5 = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; - if ((dset_dtype6 = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype6 = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; PASSED(); @@ -944,7 +944,7 @@ test_symbols_in_compound_field_name(void) } for (i = 0, total_type_size = 0; i < COMPOUND_WITH_SYMBOLS_IN_MEMBER_NAMES_TEST_NUM_SUBTYPES; i++) { - type_pool[i] = generate_random_datatype(H5T_NO_CLASS, FALSE); + type_pool[i] = generate_random_datatype(H5T_NO_CLASS, false); total_type_size += H5Tget_size(type_pool[i]); } @@ -978,7 +978,7 @@ test_symbols_in_compound_field_name(void) TEST_ERROR; if ((fspace_id = generate_random_dataspace(COMPOUND_WITH_SYMBOLS_IN_MEMBER_NAMES_TEST_DSET_RANK, NULL, - NULL, FALSE)) < 0) + NULL, false)) < 0) TEST_ERROR; if ((dset_id = H5Dcreate2(group_id, COMPOUND_WITH_SYMBOLS_IN_MEMBER_NAMES_TEST_DSET_NAME, compound_type, diff --git a/test/API/H5_api_object_test.c b/test/API/H5_api_object_test.c index 992071e..bd17a63 100644 --- a/test/API/H5_api_object_test.c +++ b/test/API/H5_api_object_test.c @@ -150,10 +150,10 @@ test_open_object(void) goto error; } - if ((fspace_id = generate_random_dataspace(OBJECT_OPEN_TEST_SPACE_RANK, NULL, NULL, FALSE)) < 0) + if ((fspace_id = generate_random_dataspace(OBJECT_OPEN_TEST_SPACE_RANK, NULL, NULL, false)) < 0) TEST_ERROR; - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; PASSED(); @@ -242,7 +242,7 @@ test_open_object(void) { TESTING_2("H5Oopen on a committed datatype"); - if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { + if ((type_id = generate_random_datatype(H5T_NO_CLASS, false)) < 0) { H5_FAILED(); printf(" couldn't create datatype '%s'\n", OBJECT_OPEN_TEST_TYPE_NAME); PART_ERROR(H5Oopen_dtype); @@ -836,10 +836,10 @@ test_object_exists(void) goto error; } - if ((fspace_id = generate_random_dataspace(OBJECT_EXISTS_TEST_DSET_SPACE_RANK, NULL, NULL, FALSE)) < 0) + if ((fspace_id = generate_random_dataspace(OBJECT_EXISTS_TEST_DSET_SPACE_RANK, NULL, NULL, false)) < 0) TEST_ERROR; - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; PASSED(); @@ -921,7 +921,7 @@ test_object_exists(void) { TESTING_2("H5Oexists_by_name on a committed datatype"); - if ((dtype_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { + if ((dtype_id = generate_random_datatype(H5T_NO_CLASS, false)) < 0) { H5_FAILED(); printf(" couldn't create datatype '%s'\n", OBJECT_EXISTS_TEST_TYPE_NAME); PART_ERROR(H5Oexists_by_name_dtype); @@ -1287,10 +1287,10 @@ test_link_object(void) goto error; } - if ((fspace_id = generate_random_dataspace(OBJECT_LINK_TEST_SPACE_RANK, NULL, NULL, FALSE)) < 0) + if ((fspace_id = generate_random_dataspace(OBJECT_LINK_TEST_SPACE_RANK, NULL, NULL, false)) < 0) TEST_ERROR; - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; PASSED(); @@ -1645,10 +1645,10 @@ test_incr_decr_object_refcount(void) goto error; } - if ((fspace_id = generate_random_dataspace(OBJECT_REF_COUNT_TEST_DSET_SPACE_RANK, NULL, NULL, FALSE)) < 0) + if ((fspace_id = generate_random_dataspace(OBJECT_REF_COUNT_TEST_DSET_SPACE_RANK, NULL, NULL, false)) < 0) TEST_ERROR; - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; PASSED(); @@ -2022,12 +2022,12 @@ test_object_copy_basic(void) goto error; } - if ((space_id = generate_random_dataspace(OBJECT_COPY_BASIC_TEST_SPACE_RANK, NULL, NULL, FALSE)) < 0) + if ((space_id = generate_random_dataspace(OBJECT_COPY_BASIC_TEST_SPACE_RANK, NULL, NULL, false)) < 0) TEST_ERROR; - if ((attr_space_id = generate_random_dataspace(OBJECT_COPY_BASIC_TEST_SPACE_RANK, NULL, NULL, TRUE)) < 0) + if ((attr_space_id = generate_random_dataspace(OBJECT_COPY_BASIC_TEST_SPACE_RANK, NULL, NULL, true)) < 0) TEST_ERROR; - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; /* Create the test group object, along with its nested members and the attributes attached to it. */ @@ -2117,7 +2117,7 @@ test_object_copy_basic(void) } /* Create the test committed datatype object, along with the attributes attached to it. */ - if ((dtype_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { + if ((dtype_id = generate_random_datatype(H5T_NO_CLASS, false)) < 0) { H5_FAILED(); printf(" couldn't create datatype\n"); goto error; @@ -2592,9 +2592,9 @@ test_object_copy_already_existing(void) } if ((space_id = - generate_random_dataspace(OBJECT_COPY_ALREADY_EXISTING_TEST_SPACE_RANK, NULL, NULL, FALSE)) < 0) + generate_random_dataspace(OBJECT_COPY_ALREADY_EXISTING_TEST_SPACE_RANK, NULL, NULL, false)) < 0) TEST_ERROR; - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; /* Create the test group object */ @@ -2614,7 +2614,7 @@ test_object_copy_already_existing(void) } /* Create the test committed datatype object */ - if ((dtype_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { + if ((dtype_id = generate_random_datatype(H5T_NO_CLASS, false)) < 0) { H5_FAILED(); printf(" couldn't create datatype\n"); goto error; @@ -3024,13 +3024,13 @@ test_object_copy_no_attributes(void) goto error; } - if ((space_id = generate_random_dataspace(OBJECT_COPY_NO_ATTRS_TEST_SPACE_RANK, NULL, NULL, FALSE)) < 0) + if ((space_id = generate_random_dataspace(OBJECT_COPY_NO_ATTRS_TEST_SPACE_RANK, NULL, NULL, false)) < 0) TEST_ERROR; - if ((attr_space_id = generate_random_dataspace(OBJECT_COPY_NO_ATTRS_TEST_SPACE_RANK, NULL, NULL, TRUE)) < + if ((attr_space_id = generate_random_dataspace(OBJECT_COPY_NO_ATTRS_TEST_SPACE_RANK, NULL, NULL, true)) < 0) TEST_ERROR; - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; /* Create the test group object, along with the attributes attached to it. */ @@ -3090,7 +3090,7 @@ test_object_copy_no_attributes(void) } /* Create the test committed datatype object, along with the attributes attached to it. */ - if ((dtype_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { + if ((dtype_id = generate_random_datatype(H5T_NO_CLASS, false)) < 0) { H5_FAILED(); printf(" couldn't create datatype\n"); goto error; @@ -3532,7 +3532,7 @@ test_object_copy_by_soft_link(void) goto error; } - if ((attr_space_id = generate_random_dataspace(OBJECT_COPY_SOFT_LINK_TEST_SPACE_RANK, NULL, NULL, TRUE)) < + if ((attr_space_id = generate_random_dataspace(OBJECT_COPY_SOFT_LINK_TEST_SPACE_RANK, NULL, NULL, true)) < 0) TEST_ERROR; @@ -4241,14 +4241,14 @@ test_object_copy_between_files(void) goto error; } - if ((space_id = generate_random_dataspace(OBJECT_COPY_BETWEEN_FILES_TEST_SPACE_RANK, NULL, NULL, FALSE)) < + if ((space_id = generate_random_dataspace(OBJECT_COPY_BETWEEN_FILES_TEST_SPACE_RANK, NULL, NULL, false)) < 0) TEST_ERROR; if ((attr_space_id = - generate_random_dataspace(OBJECT_COPY_BETWEEN_FILES_TEST_SPACE_RANK, NULL, NULL, TRUE)) < 0) + generate_random_dataspace(OBJECT_COPY_BETWEEN_FILES_TEST_SPACE_RANK, NULL, NULL, true)) < 0) TEST_ERROR; - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; /* Create the test group object, along with its nested members and the attributes attached to it. */ @@ -4338,7 +4338,7 @@ test_object_copy_between_files(void) } /* Create the test committed datatype object, along with the attributes attached to it. */ - if ((dtype_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { + if ((dtype_id = generate_random_datatype(H5T_NO_CLASS, false)) < 0) { H5_FAILED(); printf(" couldn't create datatype\n"); goto error; @@ -5106,13 +5106,13 @@ test_object_visit(void) goto error; } - if ((fspace_id = generate_random_dataspace(OBJECT_VISIT_TEST_SPACE_RANK, NULL, NULL, FALSE)) < 0) + if ((fspace_id = generate_random_dataspace(OBJECT_VISIT_TEST_SPACE_RANK, NULL, NULL, false)) < 0) TEST_ERROR; - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; - if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { + if ((type_id = generate_random_datatype(H5T_NO_CLASS, false)) < 0) { H5_FAILED(); printf(" couldn't create datatype '%s'\n", OBJECT_VISIT_TEST_TYPE_NAME); goto error; @@ -6420,10 +6420,10 @@ test_close_object(void) goto error; } - if ((fspace_id = generate_random_dataspace(OBJECT_CLOSE_TEST_SPACE_RANK, NULL, NULL, FALSE)) < 0) + if ((fspace_id = generate_random_dataspace(OBJECT_CLOSE_TEST_SPACE_RANK, NULL, NULL, false)) < 0) TEST_ERROR; - if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) + if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, false)) < 0) TEST_ERROR; PASSED(); @@ -6500,7 +6500,7 @@ test_close_object(void) { TESTING_2("H5Oclose on a committed datatype"); - if ((dtype_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { + if ((dtype_id = generate_random_datatype(H5T_NO_CLASS, false)) < 0) { H5_FAILED(); printf(" couldn't create datatype '%s'\n", OBJECT_CLOSE_TEST_TYPE_NAME); PART_ERROR(H5Oclose_dtype); @@ -6675,11 +6675,11 @@ test_close_invalid_objects(void) goto error; } - if ((attr_space_id = generate_random_dataspace(OBJECT_CLOSE_INVALID_TEST_SPACE_RANK, NULL, NULL, TRUE)) < + if ((attr_space_id = generate_random_dataspace(OBJECT_CLOSE_INVALID_TEST_SPACE_RANK, NULL, NULL, true)) < 0) TEST_ERROR; - if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) + if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, true)) < 0) TEST_ERROR; if ((attr_id = H5Acreate2(group_id, OBJECT_CLOSE_INVALID_TEST_ATTRIBUTE_NAME, attr_dtype, attr_space_id, diff --git a/test/API/H5_api_test.c b/test/API/H5_api_test.c index 3685506..b5d1643 100644 --- a/test/API/H5_api_test.c +++ b/test/API/H5_api_test.c @@ -124,7 +124,7 @@ main(int argc, char **argv) hid_t registered_con_id = H5I_INVALID_HID; char *vol_connector_string_copy = NULL; char *vol_connector_info = NULL; - hbool_t err_occurred = FALSE; + bool err_occurred = false; /* Simple argument checking, TODO can improve that later */ if (argc > 1) { @@ -171,13 +171,13 @@ main(int argc, char **argv) if (NULL == (vol_connector_string_copy = HDstrdup(vol_connector_string))) { fprintf(stderr, "Unable to copy VOL connector string\n"); - err_occurred = TRUE; + err_occurred = true; goto done; } if (NULL == (token = HDstrtok(vol_connector_string_copy, " "))) { fprintf(stderr, "Error while parsing VOL connector string\n"); - err_occurred = TRUE; + err_occurred = true; goto done; } @@ -197,7 +197,7 @@ main(int argc, char **argv) if ((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0) { fprintf(stderr, "Unable to create FAPL\n"); - err_occurred = TRUE; + err_occurred = true; goto done; } @@ -213,14 +213,14 @@ main(int argc, char **argv) if ((is_registered = H5VLis_connector_registered_by_name(vol_connector_name)) < 0) { fprintf(stderr, "Unable to determine if VOL connector is registered\n"); - err_occurred = TRUE; + err_occurred = true; goto done; } if (!is_registered) { fprintf(stderr, "Specified VOL connector '%s' wasn't correctly registered!\n", vol_connector_name); - err_occurred = TRUE; + err_occurred = true; goto done; } else { @@ -231,19 +231,19 @@ main(int argc, char **argv) */ if (H5Pget_vol_id(fapl_id, &default_con_id) < 0) { fprintf(stderr, "Couldn't retrieve ID of VOL connector set on default FAPL\n"); - err_occurred = TRUE; + err_occurred = true; goto done; } if ((registered_con_id = H5VLget_connector_id_by_name(vol_connector_name)) < 0) { fprintf(stderr, "Couldn't retrieve ID of registered VOL connector\n"); - err_occurred = TRUE; + err_occurred = true; goto done; } if (default_con_id != registered_con_id) { fprintf(stderr, "VOL connector set on default FAPL didn't match specified VOL connector\n"); - err_occurred = TRUE; + err_occurred = true; goto done; } } @@ -255,7 +255,7 @@ main(int argc, char **argv) vol_cap_flags_g = H5VL_CAP_FLAG_NONE; if (H5Pget_vol_cap_flags(fapl_id, &vol_cap_flags_g) < 0) { fprintf(stderr, "Unable to retrieve VOL connector capability flags\n"); - err_occurred = TRUE; + err_occurred = true; goto done; } @@ -265,7 +265,7 @@ main(int argc, char **argv) */ if (create_test_container(H5_api_test_filename, vol_cap_flags_g) < 0) { fprintf(stderr, "Unable to create testing container file '%s'\n", H5_api_test_filename); - err_occurred = TRUE; + err_occurred = true; goto done; } @@ -290,17 +290,17 @@ done: if (default_con_id >= 0 && H5VLclose(default_con_id) < 0) { fprintf(stderr, "Unable to close VOL connector ID\n"); - err_occurred = TRUE; + err_occurred = true; } if (registered_con_id >= 0 && H5VLclose(registered_con_id) < 0) { fprintf(stderr, "Unable to close VOL connector ID\n"); - err_occurred = TRUE; + err_occurred = true; } if (fapl_id >= 0 && H5Pclose(fapl_id) < 0) { fprintf(stderr, "Unable to close FAPL\n"); - err_occurred = TRUE; + err_occurred = true; } H5close(); diff --git a/test/API/H5_api_test_util.c b/test/API/H5_api_test_util.c index 916f2ca..83ac272 100644 --- a/test/API/H5_api_test_util.c +++ b/test/API/H5_api_test_util.c @@ -76,15 +76,15 @@ #define COMPACT_SPACE_MAX_DIM_SIZE 4 #define COMPACT_SPACE_MAX_DIMS 3 -typedef hid_t (*generate_datatype_func)(H5T_class_t parent_class, hbool_t is_compact); +typedef hid_t (*generate_datatype_func)(H5T_class_t parent_class, bool is_compact); -static hid_t generate_random_datatype_integer(H5T_class_t parent_class, hbool_t is_compact); -static hid_t generate_random_datatype_float(H5T_class_t parent_class, hbool_t is_compact); -static hid_t generate_random_datatype_string(H5T_class_t parent_class, hbool_t is_compact); -static hid_t generate_random_datatype_compound(H5T_class_t parent_class, hbool_t is_compact); -static hid_t generate_random_datatype_reference(H5T_class_t parent_class, hbool_t is_compact); -static hid_t generate_random_datatype_enum(H5T_class_t parent_class, hbool_t is_compact); -static hid_t generate_random_datatype_array(H5T_class_t parent_class, hbool_t is_compact); +static hid_t generate_random_datatype_integer(H5T_class_t parent_class, bool is_compact); +static hid_t generate_random_datatype_float(H5T_class_t parent_class, bool is_compact); +static hid_t generate_random_datatype_string(H5T_class_t parent_class, bool is_compact); +static hid_t generate_random_datatype_compound(H5T_class_t parent_class, bool is_compact); +static hid_t generate_random_datatype_reference(H5T_class_t parent_class, bool is_compact); +static hid_t generate_random_datatype_enum(H5T_class_t parent_class, bool is_compact); +static hid_t generate_random_datatype_array(H5T_class_t parent_class, bool is_compact); /* * Helper function to generate a random HDF5 datatype in order to thoroughly @@ -93,7 +93,7 @@ static hid_t generate_random_datatype_array(H5T_class_t parent_class, hbool_t is * called with H5T_NO_CLASS for the parent_class parameter. */ hid_t -generate_random_datatype(H5T_class_t parent_class, hbool_t is_compact) +generate_random_datatype(H5T_class_t parent_class, bool is_compact) { generate_datatype_func gen_func; static int depth = 0; @@ -211,7 +211,7 @@ done: } static hid_t -generate_random_datatype_integer(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_t H5_ATTR_UNUSED is_compact) +generate_random_datatype_integer(H5T_class_t H5_ATTR_UNUSED parent_class, bool H5_ATTR_UNUSED is_compact) { hid_t type_to_copy = H5I_INVALID_HID; hid_t datatype = H5I_INVALID_HID; @@ -288,7 +288,7 @@ done: } static hid_t -generate_random_datatype_float(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_t H5_ATTR_UNUSED is_compact) +generate_random_datatype_float(H5T_class_t H5_ATTR_UNUSED parent_class, bool H5_ATTR_UNUSED is_compact) { hid_t type_to_copy = H5I_INVALID_HID; hid_t datatype = H5I_INVALID_HID; @@ -330,7 +330,7 @@ done: } static hid_t -generate_random_datatype_string(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_t H5_ATTR_UNUSED is_compact) +generate_random_datatype_string(H5T_class_t H5_ATTR_UNUSED parent_class, bool H5_ATTR_UNUSED is_compact) { hid_t datatype = H5I_INVALID_HID; hid_t ret_value = H5I_INVALID_HID; @@ -387,7 +387,7 @@ done: } static hid_t -generate_random_datatype_compound(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_t is_compact) +generate_random_datatype_compound(H5T_class_t H5_ATTR_UNUSED parent_class, bool is_compact) { size_t num_members = 0; size_t next_offset = 0; @@ -455,7 +455,7 @@ done: } static hid_t -generate_random_datatype_reference(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_t H5_ATTR_UNUSED is_compact) +generate_random_datatype_reference(H5T_class_t H5_ATTR_UNUSED parent_class, bool H5_ATTR_UNUSED is_compact) { hid_t datatype = H5I_INVALID_HID; hid_t ret_value = H5I_INVALID_HID; @@ -490,7 +490,7 @@ done: } static hid_t -generate_random_datatype_enum(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_t H5_ATTR_UNUSED is_compact) +generate_random_datatype_enum(H5T_class_t H5_ATTR_UNUSED parent_class, bool H5_ATTR_UNUSED is_compact) { size_t num_members = 0; hid_t datatype = H5I_INVALID_HID; @@ -510,9 +510,9 @@ generate_random_datatype_enum(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_t H } for (size_t i = 0; i < num_members; i++) { - hbool_t unique; - char name[ENUM_TYPE_MAX_MEMBER_NAME_LENGTH]; - int enum_val; + bool unique; + char name[ENUM_TYPE_MAX_MEMBER_NAME_LENGTH]; + int enum_val; HDsnprintf(name, ENUM_TYPE_MAX_MEMBER_NAME_LENGTH, "enum_val%zu", i); @@ -520,10 +520,10 @@ generate_random_datatype_enum(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_t H enum_val = rand(); /* Check for uniqueness of enum member */ - unique = TRUE; + unique = true; for (size_t j = 0; j < i; j++) if (enum_val == enum_member_vals[j]) - unique = FALSE; + unique = false; } while (!unique); enum_member_vals[i] = enum_val; @@ -548,7 +548,7 @@ done: } static hid_t -generate_random_datatype_array(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_t is_compact) +generate_random_datatype_array(H5T_class_t H5_ATTR_UNUSED parent_class, bool is_compact) { unsigned ndims = 0; hsize_t *array_dims = NULL; @@ -599,7 +599,7 @@ done: * test support for dataspaces. */ hid_t -generate_random_dataspace(int rank, const hsize_t *max_dims, hsize_t *dims_out, hbool_t is_compact) +generate_random_dataspace(int rank, const hsize_t *max_dims, hsize_t *dims_out, bool is_compact) { hsize_t dataspace_dims[H5S_MAX_RANK]; size_t i; diff --git a/test/API/H5_api_test_util.h b/test/API/H5_api_test_util.h index 5d127bb..4e416af 100644 --- a/test/API/H5_api_test_util.h +++ b/test/API/H5_api_test_util.h @@ -15,8 +15,8 @@ #include "hdf5.h" -hid_t generate_random_datatype(H5T_class_t parent_class, hbool_t is_compact); -hid_t generate_random_dataspace(int rank, const hsize_t *max_dims, hsize_t *dims_out, hbool_t is_compact); +hid_t generate_random_datatype(H5T_class_t parent_class, bool is_compact); +hid_t generate_random_dataspace(int rank, const hsize_t *max_dims, hsize_t *dims_out, bool is_compact); int create_test_container(char *filename, uint64_t vol_cap_flags); herr_t prefix_filename(const char *prefix, const char *filename, char **filename_out); herr_t remove_test_file(const char *prefix, const char *filename); diff --git a/test/API/tarray.c b/test/API/tarray.c index e05cab3..32f3f2d 100644 --- a/test/API/tarray.c +++ b/test/API/tarray.c @@ -1919,7 +1919,7 @@ test_compat(void) size_t off; /* Offset of compound field */ hid_t mtid; /* Datatype ID for field */ int i; /* Index variables */ - hbool_t driver_is_default_compatible; + bool driver_is_default_compatible; herr_t ret; /* Generic return value */ /* Output message about test being performed */ 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 */ diff --git a/test/API/tcoords.c b/test/API/tcoords.c index d9b9711..2471504 100644 --- a/test/API/tcoords.c +++ b/test/API/tcoords.c @@ -42,7 +42,7 @@ int da_buffer[2][3][6][2]; ** *************************************************************/ static void -test_singleEnd_selElements(hid_t file, hbool_t is_chunked) +test_singleEnd_selElements(hid_t file, bool is_chunked) { hid_t sid, plid, did, msid; char dset_name[NAME_LEN]; /* Dataset name */ @@ -225,7 +225,7 @@ test_singleEnd_selElements(hid_t file, hbool_t is_chunked) ** *************************************************************/ static void -test_singleEnd_selHyperslab(hid_t file, hbool_t is_chunked) +test_singleEnd_selHyperslab(hid_t file, bool is_chunked) { hid_t sid, did, msid; char dset_name[NAME_LEN]; /* Dataset name */ @@ -371,7 +371,7 @@ test_singleEnd_selHyperslab(hid_t file, hbool_t is_chunked) ** *************************************************************/ static void -test_multiple_ends(hid_t file, hbool_t is_chunked) +test_multiple_ends(hid_t file, bool is_chunked) { hid_t sid, plid, did, msid; char dset_name[NAME_LEN]; /* Dataset name */ @@ -680,10 +680,10 @@ test_multiple_ends(hid_t file, hbool_t is_chunked) void test_coords(void) { - hid_t fid; - hbool_t is_chunk[2] = {TRUE, FALSE}; - int i; - herr_t ret; /* Generic error return */ + hid_t fid; + bool is_chunk[2] = {true, false}; + int i; + herr_t ret; /* Generic error return */ fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); CHECK(fid, FAIL, "H5Fcreate"); diff --git a/test/API/testhdf5.c b/test/API/testhdf5.c index f69b1c8..e82ac12 100644 --- a/test/API/testhdf5.c +++ b/test/API/testhdf5.c @@ -262,7 +262,7 @@ error: #endif static char * h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fullname, size_t size, - hbool_t nest_printf, hbool_t subst_for_superblock) + bool nest_printf, bool subst_for_superblock) { const char *prefix = NULL; const char *driver_env_var = NULL; /* HDF5_DRIVER environment variable */ @@ -370,7 +370,7 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu " export HDF5_PARAPREFIX\n" "*** End of Hint ***\n"); - explained = TRUE; + explained = true; #ifdef HDF5_PARAPREFIX prefix = HDF5_PARAPREFIX; #endif /* HDF5_PARAPREFIX */ @@ -486,19 +486,19 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu char * h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size) { - return (h5_fixname_real(base_name, fapl, ".h5", fullname, size, FALSE, FALSE)); + return (h5_fixname_real(base_name, fapl, ".h5", fullname, size, false, false)); } char * h5_fixname_superblock(const char *base_name, hid_t fapl_id, char *fullname, size_t size) { - return (h5_fixname_real(base_name, fapl_id, ".h5", fullname, size, FALSE, TRUE)); + return (h5_fixname_real(base_name, fapl_id, ".h5", fullname, size, false, true)); } -hbool_t +bool h5_using_default_driver(const char *drv_name) { - hbool_t ret_val = TRUE; + bool ret_val = true; assert(H5_DEFAULT_VFD == H5FD_SEC2); @@ -512,7 +512,7 @@ h5_using_default_driver(const char *drv_name) } herr_t -h5_driver_is_default_vfd_compatible(hid_t fapl_id, hbool_t *default_vfd_compatible) +h5_driver_is_default_vfd_compatible(hid_t fapl_id, bool *default_vfd_compatible) { unsigned long feat_flags = 0; hid_t driver_id = H5I_INVALID_HID; diff --git a/test/API/testhdf5.h b/test/API/testhdf5.h index f2510b2..6cdcb2e 100644 --- a/test/API/testhdf5.h +++ b/test/API/testhdf5.h @@ -29,8 +29,8 @@ #define VERBO_HI 9 /* High */ /* Turn off verbose reporting by default */ -#define VERBOSE_MED (FALSE) -#define VERBOSE_HI (FALSE) +#define VERBOSE_MED (false) +#define VERBOSE_HI (false) /* Use %ld to print the value because long should cover most cases. */ /* Used to make certain a return value _is_not_ a value */ @@ -280,12 +280,12 @@ int print_func(const char *format, ...); int TestErrPrintf(const char *format, ...); hid_t h5_fileaccess(void); /* Functions that will replace components of a FAPL */ -herr_t h5_get_vfd_fapl(hid_t fapl_id); -herr_t h5_get_libver_fapl(hid_t fapl_id); -char *h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size); -char *h5_fixname_superblock(const char *base_name, hid_t fapl, char *fullname, size_t size); -hbool_t h5_using_default_driver(const char *drv_name); -herr_t h5_driver_is_default_vfd_compatible(hid_t fapl_id, hbool_t *default_vfd_compatible); +herr_t h5_get_vfd_fapl(hid_t fapl_id); +herr_t h5_get_libver_fapl(hid_t fapl_id); +char *h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size); +char *h5_fixname_superblock(const char *base_name, hid_t fapl, char *fullname, size_t size); +bool h5_using_default_driver(const char *drv_name); +herr_t h5_driver_is_default_vfd_compatible(hid_t fapl_id, bool *default_vfd_compatible); #ifdef H5_HAVE_PARALLEL char *getenv_all(MPI_Comm comm, int root, const char *name); diff --git a/test/API/tfile.c b/test/API/tfile.c index 1915749..8704b62 100644 --- a/test/API/tfile.c +++ b/test/API/tfile.c @@ -1770,8 +1770,8 @@ test_file_is_accessible(const char *env_h5_drvr) #if 0 int posix_ret; /* Return value from POSIX calls */ #endif - hbool_t driver_is_default_compatible; - herr_t ret; /* Return value from HDF5 calls */ + bool driver_is_default_compatible; + herr_t ret; /* Return value from HDF5 calls */ /* Output message about test being performed */ MESSAGE(5, ("Testing Detection of HDF5 Files\n")); @@ -1805,7 +1805,7 @@ test_file_is_accessible(const char *env_h5_drvr) /* Verify that the file is an HDF5 file */ is_hdf5 = H5Fis_accessible(filename, fapl_id); - VERIFY(is_hdf5, TRUE, "H5Fis_accessible"); + VERIFY(is_hdf5, true, "H5Fis_accessible"); /*****************************************/ /* Newly created file that is still open */ @@ -1824,7 +1824,7 @@ test_file_is_accessible(const char *env_h5_drvr) /* Verify that the file is an HDF5 file */ is_hdf5 = H5Fis_accessible(filename, fapl_id); - VERIFY(is_hdf5, TRUE, "H5Fis_accessible"); + VERIFY(is_hdf5, true, "H5Fis_accessible"); /* Close file */ ret = H5Fclose(fid); @@ -1859,7 +1859,7 @@ test_file_is_accessible(const char *env_h5_drvr) /* Verify that the file is an HDF5 file */ is_hdf5 = H5Fis_accessible(filename, fapl_id); - VERIFY(is_hdf5, TRUE, "H5Fis_accessible"); + VERIFY(is_hdf5, true, "H5Fis_accessible"); } /* end if */ #if 0 if (driver_is_default_compatible) { @@ -1877,7 +1877,7 @@ test_file_is_accessible(const char *env_h5_drvr) /* Verify that the file is NOT an HDF5 file using the base filename */ is_hdf5 = H5Fis_accessible(non_hdf5_filename, fapl_id); - VERIFY(is_hdf5, FALSE, "H5Fis_accessible (empty non-HDF5 file)"); + VERIFY(is_hdf5, false, "H5Fis_accessible (empty non-HDF5 file)"); /***************************/ /* Non-empty non-HDF5 file */ @@ -1901,7 +1901,7 @@ test_file_is_accessible(const char *env_h5_drvr) /* Verify that the file is not an HDF5 file */ is_hdf5 = H5Fis_accessible(non_hdf5_filename, fapl_id); - VERIFY(is_hdf5, FALSE, "H5Fis_accessible (non-HDF5 file)"); + VERIFY(is_hdf5, false, "H5Fis_accessible (non-HDF5 file)"); } /* Clean up files */ @@ -1973,7 +1973,7 @@ test_file_ishdf5(const char *env_h5_drvr) /* Verify that the file is an HDF5 file */ is_hdf5 = H5Fis_hdf5(sb_filename); - VERIFY(is_hdf5, TRUE, "H5Fis_hdf5"); + VERIFY(is_hdf5, true, "H5Fis_hdf5"); /*******************************/ /* Non-default user block size */ @@ -2000,7 +2000,7 @@ test_file_ishdf5(const char *env_h5_drvr) /* Verify that the file is an HDF5 file */ is_hdf5 = H5Fis_hdf5(sb_filename); - VERIFY(is_hdf5, TRUE, "H5Fis_hdf5"); + VERIFY(is_hdf5, true, "H5Fis_hdf5"); /***************************/ /* Non-empty non-HDF5 file */ @@ -2027,7 +2027,7 @@ test_file_ishdf5(const char *env_h5_drvr) /* Verify that the file is not an HDF5 file */ is_hdf5 = H5Fis_hdf5(sb_filename); - VERIFY(is_hdf5, FALSE, "H5Fis_hdf5"); + VERIFY(is_hdf5, false, "H5Fis_hdf5"); /* Clean up files */ #if 0 @@ -2082,7 +2082,7 @@ test_file_delete(hid_t fapl_id) /* Verify that the file is an HDF5 file */ is_hdf5 = H5Fis_accessible(filename, fapl_id); - VERIFY(is_hdf5, TRUE, "H5Fis_accessible"); + VERIFY(is_hdf5, true, "H5Fis_accessible"); /* Delete the file */ ret = H5Fdelete(filename, fapl_id); @@ -2127,7 +2127,7 @@ test_file_delete(hid_t fapl_id) is_hdf5 = H5Fis_accessible(filename, fapl_id); } H5E_END_TRY - CHECK(is_hdf5, TRUE, "H5Fis_accessible"); + CHECK(is_hdf5, true, "H5Fis_accessible"); /* Try to delete it (should fail) */ H5E_BEGIN_TRY @@ -2645,7 +2645,7 @@ test_file_double_dataset_open(void) ** *****************************************************************/ static void -test_file_double_file_dataset_open(hbool_t new_format) +test_file_double_file_dataset_open(bool new_format) { hid_t fapl = -1; /* File access property list */ hid_t dcpl = -1; /* Dataset creation property list */ @@ -3251,7 +3251,7 @@ cal_chksum(const char *file, uint32_t *chksum) if (file_data) { /* Read file's data into memory */ bytes_read = HDread(fdes, file_data, (size_t)sb.st_size); - CHECK(bytes_read == sb.st_size, FALSE, "malloc"); + CHECK(bytes_read == sb.st_size, false, "malloc"); /* Calculate checksum */ *chksum = H5_checksum_lookup3(file_data, sizeof(file_data), 0); @@ -3386,7 +3386,7 @@ test_userblock_alignment_helper1(hid_t fcpl, hid_t fapl) ** *****************************************************************/ static int -test_userblock_alignment_helper2(hid_t fapl, hbool_t open_rw) +test_userblock_alignment_helper2(hid_t fapl, bool open_rw) { hid_t fid; /* File ID */ int curr_num_errs = nerrors(); /* Retrieve the current # of errors */ @@ -3486,7 +3486,7 @@ test_userblock_alignment(const char *env_h5_drvr) /* Call helper routines to perform file manipulations */ ret = test_userblock_alignment_helper1(fcpl, fapl); CHECK(ret, FAIL, "test_userblock_alignment_helper1"); - ret = test_userblock_alignment_helper2(fapl, TRUE); + ret = test_userblock_alignment_helper2(fapl, true); CHECK(ret, FAIL, "test_userblock_alignment_helper2"); /* Release property lists */ @@ -3516,7 +3516,7 @@ test_userblock_alignment(const char *env_h5_drvr) /* Call helper routines to perform file manipulations */ ret = test_userblock_alignment_helper1(fcpl, fapl); CHECK(ret, FAIL, "test_userblock_alignment_helper1"); - ret = test_userblock_alignment_helper2(fapl, TRUE); + ret = test_userblock_alignment_helper2(fapl, true); CHECK(ret, FAIL, "test_userblock_alignment_helper2"); /* Release property lists */ @@ -3546,7 +3546,7 @@ test_userblock_alignment(const char *env_h5_drvr) /* Call helper routines to perform file manipulations */ ret = test_userblock_alignment_helper1(fcpl, fapl); CHECK(ret, FAIL, "test_userblock_alignment_helper1"); - ret = test_userblock_alignment_helper2(fapl, TRUE); + ret = test_userblock_alignment_helper2(fapl, true); CHECK(ret, FAIL, "test_userblock_alignment_helper2"); /* Release property lists */ @@ -3650,9 +3650,9 @@ test_userblock_alignment(const char *env_h5_drvr) CHECK(ret, FAIL, "H5Pset_alignment"); /* Call helper routines to perform file manipulations */ - ret = test_userblock_alignment_helper2(fapl, FALSE); + ret = test_userblock_alignment_helper2(fapl, false); CHECK(ret, FAIL, "test_userblock_alignment_helper2"); - ret = test_userblock_alignment_helper2(fapl, TRUE); + ret = test_userblock_alignment_helper2(fapl, true); CHECK(ret, FAIL, "test_userblock_alignment_helper2"); /* Release property lists */ @@ -3710,13 +3710,13 @@ test_userblock_alignment_paged(const char *env_h5_drvr) ret = H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST); CHECK(ret, FAIL, "H5Pset_libver_bounds"); - ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, FALSE, (hsize_t)1); + ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, false, (hsize_t)1); CHECK(ret, FAIL, "H5Pset_file_space_strategy"); /* Call helper routines to perform file manipulations */ ret = test_userblock_alignment_helper1(fcpl, fapl); CHECK(ret, FAIL, "test_userblock_alignment_helper1"); - ret = test_userblock_alignment_helper2(fapl, TRUE); + ret = test_userblock_alignment_helper2(fapl, true); CHECK(ret, FAIL, "test_userblock_alignment_helper2"); /* Release property lists */ @@ -3740,7 +3740,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr) CHECK(fcpl, FAIL, "H5Pcreate"); ret = H5Pset_userblock(fcpl, (hsize_t)1024); CHECK(ret, FAIL, "H5Pset_userblock"); - ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, FALSE, (hsize_t)1); + ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, false, (hsize_t)1); ret = H5Pset_file_space_page_size(fcpl, (hsize_t)512); /* Create file access property list */ @@ -3752,7 +3752,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr) /* Call helper routines to perform file manipulations */ ret = test_userblock_alignment_helper1(fcpl, fapl); CHECK(ret, FAIL, "test_userblock_alignment_helper1"); - ret = test_userblock_alignment_helper2(fapl, TRUE); + ret = test_userblock_alignment_helper2(fapl, true); CHECK(ret, FAIL, "test_userblock_alignment_helper2"); /* Release property lists */ @@ -3814,7 +3814,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr) CHECK(fcpl, FAIL, "H5Pcreate"); ret = H5Pset_userblock(fcpl, (hsize_t)512); CHECK(ret, FAIL, "H5Pset_userblock"); - ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, TRUE, (hsize_t)1); + ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, true, (hsize_t)1); CHECK(ret, FAIL, "H5Pset_file_space_strategy"); ret = H5Pset_file_space_page_size(fcpl, (hsize_t)512); CHECK(ret, FAIL, "H5Pset_file_space_page_size"); @@ -3828,7 +3828,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr) /* Call helper routines to perform file manipulations */ ret = test_userblock_alignment_helper1(fcpl, fapl); CHECK(ret, FAIL, "test_userblock_alignment_helper1"); - ret = test_userblock_alignment_helper2(fapl, TRUE); + ret = test_userblock_alignment_helper2(fapl, true); CHECK(ret, FAIL, "test_userblock_alignment_helper2"); /* Release property lists */ @@ -3852,7 +3852,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr) CHECK(fcpl, FAIL, "H5Pcreate"); ret = H5Pset_userblock(fcpl, (hsize_t)512); CHECK(ret, FAIL, "H5Pset_userblock"); - ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_NONE, FALSE, (hsize_t)1); + ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_NONE, false, (hsize_t)1); CHECK(ret, FAIL, "H5Pset_file_space_strategy"); ret = H5Pset_file_space_page_size(fcpl, (hsize_t)512); CHECK(ret, FAIL, "H5Pset_file_space_page_size"); @@ -3892,7 +3892,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr) CHECK(fcpl, FAIL, "H5Pcreate"); ret = H5Pset_userblock(fcpl, (hsize_t)1024); CHECK(ret, FAIL, "H5Pset_userblock"); - ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, TRUE, (hsize_t)1); + ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, true, (hsize_t)1); CHECK(ret, FAIL, "H5Pset_file_space_strategy"); ret = H5Pset_file_space_page_size(fcpl, (hsize_t)1023); CHECK(ret, FAIL, "H5Pset_file_space_page_size"); @@ -3932,7 +3932,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr) CHECK(fcpl, FAIL, "H5Pcreate"); ret = H5Pset_userblock(fcpl, (hsize_t)1024); CHECK(ret, FAIL, "H5Pset_userblock"); - ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, FALSE, (hsize_t)1); + ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, false, (hsize_t)1); CHECK(ret, FAIL, "H5Pset_file_space_strategy"); ret = H5Pset_file_space_page_size(fcpl, (hsize_t)1023); CHECK(ret, FAIL, "H5Pset_file_space_page_size"); @@ -3946,7 +3946,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr) /* Call helper routines to perform file manipulations */ ret = test_userblock_alignment_helper1(fcpl, fapl); CHECK(ret, FAIL, "test_userblock_alignment_helper1"); - ret = test_userblock_alignment_helper2(fapl, TRUE); + ret = test_userblock_alignment_helper2(fapl, true); CHECK(ret, FAIL, "test_userblock_alignment_helper2"); /* Release property lists */ @@ -3970,7 +3970,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr) CHECK(fcpl, FAIL, "H5Pcreate"); ret = H5Pset_userblock(fcpl, (hsize_t)512); CHECK(ret, FAIL, "H5Pset_userblock"); - ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, FALSE, (hsize_t)1); + ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, false, (hsize_t)1); CHECK(ret, FAIL, "H5Pset_file_space_strategy"); ret = H5Pset_file_space_page_size(fcpl, (hsize_t)1024); CHECK(ret, FAIL, "H5Pset_file_space_page_size"); @@ -4010,7 +4010,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr) CHECK(fcpl, FAIL, "H5Pcreate"); ret = H5Pset_userblock(fcpl, (hsize_t)512); CHECK(ret, FAIL, "H5Pset_userblock"); - ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_NONE, FALSE, (hsize_t)1); + ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_NONE, false, (hsize_t)1); CHECK(ret, FAIL, "H5Pset_file_space_strategy"); ret = H5Pset_file_space_page_size(fcpl, (hsize_t)1024); CHECK(ret, FAIL, "H5Pset_file_space_page_size"); @@ -4024,7 +4024,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr) /* Call helper routines to perform file manipulations */ ret = test_userblock_alignment_helper1(fcpl, fapl); CHECK(ret, FAIL, "test_userblock_alignment_helper1"); - ret = test_userblock_alignment_helper2(fapl, TRUE); + ret = test_userblock_alignment_helper2(fapl, true); CHECK(ret, FAIL, "test_userblock_alignment_helper2"); /* Release property lists */ @@ -4050,7 +4050,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr) CHECK(fcpl, FAIL, "H5Pcreate"); ret = H5Pset_userblock(fcpl, (hsize_t)512); CHECK(ret, FAIL, "H5Pset_userblock"); - ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, FALSE, (hsize_t)1); + ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, false, (hsize_t)1); CHECK(ret, FAIL, "H5Pset_file_space_strategy"); ret = H5Pset_file_space_page_size(fcpl, (hsize_t)512); CHECK(ret, FAIL, "H5Pset_file_space_page_size"); @@ -4070,9 +4070,9 @@ test_userblock_alignment_paged(const char *env_h5_drvr) CHECK(ret, FAIL, "H5Pset_alignment"); /* Call helper routines to perform file manipulations */ - ret = test_userblock_alignment_helper2(fapl, FALSE); + ret = test_userblock_alignment_helper2(fapl, false); CHECK(ret, FAIL, "test_userblock_alignment_helper2"); - ret = test_userblock_alignment_helper2(fapl, TRUE); + ret = test_userblock_alignment_helper2(fapl, true); CHECK(ret, FAIL, "test_userblock_alignment_helper2"); /* Release property lists */ @@ -4104,7 +4104,7 @@ test_filespace_info(const char *env_h5_drvr) hid_t fapl, new_fapl; /* File access property lists */ hid_t fcpl, fcpl1, fcpl2; /* File creation property lists */ H5F_fspace_strategy_t strategy; /* File space strategy */ - hbool_t persist; /* Persist free-space or not */ + bool persist; /* Persist free-space or not */ hsize_t threshold; /* Free-space section threshold */ unsigned new_format; /* New or old format */ H5F_fspace_strategy_t fs_strategy; /* File space strategy--iteration variable */ @@ -4112,14 +4112,14 @@ test_filespace_info(const char *env_h5_drvr) hsize_t fs_threshold; /* Free-space section threshold--iteration variable */ hsize_t fsp_size; /* File space page size */ char filename[FILENAME_LEN]; /* Filename to use */ - hbool_t contig_addr_vfd; /* Whether VFD used has a contiguous address space */ + bool contig_addr_vfd; /* Whether VFD used has a contiguous address space */ herr_t ret; /* Return value */ /* Output message about test being performed */ MESSAGE(5, ("Testing file creation public routines: H5Pget/set_file_space_strategy & " "H5Pget/set_file_space_page_size\n")); - contig_addr_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); + contig_addr_vfd = (bool)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); fapl = h5_fileaccess(); h5_fixname(FILESPACE_NAME[0], fapl, filename, sizeof filename); @@ -4137,7 +4137,7 @@ test_filespace_info(const char *env_h5_drvr) * Check file space information from a default file creation property list. * Values expected: * strategy--H5F_FILE_SPACE_AGGR - * persist--FALSE + * persist--false * threshold--1 * file space page size--4096 */ @@ -4151,7 +4151,7 @@ test_filespace_info(const char *env_h5_drvr) /* Verify file space information */ VERIFY(strategy, H5F_FSPACE_STRATEGY_FSM_AGGR, "H5Pget_file_space_strategy"); - VERIFY(persist, FALSE, "H5Pget_file_space_strategy"); + VERIFY(persist, false, "H5Pget_file_space_strategy"); VERIFY(threshold, 1, "H5Pget_file_space_strategy"); /* Retrieve file space page size */ @@ -4222,7 +4222,7 @@ test_filespace_info(const char *env_h5_drvr) * Check file space information when creating a file with default properties. * Values expected: * strategy--H5F_FILE_SPACE_AGGR - * persist--FALSE + * persist--false * threshold--1 * file space page size--4096 */ @@ -4240,7 +4240,7 @@ test_filespace_info(const char *env_h5_drvr) /* Verify file space information */ VERIFY(strategy, H5F_FSPACE_STRATEGY_FSM_AGGR, "H5Pget_file_space_strategy"); - VERIFY(persist, FALSE, "H5Pget_file_space_strategy"); + VERIFY(persist, false, "H5Pget_file_space_strategy"); VERIFY(threshold, 1, "H5Pget_file_space_strategy"); /* Retrieve file space page size */ @@ -4260,7 +4260,7 @@ test_filespace_info(const char *env_h5_drvr) * latest library format and default properties. * Values expected: * strategy--H5F_FILE_SPACE_AGGR - * persist--FALSE + * persist--false * threshold--1 * file space page size--4096 */ @@ -4278,7 +4278,7 @@ test_filespace_info(const char *env_h5_drvr) /* Verify file space information */ VERIFY(strategy, H5F_FSPACE_STRATEGY_FSM_AGGR, "H5Pget_file_space_strategy"); - VERIFY(persist, FALSE, "H5Pget_file_space_strategy"); + VERIFY(persist, false, "H5Pget_file_space_strategy"); VERIFY(threshold, 1, "H5Pget_file_space_strategy"); /* Retrieve file space page size */ @@ -4305,7 +4305,7 @@ test_filespace_info(const char *env_h5_drvr) * File space page size: set to 512 * */ - for (new_format = FALSE; new_format <= TRUE; new_format++) { + for (new_format = false; new_format <= true; new_format++) { hid_t my_fapl; /* Set the FAPL for the type of format */ @@ -4318,8 +4318,8 @@ test_filespace_info(const char *env_h5_drvr) my_fapl = fapl; } /* end else */ - /* Test with TRUE or FALSE for persisting free-space */ - for (fs_persist = FALSE; fs_persist <= TRUE; fs_persist++) { + /* Test with true or false for persisting free-space */ + for (fs_persist = false; fs_persist <= true; fs_persist++) { /* Test with free-space section threshold size: 0 to 10 */ for (fs_threshold = 0; fs_threshold <= TEST_THRESHOLD10; fs_threshold++) { @@ -4336,7 +4336,7 @@ test_filespace_info(const char *env_h5_drvr) CHECK(fcpl, FAIL, "H5Pcreate"); /* Set file space information */ - ret = H5Pset_file_space_strategy(fcpl, fs_strategy, (hbool_t)fs_persist, fs_threshold); + ret = H5Pset_file_space_strategy(fcpl, fs_strategy, (bool)fs_persist, fs_threshold); CHECK(ret, FAIL, "H5Pset_file_space_strategy"); ret = H5Pset_file_space_page_size(fcpl, FSP_SIZE512); @@ -4350,11 +4350,11 @@ test_filespace_info(const char *env_h5_drvr) VERIFY(strategy, fs_strategy, "H5Pget_file_space_strategy"); if (fs_strategy < H5F_FSPACE_STRATEGY_AGGR) { - VERIFY(persist, (hbool_t)fs_persist, "H5Pget_file_space_strategy"); + VERIFY(persist, (bool)fs_persist, "H5Pget_file_space_strategy"); VERIFY(threshold, fs_threshold, "H5Pget_file_space_strategy"); } else { - VERIFY(persist, FALSE, "H5Pget_file_space_strategy"); + VERIFY(persist, false, "H5Pget_file_space_strategy"); VERIFY(threshold, 1, "H5Pget_file_space_strategy"); } @@ -4383,7 +4383,7 @@ test_filespace_info(const char *env_h5_drvr) VERIFY(threshold, fs_threshold, "H5Pget_file_space_strategy"); } else { - VERIFY(persist, FALSE, "H5Pget_file_space_strategy"); + VERIFY(persist, false, "H5Pget_file_space_strategy"); VERIFY(threshold, 1, "H5Pget_file_space_strategy"); } @@ -4415,7 +4415,7 @@ test_filespace_info(const char *env_h5_drvr) VERIFY(threshold, fs_threshold, "H5Pget_file_space_strategy"); } else { - VERIFY(persist, FALSE, "H5Pget_file_space_strategy"); + VERIFY(persist, false, "H5Pget_file_space_strategy"); VERIFY(threshold, 1, "H5Pget_file_space_strategy"); } @@ -4464,13 +4464,13 @@ test_filespace_info(const char *env_h5_drvr) *****************************************************************/ #if 0 static int -set_multi_split(hid_t fapl, hsize_t pagesize, hbool_t split) +set_multi_split(hid_t fapl, hsize_t pagesize, bool split) { H5FD_mem_t memb_map[H5FD_MEM_NTYPES]; hid_t memb_fapl_arr[H5FD_MEM_NTYPES]; char *memb_name[H5FD_MEM_NTYPES]; haddr_t memb_addr[H5FD_MEM_NTYPES]; - hbool_t relax; + bool relax; H5FD_mem_t mt; assert(split); @@ -4537,7 +4537,7 @@ test_file_freespace(const char *env_h5_drvr) char filename[FILENAME_LEN]; /* Filename to use */ char name[32]; /* Dataset name */ unsigned new_format; /* To use old or new format */ - hbool_t split_vfd, multi_vfd; /* Indicate multi/split driver */ + bool split_vfd, multi_vfd; /* Indicate multi/split driver */ hsize_t expected_freespace; /* Freespace expected */ hsize_t expected_fs_del; /* Freespace expected after delete */ herr_t ret; /* Return value */ @@ -4560,7 +4560,7 @@ test_file_freespace(const char *env_h5_drvr) CHECK(fcpl, FAIL, "H5Pcreate"); /* Test with old & new format */ - for (new_format = FALSE; new_format <= TRUE; new_format++) { + for (new_format = false; new_format <= true; new_format++) { hid_t my_fapl; /* Set the FAPL for the type of format */ @@ -4574,7 +4574,7 @@ test_file_freespace(const char *env_h5_drvr) CHECK(ret, FAIL, "set_multi_split"); } - ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, FALSE, (hsize_t)1); + ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, false, (hsize_t)1); CHECK(ret, FAIL, "H5P_set_file_space_strategy"); expected_freespace = 4534; @@ -4689,7 +4689,7 @@ test_file_freespace(const char *env_h5_drvr) ** *****************************************************************/ static void -test_sects_freespace(const char *env_h5_drvr, hbool_t new_format) +test_sects_freespace(const char *env_h5_drvr, bool new_format) { char filename[FILENAME_LEN]; /* Filename to use */ hid_t file; /* File ID */ @@ -4715,7 +4715,7 @@ test_sects_freespace(const char *env_h5_drvr, hbool_t new_format) hsize_t dims[1]; /* Dimension sizes */ unsigned u; /* Local index variable */ H5FD_mem_t type; - hbool_t split_vfd = FALSE, multi_vfd = FALSE; + bool split_vfd = false, multi_vfd = false; herr_t ret; /* Return value */ /* Output message about test being performed */ @@ -4738,7 +4738,7 @@ test_sects_freespace(const char *env_h5_drvr, hbool_t new_format) CHECK(ret, FAIL, "H5Pset_libver_bounds"); /* Set to paged aggregation and persistent free-space */ - ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, TRUE, (hsize_t)1); + ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, true, (hsize_t)1); CHECK(ret, FAIL, "H5Pget_file_space_strategy"); /* Set up paged aligned address space for multi/split driver */ @@ -4748,7 +4748,7 @@ test_sects_freespace(const char *env_h5_drvr, hbool_t new_format) } } else { - ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, TRUE, (hsize_t)1); + ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, true, (hsize_t)1); CHECK(ret, FAIL, "H5Pget_file_space_strategy"); } @@ -4961,7 +4961,7 @@ test_filespace_compatible(void) ssize_t nread; /* Number of bytes read in */ unsigned i, j; /* Local index variable */ hssize_t free_space; /* Amount of free-space in the file */ - hbool_t persist; /* Persist free-space or not */ + bool persist; /* Persist free-space or not */ hsize_t threshold; /* Free-space section threshold */ H5F_fspace_strategy_t strategy; /* File space handling strategy */ herr_t ret; /* Return value */ @@ -5008,10 +5008,10 @@ test_filespace_compatible(void) CHECK(ret, FAIL, "H5Pget_file_space_strategy"); /* File space handling strategy should be H5F_FSPACE_STRATEGY_FSM_AGGR */ - /* Persisting free-space should be FALSE */ + /* Persisting free-space should be false */ /* Free-space section threshold should be 1 */ VERIFY(strategy, H5F_FSPACE_STRATEGY_FSM_AGGR, "H5Pget_file_space_strategy"); - VERIFY(persist, FALSE, "H5Pget_file_space_strategy"); + VERIFY(persist, false, "H5Pget_file_space_strategy"); VERIFY(threshold, 1, "H5Pget_file_space_strategy"); /* Generate raw data */ @@ -5088,7 +5088,7 @@ test_filespace_1_10_0_compatible(void) hid_t fid = -1; /* File id */ hid_t did = -1; /* Dataset id */ hid_t fcpl; /* File creation property list */ - hbool_t persist; /* Persist free-space or not */ + bool persist; /* Persist free-space or not */ hsize_t threshold; /* Free-space section threshold */ H5F_fspace_strategy_t strategy; /* File space handling strategy */ int wbuf[24]; /* Buffer for dataset data */ @@ -5142,7 +5142,7 @@ test_filespace_1_10_0_compatible(void) case 1: VERIFY(strategy, H5F_FSPACE_STRATEGY_FSM_AGGR, "H5Pget_file_space_strategy"); - VERIFY(persist, TRUE, "H5Pget_file_space_strategy"); + VERIFY(persist, true, "H5Pget_file_space_strategy"); #if 0 VERIFY(threshold, H5F_FREE_SPACE_THRESHOLD_DEF, "H5Pget_file_space_strategy"); #endif @@ -5413,7 +5413,7 @@ test_filespace_round_compatible(void) hid_t fcpl = -1; /* File creation property list ID */ unsigned j; /* Local index variable */ H5F_fspace_strategy_t strategy; /* File space strategy */ - hbool_t persist; /* Persist free-space or not */ + bool persist; /* Persist free-space or not */ hsize_t threshold; /* Free-space section threshold */ hssize_t free_space; /* Amount of free space in the file */ int status; /* Status from copying the existing file */ @@ -5438,7 +5438,7 @@ test_filespace_round_compatible(void) ret = H5Pget_file_space_strategy(fcpl, &strategy, &persist, &threshold); CHECK(ret, FAIL, "H5Pget_file_space_strategy"); VERIFY(strategy, H5F_FSPACE_STRATEGY_FSM_AGGR, "H5Pget_file_space_strategy"); - VERIFY(persist, FALSE, "H5Pget_file_space_strategy"); + VERIFY(persist, false, "H5Pget_file_space_strategy"); VERIFY(threshold, 1, "H5Pget_file_space_strategy"); /* There should not be any free space in the file */ @@ -5672,7 +5672,7 @@ test_libver_bounds_open(void) /* Get new low bound and verify that it has been upgraded properly */ ret = H5Pget_libver_bounds(new_fapl, &new_low, NULL); CHECK(ret, FAIL, "H5Pget_libver_bounds"); - VERIFY(new_low >= H5F_LIBVER_V110, TRUE, "Low bound should be upgraded to at least H5F_LIBVER_V110"); + VERIFY(new_low >= H5F_LIBVER_V110, true, "Low bound should be upgraded to at least H5F_LIBVER_V110"); ret = H5Pclose(new_fapl); CHECK(ret, FAIL, "H5Pclose"); @@ -5720,7 +5720,7 @@ test_libver_bounds_copy(void) hid_t fapl = -1; /* File access property list ID */ const char *src_fname; /* Source file name */ herr_t ret; /* Generic return value */ - hbool_t driver_is_default_compatible; + bool driver_is_default_compatible; /* Output message about the test being performed */ MESSAGE(5, ("Testing H5Ocopy a dataset in a 1.8 library file to a 1.10 library file\n")); @@ -5910,14 +5910,14 @@ test_libver_bounds_super(hid_t fapl, const char *env_h5_drvr) /* Verify superblock version when creating a file with input fapl, fcpl #A and with/without SWMR access */ if (H5FD__supports_swmr_test(env_h5_drvr)) - test_libver_bounds_super_create(fapl, fcpl, TRUE, FALSE); - test_libver_bounds_super_create(fapl, fcpl, FALSE, FALSE); + test_libver_bounds_super_create(fapl, fcpl, true, false); + test_libver_bounds_super_create(fapl, fcpl, false, false); /* Verify superblock version when opening a file which is created with input fapl, fcpl #A and with/without SWMR access */ if (H5FD__supports_swmr_test(env_h5_drvr)) - test_libver_bounds_super_open(fapl, fcpl, TRUE, FALSE); - test_libver_bounds_super_open(fapl, fcpl, FALSE, FALSE); + test_libver_bounds_super_open(fapl, fcpl, true, false); + test_libver_bounds_super_open(fapl, fcpl, false, false); /* Close the fcpl */ ret = H5Pclose(fcpl); @@ -5933,14 +5933,14 @@ test_libver_bounds_super(hid_t fapl, const char *env_h5_drvr) /* Verify superblock version when creating a file with input fapl, fcpl #B and with/without SWMR access */ if (H5FD__supports_swmr_test(env_h5_drvr)) - test_libver_bounds_super_create(fapl, fcpl, TRUE, FALSE); - test_libver_bounds_super_create(fapl, fcpl, FALSE, FALSE); + test_libver_bounds_super_create(fapl, fcpl, true, false); + test_libver_bounds_super_create(fapl, fcpl, false, false); /* Verify superblock version when opening a file which is created with input fapl, fcpl #B and with/without SWMR access */ if (H5FD__supports_swmr_test(env_h5_drvr)) - test_libver_bounds_super_open(fapl, fcpl, TRUE, FALSE); - test_libver_bounds_super_open(fapl, fcpl, FALSE, FALSE); + test_libver_bounds_super_open(fapl, fcpl, true, false); + test_libver_bounds_super_open(fapl, fcpl, false, false); /* Close the fcpl */ ret = H5Pclose(fcpl); @@ -5958,14 +5958,14 @@ test_libver_bounds_super(hid_t fapl, const char *env_h5_drvr) /* Verify superblock version when creating a file with input fapl, fcpl #C and with/without SWMR access */ if (H5FD__supports_swmr_test(env_h5_drvr)) - test_libver_bounds_super_create(fapl, fcpl, TRUE, FALSE); - test_libver_bounds_super_create(fapl, fcpl, FALSE, FALSE); + test_libver_bounds_super_create(fapl, fcpl, true, false); + test_libver_bounds_super_create(fapl, fcpl, false, false); /* Verify superblock version when opening a file which is created with input fapl, fcpl #C and with/without SWMR access */ if (H5FD__supports_swmr_test(env_h5_drvr)) - test_libver_bounds_super_open(fapl, fcpl, TRUE, FALSE); - test_libver_bounds_super_open(fapl, fcpl, FALSE, FALSE); + test_libver_bounds_super_open(fapl, fcpl, true, false); + test_libver_bounds_super_open(fapl, fcpl, false, false); /* Close the fcpl */ ret = H5Pclose(fcpl); @@ -5982,14 +5982,14 @@ test_libver_bounds_super(hid_t fapl, const char *env_h5_drvr) /* Verify superblock version when creating a file with input fapl, fcpl #D and with/without SWMR access */ if (H5FD__supports_swmr_test(env_h5_drvr)) - test_libver_bounds_super_create(fapl, fcpl, TRUE, TRUE); - test_libver_bounds_super_create(fapl, fcpl, FALSE, TRUE); + test_libver_bounds_super_create(fapl, fcpl, true, true); + test_libver_bounds_super_create(fapl, fcpl, false, true); /* Verify superblock version when opening a file which is created with input fapl, fcpl #D and with/without SWMR access */ if (H5FD__supports_swmr_test(env_h5_drvr)) - test_libver_bounds_super_open(fapl, fcpl, TRUE, TRUE); - test_libver_bounds_super_open(fapl, fcpl, FALSE, TRUE); + test_libver_bounds_super_open(fapl, fcpl, true, true); + test_libver_bounds_super_open(fapl, fcpl, false, true); /* Close the fcpl */ ret = H5Pclose(fcpl); @@ -6056,7 +6056,7 @@ test_libver_bounds_super_create(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t n #endif H5F_libver_t low, high; /* Low and high bounds */ #if 0 - hbool_t ok; /* The result is ok or not */ + bool ok; /* The result is ok or not */ #endif herr_t ret; /* The return value */ @@ -6083,17 +6083,17 @@ test_libver_bounds_super_create(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t n else if (is_swmr) { /* SWMR is enabled */ if (high >= H5F_LIBVER_V110) { /* Should succeed */ - VERIFY(fid >= 0, TRUE, "H5Fcreate"); + VERIFY(fid >= 0, true, "H5Fcreate"); #if 0 VERIFY(HDF5_SUPERBLOCK_VERSION_3, f->shared->sblock->super_vers, "HDF5_superblock_ver_bounds"); - VERIFY(f->shared->low_bound >= H5F_LIBVER_V110, TRUE, "HDF5_superblock_ver_bounds"); + VERIFY(f->shared->low_bound >= H5F_LIBVER_V110, true, "HDF5_superblock_ver_bounds"); #endif } else /* Should fail */ - VERIFY(fid >= 0, FALSE, "H5Fcreate"); + VERIFY(fid >= 0, false, "H5Fcreate"); } else { /* Should succeed */ - VERIFY(fid >= 0, TRUE, "H5Fcreate"); + VERIFY(fid >= 0, true, "H5Fcreate"); #if 0 VERIFY(low, f->shared->low_bound, "HDF5_superblock_ver_bounds"); @@ -6102,12 +6102,12 @@ test_libver_bounds_super_create(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t n ok = (f->shared->sblock->super_vers == HDF5_SUPERBLOCK_VERSION_DEF || f->shared->sblock->super_vers == HDF5_SUPERBLOCK_VERSION_1 || f->shared->sblock->super_vers == HDF5_SUPERBLOCK_VERSION_2); - VERIFY(ok, TRUE, "HDF5_superblock_ver_bounds"); + VERIFY(ok, true, "HDF5_superblock_ver_bounds"); break; case H5F_LIBVER_V18: ok = (f->shared->sblock->super_vers == HDF5_SUPERBLOCK_VERSION_2); - VERIFY(ok, TRUE, "HDF5_superblock_ver_bounds"); + VERIFY(ok, true, "HDF5_superblock_ver_bounds"); break; case H5F_LIBVER_V110: @@ -6115,7 +6115,7 @@ test_libver_bounds_super_create(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t n case H5F_LIBVER_V114: case H5F_LIBVER_V116: ok = (f->shared->sblock->super_vers == HDF5_SUPERBLOCK_VERSION_3); - VERIFY(ok, TRUE, "HDF5_superblock_ver_bounds"); + VERIFY(ok, true, "HDF5_superblock_ver_bounds"); break; case H5F_LIBVER_ERROR: @@ -6251,7 +6251,7 @@ test_libver_bounds_super_open(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t non VERIFY(fid, H5I_INVALID_HID, "H5Fcreate"); } else { - VERIFY(fid >= 0, TRUE, "H5Fcreate"); + VERIFY(fid >= 0, true, "H5Fcreate"); #if 0 /* Get the internal file pointer */ f = (H5F_t *)H5VL_object(fid); @@ -6304,8 +6304,8 @@ test_libver_bounds_super_open(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t non case 3: if (high >= H5F_LIBVER_V110) { /* Should succeed */ - VERIFY(fid >= 0, TRUE, "H5Fopen"); - VERIFY(f->shared->low_bound >= H5F_LIBVER_V110, TRUE, + VERIFY(fid >= 0, true, "H5Fopen"); + VERIFY(f->shared->low_bound >= H5F_LIBVER_V110, true, "HDF5_superblock_ver_bounds"); /* Close the file */ @@ -6313,15 +6313,15 @@ test_libver_bounds_super_open(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t non CHECK(ret, FAIL, "H5Fclose"); } else /* Should fail */ - VERIFY(fid >= 0, FALSE, "H5Fopen"); + VERIFY(fid >= 0, false, "H5Fopen"); break; case 2: if (is_swmr) /* Should fail */ - VERIFY(fid >= 0, FALSE, "H5Fopen"); + VERIFY(fid >= 0, false, "H5Fopen"); else { /* Should succeed */ - VERIFY(fid >= 0, TRUE, "H5Fopen"); - VERIFY(f->shared->low_bound >= H5F_LIBVER_V18, TRUE, + VERIFY(fid >= 0, true, "H5Fopen"); + VERIFY(f->shared->low_bound >= H5F_LIBVER_V18, true, "HDF5_superblock_ver_bounds"); /* Close the file */ @@ -6333,9 +6333,9 @@ test_libver_bounds_super_open(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t non case 1: case 0: if (is_swmr) /* Should fail */ - VERIFY(fid >= 0, FALSE, "H5Fopen"); + VERIFY(fid >= 0, false, "H5Fopen"); else { /* Should succeed */ - VERIFY(fid >= 0, TRUE, "H5Fopen"); + VERIFY(fid >= 0, true, "H5Fopen"); VERIFY(f->shared->low_bound, low, "HDF5_superblock_ver_bounds"); ret = H5Fclose(fid); @@ -7652,37 +7652,37 @@ test_libver_macros(void) /* Output message about test being performed */ MESSAGE(5, ("Testing macros for library version comparison\n")); - VERIFY(H5_VERSION_GE(major, minor, release), TRUE, "H5_VERSION_GE"); - VERIFY(H5_VERSION_GE(major - 1, minor, release), TRUE, "H5_VERSION_GE"); - VERIFY(H5_VERSION_GE(major - 1, minor + 1, release), TRUE, "H5_VERSION_GE"); - VERIFY(H5_VERSION_GE(major - 1, minor, release + 1), TRUE, "H5_VERSION_GE"); - VERIFY(H5_VERSION_GE(major, minor - 1, release), TRUE, "H5_VERSION_GE"); - VERIFY(H5_VERSION_GE(major, minor - 1, release + 1), TRUE, "H5_VERSION_GE"); + VERIFY(H5_VERSION_GE(major, minor, release), true, "H5_VERSION_GE"); + VERIFY(H5_VERSION_GE(major - 1, minor, release), true, "H5_VERSION_GE"); + VERIFY(H5_VERSION_GE(major - 1, minor + 1, release), true, "H5_VERSION_GE"); + VERIFY(H5_VERSION_GE(major - 1, minor, release + 1), true, "H5_VERSION_GE"); + VERIFY(H5_VERSION_GE(major, minor - 1, release), true, "H5_VERSION_GE"); + VERIFY(H5_VERSION_GE(major, minor - 1, release + 1), true, "H5_VERSION_GE"); if (H5_VERS_RELEASE > 0) - VERIFY(H5_VERSION_GE(major, minor, release - 1), TRUE, "H5_VERSION_GE"); - - VERIFY(H5_VERSION_GE(major + 1, minor, release), FALSE, "H5_VERSION_GE"); - VERIFY(H5_VERSION_GE(major + 1, minor - 1, release), FALSE, "H5_VERSION_GE"); - VERIFY(H5_VERSION_GE(major + 1, minor - 1, release - 1), FALSE, "H5_VERSION_GE"); - VERIFY(H5_VERSION_GE(major, minor + 1, release), FALSE, "H5_VERSION_GE"); - VERIFY(H5_VERSION_GE(major, minor + 1, release - 1), FALSE, "H5_VERSION_GE"); - VERIFY(H5_VERSION_GE(major, minor, release + 1), FALSE, "H5_VERSION_GE"); - - VERIFY(H5_VERSION_LE(major, minor, release), TRUE, "H5_VERSION_LE"); - VERIFY(H5_VERSION_LE(major + 1, minor, release), TRUE, "H5_VERSION_LE"); - VERIFY(H5_VERSION_LE(major + 1, minor - 1, release), TRUE, "H5_VERSION_LE"); - VERIFY(H5_VERSION_LE(major + 1, minor - 1, release - 1), TRUE, "H5_VERSION_LE"); - VERIFY(H5_VERSION_LE(major, minor + 1, release), TRUE, "H5_VERSION_LE"); - VERIFY(H5_VERSION_LE(major, minor + 1, release - 1), TRUE, "H5_VERSION_LE"); - VERIFY(H5_VERSION_LE(major, minor, release + 1), TRUE, "H5_VERSION_LE"); - - VERIFY(H5_VERSION_LE(major - 1, minor, release), FALSE, "H5_VERSION_LE"); - VERIFY(H5_VERSION_LE(major - 1, minor + 1, release), FALSE, "H5_VERSION_LE"); - VERIFY(H5_VERSION_LE(major - 1, minor + 1, release + 1), FALSE, "H5_VERSION_LE"); - VERIFY(H5_VERSION_LE(major, minor - 1, release), FALSE, "H5_VERSION_LE"); - VERIFY(H5_VERSION_LE(major, minor - 1, release + 1), FALSE, "H5_VERSION_LE"); + VERIFY(H5_VERSION_GE(major, minor, release - 1), true, "H5_VERSION_GE"); + + VERIFY(H5_VERSION_GE(major + 1, minor, release), false, "H5_VERSION_GE"); + VERIFY(H5_VERSION_GE(major + 1, minor - 1, release), false, "H5_VERSION_GE"); + VERIFY(H5_VERSION_GE(major + 1, minor - 1, release - 1), false, "H5_VERSION_GE"); + VERIFY(H5_VERSION_GE(major, minor + 1, release), false, "H5_VERSION_GE"); + VERIFY(H5_VERSION_GE(major, minor + 1, release - 1), false, "H5_VERSION_GE"); + VERIFY(H5_VERSION_GE(major, minor, release + 1), false, "H5_VERSION_GE"); + + VERIFY(H5_VERSION_LE(major, minor, release), true, "H5_VERSION_LE"); + VERIFY(H5_VERSION_LE(major + 1, minor, release), true, "H5_VERSION_LE"); + VERIFY(H5_VERSION_LE(major + 1, minor - 1, release), true, "H5_VERSION_LE"); + VERIFY(H5_VERSION_LE(major + 1, minor - 1, release - 1), true, "H5_VERSION_LE"); + VERIFY(H5_VERSION_LE(major, minor + 1, release), true, "H5_VERSION_LE"); + VERIFY(H5_VERSION_LE(major, minor + 1, release - 1), true, "H5_VERSION_LE"); + VERIFY(H5_VERSION_LE(major, minor, release + 1), true, "H5_VERSION_LE"); + + VERIFY(H5_VERSION_LE(major - 1, minor, release), false, "H5_VERSION_LE"); + VERIFY(H5_VERSION_LE(major - 1, minor + 1, release), false, "H5_VERSION_LE"); + VERIFY(H5_VERSION_LE(major - 1, minor + 1, release + 1), false, "H5_VERSION_LE"); + VERIFY(H5_VERSION_LE(major, minor - 1, release), false, "H5_VERSION_LE"); + VERIFY(H5_VERSION_LE(major, minor - 1, release + 1), false, "H5_VERSION_LE"); if (H5_VERS_RELEASE > 0) - VERIFY(H5_VERSION_LE(major, minor, release - 1), FALSE, "H5_VERSION_LE"); + VERIFY(H5_VERSION_LE(major, minor, release - 1), false, "H5_VERSION_LE"); } /* test_libver_macros() */ /**************************************************************** @@ -7730,7 +7730,7 @@ test_libver_macros2(void) CHECK(ret, FAIL, "H5Lunlink"); status = H5Lexists(file, "Group", H5P_DEFAULT); - VERIFY(status, FALSE, "H5Lexists"); + VERIFY(status, false, "H5Lexists"); #else ret = H5Gunlink(file, "Group"); CHECK(ret, FAIL, "H5Gunlink"); @@ -7798,7 +7798,7 @@ test_incr_filesize(void) CHECK(fcpl, FAIL, "H5Pcreate"); /* Set file space strategy */ - ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, FALSE, (hsize_t)1); + ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, false, (hsize_t)1); CHECK(ret, FAIL, "H5P_set_file_space_strategy"); /* Create the test file */ @@ -7896,7 +7896,7 @@ test_min_dset_ohdr(void) char filename[FILENAME_LEN] = ""; hid_t file_id = -1; hid_t file2_id = -1; - hbool_t minimize; + bool minimize; herr_t ret; MESSAGE(5, ("Testing dataset object header minimization\n")); @@ -7919,17 +7919,17 @@ test_min_dset_ohdr(void) */ ret = H5Fget_dset_no_attrs_hint(file_id, &minimize); CHECK(ret, FAIL, "H5Fget_dset_no_attrs_hint"); - VERIFY(minimize, FALSE, "minimize flag"); + VERIFY(minimize, false, "minimize flag"); /*---------------------------------------- - * TEST set to TRUE + * TEST set to true */ - ret = H5Fset_dset_no_attrs_hint(file_id, TRUE); + ret = H5Fset_dset_no_attrs_hint(file_id, true); CHECK(ret, FAIL, "H5Fset_dset_no_attrs_hint"); ret = H5Fget_dset_no_attrs_hint(file_id, &minimize); CHECK(ret, FAIL, "H5Fget_dset_no_attrs_hint"); - VERIFY(minimize, TRUE, "minimize flag"); + VERIFY(minimize, true, "minimize flag"); /*---------------------------------------- * TEST second file open on same filename @@ -7937,41 +7937,41 @@ test_min_dset_ohdr(void) file2_id = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT); CHECK_I(file2_id, "H5Fopen"); - /* verify TRUE setting on second open + /* verify true setting on second open */ ret = H5Fget_dset_no_attrs_hint(file_id, &minimize); CHECK(ret, FAIL, "H5Fget_dset_no_attrs_hint"); - VERIFY(minimize, TRUE, "minimize flag"); + VERIFY(minimize, true, "minimize flag"); - /* re-set to FALSE on first open + /* re-set to false on first open */ - ret = H5Fset_dset_no_attrs_hint(file_id, FALSE); + ret = H5Fset_dset_no_attrs_hint(file_id, false); CHECK(ret, FAIL, "H5Fset_dset_no_attrs_hint"); - /* verify FALSE set on both opens + /* verify false set on both opens */ ret = H5Fget_dset_no_attrs_hint(file_id, &minimize); CHECK(ret, FAIL, "H5Fget_dset_no_attrs_hint"); - VERIFY(minimize, FALSE, "minimize flag"); + VERIFY(minimize, false, "minimize flag"); ret = H5Fget_dset_no_attrs_hint(file2_id, &minimize); CHECK(ret, FAIL, "H5Fget_dset_no_attrs_hint"); - VERIFY(minimize, FALSE, "minimize flag"); + VERIFY(minimize, false, "minimize flag"); - /* re-set to TRUE on second open + /* re-set to true on second open */ - ret = H5Fset_dset_no_attrs_hint(file2_id, TRUE); + ret = H5Fset_dset_no_attrs_hint(file2_id, true); CHECK(ret, FAIL, "H5Fset_dset_no_attrs_hint"); - /* verify TRUE set on both opens + /* verify true set on both opens */ ret = H5Fget_dset_no_attrs_hint(file_id, &minimize); CHECK(ret, FAIL, "H5Fget_dset_no_attrs_hint"); - VERIFY(minimize, TRUE, "minimize flag"); + VERIFY(minimize, true, "minimize flag"); ret = H5Fget_dset_no_attrs_hint(file2_id, &minimize); CHECK(ret, FAIL, "H5Fget_dset_no_attrs_hint"); - VERIFY(minimize, TRUE, "minimize flag"); + VERIFY(minimize, true, "minimize flag"); /*---------------------------------------- * TEST error cases @@ -7980,7 +7980,7 @@ test_min_dset_ohdr(void) /* trying to set with invalid file ID */ H5E_BEGIN_TRY { - ret = H5Fset_dset_no_attrs_hint(-1, TRUE); + ret = H5Fset_dset_no_attrs_hint(-1, true); } H5E_END_TRY VERIFY(ret, FAIL, "H5Fset_dset_no_attrs_hint"); @@ -8253,7 +8253,7 @@ test_file(void) { const char *env_h5_drvr; /* File Driver value from environment */ hid_t fapl_id = H5I_INVALID_HID; /* VFD-dependent fapl ID */ - hbool_t driver_is_default_compatible; + bool driver_is_default_compatible; herr_t ret; /* Output message about test being performed */ @@ -8288,8 +8288,8 @@ test_file(void) test_file_double_group_open(); /* Test opening same group from two files works properly */ test_file_double_dataset_open(); /* Test opening same dataset from two files works properly */ test_file_double_datatype_open(); /* Test opening same named datatype from two files works properly */ - test_file_double_file_dataset_open(TRUE); - test_file_double_file_dataset_open(FALSE); + test_file_double_file_dataset_open(true); + test_file_double_file_dataset_open(false); #if 0 test_userblock_file_size( env_h5_drvr); /* Tests that files created with a userblock have the correct size */ @@ -8310,10 +8310,10 @@ test_file(void) /* Skipped testing for multi/split drivers */ /* Setup for multi/split drivers are there already */ test_sects_freespace(env_h5_drvr, - TRUE); /* Test file public routine H5Fget_free_sections() for new format */ + true); /* Test file public routine H5Fget_free_sections() for new format */ /* Skipped testing for multi/split drivers */ /* Setup for multi/split drivers are there already */ - test_sects_freespace(env_h5_drvr, FALSE); /* Test file public routine H5Fget_free_sections() */ + test_sects_freespace(env_h5_drvr, false); /* Test file public routine H5Fget_free_sections() */ /* Skipped testing for multi/split drivers */ if (driver_is_default_compatible) { diff --git a/test/API/th5o.c b/test/API/th5o.c index 898c11d..f666473 100644 --- a/test/API/th5o.c +++ b/test/API/th5o.c @@ -978,7 +978,7 @@ test_h5o_link(void) /* Create LCPL with intermediate group creation flag set */ lcpl_id = H5Pcreate(H5P_LINK_CREATE); CHECK(lcpl_id, FAIL, "H5Pcreate"); - ret = H5Pset_create_intermediate_group(lcpl_id, TRUE); + ret = H5Pset_create_intermediate_group(lcpl_id, true); CHECK(ret, FAIL, "H5Pset_create_intermediate_group"); /* Create a file access property list */ @@ -1013,7 +1013,7 @@ test_h5o_link(void) ret = H5Tcommit_anon(file_id, type_id, H5P_DEFAULT, H5P_DEFAULT); CHECK(ret, FAIL, "H5Tcommit_anon"); committed = H5Tcommitted(type_id); - VERIFY(committed, TRUE, "H5Tcommitted"); + VERIFY(committed, true, "H5Tcommitted"); /* Create a dataset with no name using the committed datatype*/ dset_id = H5Dcreate_anon(file_id, type_id, space_id, H5P_DEFAULT, H5P_DEFAULT); diff --git a/test/API/th5s.c b/test/API/th5s.c index 7bf3191..3ab21f4 100644 --- a/test/API/th5s.c +++ b/test/API/th5s.c @@ -128,7 +128,7 @@ test_h5s_basic(void) hsize_t tmax[4]; hssize_t n; /* Number of dataspace elements */ #if 0 - hbool_t driver_is_default_compatible; + bool driver_is_default_compatible; #endif herr_t ret; /* Generic return value */ @@ -1624,7 +1624,7 @@ test_h5s_encode1(void) ****************************************************************/ static herr_t test_h5s_check_encoding(hid_t in_fapl, hid_t in_sid, uint32_t expected_version, uint8_t expected_enc_size, - hbool_t expected_to_fail) + bool expected_to_fail) { char *buf = NULL; /* Pointer to the encoded buffer */ size_t buf_size; /* Size of the encoded buffer */ @@ -1667,7 +1667,7 @@ test_h5s_check_encoding(hid_t in_fapl, hid_t in_sid, uint32_t expected_version, /* Verify if the two dataspace selections (in_sid, d_sid) are the same shape */ check = H5Sselect_shape_same(in_sid, d_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare the starting/ending coordinates of the bounding box for in_sid and d_sid */ ret = H5Sget_select_bounds(in_sid, in_low_bounds, in_high_bounds); @@ -1759,7 +1759,7 @@ test_h5s_encode_regular_hyper(H5F_libver_t low, H5F_libver_t high) /* Testing with each configuration */ for (config = CONFIG_16; config <= CONFIG_32; config++) { - hbool_t expected_to_fail = FALSE; + bool expected_to_fail = false; /* Testing with unlimited or not */ for (unlim = 0; unlim <= 1; unlim++) { @@ -1767,7 +1767,7 @@ test_h5s_encode_regular_hyper(H5F_libver_t low, H5F_libver_t high) count = unlim ? H5S_UNLIMITED : 2; if ((high <= H5F_LIBVER_V18) && (unlim || config == CONFIG_32)) - expected_to_fail = TRUE; + expected_to_fail = true; if (low >= H5F_LIBVER_V112) expected_version = 3; @@ -1952,7 +1952,7 @@ test_h5s_encode_irregular_hyper(H5F_libver_t low, H5F_libver_t high) /* Testing with each configuration */ for (config = CONFIG_8; config <= CONFIG_32; config++) { - hbool_t expected_to_fail = FALSE; /* Whether H5Sencode2 is expected to fail */ + bool expected_to_fail = false; /* Whether H5Sencode2 is expected to fail */ uint32_t expected_version = 0; /* Expected version for selection info */ uint32_t expected_enc_size = 0; /* Expected encoded size for selection info */ @@ -1963,7 +1963,7 @@ test_h5s_encode_irregular_hyper(H5F_libver_t low, H5F_libver_t high) /* H5Sencode2 is expected to fail for library v110 and below when the selection exceeds the 32 bits integer limit */ if (high <= H5F_LIBVER_V110 && config == CONFIG_32) - expected_to_fail = TRUE; + expected_to_fail = true; if (low >= H5F_LIBVER_V112 || config == CONFIG_32) expected_version = 3; @@ -2023,7 +2023,7 @@ test_h5s_encode_irregular_hyper(H5F_libver_t low, H5F_libver_t high) /* Should be irregular hyperslab */ is_regular = H5Sis_regular_hyperslab(sid); - VERIFY(is_regular, FALSE, "H5Sis_regular_hyperslab"); + VERIFY(is_regular, false, "H5Sis_regular_hyperslab"); /* Verify the version and encoded size expected for the configuration */ assert(expected_enc_size <= 255); @@ -2057,7 +2057,7 @@ test_h5s_encode_points(H5F_libver_t low, H5F_libver_t high) hsize_t vdsdims[1] = {total_particles}; /* Dimension size */ hsize_t coord[4]; /* The point coordinates */ herr_t ret; /* Generic return value */ - hbool_t expected_to_fail = FALSE; /* Expected to fail or not */ + bool expected_to_fail = false; /* Expected to fail or not */ uint32_t expected_version = 0; /* Expected version for selection info */ uint8_t expected_enc_size = 0; /* Expected encoded size of selection info */ @@ -2084,7 +2084,7 @@ test_h5s_encode_points(H5F_libver_t low, H5F_libver_t high) ret = H5Sselect_elements(sid, H5S_SELECT_SET, (size_t)4, coord); CHECK(ret, FAIL, "H5Sselect_elements"); - expected_to_fail = FALSE; + expected_to_fail = false; expected_enc_size = 4; expected_version = 1; @@ -2109,7 +2109,7 @@ test_h5s_encode_points(H5F_libver_t low, H5F_libver_t high) /* test 3 */ if (high <= H5F_LIBVER_V110) - expected_to_fail = TRUE; + expected_to_fail = true; if (high >= H5F_LIBVER_V112) { expected_version = 2; @@ -2677,423 +2677,423 @@ test_h5s_extent_equal(void) /* Compare null dataspace against all others, including itself */ ext_equal = H5Sextent_equal(null_space, null_space); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); ext_equal = H5Sextent_equal(null_space, scalar_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(null_space, d1_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(null_space, d1_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(null_space, d1_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(null_space, d1_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(null_space, d2_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(null_space, d2_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(null_space, d2_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(null_space, d2_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(null_space, d3_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(null_space, d3_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(null_space, d3_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(null_space, d3_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); /* Compare scalar dataspace against all others, including itself */ ext_equal = H5Sextent_equal(scalar_space, null_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(scalar_space, scalar_space); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); ext_equal = H5Sextent_equal(scalar_space, d1_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(scalar_space, d1_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(scalar_space, d1_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(scalar_space, d1_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(scalar_space, d2_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(scalar_space, d2_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(scalar_space, d2_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(scalar_space, d2_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(scalar_space, d3_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(scalar_space, d3_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(scalar_space, d3_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(scalar_space, d3_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); /* Compare small 1-D dataspace w/no max. dims against all others, including itself */ ext_equal = H5Sextent_equal(d1_space1, null_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space1, scalar_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space1, d1_space1); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space1, d1_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space1, d1_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space1, d1_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space1, d2_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space1, d2_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space1, d2_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space1, d2_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space1, d3_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space1, d3_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space1, d3_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space1, d3_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); /* Compare larger 1-D dataspace w/no max. dims against all others, including itself */ ext_equal = H5Sextent_equal(d1_space2, null_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space2, scalar_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space2, d1_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space2, d1_space2); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space2, d1_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space2, d1_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space2, d2_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space2, d2_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space2, d2_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space2, d2_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space2, d3_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space2, d3_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space2, d3_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space2, d3_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); /* Compare small 1-D dataspace w/fixed max. dims against all others, including itself */ ext_equal = H5Sextent_equal(d1_space3, null_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space3, scalar_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space3, d1_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space3, d1_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space3, d1_space3); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space3, d1_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space3, d2_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space3, d2_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space3, d2_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space3, d2_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space3, d3_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space3, d3_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space3, d3_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space3, d3_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); /* Compare small 1-D dataspace w/unlimited max. dims against all others, including itself */ ext_equal = H5Sextent_equal(d1_space4, null_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space4, scalar_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space4, d1_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space4, d1_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space4, d1_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space4, d1_space4); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space4, d2_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space4, d2_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space4, d2_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space4, d2_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space4, d3_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space4, d3_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space4, d3_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space4, d3_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); /* Compare small 2-D dataspace w/no max. dims against all others, including itself */ ext_equal = H5Sextent_equal(d2_space1, null_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space1, scalar_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space1, d1_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space1, d1_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space1, d1_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space1, d1_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space1, d2_space1); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space1, d2_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space1, d2_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space1, d2_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space1, d3_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space1, d3_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space1, d3_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space1, d3_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); /* Compare larger 2-D dataspace w/no max. dims against all others, including itself */ ext_equal = H5Sextent_equal(d2_space2, null_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space2, scalar_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space2, d1_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space2, d1_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space2, d1_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space2, d1_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space2, d2_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space2, d2_space2); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space2, d2_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space2, d2_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space2, d3_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space2, d3_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space2, d3_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space2, d3_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); /* Compare small 2-D dataspace w/fixed max. dims against all others, including itself */ ext_equal = H5Sextent_equal(d2_space3, null_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space3, scalar_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space3, d1_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space3, d1_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space3, d1_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space3, d1_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space3, d2_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space3, d2_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space3, d2_space3); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space3, d2_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space3, d3_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space3, d3_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space3, d3_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space3, d3_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); /* Compare small 2-D dataspace w/unlimited max. dims against all others, including itself */ ext_equal = H5Sextent_equal(d2_space4, null_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space4, scalar_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space4, d1_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space4, d1_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space4, d1_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space4, d1_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space4, d2_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space4, d2_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space4, d2_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space4, d2_space4); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space4, d3_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space4, d3_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space4, d3_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space4, d3_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); /* Compare small 3-D dataspace w/no max. dims against all others, including itself */ ext_equal = H5Sextent_equal(d3_space1, null_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space1, scalar_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space1, d1_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space1, d1_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space1, d1_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space1, d1_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space1, d2_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space1, d2_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space1, d2_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space1, d2_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space1, d3_space1); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space1, d3_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space1, d3_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space1, d3_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); /* Compare larger 2-D dataspace w/no max. dims against all others, including itself */ ext_equal = H5Sextent_equal(d3_space2, null_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space2, scalar_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space2, d1_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space2, d1_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space2, d1_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space2, d1_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space2, d2_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space2, d2_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space2, d2_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space2, d2_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space2, d3_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space2, d3_space2); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space2, d3_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space2, d3_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); /* Compare small 2-D dataspace w/fixed max. dims against all others, including itself */ ext_equal = H5Sextent_equal(d3_space3, null_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space3, scalar_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space3, d1_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space3, d1_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space3, d1_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space3, d1_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space3, d2_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space3, d2_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space3, d2_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space3, d2_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space3, d3_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space3, d3_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space3, d3_space3); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space3, d3_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); /* Compare small 2-D dataspace w/unlimited max. dims against all others, including itself */ ext_equal = H5Sextent_equal(d3_space4, null_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space4, scalar_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space4, d1_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space4, d1_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space4, d1_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space4, d1_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space4, d2_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space4, d2_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space4, d2_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space4, d2_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space4, d3_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space4, d3_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space4, d3_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space4, d3_space4); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); /* Close dataspaces */ ret = H5Sclose(null_space); @@ -3216,7 +3216,7 @@ test_h5s_extent_copy(void) /* Verify that the extents are equal */ ext_equal = H5Sextent_equal(tmp_space, spaces[j]); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); /* Verify that the correct number of elements is selected */ npoints_ret = H5Sget_select_npoints(tmp_space); @@ -3228,7 +3228,7 @@ test_h5s_extent_copy(void) /* Verify that the extents are equal */ ext_equal = H5Sextent_equal(tmp_space, spaces[i]); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); /* Verify that the correct number of elements is selected */ npoints_ret = H5Sget_select_npoints(tmp_space); @@ -3279,7 +3279,7 @@ test_h5s_bug1(void) /* Check that space1's selection is valid */ select_valid = H5Sselect_valid(space1); CHECK(select_valid, FAIL, "H5Sselect_valid"); - VERIFY(select_valid, TRUE, "H5Sselect_valid result"); + VERIFY(select_valid, true, "H5Sselect_valid result"); /* Close dataspaces */ ret = H5Sclose(space1); @@ -3327,7 +3327,7 @@ test_h5s_bug2(void) /* Check that space's selection is valid */ select_valid = H5Sselect_valid(space); CHECK(select_valid, FAIL, "H5Sselect_valid"); - VERIFY(select_valid, TRUE, "H5Sselect_valid result"); + VERIFY(select_valid, true, "H5Sselect_valid result"); /* Check that 4 elements are selected */ elements_selected = H5Sget_select_npoints(space); diff --git a/test/API/tid.c b/test/API/tid.c index b353a8a..649bacb 100644 --- a/test/API/tid.c +++ b/test/API/tid.c @@ -397,15 +397,15 @@ test_is_valid(void) /* Check that the ID is valid */ tri_ret = H5Iis_valid(dtype); - VERIFY(tri_ret, TRUE, "H5Iis_valid"); - if (tri_ret != TRUE) + VERIFY(tri_ret, true, "H5Iis_valid"); + if (tri_ret != true) goto out; #if 0 /* Cannot call internal APIs and cannot call public H5Inmembers on library types */ /* Artificially manipulate the reference counts so app_count is 0, and dtype * appears to be an internal id. This takes advantage of the fact that * H5Ipkg is included. */ - ret = H5I_inc_ref(dtype, FALSE); + ret = H5I_inc_ref(dtype, false); CHECK(ret, FAIL, "H5I_inc_ref"); if (ret < 0) goto out; @@ -416,8 +416,8 @@ test_is_valid(void) /* Check that dtype is invalid */ tri_ret = H5Iis_valid(dtype); - VERIFY(tri_ret, FALSE, "H5Iis_valid"); - if (tri_ret != FALSE) + VERIFY(tri_ret, false, "H5Iis_valid"); + if (tri_ret != false) goto out; /* Close dtype and verify that it has been closed */ @@ -436,14 +436,14 @@ test_is_valid(void) /* Check that dtype is invalid */ tri_ret = H5Iis_valid(dtype); - VERIFY(tri_ret, FALSE, "H5Iis_valid"); - if (tri_ret != FALSE) + VERIFY(tri_ret, false, "H5Iis_valid"); + if (tri_ret != false) goto out; #endif /* Check that an id of -1 is invalid */ tri_ret = H5Iis_valid((hid_t)-1); - VERIFY(tri_ret, FALSE, "H4Iis_valid"); - if (tri_ret != FALSE) + VERIFY(tri_ret, false, "H4Iis_valid"); + if (tri_ret != false) goto out; return 0; @@ -619,7 +619,7 @@ typedef struct rct_obj_t { /* Whether we are currently freeing this object directly * through H5Idec_ref(). */ - hbool_t freeing; + bool freeing; /* Pointer to the master list of all objects */ rct_obj_list_t *list; @@ -677,7 +677,7 @@ rct_free_cb(void *_obj, void H5_ATTR_UNUSED **_ctx) * not free another object. We don't want to recursively free the * entire list when we free the first ID. */ - obj->list->objects[i].freeing = TRUE; + obj->list->objects[i].freeing = true; /* Decrement the reference count on the object */ ret = H5Idec_ref(obj->list->objects[i].id); @@ -686,7 +686,7 @@ rct_free_cb(void *_obj, void H5_ATTR_UNUSED **_ctx) goto error; /* Unset the "freeing" flag */ - obj->list->objects[i].freeing = FALSE; + obj->list->objects[i].freeing = false; } /* Verify the number of objects remaining in the master list is non-negative */ @@ -751,7 +751,7 @@ test_remove_clear_type(void) /* Object setup */ objects[j].nfrees = 0; - objects[j].freeing = FALSE; + objects[j].freeing = false; objects[j].list = &obj_list; /* Register an ID for it */ @@ -770,13 +770,13 @@ test_remove_clear_type(void) } /****************************************** - * Clear the type with force set to FALSE * + * Clear the type with force set to false * ******************************************/ - /* Clear the type. Since force is FALSE, only + /* Clear the type. Since force is false, only * IDs with a reference count of 1 will be cleared. */ - ret = H5Iclear_type(obj_type, FALSE); + ret = H5Iclear_type(obj_type, false); CHECK(ret, FAIL, "H5Iclear_type"); if (ret == FAIL) goto error; @@ -799,8 +799,8 @@ test_remove_clear_type(void) } /* No object should still be marked as "freeing" */ - VERIFY(objects[j].freeing, FALSE, "object marked as freeing"); - if (objects[j].freeing != FALSE) + VERIFY(objects[j].freeing, false, "object marked as freeing"); + if (objects[j].freeing != false) goto error; } @@ -821,11 +821,11 @@ test_remove_clear_type(void) goto error; /***************************************** - * Clear the type with force set to TRUE * + * Clear the type with force set to true * *****************************************/ - /* Clear the type. Since force is TRUE, all IDs will be cleared. */ - ret = H5Iclear_type(obj_type, TRUE); + /* Clear the type. Since force is true, all IDs will be cleared. */ + ret = H5Iclear_type(obj_type, true); CHECK(ret, FAIL, "H5Iclear_type"); if (ret == FAIL) goto error; @@ -839,8 +839,8 @@ test_remove_clear_type(void) goto error; /* No object should still be marked as "freeing" */ - VERIFY(objects[j].freeing, FALSE, "object marked as freeing"); - if (objects[j].freeing != FALSE) + VERIFY(objects[j].freeing, false, "object marked as freeing"); + if (objects[j].freeing != false) goto error; } @@ -1357,7 +1357,7 @@ test_future_ids(void) CHECK(ret, FAIL, "H5Pisa_class"); if (FAIL == ret) goto error; - if (TRUE != ret) + if (true != ret) goto error; /* Verify that the application believes the ID is still a property list */ diff --git a/test/API/titerate.c b/test/API/titerate.c index 23b65fc..741d45a 100644 --- a/test/API/titerate.c +++ b/test/API/titerate.c @@ -52,8 +52,8 @@ typedef struct { #define CORRUPTED_ATNAMELEN_FILE "memleak_H5O_dtype_decode_helper_H5Odtype.h5" #define DSET_NAME "image" typedef struct searched_err_t { - char message[256]; - hbool_t found; + char message[256]; + bool found; } searched_err_t; #if 0 /* Call back function for test_corrupted_attnamelen */ @@ -126,7 +126,7 @@ liter_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info2_t H5_ATTR ** ****************************************************************/ static void -test_iter_group(hid_t fapl, hbool_t new_format) +test_iter_group(hid_t fapl, bool new_format) { hid_t file; /* File ID */ hid_t dataset; /* Dataset ID */ @@ -426,7 +426,7 @@ aiter_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5A_info_t H5_ATTR_ ** ****************************************************************/ static void -test_iter_attr(hid_t fapl, hbool_t new_format) +test_iter_attr(hid_t fapl, bool new_format) { hid_t file; /* File ID */ hid_t dataset; /* Common Dataset ID */ @@ -1031,7 +1031,7 @@ find_err_msg_cb(unsigned H5_ATTR_UNUSED n, const H5E_error2_t *err_desc, void *_ /* If the searched error message is found, stop the iteration */ if (err_desc->desc != NULL && HDstrcmp(err_desc->desc, searched_err->message) == 0) { - searched_err->found = TRUE; + searched_err->found = true; status = H5_ITER_STOP; } @@ -1055,7 +1055,7 @@ test_corrupted_attnamelen(void) searched_err_t err_caught; /* Data to be passed to callback func */ int err_status; /* Status returned by H5Aiterate2 */ herr_t ret; /* Return value */ - hbool_t driver_is_default_compatible; + bool driver_is_default_compatible; const char *testfile = H5_get_srcdir_filename(CORRUPTED_ATNAMELEN_FILE); /* Corrected test file name */ const char *err_message = "attribute name has different length than stored length"; @@ -1088,14 +1088,14 @@ test_corrupted_attnamelen(void) if (err_status == -1) { /* Initialize client data */ HDstrcpy(err_caught.message, err_message); - err_caught.found = FALSE; + err_caught.found = false; /* Look for the correct error message */ ret = H5Ewalk2(H5E_DEFAULT, H5E_WALK_UPWARD, find_err_msg_cb, &err_caught); CHECK(ret, FAIL, "H5Ewalk2"); /* Fail if the indicated message is not found */ - CHECK(err_caught.found, FALSE, "test_corrupted_attnamelen: Expected error not found"); + CHECK(err_caught.found, false, "test_corrupted_attnamelen: Expected error not found"); } /* Close the dataset and file */ @@ -1222,7 +1222,7 @@ test_iterate(void) CHECK(ret, FAIL, "H5Pset_libver_bounds"); /* These next tests use the same file */ - for (new_format = FALSE; new_format <= TRUE; new_format++) { + for (new_format = false; new_format <= true; new_format++) { test_iter_group(new_format ? fapl2 : fapl, new_format); /* Test group iteration */ test_iter_group_large(new_format ? fapl2 : fapl); /* Test group iteration for large # of objects */ test_iter_attr(new_format ? fapl2 : fapl, new_format); /* Test attribute iteration */ diff --git a/test/API/tmisc.c b/test/API/tmisc.c index 791d22b..6a061e3 100644 --- a/test/API/tmisc.c +++ b/test/API/tmisc.c @@ -1848,7 +1848,7 @@ test_misc10(void) hid_t dcpl; /* Dataset creation property list */ hid_t space, type; /* Old dataset's dataspace & datatype */ const char *testfile = H5_get_srcdir_filename(MISC10_FILE_OLD); /* Corrected test file name */ - hbool_t driver_is_default_compatible; + bool driver_is_default_compatible; herr_t ret; /* Output message about test being performed */ @@ -1934,7 +1934,7 @@ test_misc11(void) #endif H5F_fspace_strategy_t strategy; /* File space strategy */ hsize_t threshold; /* Free-space section threshold */ - hbool_t persist; /* To persist free-space or not */ + bool persist; /* To persist free-space or not */ herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -1995,7 +1995,7 @@ test_misc11(void) ret = H5Pset_shared_mesg_nindexes(fcpl, MISC11_NINDEXES); CHECK(ret, FAIL, "H5Pset_shared_mesg"); - ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_NONE, FALSE, (hsize_t)1); + ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_NONE, false, (hsize_t)1); CHECK(ret, FAIL, "H5Pset_file_space"); /* Creating a file with the non-default file creation property list should @@ -2062,7 +2062,7 @@ test_misc11(void) ret = H5Pget_file_space_strategy(fcpl, &strategy, &persist, &threshold); CHECK(ret, FAIL, "H5Pget_file_space_strategy"); VERIFY(strategy, 3, "H5Pget_file_space_strategy"); - VERIFY(persist, FALSE, "H5Pget_file_space_strategy"); + VERIFY(persist, false, "H5Pget_file_space_strategy"); VERIFY(threshold, 1, "H5Pget_file_space_strategy"); /* Close file */ @@ -2208,16 +2208,16 @@ misc13_init_data(unsigned *original_data) original_data[u] = u; } -static hbool_t +static bool misc13_verify_data_match(const unsigned *original_data, const unsigned *read_data) { unsigned u; for (u = 0; u < MISC13_DIM1; u++) if (original_data[u] != read_data[u]) - return FALSE; + return false; - return TRUE; + return true; } static void @@ -2432,7 +2432,7 @@ misc13_insert_user_block(const char *old_name, const char *new_name, const char static void misc13_verify_file(const char *name, const unsigned *data, hsize_t userblock_size, - hbool_t check_for_new_dataset) + bool check_for_new_dataset) { hid_t fid = -1; /* File ID */ hid_t gid1 = -1; /* Group IDs */ @@ -2476,7 +2476,7 @@ misc13_verify_file(const char *name, const unsigned *data, hsize_t userblock_siz CHECK(tid, FAIL, "H5Topen2"); /* Verify the type is correct */ - VERIFY(H5Tequal(tid, H5T_NATIVE_INT), TRUE, "H5Tequal"); + VERIFY(H5Tequal(tid, H5T_NATIVE_INT), true, "H5Tequal"); /* Close named datatype */ ret = H5Tclose(tid); @@ -2497,7 +2497,7 @@ misc13_verify_file(const char *name, const unsigned *data, hsize_t userblock_siz CHECK(tid, FAIL, "H5Topen2"); /* Verify the type is correct */ - VERIFY(H5Tequal(tid, H5T_NATIVE_INT), TRUE, "H5Tequal"); + VERIFY(H5Tequal(tid, H5T_NATIVE_INT), true, "H5Tequal"); /* Close named datatype */ ret = H5Tclose(tid); @@ -2551,7 +2551,7 @@ test_misc13(void) { unsigned *data = NULL; /* Data to write to dataset */ hsize_t userblock_size; /* Correct size of userblock */ - hbool_t check_for_new_dataset; /* Whether to check for the post-userblock-creation dataset */ + bool check_for_new_dataset; /* Whether to check for the post-userblock-creation dataset */ /* Create a data buffer for the datasets */ data = (unsigned *)calloc(MISC13_DIM1, sizeof(unsigned)); @@ -2565,7 +2565,7 @@ test_misc13(void) /* Verify file contents are correct */ userblock_size = 0; - check_for_new_dataset = FALSE; + check_for_new_dataset = false; misc13_verify_file(MISC13_FILE_1, data, userblock_size, check_for_new_dataset); /* Create a new file by inserting a user block in front of the first file */ @@ -2573,7 +2573,7 @@ test_misc13(void) /* Verify file contents are still correct */ userblock_size = MISC13_USERBLOCK_SIZE; - check_for_new_dataset = FALSE; + check_for_new_dataset = false; misc13_verify_file(MISC13_FILE_2, data, userblock_size, check_for_new_dataset); /* Make certain we can modify the new file */ @@ -2581,7 +2581,7 @@ test_misc13(void) /* Verify file contents are still correct */ userblock_size = MISC13_USERBLOCK_SIZE; - check_for_new_dataset = TRUE; + check_for_new_dataset = true; misc13_verify_file(MISC13_FILE_2, data, userblock_size, check_for_new_dataset); /* Free the dataset buffer */ @@ -3777,7 +3777,7 @@ test_misc20(void) unsigned version; /* Version of storage layout info */ hsize_t contig_size; /* Size of contiguous storage size from layout into */ const char *testfile = H5_get_srcdir_filename(MISC20_FILE_OLD); /* Corrected test file name */ - hbool_t driver_is_default_compatible; + bool driver_is_default_compatible; herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -4255,7 +4255,7 @@ test_misc23(void) CHECK(create_id, FAIL, "H5Pcreate"); /* Set flag for intermediate group creation */ - status = H5Pset_create_intermediate_group(create_id, TRUE); + status = H5Pset_create_intermediate_group(create_id, true); CHECK(status, FAIL, "H5Pset_create_intermediate_group"); tmp_id = H5Gcreate2(file_id, "/A/B01/grp", create_id, H5P_DEFAULT, access_id); @@ -4316,7 +4316,7 @@ test_misc23(void) CHECK(create_id, FAIL, "H5Pcreate"); /* Set flag for intermediate group creation */ - status = H5Pset_create_intermediate_group(create_id, TRUE); + status = H5Pset_create_intermediate_group(create_id, true); CHECK(status, FAIL, "H5Pset_create_intermediate_group"); tmp_id = H5Dcreate2(file_id, "/A/B06/dset", type_id, space_id, create_id, H5P_DEFAULT, H5P_DEFAULT); @@ -4367,7 +4367,7 @@ test_misc23(void) CHECK(create_id, FAIL, "H5Pcreate"); /* Set flag for intermediate group creation */ - status = H5Pset_create_intermediate_group(create_id, TRUE); + status = H5Pset_create_intermediate_group(create_id, true); CHECK(status, FAIL, "H5Pset_create_intermediate_group"); tmp_id = H5Tcopy(H5T_NATIVE_INT16); @@ -4427,17 +4427,17 @@ test_misc23(void) CHECK(create_id, FAIL, "H5Pcreate"); /* Set flag for intermediate group creation */ - status = H5Pset_create_intermediate_group(create_id, TRUE); + status = H5Pset_create_intermediate_group(create_id, true); CHECK(status, FAIL, "H5Pset_create_intermediate_group"); status = H5Lcopy(file_id, "/A/B01/grp", file_id, "/A/B16/grp", create_id, access_id); CHECK(status, FAIL, "H5Lcopy"); tri_status = H5Lexists(file_id, "/A/B16/grp", access_id); - VERIFY(tri_status, TRUE, "H5Lexists"); + VERIFY(tri_status, true, "H5Lexists"); tri_status = H5Lexists(file_id, "/A/B01/grp", access_id); - VERIFY(tri_status, TRUE, "H5Lexists"); + VERIFY(tri_status, true, "H5Lexists"); /********************************************************************** * test H5Lmove() @@ -4447,10 +4447,10 @@ test_misc23(void) CHECK(status, FAIL, "H5Lmove"); tri_status = H5Lexists(file_id, "/A/B17/grp", access_id); - VERIFY(tri_status, TRUE, "H5Lexists"); + VERIFY(tri_status, true, "H5Lexists"); tri_status = H5Lexists(file_id, "/A/B16/grp", access_id); - VERIFY(tri_status, FALSE, "H5Lexists"); + VERIFY(tri_status, false, "H5Lexists"); /********************************************************************** * test H5Lcreate_hard() @@ -4460,7 +4460,7 @@ test_misc23(void) CHECK(status, FAIL, "H5Lcreate_hard"); tri_status = H5Lexists(file_id, "/A/B18/grp", access_id); - VERIFY(tri_status, TRUE, "H5Lexists"); + VERIFY(tri_status, true, "H5Lexists"); /********************************************************************** * test H5Lcreate_soft() @@ -4470,7 +4470,7 @@ test_misc23(void) CHECK(status, FAIL, "H5Lcreate_soft"); tri_status = H5Lexists(file_id, "/A/B19/grp", access_id); - VERIFY(tri_status, TRUE, "H5Lexists"); + VERIFY(tri_status, true, "H5Lexists"); /********************************************************************** * test H5Lcreate_external() @@ -4482,7 +4482,7 @@ test_misc23(void) CHECK(status, FAIL, "H5Lcreate_external"); tri_status = H5Lexists(file_id, "/A/B20/grp", access_id); - VERIFY(tri_status, TRUE, "H5Lexists"); + VERIFY(tri_status, true, "H5Lexists"); } /********************************************************************** @@ -4495,7 +4495,7 @@ test_misc23(void) CHECK(status, FAIL, "H5Lcreate_ud"); tri_status = H5Lexists(file_id, "/A/B21/grp", access_id); - VERIFY(tri_status, TRUE, "H5Lexists"); + VERIFY(tri_status, true, "H5Lexists"); } /********************************************************************** @@ -5084,7 +5084,7 @@ test_misc25b(void) hid_t fid; /* File ID */ hid_t gid; /* Group ID */ const char *testfile = H5_get_srcdir_filename(MISC25B_FILE); /* Corrected test file name */ - hbool_t driver_is_default_compatible; + bool driver_is_default_compatible; herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -5347,7 +5347,7 @@ test_misc27(void) hid_t fid; /* File ID */ hid_t gid; /* Group ID */ const char *testfile = H5_get_srcdir_filename(MISC27_FILE); /* Corrected test file name */ - hbool_t driver_is_default_compatible; + bool driver_is_default_compatible; herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -5574,7 +5574,7 @@ test_misc28(void) static void test_misc29(void) { - hbool_t driver_is_default_compatible; + bool driver_is_default_compatible; hid_t fid; /* File ID */ herr_t ret; /* Generic return value */ @@ -5641,7 +5641,7 @@ test_misc30(void) /* Output message about test being performed */ MESSAGE(5, ("Local heap dropping free block info\n")); - for (get_info = FALSE; get_info <= TRUE; get_info++) { + for (get_info = false; get_info <= true; get_info++) { hid_t fid; /* File ID */ hid_t gid; /* Group ID */ int i; /* Local index counter */ @@ -5824,15 +5824,15 @@ test_misc32(void) /* Size zero returns NULL. * Also checks that a size of zero and setting the buffer clear flag - * to TRUE can be used together. + * to true can be used together. * * Note that we have asserts in the code, so only check when NDEBUG * is defined. */ #ifdef NDEBUG - buffer = H5allocate_memory(0, FALSE); + buffer = H5allocate_memory(0, false); CHECK_PTR_NULL(buffer, "H5allocate_memory"); /*BAD*/ - buffer = H5allocate_memory(0, TRUE); + buffer = H5allocate_memory(0, true); CHECK_PTR_NULL(buffer, "H5allocate_memory"); /*BAD*/ #endif /* NDEBUG */ @@ -5840,7 +5840,7 @@ test_misc32(void) /* Size zero returns NULL. Valgrind will confirm buffer is freed. */ size = 1024; - buffer = H5allocate_memory(size, TRUE); + buffer = H5allocate_memory(size, true); resized = H5resize_memory(buffer, 0); CHECK_PTR_NULL(resized, "H5resize_memory"); @@ -5874,7 +5874,7 @@ test_misc33(void) hid_t fid = -1; /* File ID */ const char *testfile = H5_get_srcdir_filename(MISC33_FILE); /* Corrected test file name */ H5O_info2_t oinfo; /* Structure for object metadata information */ - hbool_t driver_is_default_compatible; + bool driver_is_default_compatible; herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -6057,15 +6057,15 @@ static int test_misc36_context; static void test_misc36_cb1(void *_ctx) { - int *ctx = (int *)_ctx; /* Set up context pointer */ - hbool_t is_terminating; /* Flag indicating the library is terminating */ - herr_t ret; /* Return value */ + int *ctx = (int *)_ctx; /* Set up context pointer */ + bool is_terminating; /* Flag indicating the library is terminating */ + herr_t ret; /* Return value */ /* Check whether the library thinks it's terminating */ - is_terminating = FALSE; + is_terminating = false; ret = H5is_library_terminating(&is_terminating); CHECK(ret, FAIL, "H5is_library_terminating"); - VERIFY(is_terminating, TRUE, "H5is_library_terminating"); + VERIFY(is_terminating, true, "H5is_library_terminating"); /* Verify correct ordering for 'atclose' callbacks */ if (0 != *ctx) @@ -6078,15 +6078,15 @@ test_misc36_cb1(void *_ctx) static void test_misc36_cb2(void *_ctx) { - int *ctx = (int *)_ctx; /* Set up context pointer */ - hbool_t is_terminating; /* Flag indicating the library is terminating */ - herr_t ret; /* Return value */ + int *ctx = (int *)_ctx; /* Set up context pointer */ + bool is_terminating; /* Flag indicating the library is terminating */ + herr_t ret; /* Return value */ /* Check whether the library thinks it's terminating */ - is_terminating = FALSE; + is_terminating = false; ret = H5is_library_terminating(&is_terminating); CHECK(ret, FAIL, "H5is_library_terminating"); - VERIFY(is_terminating, TRUE, "H5is_library_terminating"); + VERIFY(is_terminating, true, "H5is_library_terminating"); /* Verify correct ordering for 'atclose' callbacks */ if (1 != *ctx) @@ -6104,27 +6104,27 @@ test_misc36_cb2(void *_ctx) static void test_misc36(void) { - hbool_t is_terminating; /* Flag indicating the library is terminating */ - herr_t ret; /* Return value */ + bool is_terminating; /* Flag indicating the library is terminating */ + herr_t ret; /* Return value */ /* Output message about test being performed */ MESSAGE(5, ("H5atclose and H5is_library_terminating API calls")); /* Check whether the library thinks it's terminating */ - is_terminating = TRUE; + is_terminating = true; ret = H5is_library_terminating(&is_terminating); CHECK(ret, FAIL, "H5is_library_terminating"); - VERIFY(is_terminating, FALSE, "H5is_library_terminating"); + VERIFY(is_terminating, false, "H5is_library_terminating"); /* Shut the library down */ test_misc36_context = 0; H5close(); /* Check whether the library thinks it's terminating */ - is_terminating = TRUE; + is_terminating = true; ret = H5is_library_terminating(&is_terminating); CHECK(ret, FAIL, "H5is_library_terminating"); - VERIFY(is_terminating, FALSE, "H5is_library_terminating"); + VERIFY(is_terminating, false, "H5is_library_terminating"); /* Check the close context was not changed */ VERIFY(test_misc36_context, 0, "H5atclose"); @@ -6133,10 +6133,10 @@ test_misc36(void) H5open(); /* Check whether the library thinks it's terminating */ - is_terminating = TRUE; + is_terminating = true; ret = H5is_library_terminating(&is_terminating); CHECK(ret, FAIL, "H5is_library_terminating"); - VERIFY(is_terminating, FALSE, "H5is_library_terminating"); + VERIFY(is_terminating, false, "H5is_library_terminating"); /* Register the 'atclose' callbacks */ /* (Note that these will be called in reverse order, which is checked) */ @@ -6176,7 +6176,7 @@ static void test_misc37(void) { const char *testfile = H5_get_srcdir_filename(CVE_2020_10812_FILENAME); - hbool_t driver_is_default_compatible; + bool driver_is_default_compatible; hid_t fid; herr_t ret; @@ -6214,7 +6214,7 @@ test_misc37(void) void test_misc(void) { - hbool_t default_driver = h5_using_default_driver(NULL); + bool default_driver = h5_using_default_driver(NULL); /* Output message about test being performed */ MESSAGE(5, ("Testing Miscellaneous Routines\n")); diff --git a/test/API/trefer.c b/test/API/trefer.c index 6e194d2..b216161 100644 --- a/test/API/trefer.c +++ b/test/API/trefer.c @@ -1307,7 +1307,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) H5E_END_TRY if (dset1 < 0) { - VERIFY(libver_high <= H5F_LIBVER_V110, TRUE, "H5Dcreate2"); + VERIFY(libver_high <= H5F_LIBVER_V110, true, "H5Dcreate2"); ret = H5Sclose(sid1); CHECK(ret, FAIL, "H5Sclose"); @@ -1605,7 +1605,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) VERIFY(hssize_ret, (hssize_t)H5S_UNLIMITED, "H5Sget_select_npoints"); tri_ret = H5Sis_regular_hyperslab(sid2); CHECK(tri_ret, FAIL, "H5Sis_regular_hyperslab"); - VERIFY(tri_ret, TRUE, "H5Sis_regular_hyperslab Result"); + VERIFY(tri_ret, true, "H5Sis_regular_hyperslab Result"); ret = H5Sget_regular_hyperslab(sid2, start, stride, count, block); CHECK(ret, FAIL, "H5Sget_regular_hyperslab"); VERIFY(start[0], (hsize_t)1, "Hyperslab Coordinates"); @@ -1764,7 +1764,7 @@ test_reference_region_1D(H5F_libver_t libver_low, H5F_libver_t libver_high) if (dset1 < 0) { - VERIFY(libver_high <= H5F_LIBVER_V110, TRUE, "H5Dcreate2"); + VERIFY(libver_high <= H5F_LIBVER_V110, true, "H5Dcreate2"); ret = H5Sclose(sid1); CHECK(ret, FAIL, "H5Sclose"); diff --git a/test/API/tselect.c b/test/API/tselect.c index 49215c2..a246661 100644 --- a/test/API/tselect.c +++ b/test/API/tselect.c @@ -1884,13 +1884,13 @@ verify_select_hyper_contig_dr__run_test(const uint16_t *cube_buf, size_t cube_si uint16_t expected_value; /* Expected value in dataset */ unsigned i, j, k, l, m; /* Local index variables */ size_t s; /* Local index variable */ - hbool_t mis_match; /* Flag to indicate mismatch in expected value */ + bool mis_match; /* Flag to indicate mismatch in expected value */ assert(cube_buf); assert(cube_size > 0); expected_value = 0; - mis_match = FALSE; + mis_match = false; cube_ptr = cube_buf; s = 0; i = 0; @@ -1908,7 +1908,7 @@ verify_select_hyper_contig_dr__run_test(const uint16_t *cube_buf, size_t cube_si /* Check for correct value */ if (*cube_ptr != expected_value) - mis_match = TRUE; + mis_match = true; /* Advance to next element */ cube_ptr++; @@ -1944,7 +1944,7 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co unsigned edge_size, unsigned chunk_edge_size, unsigned small_rank, unsigned large_rank, hid_t dset_type, hid_t xfer_plist) { - hbool_t mis_match; /* Flag indicating a value read in wasn't what was expected */ + bool mis_match; /* Flag indicating a value read in wasn't what was expected */ hid_t fapl; /* File access property list */ hid_t fid1; /* File ID */ hid_t small_cube_sid; /* Dataspace ID for small cube in memory & file */ @@ -2015,7 +2015,7 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co CHECK(fapl, FAIL, "H5Pcreate"); /* Use the 'core' VFD for this test */ - ret = H5Pset_fapl_core(fapl, (size_t)(1024 * 1024), FALSE); + ret = H5Pset_fapl_core(fapl, (size_t)(1024 * 1024), false); CHECK(ret, FAIL, "H5Pset_fapl_core"); /* Create file */ @@ -2162,7 +2162,7 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co * selections as having the same shape. */ check = H5Sselect_shape_same(small_cube_sid, file_large_cube_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Read selection from disk */ ret = H5Dread(large_cube_dataset, H5T_NATIVE_UINT16, small_cube_sid, file_large_cube_sid, @@ -2170,14 +2170,14 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co CHECK(ret, FAIL, "H5Dread"); /* verify that expected data is retrieved */ - mis_match = FALSE; + mis_match = false; ptr_1 = small_cube_buf_1; expected_value = (uint16_t)((u * edge_size * edge_size * edge_size * edge_size) + (v * edge_size * edge_size * edge_size) + (w * edge_size * edge_size) + (x * edge_size)); for (s = 0; s < small_cube_size; s++) { if (*ptr_1 != expected_value) - mis_match = TRUE; + mis_match = true; ptr_1++; expected_value++; } /* end for */ @@ -2227,7 +2227,7 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co * selections as having the same shape. */ check = H5Sselect_shape_same(small_cube_sid, mem_large_cube_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Read selection from disk */ ret = H5Dread(small_cube_dataset, H5T_NATIVE_UINT16, mem_large_cube_sid, small_cube_sid, @@ -2245,23 +2245,23 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co assert(start_index < stop_index); assert(stop_index <= large_cube_size); - mis_match = FALSE; + mis_match = false; ptr_1 = large_cube_buf_1; expected_value = 0; for (s = 0; s < start_index; s++) { if (*ptr_1 != 0) - mis_match = TRUE; + mis_match = true; ptr_1++; } /* end for */ for (; s <= stop_index; s++) { if (*ptr_1 != expected_value) - mis_match = TRUE; + mis_match = true; expected_value++; ptr_1++; } /* end for */ for (; s < large_cube_size; s++) { if (*ptr_1 != 0) - mis_match = TRUE; + mis_match = true; ptr_1++; } /* end for */ if (mis_match) @@ -2326,7 +2326,7 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co * on disk full small cube selections as having the same shape. */ check = H5Sselect_shape_same(small_cube_sid, mem_large_cube_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* write the slice from the in memory large cube to the on disk small cube */ ret = H5Dwrite(small_cube_dataset, H5T_NATIVE_UINT16, mem_large_cube_sid, small_cube_sid, @@ -2339,14 +2339,14 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co CHECK(ret, FAIL, "H5Dread"); /* verify that expected data is retrieved */ - mis_match = FALSE; + mis_match = false; ptr_1 = small_cube_buf_1; expected_value = (uint16_t)((u * edge_size * edge_size * edge_size * edge_size) + (v * edge_size * edge_size * edge_size) + (w * edge_size * edge_size) + (x * edge_size)); for (s = 0; s < small_cube_size; s++) { if (*ptr_1 != expected_value) - mis_match = TRUE; + mis_match = true; expected_value++; ptr_1++; } /* end for */ @@ -2413,7 +2413,7 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co * as having the same shape. */ check = H5Sselect_shape_same(small_cube_sid, file_large_cube_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* write the cube from memory to the target slice of the disk cube */ ret = H5Dwrite(large_cube_dataset, H5T_NATIVE_UINT16, small_cube_sid, file_large_cube_sid, @@ -2439,23 +2439,23 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co assert(start_index < stop_index); assert(stop_index <= large_cube_size); - mis_match = FALSE; + mis_match = false; ptr_1 = large_cube_buf_1; expected_value = 0; for (s = 0; s < start_index; s++) { if (*ptr_1 != 0) - mis_match = TRUE; + mis_match = true; ptr_1++; } /* end for */ for (; s <= stop_index; s++) { if (*ptr_1 != expected_value) - mis_match = TRUE; + mis_match = true; expected_value++; ptr_1++; } /* end for */ for (; s < large_cube_size; s++) { if (*ptr_1 != 0) - mis_match = TRUE; + mis_match = true; ptr_1++; } /* end for */ if (mis_match) @@ -2590,7 +2590,7 @@ test_select_hyper_checker_board_dr__select_checker_board(hid_t tgt_n_cube_sid, u unsigned edge_size, unsigned checker_edge_size, unsigned sel_rank, const hsize_t sel_start[]) { - hbool_t first_selection = TRUE; + bool first_selection = true; unsigned n_cube_offset; unsigned sel_offset; hsize_t base_count; @@ -2725,7 +2725,7 @@ test_select_hyper_checker_board_dr__select_checker_board(hid_t tgt_n_cube_sid, u if (((i + j + k + l + m) % 2) == 0) { if (first_selection) { - first_selection = FALSE; + first_selection = false; ret = H5Sselect_hyperslab(tgt_n_cube_sid, H5S_SELECT_SET, &(start[n_cube_offset]), &(stride[n_cube_offset]), @@ -2775,7 +2775,7 @@ test_select_hyper_checker_board_dr__select_checker_board(hid_t tgt_n_cube_sid, u ** test_select_hyper_checker_board_dr__verify_data(): ** ** Examine the supplied buffer to see if it contains the -** expected data. Return TRUE if it does, and FALSE +** expected data. Return true if it does, and false ** otherwise. ** ** The supplied buffer is presumed to contain the results @@ -2813,14 +2813,14 @@ test_select_hyper_checker_board_dr__select_checker_board(hid_t tgt_n_cube_sid, u ** ****************************************************************/ #if 0 -H5_ATTR_PURE static hbool_t +H5_ATTR_PURE static bool test_select_hyper_checker_board_dr__verify_data(uint16_t *buf_ptr, unsigned rank, unsigned edge_size, unsigned checker_edge_size, uint16_t first_expected_val, - hbool_t buf_starts_in_checker) + bool buf_starts_in_checker) { - hbool_t good_data = TRUE; - hbool_t in_checker; - hbool_t start_in_checker[5]; + bool good_data = true; + bool in_checker; + bool start_in_checker[5]; uint16_t expected_value; uint16_t *val_ptr; unsigned i, j, k, l, m; /* to track position in n-cube */ @@ -2885,11 +2885,11 @@ test_select_hyper_checker_board_dr__verify_data(uint16_t *buf_ptr, unsigned rank if (in_checker) { if (*val_ptr != expected_value) - good_data = FALSE; + good_data = false; } /* end if */ else { if (*val_ptr != 0) - good_data = FALSE; + good_data = false; } /* end else */ val_ptr++; @@ -2931,7 +2931,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ unsigned chunk_edge_size, unsigned small_rank, unsigned large_rank, hid_t dset_type, hid_t xfer_plist) { - hbool_t data_ok; + bool data_ok; hid_t fapl; /* File access property list */ hid_t fid; /* HDF5 File IDs */ hid_t full_small_cube_sid; /* Dataspace for small cube w/all selection */ @@ -3006,7 +3006,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ CHECK(fapl, FAIL, "H5Pcreate"); /* Use the 'core' VFD for this test */ - ret = H5Pset_fapl_core(fapl, (size_t)(1024 * 1024), FALSE); + ret = H5Pset_fapl_core(fapl, (size_t)(1024 * 1024), false); CHECK(ret, FAIL, "H5Pset_fapl_core"); /* Create file */ @@ -3173,7 +3173,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ * selections as having the same shape. */ check = H5Sselect_shape_same(mem_small_cube_sid, file_large_cube_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* zero the buffer that we will be using for reading */ memset(small_cube_buf_1, 0, sizeof(*small_cube_buf_1) * small_cube_size); @@ -3189,7 +3189,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ data_ok = test_select_hyper_checker_board_dr__verify_data(small_cube_buf_1, small_rank, edge_size, checker_edge_size, - expected_value, (hbool_t)TRUE); + expected_value, (bool)true); if (!data_ok) TestErrPrintf("small cube read from largecube has bad data! Line=%d\n", __LINE__); @@ -3253,7 +3253,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ * selections as having the same shape. */ check = H5Sselect_shape_same(file_small_cube_sid, mem_large_cube_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* zero out the in memory large cube */ memset(large_cube_buf_1, 0, sizeof(*large_cube_buf_1) * large_cube_size); @@ -3266,7 +3266,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ /* verify that the expected data and only the * expected data was read. */ - data_ok = TRUE; + data_ok = true; ptr_1 = large_cube_buf_1; expected_value = 0; start_index = (u * edge_size * edge_size * edge_size * edge_size) + @@ -3280,13 +3280,13 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ /* verify that the large cube contains only zeros before the slice */ for (s = 0; s < start_index; s++) { if (*ptr_1 != 0) - data_ok = FALSE; + data_ok = false; ptr_1++; } /* end for */ assert(s == start_index); data_ok &= test_select_hyper_checker_board_dr__verify_data( - ptr_1, small_rank, edge_size, checker_edge_size, (uint16_t)0, (hbool_t)TRUE); + ptr_1, small_rank, edge_size, checker_edge_size, (uint16_t)0, (bool)true); ptr_1 += small_cube_size; s += small_cube_size; @@ -3296,7 +3296,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ /* verify that the large cube contains only zeros after the slice */ for (s = stop_index + 1; s < large_cube_size; s++) { if (*ptr_1 != 0) - data_ok = FALSE; + data_ok = false; ptr_1++; } /* end for */ if (!data_ok) @@ -3373,7 +3373,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ * selections as having the same shape. */ check = H5Sselect_shape_same(file_small_cube_sid, mem_large_cube_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* write the slice from the in memory large cube to the * on disk small cube @@ -3396,7 +3396,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ data_ok = test_select_hyper_checker_board_dr__verify_data(small_cube_buf_1, small_rank, edge_size, checker_edge_size, - expected_value, (hbool_t)TRUE); + expected_value, (bool)true); if (!data_ok) TestErrPrintf("small cube read from largecube has bad data! Line=%d\n", __LINE__); @@ -3468,7 +3468,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ * selections as having the same shape. */ check = H5Sselect_shape_same(file_large_cube_sid, mem_small_cube_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* write the checker board selection of the in memory * small cube to a slice through the on disk large @@ -3490,7 +3490,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ * expected data was written to the on disk large * cube. */ - data_ok = TRUE; + data_ok = true; ptr_1 = large_cube_buf_1; expected_value = 0; start_index = (u * edge_size * edge_size * edge_size * edge_size) + @@ -3504,14 +3504,14 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ /* verify that the large cube contains only zeros before the slice */ for (s = 0; s < start_index; s++) { if (*ptr_1 != 0) - data_ok = FALSE; + data_ok = false; ptr_1++; } /* end for */ assert(s == start_index); /* verify that the slice contains the expected data */ data_ok &= test_select_hyper_checker_board_dr__verify_data( - ptr_1, small_rank, edge_size, checker_edge_size, (uint16_t)0, (hbool_t)TRUE); + ptr_1, small_rank, edge_size, checker_edge_size, (uint16_t)0, (bool)true); ptr_1 += small_cube_size; s += small_cube_size; @@ -3521,7 +3521,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ /* verify that the large cube contains only zeros after the slice */ for (s = stop_index + 1; s < large_cube_size; s++) { if (*ptr_1 != 0) - data_ok = FALSE; + data_ok = false; ptr_1++; } /* end for */ if (!data_ok) @@ -4126,7 +4126,7 @@ test_select_hyper_offset(void) ret = H5Soffset_simple(sid1, offset); CHECK(ret, FAIL, "H5Soffset_simple"); valid = H5Sselect_valid(sid1); - VERIFY(valid, TRUE, "H5Sselect_valid"); + VERIFY(valid, true, "H5Sselect_valid"); /* Check an invalid offset */ offset[0] = 10; @@ -4135,7 +4135,7 @@ test_select_hyper_offset(void) ret = H5Soffset_simple(sid1, offset); CHECK(ret, FAIL, "H5Soffset_simple"); valid = H5Sselect_valid(sid1); - VERIFY(valid, FALSE, "H5Sselect_valid"); + VERIFY(valid, false, "H5Sselect_valid"); /* Reset offset */ offset[0] = 0; @@ -4144,7 +4144,7 @@ test_select_hyper_offset(void) ret = H5Soffset_simple(sid1, offset); CHECK(ret, FAIL, "H5Soffset_simple"); valid = H5Sselect_valid(sid1); - VERIFY(valid, TRUE, "H5Sselect_valid"); + VERIFY(valid, true, "H5Sselect_valid"); /* Select 15x26 hyperslab for memory dataset */ start[0] = 15; @@ -4164,7 +4164,7 @@ test_select_hyper_offset(void) ret = H5Soffset_simple(sid2, offset); CHECK(ret, FAIL, "H5Soffset_simple"); valid = H5Sselect_valid(sid2); - VERIFY(valid, TRUE, "H5Sselect_valid"); + VERIFY(valid, true, "H5Sselect_valid"); /* Create a dataset */ dataset = H5Dcreate2(fid1, SPACE1_NAME, H5T_NATIVE_UCHAR, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); @@ -4295,7 +4295,7 @@ test_select_hyper_offset2(void) ret = H5Soffset_simple(sid1, offset); CHECK(ret, FAIL, "H5Soffset_simple"); valid = H5Sselect_valid(sid1); - VERIFY(valid, TRUE, "H5Sselect_valid"); + VERIFY(valid, true, "H5Sselect_valid"); /* Select 4x10 hyperslab for memory dataset */ start[0] = 1; @@ -4311,7 +4311,7 @@ test_select_hyper_offset2(void) ret = H5Soffset_simple(sid2, offset); CHECK(ret, FAIL, "H5Soffset_simple"); valid = H5Sselect_valid(sid2); - VERIFY(valid, TRUE, "H5Sselect_valid"); + VERIFY(valid, true, "H5Sselect_valid"); /* Create a dataset */ dataset = H5Dcreate2(fid1, SPACE7_NAME, H5T_NATIVE_UCHAR, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); @@ -4452,7 +4452,7 @@ test_select_point_offset(void) ret = H5Soffset_simple(sid1, offset); CHECK(ret, FAIL, "H5Soffset_simple"); valid = H5Sselect_valid(sid1); - VERIFY(valid, TRUE, "H5Sselect_valid"); + VERIFY(valid, true, "H5Sselect_valid"); /* Check an invalid offset */ offset[0] = 10; @@ -4461,7 +4461,7 @@ test_select_point_offset(void) ret = H5Soffset_simple(sid1, offset); CHECK(ret, FAIL, "H5Soffset_simple"); valid = H5Sselect_valid(sid1); - VERIFY(valid, FALSE, "H5Sselect_valid"); + VERIFY(valid, false, "H5Sselect_valid"); /* Reset offset */ offset[0] = 0; @@ -4470,7 +4470,7 @@ test_select_point_offset(void) ret = H5Soffset_simple(sid1, offset); CHECK(ret, FAIL, "H5Soffset_simple"); valid = H5Sselect_valid(sid1); - VERIFY(valid, TRUE, "H5Sselect_valid"); + VERIFY(valid, true, "H5Sselect_valid"); /* Select sequence of ten points for write dataset */ coord2[0][0] = 12; @@ -4502,7 +4502,7 @@ test_select_point_offset(void) ret = H5Soffset_simple(sid2, offset); CHECK(ret, FAIL, "H5Soffset_simple"); valid = H5Sselect_valid(sid2); - VERIFY(valid, TRUE, "H5Sselect_valid"); + VERIFY(valid, true, "H5Sselect_valid"); /* Create a dataset */ dataset = H5Dcreate2(fid1, SPACE1_NAME, H5T_NATIVE_UCHAR, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); @@ -6985,13 +6985,13 @@ test_select_valid(void) CHECK(error, FAIL, "H5Sselect_hyperslab"); valid = H5Sselect_valid(sub_space); - VERIFY(valid, TRUE, "H5Sselect_valid"); + VERIFY(valid, true, "H5Sselect_valid"); error = H5Sselect_hyperslab(sub_space, H5S_SELECT_OR, safe_start, NULL, safe_count, NULL); CHECK(error, FAIL, "H5Sselect_hyperslab"); valid = H5Sselect_valid(sub_space); - VERIFY(valid, TRUE, "H5Sselect_valid"); + VERIFY(valid, true, "H5Sselect_valid"); error = H5Sclose(sub_space); CHECK(error, FAIL, "H5Sclose"); @@ -7008,13 +7008,13 @@ test_select_valid(void) CHECK(error, FAIL, "H5Sselect_hyperslab"); valid = H5Sselect_valid(sub_space); - VERIFY(valid, FALSE, "H5Sselect_valid"); + VERIFY(valid, false, "H5Sselect_valid"); error = H5Sselect_hyperslab(sub_space, H5S_SELECT_OR, safe_start, NULL, safe_count, NULL); CHECK(error, FAIL, "H5Sselect_hyperslab"); valid = H5Sselect_valid(sub_space); - VERIFY(valid, FALSE, "H5Sselect_valid"); + VERIFY(valid, false, "H5Sselect_valid"); error = H5Sclose(sub_space); CHECK(error, FAIL, "H5Sclose"); @@ -7031,13 +7031,13 @@ test_select_valid(void) CHECK(error, FAIL, "H5Sselect_hyperslab"); valid = H5Sselect_valid(sub_space); - VERIFY(valid, FALSE, "H5Sselect_valid"); + VERIFY(valid, false, "H5Sselect_valid"); error = H5Sselect_hyperslab(sub_space, H5S_SELECT_OR, safe_start, NULL, safe_count, NULL); CHECK(error, FAIL, "H5Sselect_hyperslab"); valid = H5Sselect_valid(sub_space); - VERIFY(valid, FALSE, "H5Sselect_valid"); + VERIFY(valid, false, "H5Sselect_valid"); error = H5Sclose(sub_space); CHECK(error, FAIL, "H5Sclose"); @@ -8640,289 +8640,289 @@ test_shape_same(void) /* Compare "all" selection to all the selections created */ /* Compare against itself */ check = H5Sselect_shape_same(all_sid, all_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against copy of itself */ tmp_sid = H5Scopy(all_sid); CHECK(tmp_sid, FAIL, "H5Scopy"); check = H5Sselect_shape_same(all_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); /* Compare against "none" selection */ check = H5Sselect_shape_same(all_sid, none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against single point selection */ check = H5Sselect_shape_same(all_sid, single_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against multiple point selection */ check = H5Sselect_shape_same(all_sid, mult_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "plain" single hyperslab selection */ check = H5Sselect_shape_same(all_sid, single_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "all" single hyperslab selection */ check = H5Sselect_shape_same(all_sid, single_hyper_all_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against "single point" single hyperslab selection */ check = H5Sselect_shape_same(all_sid, single_hyper_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against regular, strided hyperslab selection */ check = H5Sselect_shape_same(all_sid, regular_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against irregular hyperslab selection */ check = H5Sselect_shape_same(all_sid, irreg_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "no" hyperslab selection */ check = H5Sselect_shape_same(all_sid, none_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against scalar "all" hyperslab selection */ check = H5Sselect_shape_same(all_sid, scalar_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against scalar "none" hyperslab selection */ check = H5Sselect_shape_same(all_sid, scalar_none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare "none" selection to all the selections created */ /* Compare against itself */ check = H5Sselect_shape_same(none_sid, none_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against copy of itself */ tmp_sid = H5Scopy(none_sid); CHECK(tmp_sid, FAIL, "H5Scopy"); check = H5Sselect_shape_same(none_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); /* Compare against "all" selection */ check = H5Sselect_shape_same(none_sid, all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against single point selection */ check = H5Sselect_shape_same(none_sid, single_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against multiple point selection */ check = H5Sselect_shape_same(none_sid, mult_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "plain" single hyperslab selection */ check = H5Sselect_shape_same(none_sid, single_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "all" single hyperslab selection */ check = H5Sselect_shape_same(none_sid, single_hyper_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "single point" single hyperslab selection */ check = H5Sselect_shape_same(none_sid, single_hyper_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against regular, strided hyperslab selection */ check = H5Sselect_shape_same(none_sid, regular_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against irregular hyperslab selection */ check = H5Sselect_shape_same(none_sid, irreg_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "no" hyperslab selection */ check = H5Sselect_shape_same(none_sid, none_hyper_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against scalar "all" hyperslab selection */ check = H5Sselect_shape_same(none_sid, scalar_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against scalar "none" hyperslab selection */ check = H5Sselect_shape_same(none_sid, scalar_none_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare single point selection to all the selections created */ /* Compare against itself */ check = H5Sselect_shape_same(single_pt_sid, single_pt_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against copy of itself */ tmp_sid = H5Scopy(single_pt_sid); CHECK(tmp_sid, FAIL, "H5Scopy"); check = H5Sselect_shape_same(single_pt_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); /* Compare against "all" selection */ check = H5Sselect_shape_same(single_pt_sid, all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "none" selection */ check = H5Sselect_shape_same(single_pt_sid, none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against multiple point selection */ check = H5Sselect_shape_same(single_pt_sid, mult_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "plain" single hyperslab selection */ check = H5Sselect_shape_same(single_pt_sid, single_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "all" single hyperslab selection */ check = H5Sselect_shape_same(single_pt_sid, single_hyper_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "single point" single hyperslab selection */ check = H5Sselect_shape_same(single_pt_sid, single_hyper_pt_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against regular, strided hyperslab selection */ check = H5Sselect_shape_same(single_pt_sid, regular_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against irregular hyperslab selection */ check = H5Sselect_shape_same(single_pt_sid, irreg_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "no" hyperslab selection */ check = H5Sselect_shape_same(single_pt_sid, none_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against scalar "all" hyperslab selection */ check = H5Sselect_shape_same(single_pt_sid, scalar_all_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against scalar "none" hyperslab selection */ check = H5Sselect_shape_same(single_pt_sid, scalar_none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare multiple point selection to all the selections created */ /* Compare against itself */ check = H5Sselect_shape_same(mult_pt_sid, mult_pt_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against copy of itself */ tmp_sid = H5Scopy(mult_pt_sid); CHECK(tmp_sid, FAIL, "H5Scopy"); check = H5Sselect_shape_same(mult_pt_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); /* Compare against "all" selection */ check = H5Sselect_shape_same(mult_pt_sid, all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "none" selection */ check = H5Sselect_shape_same(mult_pt_sid, none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against single point selection */ check = H5Sselect_shape_same(mult_pt_sid, single_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "plain" single hyperslab selection */ check = H5Sselect_shape_same(mult_pt_sid, single_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "all" single hyperslab selection */ check = H5Sselect_shape_same(mult_pt_sid, single_hyper_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "single point" single hyperslab selection */ check = H5Sselect_shape_same(mult_pt_sid, single_hyper_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against regular, strided hyperslab selection */ check = H5Sselect_shape_same(mult_pt_sid, regular_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against irregular hyperslab selection */ check = H5Sselect_shape_same(mult_pt_sid, irreg_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "no" hyperslab selection */ check = H5Sselect_shape_same(mult_pt_sid, none_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against scalar "all" hyperslab selection */ check = H5Sselect_shape_same(mult_pt_sid, scalar_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against scalar "none" hyperslab selection */ check = H5Sselect_shape_same(mult_pt_sid, scalar_none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare single "normal" hyperslab selection to all the selections created */ /* Compare against itself */ check = H5Sselect_shape_same(single_hyper_sid, single_hyper_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against copy of itself */ tmp_sid = H5Scopy(single_hyper_sid); CHECK(tmp_sid, FAIL, "H5Scopy"); check = H5Sselect_shape_same(single_hyper_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); /* Compare against "all" selection */ check = H5Sselect_shape_same(single_hyper_sid, all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "none" selection */ check = H5Sselect_shape_same(single_hyper_sid, none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against single point selection */ check = H5Sselect_shape_same(single_hyper_sid, single_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against multiple point selection */ check = H5Sselect_shape_same(single_hyper_sid, mult_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "all" single hyperslab selection */ check = H5Sselect_shape_same(single_hyper_sid, single_hyper_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "single point" single hyperslab selection */ check = H5Sselect_shape_same(single_hyper_sid, single_hyper_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against regular, strided hyperslab selection */ check = H5Sselect_shape_same(single_hyper_sid, regular_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against irregular hyperslab selection */ check = H5Sselect_shape_same(single_hyper_sid, irreg_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "no" hyperslab selection */ check = H5Sselect_shape_same(single_hyper_sid, none_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); #ifdef NOT_YET /* In theory, these two selections are the same shape, but the @@ -8949,7 +8949,7 @@ test_shape_same(void) /* Compare against hyperslab selection */ check = H5Sselect_shape_same(single_hyper_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); @@ -8980,69 +8980,69 @@ test_shape_same(void) /* Compare against hyperslab selection */ check = H5Sselect_shape_same(single_hyper_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); /* Compare against scalar "all" hyperslab selection */ check = H5Sselect_shape_same(single_hyper_sid, scalar_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against scalar "none" hyperslab selection */ check = H5Sselect_shape_same(single_hyper_sid, scalar_none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare single "all" hyperslab selection to all the selections created */ /* Compare against itself */ check = H5Sselect_shape_same(single_hyper_all_sid, single_hyper_all_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against copy of itself */ tmp_sid = H5Scopy(single_hyper_all_sid); CHECK(tmp_sid, FAIL, "H5Scopy"); check = H5Sselect_shape_same(single_hyper_all_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); /* Compare against "all" selection */ check = H5Sselect_shape_same(single_hyper_all_sid, all_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against "none" selection */ check = H5Sselect_shape_same(single_hyper_all_sid, none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against single point selection */ check = H5Sselect_shape_same(single_hyper_all_sid, single_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against multiple point selection */ check = H5Sselect_shape_same(single_hyper_all_sid, mult_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "plain" single hyperslab selection */ check = H5Sselect_shape_same(single_hyper_all_sid, single_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "single point" single hyperslab selection */ check = H5Sselect_shape_same(single_hyper_all_sid, single_hyper_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against regular, strided hyperslab selection */ check = H5Sselect_shape_same(single_hyper_all_sid, regular_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against irregular hyperslab selection */ check = H5Sselect_shape_same(single_hyper_all_sid, irreg_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "no" hyperslab selection */ check = H5Sselect_shape_same(single_hyper_all_sid, none_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); #ifdef NOT_YET /* In theory, these two selections are the same shape, but the @@ -9068,7 +9068,7 @@ test_shape_same(void) /* Compare against hyperslab selection */ check = H5Sselect_shape_same(single_hyper_all_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); @@ -9099,128 +9099,128 @@ test_shape_same(void) /* Compare against hyperslab selection */ check = H5Sselect_shape_same(single_hyper_all_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); /* Compare against scalar "all" hyperslab selection */ check = H5Sselect_shape_same(single_hyper_all_sid, scalar_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against scalar "none" hyperslab selection */ check = H5Sselect_shape_same(single_hyper_all_sid, scalar_none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare single "point" hyperslab selection to all the selections created */ /* Compare against itself */ check = H5Sselect_shape_same(single_hyper_pt_sid, single_hyper_pt_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against copy of itself */ tmp_sid = H5Scopy(single_hyper_pt_sid); CHECK(tmp_sid, FAIL, "H5Scopy"); check = H5Sselect_shape_same(single_hyper_pt_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); /* Compare against "all" selection */ check = H5Sselect_shape_same(single_hyper_pt_sid, all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "none" selection */ check = H5Sselect_shape_same(single_hyper_pt_sid, none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against single point selection */ check = H5Sselect_shape_same(single_hyper_pt_sid, single_pt_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against multiple point selection */ check = H5Sselect_shape_same(single_hyper_pt_sid, mult_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "plain" single hyperslab selection */ check = H5Sselect_shape_same(single_hyper_pt_sid, single_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "all" single hyperslab selection */ check = H5Sselect_shape_same(single_hyper_pt_sid, single_hyper_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against regular, strided hyperslab selection */ check = H5Sselect_shape_same(single_hyper_pt_sid, regular_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against irregular hyperslab selection */ check = H5Sselect_shape_same(single_hyper_pt_sid, irreg_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "no" hyperslab selection */ check = H5Sselect_shape_same(single_hyper_pt_sid, none_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against scalar "all" hyperslab selection */ check = H5Sselect_shape_same(single_hyper_pt_sid, scalar_all_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against scalar "none" hyperslab selection */ check = H5Sselect_shape_same(single_hyper_pt_sid, scalar_none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare regular, strided hyperslab selection to all the selections created */ /* Compare against itself */ check = H5Sselect_shape_same(regular_hyper_sid, regular_hyper_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against copy of itself */ tmp_sid = H5Scopy(regular_hyper_sid); CHECK(tmp_sid, FAIL, "H5Scopy"); check = H5Sselect_shape_same(regular_hyper_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); /* Compare against "all" selection */ check = H5Sselect_shape_same(regular_hyper_sid, all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "none" selection */ check = H5Sselect_shape_same(regular_hyper_sid, none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against single point selection */ check = H5Sselect_shape_same(regular_hyper_sid, single_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against multiple point selection */ check = H5Sselect_shape_same(regular_hyper_sid, mult_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "plain" single hyperslab selection */ check = H5Sselect_shape_same(regular_hyper_sid, single_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "all" single hyperslab selection */ check = H5Sselect_shape_same(regular_hyper_sid, single_hyper_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "single point" single hyperslab selection */ check = H5Sselect_shape_same(regular_hyper_sid, single_hyper_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against irregular hyperslab selection */ check = H5Sselect_shape_same(regular_hyper_sid, irreg_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "no" hyperslab selection */ check = H5Sselect_shape_same(regular_hyper_sid, none_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Construct point selection which matches regular, strided hyperslab selection */ /* Create dataspace for point selection */ @@ -9239,7 +9239,7 @@ test_shape_same(void) /* Compare against hyperslab selection */ check = H5Sselect_shape_same(regular_hyper_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); @@ -9269,7 +9269,7 @@ test_shape_same(void) /* Compare against hyperslab selection */ check = H5Sselect_shape_same(regular_hyper_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); @@ -9294,69 +9294,69 @@ test_shape_same(void) /* Compare against hyperslab selection */ check = H5Sselect_shape_same(regular_hyper_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); /* Compare against scalar "all" hyperslab selection */ check = H5Sselect_shape_same(regular_hyper_sid, scalar_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against scalar "none" hyperslab selection */ check = H5Sselect_shape_same(regular_hyper_sid, scalar_none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare irregular hyperslab selection to all the selections created */ /* Compare against itself */ check = H5Sselect_shape_same(irreg_hyper_sid, irreg_hyper_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against copy of itself */ tmp_sid = H5Scopy(irreg_hyper_sid); CHECK(tmp_sid, FAIL, "H5Scopy"); check = H5Sselect_shape_same(irreg_hyper_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); /* Compare against "all" selection */ check = H5Sselect_shape_same(irreg_hyper_sid, all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "none" selection */ check = H5Sselect_shape_same(irreg_hyper_sid, none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against single point selection */ check = H5Sselect_shape_same(irreg_hyper_sid, single_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against multiple point selection */ check = H5Sselect_shape_same(irreg_hyper_sid, mult_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "plain" single hyperslab selection */ check = H5Sselect_shape_same(irreg_hyper_sid, single_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "all" single hyperslab selection */ check = H5Sselect_shape_same(irreg_hyper_sid, single_hyper_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "single point" single hyperslab selection */ check = H5Sselect_shape_same(irreg_hyper_sid, single_hyper_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against regular, strided hyperslab selection */ check = H5Sselect_shape_same(irreg_hyper_sid, regular_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "no" hyperslab selection */ check = H5Sselect_shape_same(irreg_hyper_sid, none_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Construct hyperslab selection which matches irregular hyperslab selection */ /* Create dataspace for hyperslab selection */ @@ -9390,138 +9390,138 @@ test_shape_same(void) /* Compare against hyperslab selection */ check = H5Sselect_shape_same(irreg_hyper_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); /* Compare against scalar "all" hyperslab selection */ check = H5Sselect_shape_same(irreg_hyper_sid, scalar_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against scalar "none" hyperslab selection */ check = H5Sselect_shape_same(irreg_hyper_sid, scalar_none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare scalar "all" dataspace with all selections created */ /* Compare against itself */ check = H5Sselect_shape_same(scalar_all_sid, scalar_all_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against copy of itself */ tmp_sid = H5Scopy(scalar_all_sid); CHECK(tmp_sid, FAIL, "H5Scopy"); check = H5Sselect_shape_same(scalar_all_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); /* Compare against "all" selection */ check = H5Sselect_shape_same(scalar_all_sid, all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "none" selection */ check = H5Sselect_shape_same(scalar_all_sid, none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against single point selection */ check = H5Sselect_shape_same(scalar_all_sid, single_pt_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against multiple point selection */ check = H5Sselect_shape_same(scalar_all_sid, mult_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "plain" single hyperslab selection */ check = H5Sselect_shape_same(scalar_all_sid, single_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "all" single hyperslab selection */ check = H5Sselect_shape_same(scalar_all_sid, single_hyper_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "single point" single hyperslab selection */ check = H5Sselect_shape_same(scalar_all_sid, single_hyper_pt_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against regular, strided hyperslab selection */ check = H5Sselect_shape_same(scalar_all_sid, regular_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against irregular hyperslab selection */ check = H5Sselect_shape_same(scalar_all_sid, irreg_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "no" hyperslab selection */ check = H5Sselect_shape_same(scalar_all_sid, none_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against scalar "none" hyperslab selection */ check = H5Sselect_shape_same(scalar_all_sid, scalar_none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare scalar "none" dataspace with all selections created */ /* Compare against itself */ check = H5Sselect_shape_same(scalar_none_sid, scalar_none_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against copy of itself */ tmp_sid = H5Scopy(scalar_none_sid); CHECK(tmp_sid, FAIL, "H5Scopy"); check = H5Sselect_shape_same(scalar_none_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); /* Compare against "all" selection */ check = H5Sselect_shape_same(scalar_none_sid, all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "none" selection */ check = H5Sselect_shape_same(scalar_none_sid, none_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against single point selection */ check = H5Sselect_shape_same(scalar_none_sid, single_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against multiple point selection */ check = H5Sselect_shape_same(scalar_none_sid, mult_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "plain" single hyperslab selection */ check = H5Sselect_shape_same(scalar_none_sid, single_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "all" single hyperslab selection */ check = H5Sselect_shape_same(scalar_none_sid, single_hyper_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "single point" single hyperslab selection */ check = H5Sselect_shape_same(scalar_none_sid, single_hyper_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against regular, strided hyperslab selection */ check = H5Sselect_shape_same(scalar_none_sid, regular_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against irregular hyperslab selection */ check = H5Sselect_shape_same(scalar_none_sid, irreg_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "no" hyperslab selection */ check = H5Sselect_shape_same(scalar_none_sid, none_hyper_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against scalar "all" hyperslab selection */ check = H5Sselect_shape_same(scalar_none_sid, scalar_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Close dataspaces */ ret = H5Sclose(all_sid); @@ -9563,16 +9563,16 @@ test_shape_same(void) ** xz plane, and three parallel to the yz plane. ** ** Assuming that z is the fastest changing dimension, -** H5Sselect_shape_same() should return TRUE when comparing +** H5Sselect_shape_same() should return true when comparing ** the full 2-D space against any hyperslab parallel to the -** yz plane in the 3-D space, and FALSE when comparing the +** yz plane in the 3-D space, and false when comparing the ** full 2-D space against the other two hyperslabs. ** ** Also create two additional 3-D dataspaces (10 X 10 X 10), ** and select a (10 X 10 X 2) hyperslab parallel to the yz ** axis in one of them, and two parallel (10 X 10 X 1) hyper ** slabs parallel to the yz axis in the other. -** H5Sselect_shape_same() should return FALSE when comparing +** H5Sselect_shape_same() should return false when comparing ** each to the 2-D selection. ** ****************************************************************/ @@ -9747,39 +9747,39 @@ test_shape_same_dr__smoke_check_1(void) /* Compare against "xy" selection */ check = H5Sselect_shape_same(small_cube_xy_slice_0_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_xy_slice_1_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_xy_slice_2_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "xz" selection */ check = H5Sselect_shape_same(small_cube_xz_slice_0_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_xz_slice_1_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_xz_slice_2_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "yz" selection */ check = H5Sselect_shape_same(small_cube_yz_slice_0_sid, small_square_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_yz_slice_1_sid, small_square_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_yz_slice_2_sid, small_square_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_yz_slice_3_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_yz_slice_4_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Close dataspaces */ ret = H5Sclose(small_square_sid); @@ -9848,17 +9848,17 @@ test_shape_same_dr__smoke_check_1(void) ** to the yz plane. ** ** Assuming that z is the fastest changing dimension, -** H5Sselect_shape_same() should return TRUE when comparing +** H5Sselect_shape_same() should return true when comparing ** the 2-D space checker board selection against a checker ** board hyperslab parallel to the yz plane in the 3-D -** space, and FALSE when comparing the 2-D checkerboard +** space, and false when comparing the 2-D checkerboard ** selection against two hyperslabs parallel to the xy ** or xz planes. ** ** Also create an additional 3-D dataspaces (10 X 10 X 10), ** and select a checker board parallel with the yz axis, ** save with some squares being on different planes. -** H5Sselect_shape_same() should return FALSE when +** H5Sselect_shape_same() should return false when ** comparing this selection to the 2-D selection. ** ****************************************************************/ @@ -10124,36 +10124,36 @@ test_shape_same_dr__smoke_check_2(void) /* Compare against "xy" selection */ check = H5Sselect_shape_same(small_cube_xy_slice_0_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_xy_slice_1_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_xy_slice_2_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "xz" selection */ check = H5Sselect_shape_same(small_cube_xz_slice_0_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_xz_slice_1_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_xz_slice_2_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "yz" selection */ check = H5Sselect_shape_same(small_cube_yz_slice_0_sid, small_square_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_yz_slice_1_sid, small_square_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_yz_slice_2_sid, small_square_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_yz_slice_3_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Close dataspaces */ ret = H5Sclose(small_square_sid); @@ -10222,10 +10222,10 @@ test_shape_same_dr__smoke_check_2(void) ** cases. ** ** Assuming that z is the fastest changing dimension, -** H5Sselect_shape_same() should return TRUE when +** H5Sselect_shape_same() should return true when ** comparing the 2-D irregular hyperslab selection ** against the irregular hyperslab selections parallel -** to the yz plane in the 3-D space, and FALSE when +** to the yz plane in the 3-D space, and false when ** comparing it against the irregular hyperslabs ** selections parallel to the xy or xz planes. ** @@ -10605,33 +10605,33 @@ test_shape_same_dr__smoke_check_3(void) /* Compare against "xy" selection */ check = H5Sselect_shape_same(small_cube_xy_slice_0_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_xy_slice_1_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_xy_slice_2_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "xz" selection */ check = H5Sselect_shape_same(small_cube_xz_slice_0_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_xz_slice_1_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_xz_slice_2_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "yz" selection */ check = H5Sselect_shape_same(small_cube_yz_slice_0_sid, small_square_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_yz_slice_1_sid, small_square_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_yz_slice_2_sid, small_square_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Close dataspaces */ ret = H5Sclose(small_square_sid); @@ -10691,8 +10691,8 @@ test_shape_same_dr__smoke_check_3(void) ** ** Compare the 2-D space against all the other spaces ** with H5Sselect_shape_same(). The (1 X 10 X 10) & -** (1 X 1 X 10 X 10) should return TRUE. All others -** should return FALSE. +** (1 X 1 X 10 X 10) should return true. All others +** should return false. ** ****************************************************************/ static void @@ -10807,37 +10807,37 @@ test_shape_same_dr__smoke_check_4(void) /* setup is done -- run the tests: */ check = H5Sselect_shape_same(three_d_space_0_sid, square_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); check = H5Sselect_shape_same(three_d_space_1_sid, square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(three_d_space_2_sid, square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(three_d_space_3_sid, square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(four_d_space_0_sid, square_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); check = H5Sselect_shape_same(four_d_space_1_sid, square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(four_d_space_2_sid, square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(four_d_space_3_sid, square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(four_d_space_4_sid, square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(four_d_space_5_sid, square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(four_d_space_6_sid, square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Close dataspaces */ ret = H5Sclose(square_sid); @@ -10884,7 +10884,7 @@ test_shape_same_dr__smoke_check_4(void) ** of an m-cube (m > n) in a call to H5Sselect_shape_same(). ** Note that this test does not require the n-cube and the ** n-dimensional slice to have the same rank (although -** H5Sselect_shape_same() should always return FALSE if +** H5Sselect_shape_same() should always return false if ** they don't). ** ** Per Quincey's suggestion, only test up to 5 dimensional @@ -10893,7 +10893,7 @@ test_shape_same_dr__smoke_check_4(void) ****************************************************************/ static void test_shape_same_dr__full_space_vs_slice(int test_num, int small_rank, int large_rank, int offset, - hsize_t edge_size, hbool_t dim_selected[], hbool_t expected_result) + hsize_t edge_size, bool dim_selected[], bool expected_result) { char test_desc_0[128]; char test_desc_1[256]; @@ -11022,8 +11022,8 @@ test_shape_same_dr__full_space_vs_slice(int test_num, int small_rank, int large_ static void test_shape_same_dr__run_full_space_vs_slice_tests(void) { - hbool_t dim_selected[5]; - hbool_t expected_result; + bool dim_selected[5]; + bool expected_result; int i, j; int v, w, x, y, z; int test_num = 0; @@ -11036,52 +11036,52 @@ test_shape_same_dr__run_full_space_vs_slice_tests(void) v = 0; do { if (v == 0) - dim_selected[0] = FALSE; + dim_selected[0] = false; else - dim_selected[0] = TRUE; + dim_selected[0] = true; w = 0; do { if (w == 0) - dim_selected[1] = FALSE; + dim_selected[1] = false; else - dim_selected[1] = TRUE; + dim_selected[1] = true; x = 0; do { if (x == 0) - dim_selected[2] = FALSE; + dim_selected[2] = false; else - dim_selected[2] = TRUE; + dim_selected[2] = true; y = 0; do { if (y == 0) - dim_selected[3] = FALSE; + dim_selected[3] = false; else - dim_selected[3] = TRUE; + dim_selected[3] = true; z = 0; do { if (z == 0) - dim_selected[4] = FALSE; + dim_selected[4] = false; else - dim_selected[4] = TRUE; + dim_selected[4] = true; /* compute the expected result: */ i = 0; j = 4; - expected_result = TRUE; + expected_result = true; while ((i < small_rank) && expected_result) { if (!dim_selected[j]) - expected_result = FALSE; + expected_result = false; i++; j--; } while ((i < large_rank) && expected_result) { if (dim_selected[j]) - expected_result = FALSE; + expected_result = false; i++; j--; } @@ -11127,7 +11127,7 @@ test_shape_same_dr__run_full_space_vs_slice_tests(void) ** ** Note that this test does not require the n-cube and the ** n-dimensional slice to have the same rank (although -** H5Sselect_shape_same() should always return FALSE if +** H5Sselect_shape_same() should always return false if ** they don't). ** ** Per Quincey's suggestion, only test up to 5 dimensional @@ -11136,7 +11136,7 @@ test_shape_same_dr__run_full_space_vs_slice_tests(void) ****************************************************************/ static void test_shape_same_dr__checkerboard(int test_num, int small_rank, int large_rank, int offset, hsize_t edge_size, - hsize_t checker_size, hbool_t dim_selected[], hbool_t expected_result) + hsize_t checker_size, bool dim_selected[], bool expected_result) { char test_desc_0[128]; char test_desc_1[256]; @@ -11174,7 +11174,7 @@ test_shape_same_dr__checkerboard(int test_num, int small_rank, int large_rank, i assert(offset < (int)edge_size); for (i = SS_DR_MAX_RANK - large_rank; i < SS_DR_MAX_RANK; i++) - if (dim_selected[i] == TRUE) + if (dim_selected[i] == true) dims_selected++; assert(dims_selected >= 0); @@ -11461,65 +11461,65 @@ test_shape_same_dr__checkerboard(int test_num, int small_rank, int large_rank, i static void test_shape_same_dr__run_checkerboard_tests(void) { - hbool_t dim_selected[5]; - hbool_t expected_result; - int i, j; - int v, w, x, y, z; - int test_num = 0; - int small_rank; - int large_rank; + bool dim_selected[5]; + bool expected_result; + int i, j; + int v, w, x, y, z; + int test_num = 0; + int small_rank; + int large_rank; for (large_rank = 1; large_rank <= 5; large_rank++) { for (small_rank = 1; small_rank <= large_rank; small_rank++) { v = 0; do { if (v == 0) - dim_selected[0] = FALSE; + dim_selected[0] = false; else - dim_selected[0] = TRUE; + dim_selected[0] = true; w = 0; do { if (w == 0) - dim_selected[1] = FALSE; + dim_selected[1] = false; else - dim_selected[1] = TRUE; + dim_selected[1] = true; x = 0; do { if (x == 0) - dim_selected[2] = FALSE; + dim_selected[2] = false; else - dim_selected[2] = TRUE; + dim_selected[2] = true; y = 0; do { if (y == 0) - dim_selected[3] = FALSE; + dim_selected[3] = false; else - dim_selected[3] = TRUE; + dim_selected[3] = true; z = 0; do { if (z == 0) - dim_selected[4] = FALSE; + dim_selected[4] = false; else - dim_selected[4] = TRUE; + dim_selected[4] = true; /* compute the expected result: */ i = 0; j = 4; - expected_result = TRUE; + expected_result = true; while ((i < small_rank) && expected_result) { if (!dim_selected[j]) - expected_result = FALSE; + expected_result = false; i++; j--; } /* end while */ while ((i < large_rank) && expected_result) { if (dim_selected[j]) - expected_result = FALSE; + expected_result = false; i++; j--; } /* end while */ @@ -11639,13 +11639,13 @@ test_shape_same_dr__run_checkerboard_tests(void) ** ** Note that this test does not require the n-cube and the ** n-dimensional slice to have the same rank (although -** H5Sselect_shape_same() should always return FALSE if +** H5Sselect_shape_same() should always return false if ** they don't). ** ****************************************************************/ static void test_shape_same_dr__irregular(int test_num, int small_rank, int large_rank, int pattern_offset, - int slice_offset, hbool_t dim_selected[], hbool_t expected_result) + int slice_offset, bool dim_selected[], bool expected_result) { char test_desc_0[128]; char test_desc_1[256]; @@ -11719,7 +11719,7 @@ test_shape_same_dr__irregular(int test_num, int small_rank, int large_rank, int assert(pattern_offset <= 2); for (i = SS_DR_MAX_RANK - large_rank; i < SS_DR_MAX_RANK; i++) - if (dim_selected[i] == TRUE) + if (dim_selected[i] == true) dims_selected++; assert(dims_selected >= 0); @@ -11902,65 +11902,65 @@ test_shape_same_dr__irregular(int test_num, int small_rank, int large_rank, int static void test_shape_same_dr__run_irregular_tests(void) { - hbool_t dim_selected[5]; - hbool_t expected_result; - int i, j; - int v, w, x, y, z; - int test_num = 0; - int small_rank; - int large_rank; + bool dim_selected[5]; + bool expected_result; + int i, j; + int v, w, x, y, z; + int test_num = 0; + int small_rank; + int large_rank; for (large_rank = 1; large_rank <= 5; large_rank++) { for (small_rank = 1; small_rank <= large_rank; small_rank++) { v = 0; do { if (v == 0) - dim_selected[0] = FALSE; + dim_selected[0] = false; else - dim_selected[0] = TRUE; + dim_selected[0] = true; w = 0; do { if (w == 0) - dim_selected[1] = FALSE; + dim_selected[1] = false; else - dim_selected[1] = TRUE; + dim_selected[1] = true; x = 0; do { if (x == 0) - dim_selected[2] = FALSE; + dim_selected[2] = false; else - dim_selected[2] = TRUE; + dim_selected[2] = true; y = 0; do { if (y == 0) - dim_selected[3] = FALSE; + dim_selected[3] = false; else - dim_selected[3] = TRUE; + dim_selected[3] = true; z = 0; do { if (z == 0) - dim_selected[4] = FALSE; + dim_selected[4] = false; else - dim_selected[4] = TRUE; + dim_selected[4] = true; /* compute the expected result: */ i = 0; j = 4; - expected_result = TRUE; + expected_result = true; while ((i < small_rank) && expected_result) { if (!dim_selected[j]) - expected_result = FALSE; + expected_result = false; i++; j--; } /* end while */ while ((i < large_rank) && expected_result) { if (dim_selected[j]) - expected_result = FALSE; + expected_result = false; i++; j--; } /* end while */ @@ -12155,9 +12155,9 @@ test_space_rebuild(void) CHECK(ret, FAIL, "H5S_hyper_rebuild"); } if (ret != FAIL) { - /* In this case, rebuild_check should be TRUE. */ + /* In this case, rebuild_check should be true. */ rebuild_check = H5Sselect_shape_same(sid_reg1, sid_reg_ori1); - CHECK(rebuild_check, FALSE, "H5Sselect_shape_same"); + CHECK(rebuild_check, false, "H5Sselect_shape_same"); } #endif /* For irregular hyperslab */ @@ -12243,9 +12243,9 @@ test_space_rebuild(void) CHECK(ret, FAIL, "H5S_hyper_rebuild"); } /* end if */ if (ret != FAIL) { - /* In this case, rebuild_check should be TRUE. */ + /* In this case, rebuild_check should be true. */ rebuild_check = H5Sselect_shape_same(sid_reg2, sid_reg_ori2); - CHECK(rebuild_check, FALSE, "H5Sselect_shape_same"); + CHECK(rebuild_check, false, "H5Sselect_shape_same"); } #endif /* 2-D irregular case */ @@ -12341,9 +12341,9 @@ test_space_rebuild(void) CHECK(ret, FAIL, "H5S_hyper_rebuild"); } if (ret != FAIL) { - /* In this case, rebuild_check should be TRUE. */ + /* In this case, rebuild_check should be true. */ rebuild_check = H5Sselect_shape_same(sid_reg3, sid_reg_ori3); - CHECK(rebuild_check, FALSE, "H5Sselect_shape_same"); + CHECK(rebuild_check, false, "H5Sselect_shape_same"); } #endif @@ -12452,9 +12452,9 @@ test_space_rebuild(void) CHECK(ret, FAIL, "H5S_hyper_rebuild"); } if (ret != FAIL) { - /* In this case, rebuild_check should be TRUE. */ + /* In this case, rebuild_check should be true. */ rebuild_check = H5Sselect_shape_same(sid_reg4, sid_reg_ori4); - CHECK(rebuild_check, FALSE, "H5Sselect_shape_same"); + CHECK(rebuild_check, false, "H5Sselect_shape_same"); } #endif @@ -12579,9 +12579,9 @@ test_space_rebuild(void) CHECK(ret, FAIL, "H5S_hyper_rebuild"); } if (ret != FAIL) { - /* In this case, rebuild_check should be TRUE. */ + /* In this case, rebuild_check should be true. */ rebuild_check = H5Sselect_shape_same(sid_reg5, sid_reg_ori5); - CHECK(rebuild_check, FALSE, "H5Sselect_shape_same"); + CHECK(rebuild_check, false, "H5Sselect_shape_same"); } #endif @@ -12645,7 +12645,7 @@ test_space_rebuild(void) #endif /* We use 5-D to test a special case with - rebuilding routine TRUE, FALSE and TRUE */ + rebuilding routine true, false and true */ sid_spec = H5Screate_simple(SPACERE5_RANK, dims5, NULL); /* Build up the original five dimensional regular selection */ @@ -14233,9 +14233,9 @@ test_hyper_regular(void) ret = H5Sselect_hyperslab(sid, H5S_SELECT_SET, start, stride, count, block); CHECK(ret, FAIL, "H5Sselect_hyperslab"); - /* Query if 'hyperslab' selection is regular hyperslab (should be TRUE) */ + /* Query if 'hyperslab' selection is regular hyperslab (should be true) */ is_regular = H5Sis_regular_hyperslab(sid); - VERIFY(is_regular, TRUE, "H5Sis_regular_hyperslab"); + VERIFY(is_regular, true, "H5Sis_regular_hyperslab"); /* Retrieve the hyperslab parameters */ ret = H5Sget_regular_hyperslab(sid, q_start, q_stride, q_count, q_block); @@ -14263,9 +14263,9 @@ test_hyper_regular(void) ret = H5Sselect_hyperslab(sid, H5S_SELECT_OR, t_start, NULL, t_count, NULL); CHECK(ret, FAIL, "H5Sselect_hyperslab"); - /* Query if 'hyperslab' selection is regular hyperslab (should be FALSE) */ + /* Query if 'hyperslab' selection is regular hyperslab (should be false) */ is_regular = H5Sis_regular_hyperslab(sid); - VERIFY(is_regular, FALSE, "H5Sis_regular_hyperslab"); + VERIFY(is_regular, false, "H5Sis_regular_hyperslab"); /* Query regular hyperslab selection info (should fail) */ H5E_BEGIN_TRY @@ -14285,9 +14285,9 @@ test_hyper_regular(void) ret = H5Sselect_hyperslab(sid, H5S_SELECT_XOR, t_start, NULL, t_count, NULL); CHECK(ret, FAIL, "H5Sselect_hyperslab"); - /* Query if 'hyperslab' selection is regular hyperslab (should be TRUE) */ + /* Query if 'hyperslab' selection is regular hyperslab (should be true) */ is_regular = H5Sis_regular_hyperslab(sid); - VERIFY(is_regular, TRUE, "H5Sis_regular_hyperslab"); + VERIFY(is_regular, true, "H5Sis_regular_hyperslab"); /* Retrieve the hyperslab parameters */ ret = H5Sget_regular_hyperslab(sid, q_start, q_stride, q_count, q_block); @@ -14980,54 +14980,54 @@ test_internal_consistency(void) CHECK(tmp_sid, FAIL, "H5Scopy"); #if 0 check = H5S__internal_consistency_test(tmp_sid); - VERIFY(check, TRUE, "H5S__internal_consistency_test"); + VERIFY(check, true, "H5S__internal_consistency_test"); #endif ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); #if 0 /* Test "none" selection */ check = H5S__internal_consistency_test(none_sid); - VERIFY(check, TRUE, "H5S__internal_consistency_test"); + VERIFY(check, true, "H5S__internal_consistency_test"); /* Test single point selection */ check = H5S__internal_consistency_test(single_pt_sid); - VERIFY(check, TRUE, "H5S__internal_consistency_test"); + VERIFY(check, true, "H5S__internal_consistency_test"); /* Test multiple point selection */ check = H5S__internal_consistency_test(mult_pt_sid); - VERIFY(check, TRUE, "H5S__internal_consistency_test"); + VERIFY(check, true, "H5S__internal_consistency_test"); /* Test "plain" single hyperslab selection */ check = H5S__internal_consistency_test(single_hyper_sid); - VERIFY(check, TRUE, "H5S__internal_consistency_test"); + VERIFY(check, true, "H5S__internal_consistency_test"); /* Test "all" single hyperslab selection */ check = H5S__internal_consistency_test(single_hyper_all_sid); - VERIFY(check, TRUE, "H5S__internal_consistency_test"); + VERIFY(check, true, "H5S__internal_consistency_test"); /* Test "single point" single hyperslab selection */ check = H5S__internal_consistency_test(single_hyper_pt_sid); - VERIFY(check, TRUE, "H5S__internal_consistency_test"); + VERIFY(check, true, "H5S__internal_consistency_test"); /* Test regular, strided hyperslab selection */ check = H5S__internal_consistency_test(regular_hyper_sid); - VERIFY(check, TRUE, "H5S__internal_consistency_test"); + VERIFY(check, true, "H5S__internal_consistency_test"); /* Test irregular hyperslab selection */ check = H5S__internal_consistency_test(irreg_hyper_sid); - VERIFY(check, TRUE, "H5S__internal_consistency_test"); + VERIFY(check, true, "H5S__internal_consistency_test"); /* Test "no" hyperslab selection */ check = H5S__internal_consistency_test(none_hyper_sid); - VERIFY(check, TRUE, "H5S__internal_consistency_test"); + VERIFY(check, true, "H5S__internal_consistency_test"); /* Test scalar "all" hyperslab selection */ check = H5S__internal_consistency_test(scalar_all_sid); - VERIFY(check, TRUE, "H5S__internal_consistency_test"); + VERIFY(check, true, "H5S__internal_consistency_test"); /* Test scalar "none" hyperslab selection */ check = H5S__internal_consistency_test(scalar_none_sid); - VERIFY(check, TRUE, "H5S__internal_consistency_test"); + VERIFY(check, true, "H5S__internal_consistency_test"); #endif /* Close dataspaces */ @@ -15755,7 +15755,7 @@ test_select_intersect_block(void) /* Test block intersection with 'none' selection (always false) */ status = H5Sselect_intersect_block(sid, block_start, block_end); - VERIFY(status, FALSE, "H5Sselect_intersect_block"); + VERIFY(status, false, "H5Sselect_intersect_block"); /* Set selection to 'all' */ ret = H5Sselect_all(sid); @@ -15763,7 +15763,7 @@ test_select_intersect_block(void) /* Test block intersection with 'all' selection (always true) */ status = H5Sselect_intersect_block(sid, block_start, block_end); - VERIFY(status, TRUE, "H5Sselect_intersect_block"); + VERIFY(status, true, "H5Sselect_intersect_block"); /* Select sequence of ten points */ coord[0][0] = 0; @@ -15791,9 +15791,9 @@ test_select_intersect_block(void) /* Test block intersection with 'point' selection */ status = H5Sselect_intersect_block(sid, block_start, block_end); - VERIFY(status, TRUE, "H5Sselect_intersect_block"); + VERIFY(status, true, "H5Sselect_intersect_block"); status = H5Sselect_intersect_block(sid, block_start, block_end4); - VERIFY(status, FALSE, "H5Sselect_intersect_block"); + VERIFY(status, false, "H5Sselect_intersect_block"); /* Select single 4x6 hyperslab block at (2,1) */ start[0] = 2; @@ -15809,9 +15809,9 @@ test_select_intersect_block(void) /* Test block intersection with single 'hyperslab' selection */ status = H5Sselect_intersect_block(sid, block_start, block_end); - VERIFY(status, TRUE, "H5Sselect_intersect_block"); + VERIFY(status, true, "H5Sselect_intersect_block"); status = H5Sselect_intersect_block(sid, block_start, block_end4); - VERIFY(status, FALSE, "H5Sselect_intersect_block"); + VERIFY(status, false, "H5Sselect_intersect_block"); /* 'OR' another hyperslab block in, making an irregular hyperslab selection */ start[0] = 3; @@ -15827,9 +15827,9 @@ test_select_intersect_block(void) /* Test block intersection with 'hyperslab' selection */ status = H5Sselect_intersect_block(sid, block_start, block_end); - VERIFY(status, TRUE, "H5Sselect_intersect_block"); + VERIFY(status, true, "H5Sselect_intersect_block"); status = H5Sselect_intersect_block(sid, block_start, block_end4); - VERIFY(status, FALSE, "H5Sselect_intersect_block"); + VERIFY(status, false, "H5Sselect_intersect_block"); /* Select regular, strided hyperslab selection */ start[0] = 2; @@ -15845,9 +15845,9 @@ test_select_intersect_block(void) /* Test block intersection with single 'hyperslab' selection */ status = H5Sselect_intersect_block(sid, block_start, block_end); - VERIFY(status, TRUE, "H5Sselect_intersect_block"); + VERIFY(status, true, "H5Sselect_intersect_block"); status = H5Sselect_intersect_block(sid, block_start, block_end4); - VERIFY(status, FALSE, "H5Sselect_intersect_block"); + VERIFY(status, false, "H5Sselect_intersect_block"); /* Close dataspace */ ret = H5Sclose(sid); @@ -16062,7 +16062,7 @@ test_h5s_set_extent_none(void) null_sid = H5Screate(H5S_NULL); CHECK(null_sid, H5I_INVALID_HID, "H5Screate"); equal = H5Sextent_equal(sid, null_sid); - VERIFY(equal, TRUE, "H5Sextent_equal"); + VERIFY(equal, true, "H5Sextent_equal"); /* Close */ ret = H5Sclose(sid); diff --git a/test/API/tvlstr.c b/test/API/tvlstr.c index ced17ea..f702cfd 100644 --- a/test/API/tvlstr.c +++ b/test/API/tvlstr.c @@ -424,12 +424,12 @@ test_vlstring_type(void) ret = H5Tget_class(tid_vlstr); VERIFY(ret, H5T_STRING, "H5Tget_class"); ret = H5Tis_variable_str(tid_vlstr); - VERIFY(ret, TRUE, "H5Tis_variable_str"); + VERIFY(ret, true, "H5Tis_variable_str"); /* Verify that the class detects as a string */ vl_str = H5Tdetect_class(tid_vlstr, H5T_STRING); CHECK(vl_str, FAIL, "H5Tdetect_class"); - VERIFY(vl_str, TRUE, "H5Tdetect_class"); + VERIFY(vl_str, true, "H5Tdetect_class"); /* Check default character set and padding */ cset = H5Tget_cset(tid_vlstr); diff --git a/test/accum.c b/test/accum.c index 6f4db2d..70b99c6 100644 --- a/test/accum.c +++ b/test/accum.c @@ -51,7 +51,7 @@ unsigned test_read_after(H5F_t *f); unsigned test_free(H5F_t *f); unsigned test_big(H5F_t *f); unsigned test_random_write(H5F_t *f); -unsigned test_swmr_write_big(hbool_t newest_format); +unsigned test_swmr_write_big(bool newest_format); /* Helper Function Prototypes */ void accum_printf(const H5F_t *f); @@ -61,7 +61,7 @@ void accum_printf(const H5F_t *f); #define accum_read(a, s, b) H5F_block_read(f, H5FD_MEM_DEFAULT, (haddr_t)(a), (size_t)(s), (b)) #define accum_free(f, a, s) H5F__accum_free(f->shared, H5FD_MEM_DEFAULT, (haddr_t)(a), (hsize_t)(s)) #define accum_flush(f) H5F__accum_flush(f->shared) -#define accum_reset(f) H5F__accum_reset(f->shared, TRUE) +#define accum_reset(f) H5F__accum_reset(f->shared, true) /* ================= */ /* Main Test Routine */ @@ -81,7 +81,7 @@ int main(void) { unsigned nerrors = 0; /* track errors */ - hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ + bool api_ctx_pushed = false; /* Whether API context pushed */ hid_t fid = -1; hid_t fapl = -1; /* File access property list */ char filename[1024]; @@ -103,7 +103,7 @@ main(void) /* Push API context */ if (H5CX_push() < 0) FAIL_STACK_ERROR; - api_ctx_pushed = TRUE; + api_ctx_pushed = true; /* Get H5F_t * to internal file structure */ if (NULL == (f = (H5F_t *)H5VL_object(fid))) @@ -133,17 +133,17 @@ main(void) nerrors += test_random_write(f); /* Pop API context */ - if (api_ctx_pushed && H5CX_pop(FALSE) < 0) + if (api_ctx_pushed && H5CX_pop(false) < 0) FAIL_STACK_ERROR; - api_ctx_pushed = FALSE; + api_ctx_pushed = false; /* End of test code, close and delete file */ if (H5Fclose(fid) < 0) TEST_ERROR; /* This test uses a different file */ - nerrors += test_swmr_write_big(TRUE); - nerrors += test_swmr_write_big(FALSE); + nerrors += test_swmr_write_big(true); + nerrors += test_swmr_write_big(false); if (nerrors) goto error; @@ -154,7 +154,7 @@ main(void) error: if (api_ctx_pushed) - H5CX_pop(FALSE); + H5CX_pop(false); HDputs("*** TESTS FAILED ***"); return 1; @@ -2047,7 +2047,7 @@ error: *------------------------------------------------------------------------- */ unsigned -test_swmr_write_big(hbool_t newest_format) +test_swmr_write_big(bool newest_format) { hid_t fid = -1; /* File ID */ @@ -2057,9 +2057,9 @@ test_swmr_write_big(hbool_t newest_format) uint8_t *wbuf2 = NULL, *rbuf = NULL; /* Buffers for reading & writing */ uint8_t wbuf[1024]; /* Buffer for reading & writing */ unsigned u; /* Local index variable */ - hbool_t process_success = FALSE; + bool process_success = false; char *driver = NULL; /* VFD string (from env variable) */ - hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ + bool api_ctx_pushed = false; /* Whether API context pushed */ if (newest_format) TESTING("SWMR write of large metadata: with latest format"); @@ -2113,7 +2113,7 @@ test_swmr_write_big(hbool_t newest_format) /* Push API context */ if (H5CX_push() < 0) FAIL_STACK_ERROR; - api_ctx_pushed = TRUE; + api_ctx_pushed = true; /* Get H5F_t * to internal file structure */ if (NULL == (rf = (H5F_t *)H5VL_object(fid))) @@ -2193,17 +2193,17 @@ test_swmr_write_big(hbool_t newest_format) si.cb = sizeof(si); ZeroMemory(&pi, sizeof(pi)); - if (0 == CreateProcess(NULL, SWMR_READER, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) { + if (0 == CreateProcess(NULL, SWMR_READER, NULL, NULL, false, 0, NULL, NULL, &si, &pi)) { printf("CreateProcess failed (%d).\n", GetLastError()); FAIL_STACK_ERROR; } (void)WaitForSingleObject(pi.hProcess, INFINITE); - if (FALSE == GetExitCodeProcess(pi.hProcess, &exit_code) || EXIT_FAILURE == exit_code) - process_success = FALSE; + if (false == GetExitCodeProcess(pi.hProcess, &exit_code) || EXIT_FAILURE == exit_code) + process_success = false; else - process_success = TRUE; + process_success = true; CloseHandle(pi.hProcess); CloseHandle(pi.hThread); @@ -2238,7 +2238,7 @@ test_swmr_write_big(hbool_t newest_format) /* Check if child process terminates normally and its return value */ if (WIFEXITED(status) && !WEXITSTATUS(status)) - process_success = TRUE; + process_success = true; } #endif /* defined(H5_HAVE_WIN32_API) */ @@ -2259,9 +2259,9 @@ test_swmr_write_big(hbool_t newest_format) FAIL_STACK_ERROR; /* Pop API context */ - if (api_ctx_pushed && H5CX_pop(FALSE) < 0) + if (api_ctx_pushed && H5CX_pop(false) < 0) FAIL_STACK_ERROR; - api_ctx_pushed = FALSE; + api_ctx_pushed = false; /* Release memory */ if (wbuf2) @@ -2277,7 +2277,7 @@ error: H5Fclose(fid); if (api_ctx_pushed) - H5CX_pop(FALSE); + H5CX_pop(false); H5Pclose(fapl); @@ -2319,7 +2319,7 @@ accum_printf(const H5F_t *f) printf("=====================================================\n"); printf(" accumulator allocated size == %zu\n", accum->alloc_size); printf(" accumulated data size == %zu\n", accum->size); - fprintf(stdout, " accumulator dirty? == %s\n", accum->dirty ? "TRUE" : "FALSE"); + fprintf(stdout, " accumulator dirty? == %s\n", accum->dirty ? "true" : "false"); printf("=====================================================\n"); fprintf(stdout, " start of accumulated data, loc = %" PRIuHADDR "\n", accum->loc); if (accum->dirty) { diff --git a/test/accum_swmr_reader.c b/test/accum_swmr_reader.c index 659a60a..a606506 100644 --- a/test/accum_swmr_reader.c +++ b/test/accum_swmr_reader.c @@ -48,7 +48,7 @@ main(void) uint8_t rbuf[1024]; /* Buffer for reading */ uint8_t buf[1024]; /* Buffer for holding the expected data */ char *driver = NULL; /* VFD string (from env variable) */ - hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ + bool api_ctx_pushed = false; /* Whether API context pushed */ /* Testing setup */ h5_reset(); @@ -77,7 +77,7 @@ main(void) /* Push API context */ if (H5CX_push() < 0) FAIL_STACK_ERROR; - api_ctx_pushed = TRUE; + api_ctx_pushed = true; /* Get H5F_t * to internal file structure */ if (NULL == (f = (H5F_t *)H5VL_object(fid))) @@ -98,9 +98,9 @@ main(void) FAIL_STACK_ERROR; /* Pop API context */ - if (api_ctx_pushed && H5CX_pop(FALSE) < 0) + if (api_ctx_pushed && H5CX_pop(false) < 0) FAIL_STACK_ERROR; - api_ctx_pushed = FALSE; + api_ctx_pushed = false; return EXIT_SUCCESS; @@ -113,7 +113,7 @@ error: H5E_END_TRY if (api_ctx_pushed) - H5CX_pop(FALSE); + H5CX_pop(false); return EXIT_FAILURE; } /* end main() */ diff --git a/test/bittests.c b/test/bittests.c index 10cd280..5578c97 100644 --- a/test/bittests.c +++ b/test/bittests.c @@ -44,13 +44,13 @@ test_find(void) /* The zero length buffer */ memset(v1, 0xaa, sizeof v1); - n = H5T__bit_find(v1, (size_t)0, (size_t)0, H5T_BIT_LSB, TRUE); + n = H5T__bit_find(v1, (size_t)0, (size_t)0, H5T_BIT_LSB, true); if (-1 != n) { H5_FAILED(); HDputs(" Zero length test failed (lsb)!"); goto failed; } - n = H5T__bit_find(v1, (size_t)0, (size_t)0, H5T_BIT_MSB, TRUE); + n = H5T__bit_find(v1, (size_t)0, (size_t)0, H5T_BIT_MSB, true); if (-1 != n) { H5_FAILED(); HDputs(" Zero length test failed (msb)!"); @@ -59,13 +59,13 @@ test_find(void) /* The zero buffer */ memset(v1, 0, sizeof v1); - n = H5T__bit_find(v1, (size_t)0, 8 * sizeof(v1), H5T_BIT_LSB, TRUE); + n = H5T__bit_find(v1, (size_t)0, 8 * sizeof(v1), H5T_BIT_LSB, true); if (-1 != n) { H5_FAILED(); HDputs(" Zero buffer test failed (lsb)!"); goto failed; } - n = H5T__bit_find(v1, (size_t)0, 8 * sizeof(v1), H5T_BIT_MSB, TRUE); + n = H5T__bit_find(v1, (size_t)0, 8 * sizeof(v1), H5T_BIT_MSB, true); if (-1 != n) { H5_FAILED(); HDputs(" Zero buffer test failed (msb)!"); @@ -76,13 +76,13 @@ test_find(void) for (i = 0; i < 8 * (int)sizeof(v1); i++) { memset(v1, 0, sizeof v1); v1[i / 8] = (uint8_t)(1 << (i % 8)); - n = H5T__bit_find(v1, (size_t)0, 8 * sizeof(v1), H5T_BIT_LSB, TRUE); + n = H5T__bit_find(v1, (size_t)0, 8 * sizeof(v1), H5T_BIT_LSB, true); if ((ssize_t)i != n) { H5_FAILED(); printf(" Test for set bit %d failed (lsb)!\n", i); goto failed; } - n = H5T__bit_find(v1, (size_t)0, 8 * sizeof(v1), H5T_BIT_MSB, TRUE); + n = H5T__bit_find(v1, (size_t)0, 8 * sizeof(v1), H5T_BIT_MSB, true); if ((ssize_t)i != n) { H5_FAILED(); printf(" Test for set bit %d failed (msb)!\n", i); @@ -92,13 +92,13 @@ test_find(void) /* The one buffer */ memset(v1, 0xff, sizeof v1); - n = H5T__bit_find(v1, (size_t)0, 8 * sizeof(v1), H5T_BIT_LSB, FALSE); + n = H5T__bit_find(v1, (size_t)0, 8 * sizeof(v1), H5T_BIT_LSB, false); if (-1 != n) { H5_FAILED(); HDputs(" One buffer test failed (lsb)!"); goto failed; } - n = H5T__bit_find(v1, (size_t)0, 8 * sizeof(v1), H5T_BIT_MSB, FALSE); + n = H5T__bit_find(v1, (size_t)0, 8 * sizeof(v1), H5T_BIT_MSB, false); if (-1 != n) { H5_FAILED(); HDputs(" One buffer test failed (msb)!"); @@ -109,13 +109,13 @@ test_find(void) for (i = 0; i < 8 * (int)sizeof(v1); i++) { memset(v1, 0xff, sizeof v1); v1[i / 8] &= (uint8_t) ~(1 << (i % 8)); - n = H5T__bit_find(v1, (size_t)0, 8 * sizeof(v1), H5T_BIT_LSB, FALSE); + n = H5T__bit_find(v1, (size_t)0, 8 * sizeof(v1), H5T_BIT_LSB, false); if ((ssize_t)i != n) { H5_FAILED(); printf(" Test for clear bit %d failed (lsb)!\n", i); goto failed; } - n = H5T__bit_find(v1, (size_t)0, 8 * sizeof(v1), H5T_BIT_MSB, FALSE); + n = H5T__bit_find(v1, (size_t)0, 8 * sizeof(v1), H5T_BIT_MSB, false); if ((ssize_t)i != n) { H5_FAILED(); printf(" Test for clear bit %d failed (lsb)!\n", i); @@ -671,7 +671,7 @@ test_set(void) memset(v2, 0x00, sizeof v2); /* Set some bits in v2 */ - H5T__bit_set(v2, d_offset, size, TRUE); + H5T__bit_set(v2, d_offset, size, true); for (j = 0; j < (int)sizeof(v2); j++) if (v2[j]) break; @@ -786,7 +786,7 @@ test_clear(void) memset(v2, 0xff, sizeof v2); /* Clear some bits in v2 */ - H5T__bit_set(v2, d_offset, size, FALSE); + H5T__bit_set(v2, d_offset, size, false); for (j = 0; j < (int)sizeof(v2); j++) if (0xff != v2[j]) break; diff --git a/test/btree2.c b/test/btree2.c index 9b8edbe..d8e97c4 100644 --- a/test/btree2.c +++ b/test/btree2.c @@ -39,7 +39,7 @@ static const char *FILENAME[] = {"btree2", "btree2_tmp", NULL}; /* Testing parameters */ typedef struct bt2_test_param_t { - hbool_t reopen_btree; /* Whether to re-open the B-tree during the test */ + bool reopen_btree; /* Whether to re-open the B-tree during the test */ } bt2_test_param_t; /*------------------------------------------------------------------------- @@ -351,7 +351,7 @@ iter_rec_cb(const void *_record, void *_op_data) * * Purpose: v2 B-tree find callback * - * Return: Success: TRUE/FALSE + * Return: Success: true/false * Failure: FAIL * *------------------------------------------------------------------------- @@ -363,9 +363,9 @@ find_cb(const void *_record, void *_op_data) hsize_t *search = (hsize_t *)_op_data; if (*record != *search) - return (FALSE); + return (false); - return (TRUE); + return (true); } /* end find_cb() */ /*------------------------------------------------------------------------- @@ -373,7 +373,7 @@ find_cb(const void *_record, void *_op_data) * * Purpose: v2 B-tree find callback for H5B2_test_rec_t records * - * Return: Success: TRUE/FALSE + * Return: Success: true/false * Failure: FAIL * *------------------------------------------------------------------------- @@ -385,10 +385,10 @@ find_rec_cb(const void *_record, void *_op_data) H5B2_test_rec_t *search = (H5B2_test_rec_t *)_op_data; if (record->key != search->key) - return (FALSE); + return (false); search->val = record->val; - return (TRUE); + return (true); } /* end find_rec_cb() */ /*------------------------------------------------------------------------- @@ -420,7 +420,7 @@ find_dec_cb(const void *_record, void *_op_data) * * Purpose: v2 B-tree index callback for H5B2_test_rec_t records * - * Return: Success: TRUE/FALSE + * Return: Success: true/false * Failure: FAIL * *------------------------------------------------------------------------- @@ -436,7 +436,7 @@ index_rec_cb(const void *_record, void *_op_data) search->key = record->key; search->val = record->val; - return (TRUE); + return (true); } /* end index_rec_cb() */ /*------------------------------------------------------------------------- @@ -473,13 +473,13 @@ neighbor_cb(const void *_record, void *_op_data) *------------------------------------------------------------------------- */ static int -modify_cb(void *_record, void *_op_data, hbool_t *changed) +modify_cb(void *_record, void *_op_data, bool *changed) { hsize_t *record = (hsize_t *)_record; hsize_t *modify = (hsize_t *)_op_data; *record = *modify; - *changed = TRUE; + *changed = true; return (0); } /* end modify_cb() */ @@ -495,14 +495,14 @@ modify_cb(void *_record, void *_op_data, hbool_t *changed) *------------------------------------------------------------------------- */ static int -modify_rec_cb(void *_record, void *_op_data, hbool_t *changed) +modify_rec_cb(void *_record, void *_op_data, bool *changed) { H5B2_test_rec_t *record = (H5B2_test_rec_t *)_record; H5B2_test_rec_t *modify = (H5B2_test_rec_t *)_op_data; assert(record->key == modify->key); record->val = modify->val; - *changed = TRUE; + *changed = true; return (0); } /* end modify_rec_cb() */ @@ -519,9 +519,9 @@ modify_rec_cb(void *_record, void *_op_data, hbool_t *changed) *------------------------------------------------------------------------- */ static int -no_modify_cb(void H5_ATTR_UNUSED *_record, void H5_ATTR_UNUSED *_op_data, hbool_t *changed) +no_modify_cb(void H5_ATTR_UNUSED *_record, void H5_ATTR_UNUSED *_op_data, bool *changed) { - *changed = FALSE; + *changed = false; return (1); } /* end no_modify_cb() */ @@ -567,7 +567,7 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t idx; /* Index within B-tree, for iterator */ - hbool_t found; /* Whether record was found */ + bool found; /* Whether record was found */ herr_t ret; /* Generic error return value */ /* @@ -604,7 +604,7 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_ /* Attempt to find record in B-tree with no records */ idx = 0; - found = FALSE; + found = false; if (H5B2_find(bt2, &idx, &found, find_cb, NULL) < 0) TEST_ERROR; if (found) @@ -639,7 +639,7 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_ /* Attempt to find non-existent record in B-tree with 1 record */ /* (Should not be found, but not fail) */ idx = 41; - found = FALSE; + found = false; if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0) TEST_ERROR; if (found) @@ -647,7 +647,7 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_ /* Try again with NULL 'op' */ /* (Should not be found, but not fail) */ - found = FALSE; + found = false; if (H5B2_find(bt2, &idx, &found, NULL, NULL) < 0) TEST_ERROR; if (found) @@ -655,14 +655,14 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_ /* Attempt to find existent record in B-tree with 1 record */ idx = 42; - found = FALSE; + found = false; if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0) TEST_ERROR; if (!found) TEST_ERROR; /* Try again with NULL 'op' */ - found = FALSE; + found = false; if (H5B2_find(bt2, &idx, &found, NULL, NULL) < 0) TEST_ERROR; if (!found) @@ -719,7 +719,7 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_ /* Attempt to find non-existent record in level-0 B-tree with several records */ /* (Should not be found, but not fail) */ idx = 41; - found = FALSE; + found = false; if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0) TEST_ERROR; if (found) @@ -727,7 +727,7 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_ /* Attempt to find existent record in level-0 B-tree with several record */ idx = 56; - found = FALSE; + found = false; if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0) TEST_ERROR; if (!found) @@ -807,7 +807,7 @@ test_insert_split_root(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_p hsize_t idx; /* Index within B-tree, for iterator */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ unsigned u; /* Local index variable */ - hbool_t found; /* Whether record was found */ + bool found; /* Whether record was found */ herr_t ret; /* Generic error return value */ /* @@ -894,7 +894,7 @@ test_insert_split_root(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_p /* Attempt to find non-existent record in level-1 B-tree */ /* (Should not be found, but not fail) */ idx = INSERT_SPLIT_ROOT_NREC + 10; - found = FALSE; + found = false; if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0) TEST_ERROR; if (found) @@ -902,7 +902,7 @@ test_insert_split_root(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_p /* Attempt to find existent record in root of level-1 B-tree */ idx = 33; - found = FALSE; + found = false; if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0) FAIL_STACK_ERROR; if (!found) @@ -910,7 +910,7 @@ test_insert_split_root(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_p /* Attempt to find existent record in leaf of level-1 B-tree */ idx = 56; - found = FALSE; + found = false; if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0) FAIL_STACK_ERROR; if (!found) @@ -1552,7 +1552,7 @@ test_insert_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ hsize_t idx; /* Index within B-tree, for iterator */ unsigned u; /* Local index variable */ - hbool_t found; /* Whether record was found */ + bool found; /* Whether record was found */ herr_t ret; /* Generic error return value */ /* @@ -1625,7 +1625,7 @@ test_insert_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_ /* Attempt to find non-existent record in level-2 B-tree */ /* (Should not be found, but not fail) */ idx = INSERT_SPLIT_ROOT_NREC * 30; - found = FALSE; + found = false; if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0) TEST_ERROR; if (found) @@ -1633,7 +1633,7 @@ test_insert_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_ /* Attempt to find existent record in root of level-2 B-tree */ idx = 948; - found = FALSE; + found = false; if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0) FAIL_STACK_ERROR; if (!found) @@ -1646,7 +1646,7 @@ test_insert_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_ /* Attempt to find existent record in internal node of level-2 B-tree */ idx = 505; - found = FALSE; + found = false; if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0) FAIL_STACK_ERROR; if (!found) @@ -1659,7 +1659,7 @@ test_insert_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_ /* Attempt to find existent record in leaf of level-2 B-tree */ idx = 555; - found = FALSE; + found = false; if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0) FAIL_STACK_ERROR; if (!found) @@ -2899,7 +2899,7 @@ test_insert_lots(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t hsize_t temp_rec; /* Temporary record */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ hsize_t nrec; /* Number of records in B-tree */ - hbool_t found; /* Whether record was found */ + bool found; /* Whether record was found */ herr_t ret; /* Generic error return value */ /* Initialize random number seed */ @@ -3006,7 +3006,7 @@ fprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time); /* Attempt to find non-existent record in level-4 B-tree */ /* (Should not be found, but not fail) */ idx = INSERT_MANY * 2; - found = FALSE; + found = false; if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0) TEST_ERROR; if (found) @@ -3018,7 +3018,7 @@ fprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time); idx = (hsize_t)(HDrandom() % INSERT_MANY); /* Attempt to find existent record in root of level-4 B-tree */ - found = FALSE; + found = false; if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0) FAIL_STACK_ERROR; if (!found) @@ -3132,7 +3132,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_ H5B2_test_rec_t record; /* Record to insert into tree */ H5B2_test_rec_t modify; /* Modified value */ H5B2_test_rec_t find; /* Record to find */ - hbool_t found; /* Whether record was found */ + bool found; /* Whether record was found */ herr_t ret; /* Generic error return value */ /* Create the file for the test */ @@ -3161,7 +3161,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_ /* (Should not be found, but not fail) */ find.key = 10; find.val = (hsize_t)-1; - found = FALSE; + found = false; if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0) FAIL_STACK_ERROR; if (find.val != (hsize_t)-1) @@ -3171,7 +3171,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_ /* Try again with NULL 'op' */ /* (Should not be found, but not fail) */ - found = FALSE; + found = false; if (H5B2_find(bt2, &find, &found, NULL, NULL) < 0) FAIL_STACK_ERROR; if (find.val != (hsize_t)-1) @@ -3181,7 +3181,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_ /* Attempt to find existent record in B-tree with 1 record */ find.key = 42; - found = FALSE; + found = false; if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0) FAIL_STACK_ERROR; if (find.val != 72) @@ -3191,7 +3191,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_ /* Try again with NULL 'op' */ find.val = (hsize_t)-1; - found = FALSE; + found = false; if (H5B2_find(bt2, &find, &found, NULL, NULL) < 0) FAIL_STACK_ERROR; if (find.val != (hsize_t)-1) @@ -3238,7 +3238,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_ /* (Should not be found, but not fail) */ find.key = 10; find.val = (hsize_t)-1; - found = FALSE; + found = false; if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0) FAIL_STACK_ERROR; if (find.val != (hsize_t)-1) @@ -3248,7 +3248,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_ /* Try again with NULL 'op' */ /* (Should not be found, but not fail) */ - found = FALSE; + found = false; if (H5B2_find(bt2, &find, &found, NULL, NULL) < 0) FAIL_STACK_ERROR; if (find.val != (hsize_t)-1) @@ -3258,7 +3258,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_ /* Attempt to find modified record in B-tree with 1 record */ find.key = 42; - found = FALSE; + found = false; if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0) FAIL_STACK_ERROR; if (find.val != 43) @@ -3268,7 +3268,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_ /* Try again with NULL 'op' */ find.val = (hsize_t)-1; - found = FALSE; + found = false; if (H5B2_find(bt2, &find, &found, NULL, NULL) < 0) FAIL_STACK_ERROR; if (find.val != (hsize_t)-1) @@ -3335,7 +3335,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_ /* (Should not be found, but not fail) */ find.key = 10; find.val = (hsize_t)-1; - found = FALSE; + found = false; if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0) TEST_ERROR; if (find.val != (hsize_t)-1) @@ -3345,7 +3345,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_ /* Attempt to find existent record in level-0 B-tree with several records */ find.key = 56; - found = FALSE; + found = false; if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0) TEST_ERROR; if (find.val != 12) @@ -3429,7 +3429,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_ /* (Should not be found, but not fail) */ find.key = 41; find.val = (hsize_t)-1; - found = FALSE; + found = false; if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0) TEST_ERROR; if (find.val != (hsize_t)-1) @@ -3439,7 +3439,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_ /* Attempt to find existent record in level-0 B-tree with several record */ find.key = 56; - found = FALSE; + found = false; if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0) TEST_ERROR; if (find.val != 22) @@ -3542,7 +3542,7 @@ test_update_split_root(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_p H5B2_test_rec_t idx; /* Index within B-tree, for iterator */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ unsigned u; /* Local index variable */ - hbool_t found; /* Whether record was found */ + bool found; /* Whether record was found */ herr_t ret; /* Generic error return value */ /* @@ -3677,7 +3677,7 @@ test_update_split_root(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_p /* (Should not be found, but not fail) */ find.key = 800; find.val = (hsize_t)-1; - found = FALSE; + found = false; if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0) TEST_ERROR; if (find.val != (hsize_t)-1) @@ -3688,7 +3688,7 @@ test_update_split_root(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_p /* Attempt to find existent record in root of level-1 B-tree */ find.key = 33; find.val = (hsize_t)-1; - found = FALSE; + found = false; if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0) FAIL_STACK_ERROR; if (find.key != 33) @@ -3701,7 +3701,7 @@ test_update_split_root(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_p /* Attempt to find existent record in leaf of level-1 B-tree */ find.key = 56; find.val = (hsize_t)-1; - found = FALSE; + found = false; if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0) FAIL_STACK_ERROR; if (find.key != 56) @@ -4377,7 +4377,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_ H5B2_test_rec_t idx; /* Index within B-tree, for iterator */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ unsigned u; /* Local index variable */ - hbool_t found; /* Whether record was found */ + bool found; /* Whether record was found */ herr_t ret; /* Generic error return value */ /* @@ -4458,7 +4458,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_ /* (Should not be found, but not fail) */ find.key = INSERT_SPLIT_ROOT_NREC_REC * 42; find.val = (hsize_t)-1; - found = FALSE; + found = false; if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0) TEST_ERROR; if (find.val != (hsize_t)-1) @@ -4469,7 +4469,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_ /* Attempt to find existent record in root of level-2 B-tree */ find.key = 1347; find.val = (hsize_t)-1; - found = FALSE; + found = false; if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0) FAIL_STACK_ERROR; if (find.val != (1347 * 2)) @@ -4485,7 +4485,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_ /* Attempt to find existent record in internal node of level-2 B-tree */ find.key = 513; find.val = (hsize_t)-1; - found = FALSE; + found = false; if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0) FAIL_STACK_ERROR; if (find.val != (513 * 2)) @@ -4501,7 +4501,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_ /* Attempt to find existent record in leaf of level-2 B-tree */ find.key = 555; find.val = (hsize_t)-1; - found = FALSE; + found = false; if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0) FAIL_STACK_ERROR; if (find.val != (555 * 2)) @@ -4635,7 +4635,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_ /* (Should not be found, but not fail) */ find.key = INSERT_SPLIT_ROOT_NREC_REC * 42; find.val = (hsize_t)-1; - found = FALSE; + found = false; if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0) TEST_ERROR; if (find.val != (hsize_t)-1) @@ -4646,7 +4646,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_ /* Attempt to find existent record in root of level-2 B-tree */ find.key = 1344; find.val = (hsize_t)-1; - found = FALSE; + found = false; if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0) FAIL_STACK_ERROR; if (find.val != (1344 * 2)) @@ -4662,7 +4662,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_ /* Attempt to find existent record in internal node of level-2 B-tree */ find.key = 512; find.val = (hsize_t)-1; - found = FALSE; + found = false; if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0) FAIL_STACK_ERROR; if (find.val != (512 * 2)) @@ -4678,7 +4678,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_ /* Attempt to find existent record in leaf of level-2 B-tree */ find.key = 555; find.val = (hsize_t)-1; - found = FALSE; + found = false; if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0) FAIL_STACK_ERROR; if (find.val != (555 * 2)) @@ -4822,7 +4822,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_ /* (Should not be found, but not fail) */ find.key = INSERT_SPLIT_ROOT_NREC_REC * 42; find.val = (hsize_t)-1; - found = FALSE; + found = false; if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0) TEST_ERROR; if (find.val != (hsize_t)-1) @@ -4833,7 +4833,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_ /* Attempt to find existent record in root of level-2 B-tree */ find.key = 1345; find.val = (hsize_t)-1; - found = FALSE; + found = false; if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0) FAIL_STACK_ERROR; if (find.val != (1345 * 2)) @@ -4849,7 +4849,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_ /* Attempt to find existent record in internal node of level-2 B-tree */ find.key = 513; find.val = (hsize_t)-1; - found = FALSE; + found = false; if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0) FAIL_STACK_ERROR; if (find.val != (513 * 2)) @@ -4865,7 +4865,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_ /* Attempt to find existent record in leaf of level-2 B-tree */ find.key = 555; find.val = (hsize_t)-1; - found = FALSE; + found = false; if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0) FAIL_STACK_ERROR; if (find.val != (555 * 2)) @@ -4969,7 +4969,7 @@ test_update_lots(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ hsize_t nrec; /* Number of records in B-tree */ unsigned u; /* Local index variable */ - hbool_t found; /* Whether record was found */ + bool found; /* Whether record was found */ herr_t ret; /* Generic error return value */ /* Initialize random number seed */ @@ -5065,7 +5065,7 @@ fprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time); /* (Should not be found, but not fail) */ find.key = INSERT_MANY_REC * 2; find.val = (hsize_t)-1; - found = FALSE; + found = false; if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0) TEST_ERROR; if (find.val != (hsize_t)-1) @@ -5080,7 +5080,7 @@ fprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time); find.val = (hsize_t)-1; /* Attempt to find existent record in level-4 B-tree */ - found = FALSE; + found = false; if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0) FAIL_STACK_ERROR; if (find.val != (find.key * 2)) @@ -8616,7 +8616,7 @@ test_remove_lots(const char *env_h5_drvr, hid_t fapl, const H5B2_create_t *cpara unsigned u; /* Local index variable */ unsigned rem_idx; /* Location to remove */ hsize_t nrec; /* Number of records in B-tree */ - hbool_t single_file_vfd; /* Whether VFD used stores data in a single file */ + bool single_file_vfd; /* Whether VFD used stores data in a single file */ /* Initialize random number seed */ curr_time = HDtime(NULL); @@ -9540,7 +9540,7 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tpa H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ H5B2_node_info_test_t ninfo; /* B-tree node info */ unsigned u; /* Local index variable */ - hbool_t rec_found; /* Whether record was found */ + bool rec_found; /* Whether record was found */ herr_t ret; /* Generic error return value */ /* @@ -9612,7 +9612,7 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tpa /* Attempt to find modified record */ record = 4331; found = 4331; - rec_found = FALSE; + rec_found = false; if (H5B2_find(bt2, &record, &rec_found, find_cb, &found) < 0) FAIL_STACK_ERROR; if (found != 4331) @@ -9663,7 +9663,7 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tpa /* Attempt to find modified record */ record = 5352; found = 5352; - rec_found = FALSE; + rec_found = false; if (H5B2_find(bt2, &record, &rec_found, find_cb, &found) < 0) STACK_ERROR; if (found != 5352) @@ -9714,7 +9714,7 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tpa /* Attempt to find modified record */ record = 9448; found = 9448; - rec_found = FALSE; + rec_found = false; if (H5B2_find(bt2, &record, &rec_found, find_cb, &found) < 0) STACK_ERROR; if (found != 9448) @@ -9916,7 +9916,7 @@ main(void) unsigned reopen; /* Whether to reopen B-tree during tests */ int ExpressMode; const char *envval = NULL; - hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ + bool api_ctx_pushed = false; /* Whether API context pushed */ envval = HDgetenv(HDF5_DRIVER); if (envval == NULL) @@ -9940,17 +9940,17 @@ main(void) /* Push API context */ if (H5CX_push() < 0) FAIL_STACK_ERROR; - api_ctx_pushed = TRUE; + api_ctx_pushed = true; /* Loop over re-opening B-tree during tests */ - for (reopen = FALSE; reopen <= TRUE; reopen++) { + for (reopen = false; reopen <= true; reopen++) { if (reopen) { fprintf(stdout, "Testing with reopening B-tree:\n"); - tparam.reopen_btree = TRUE; + tparam.reopen_btree = true; } /* end if */ else { fprintf(stdout, "Testing without reopening B-tree:\n"); - tparam.reopen_btree = FALSE; + tparam.reopen_btree = false; } /* end else */ /* Test B-tree record insertion */ @@ -10031,9 +10031,9 @@ main(void) nerrors += (h5_verify_cached_stabs(FILENAME, fapl) < 0 ? 1 : 0); /* Pop API context */ - if (api_ctx_pushed && H5CX_pop(FALSE) < 0) + if (api_ctx_pushed && H5CX_pop(false) < 0) FAIL_STACK_ERROR; - api_ctx_pushed = FALSE; + api_ctx_pushed = false; if (nerrors) goto error; @@ -10054,7 +10054,7 @@ error: H5E_END_TRY if (api_ctx_pushed) - H5CX_pop(FALSE); + H5CX_pop(false); return 1; } /* end main() */ diff --git a/test/cache.c b/test/cache.c index 673b253..a9d91a6 100644 --- a/test/cache.c +++ b/test/cache.c @@ -44,9 +44,9 @@ hid_t saved_fcpl_id = H5P_DEFAULT; /* store the fcpl id here between hid_t saved_fid = -1; /* store the file id here between cache setup * and takedown. */ -hbool_t write_permitted = TRUE; -hbool_t try_core_file_driver = FALSE; -hbool_t core_file_driver_failed = FALSE; +bool write_permitted = true; +bool try_core_file_driver = false; +bool core_file_driver_failed = false; /* global variable declarations: */ @@ -58,80 +58,80 @@ struct flush_cache_test_spec { int entry_num; int entry_type; int entry_index; - hbool_t insert_flag; + bool insert_flag; unsigned int flags; - hbool_t expected_deserialized; - hbool_t expected_serialized; - hbool_t expected_destroyed; + bool expected_deserialized; + bool expected_serialized; + bool expected_destroyed; }; struct pe_flush_cache_test_spec { int entry_num; int entry_type; int entry_index; - hbool_t insert_flag; + bool insert_flag; unsigned int flags; int num_pins; int pin_type[MAX_PINS]; int pin_idx[MAX_PINS]; - hbool_t expected_deserialized; - hbool_t expected_serialized; - hbool_t expected_destroyed; + bool expected_deserialized; + bool expected_serialized; + bool expected_destroyed; }; struct fo_flush_entry_check { - int entry_num; - int entry_type; - int entry_index; - size_t expected_size; - hbool_t in_cache; - hbool_t at_main_addr; - hbool_t is_dirty; - hbool_t is_protected; - hbool_t is_pinned; - hbool_t expected_deserialized; - hbool_t expected_serialized; - hbool_t expected_destroyed; + int entry_num; + int entry_type; + int entry_index; + size_t expected_size; + bool in_cache; + bool at_main_addr; + bool is_dirty; + bool is_protected; + bool is_pinned; + bool expected_deserialized; + bool expected_serialized; + bool expected_destroyed; }; struct fo_flush_cache_test_spec { int entry_num; int entry_type; int entry_index; - hbool_t insert_flag; + bool insert_flag; unsigned int flags; - hbool_t resize_flag; + bool resize_flag; size_t new_size; int num_pins; int pin_type[MAX_PINS]; int pin_idx[MAX_PINS]; int num_flush_ops; struct flush_op flush_ops[MAX_FLUSH_OPS]; - hbool_t expected_deserialized; - hbool_t expected_serialized; - hbool_t expected_destroyed; + bool expected_deserialized; + bool expected_serialized; + bool expected_destroyed; }; struct move_entry_test_spec { - int entry_type; - int entry_index; - hbool_t is_pinned; - hbool_t is_protected; + int entry_type; + int entry_index; + bool is_pinned; + bool is_protected; }; struct pinned_single_entry_test_spec { int test_num; int entry_type; int entry_idx; - hbool_t dirty_flag; - hbool_t mark_dirty; - hbool_t pop_mark_dirty_prot; - hbool_t pop_mark_dirty_pinned; - hbool_t unprotect_unpin; + bool dirty_flag; + bool mark_dirty; + bool pop_mark_dirty_prot; + bool pop_mark_dirty_pinned; + bool unprotect_unpin; unsigned int flags; unsigned int flush_flags; - hbool_t expected_serialized; - hbool_t expected_destroyed; + bool expected_serialized; + bool expected_destroyed; }; /* private function declarations: */ @@ -158,21 +158,23 @@ static void check_flush_cache__pe_multi_entry_test(H5F_t *file_ptr, int test_num struct pe_flush_cache_test_spec spec[]); static void check_flush_cache__single_entry(H5F_t *file_ptr); static void check_flush_cache__single_entry_test(H5F_t *file_ptr, int test_num, int entry_type, int entry_idx, - hbool_t insert_flag, unsigned int flags, - unsigned int flush_flags, hbool_t expected_deserialized, - hbool_t expected_serialized, hbool_t expected_destroyed); -static void check_flush_cache__pinned_single_entry_test( - H5F_t *file_ptr, int test_num, int entry_type, int entry_idx, hbool_t unprot_dirty_flag, - hbool_t mark_dirty, hbool_t pop_mark_dirty_prot, hbool_t pop_mark_dirty_pinned, hbool_t unprotect_unpin, - unsigned int flags, unsigned int flush_flags, hbool_t expected_serialized, hbool_t expected_destroyed); -static void check_flush_cache__flush_ops(H5F_t *file_ptr); -static void check_flush_cache__flush_op_test(H5F_t *file_ptr, int test_num, unsigned int flush_flags, - int spec_size, const struct fo_flush_cache_test_spec spec[], - unsigned init_expected_index_len, - size_t init_expected_index_size, unsigned expected_index_len, - size_t expected_index_size, int check_size, - struct fo_flush_entry_check check[]); -static void check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr); + bool insert_flag, unsigned int flags, + unsigned int flush_flags, bool expected_deserialized, + bool expected_serialized, bool expected_destroyed); +static void check_flush_cache__pinned_single_entry_test(H5F_t *file_ptr, int test_num, int entry_type, + int entry_idx, bool unprot_dirty_flag, + bool mark_dirty, bool pop_mark_dirty_prot, + bool pop_mark_dirty_pinned, bool unprotect_unpin, + unsigned int flags, unsigned int flush_flags, + bool expected_serialized, bool expected_destroyed); +static void check_flush_cache__flush_ops(H5F_t *file_ptr); +static void check_flush_cache__flush_op_test(H5F_t *file_ptr, int test_num, unsigned int flush_flags, + int spec_size, const struct fo_flush_cache_test_spec spec[], + unsigned init_expected_index_len, + size_t init_expected_index_size, unsigned expected_index_len, + size_t expected_index_size, int check_size, + struct fo_flush_entry_check check[]); +static void check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr); static unsigned check_get_entry_status(unsigned paged); static unsigned check_expunge_entry(unsigned paged); static unsigned check_multiple_read_protect(unsigned paged); @@ -199,17 +201,17 @@ static unsigned check_unprotect_ro_dirty_err(unsigned paged); static unsigned check_protect_ro_rw_err(unsigned paged); static unsigned check_protect_retries(unsigned paged); static unsigned check_check_evictions_enabled_err(unsigned paged); -static unsigned check_auto_cache_resize(hbool_t cork_ageout, unsigned paged); +static unsigned check_auto_cache_resize(bool cork_ageout, unsigned paged); static unsigned check_auto_cache_resize_disable(unsigned paged); static unsigned check_auto_cache_resize_epoch_markers(unsigned paged); static unsigned check_auto_cache_resize_input_errs(unsigned paged); static unsigned check_auto_cache_resize_aux_fcns(unsigned paged); -static unsigned check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged); +static unsigned check_metadata_blizzard_absence(bool fill_via_insertion, unsigned paged); static unsigned check_flush_deps(unsigned paged); static unsigned check_flush_deps_err(unsigned paged); static unsigned check_flush_deps_order(unsigned paged); static unsigned check_notify_cb(unsigned paged); -static unsigned check_metadata_cork(hbool_t fill_via_insertion, unsigned paged); +static unsigned check_metadata_cork(bool fill_via_insertion, unsigned paged); static unsigned check_entry_deletions_during_scans(unsigned paged); static void cedds__expunge_dirty_entry_in_flush_test(H5F_t *file_ptr); static void cedds__H5C_make_space_in_cache(H5F_t *file_ptr); @@ -222,7 +224,7 @@ static void check_stats__smoke_check_1(H5F_t *file_ptr); static H5F_t *setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged); -static void takedown_cache(H5F_t *file_ptr, hbool_t dump_stats, hbool_t dump_detailed_stats); +static void takedown_cache(H5F_t *file_ptr, bool dump_stats, bool dump_detailed_stats); /**************************************************************************/ /**************************************************************************/ @@ -245,10 +247,10 @@ static void takedown_cache(H5F_t *file_ptr, hbool_t dump_stats, hbool_t dump_det static unsigned smoke_check_1(int express_test, unsigned paged) { - hbool_t show_progress = FALSE; - int dirty_unprotects = FALSE; - int dirty_destroys = FALSE; - hbool_t display_stats = FALSE; + bool show_progress = false; + int dirty_unprotects = false; + int dirty_destroys = false; + bool display_stats = false; int32_t lag = 10; int32_t max_index = (10 * 1024) - 1; int mile_stone = 1; @@ -285,7 +287,7 @@ smoke_check_1(int express_test, unsigned paged) break; } - pass = TRUE; + pass = true; if (show_progress) /* 1 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -303,15 +305,15 @@ smoke_check_1(int express_test, unsigned paged) row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ FALSE, - /* do_inserts */ TRUE, - /* do_moves */ TRUE, - /* move_to_main_addr */ FALSE, - /* do_destroys */ TRUE, - /* do_mult_ro_protects */ TRUE, + /* display_detailed_stats */ false, + /* do_inserts */ true, + /* do_moves */ true, + /* move_to_main_addr */ false, + /* do_destroys */ true, + /* do_mult_ro_protects */ true, /* dirty_destroys */ dirty_destroys, /* dirty_unprotects */ dirty_unprotects); @@ -321,15 +323,15 @@ smoke_check_1(int express_test, unsigned paged) row_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ FALSE, - /* do_inserts */ FALSE, - /* do_moves */ TRUE, - /* move_to_main_addr */ TRUE, - /* do_destroys */ FALSE, - /* do_mult_ro_protects */ TRUE, + /* display_detailed_stats */ false, + /* do_inserts */ false, + /* do_moves */ true, + /* move_to_main_addr */ true, + /* do_destroys */ false, + /* do_mult_ro_protects */ true, /* dirty_destroys */ dirty_destroys, /* dirty_unprotects */ dirty_unprotects); @@ -339,15 +341,15 @@ smoke_check_1(int express_test, unsigned paged) row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ FALSE, - /* do_inserts */ TRUE, - /* do_moves */ TRUE, - /* move_to_main_addr */ FALSE, - /* do_destroys */ FALSE, - /* do_mult_ro_protects */ TRUE, + /* display_detailed_stats */ false, + /* do_inserts */ true, + /* do_moves */ true, + /* move_to_main_addr */ false, + /* do_destroys */ false, + /* do_mult_ro_protects */ true, /* dirty_destroys */ dirty_destroys, /* dirty_unprotects */ dirty_unprotects); @@ -357,9 +359,9 @@ smoke_check_1(int express_test, unsigned paged) /* flush and destroy all entries in the cache: */ flush_cache(/* file_ptr */ file_ptr, - /* destroy_entries */ TRUE, - /* dump_stats */ FALSE, - /* dump_detailed_stats */ FALSE); + /* destroy_entries */ true, + /* dump_stats */ false, + /* dump_detailed_stats */ false); if (show_progress) /* 7 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -367,11 +369,11 @@ smoke_check_1(int express_test, unsigned paged) col_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ TRUE, - /* do_inserts */ TRUE, + /* display_detailed_stats */ true, + /* do_inserts */ true, /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 8 */ @@ -380,9 +382,9 @@ smoke_check_1(int express_test, unsigned paged) /* flush all entries in the cache: */ flush_cache(/* file_ptr */ file_ptr, - /* destroy_entries */ FALSE, - /* dump_stats */ FALSE, - /* dump_detailed_stats */ FALSE); + /* destroy_entries */ false, + /* dump_stats */ false, + /* dump_detailed_stats */ false); if (show_progress) /* 9 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -390,17 +392,17 @@ smoke_check_1(int express_test, unsigned paged) col_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ TRUE, - /* do_inserts */ TRUE, + /* display_detailed_stats */ true, + /* do_inserts */ true, /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 10 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); - takedown_cache(file_ptr, display_stats, TRUE); + takedown_cache(file_ptr, display_stats, true); if (show_progress) /* 11 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -440,10 +442,10 @@ smoke_check_1(int express_test, unsigned paged) static unsigned smoke_check_2(int express_test, unsigned paged) { - hbool_t show_progress = FALSE; - int dirty_unprotects = TRUE; - int dirty_destroys = TRUE; - hbool_t display_stats = FALSE; + bool show_progress = false; + int dirty_unprotects = true; + int dirty_destroys = true; + bool display_stats = false; int32_t max_index = (10 * 1024) - 1; int32_t lag = 10; int mile_stone = 1; @@ -480,7 +482,7 @@ smoke_check_2(int express_test, unsigned paged) break; } - pass = TRUE; + pass = true; if (show_progress) /* 1 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -498,15 +500,15 @@ smoke_check_2(int express_test, unsigned paged) row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ TRUE, - /* do_inserts */ TRUE, - /* do_moves */ TRUE, - /* move_to_main_addr */ FALSE, - /* do_destroys */ TRUE, - /* do_mult_ro_protects */ TRUE, + /* display_detailed_stats */ true, + /* do_inserts */ true, + /* do_moves */ true, + /* move_to_main_addr */ false, + /* do_destroys */ true, + /* do_mult_ro_protects */ true, /* dirty_destroys */ dirty_destroys, /* dirty_unprotects */ dirty_unprotects); @@ -516,15 +518,15 @@ smoke_check_2(int express_test, unsigned paged) row_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ TRUE, - /* do_inserts */ FALSE, - /* do_moves */ TRUE, - /* move_to_main_addr */ TRUE, - /* do_destroys */ FALSE, - /* do_mult_ro_protects */ TRUE, + /* display_detailed_stats */ true, + /* do_inserts */ false, + /* do_moves */ true, + /* move_to_main_addr */ true, + /* do_destroys */ false, + /* do_mult_ro_protects */ true, /* dirty_destroys */ dirty_destroys, /* dirty_unprotects */ dirty_unprotects); @@ -534,15 +536,15 @@ smoke_check_2(int express_test, unsigned paged) row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ TRUE, - /* do_inserts */ TRUE, - /* do_moves */ TRUE, - /* move_to_main_addr */ FALSE, - /* do_destroys */ FALSE, - /* do_mult_ro_protects */ TRUE, + /* display_detailed_stats */ true, + /* do_inserts */ true, + /* do_moves */ true, + /* move_to_main_addr */ false, + /* do_destroys */ false, + /* do_mult_ro_protects */ true, /* dirty_destroys */ dirty_destroys, /* dirty_unprotects */ dirty_unprotects); @@ -552,9 +554,9 @@ smoke_check_2(int express_test, unsigned paged) /* flush and destroy all entries in the cache: */ flush_cache(/* file_ptr */ file_ptr, - /* destroy_entries */ TRUE, - /* dump_stats */ FALSE, - /* dump_detailed_stats */ FALSE); + /* destroy_entries */ true, + /* dump_stats */ false, + /* dump_detailed_stats */ false); if (show_progress) /* 7 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -562,11 +564,11 @@ smoke_check_2(int express_test, unsigned paged) col_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ TRUE, - /* do_inserts */ TRUE, + /* display_detailed_stats */ true, + /* do_inserts */ true, /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 8 */ @@ -575,9 +577,9 @@ smoke_check_2(int express_test, unsigned paged) /* flush all entries in the cache: */ flush_cache(/* file_ptr */ file_ptr, - /* destroy_entries */ FALSE, - /* dump_stats */ FALSE, - /* dump_detailed_stats */ FALSE); + /* destroy_entries */ false, + /* dump_stats */ false, + /* dump_detailed_stats */ false); if (show_progress) /* 9 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -585,17 +587,17 @@ smoke_check_2(int express_test, unsigned paged) col_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ TRUE, - /* do_inserts */ TRUE, + /* display_detailed_stats */ true, + /* do_inserts */ true, /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 10 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); - takedown_cache(file_ptr, display_stats, TRUE); + takedown_cache(file_ptr, display_stats, true); if (show_progress) /* 11 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -634,10 +636,10 @@ smoke_check_2(int express_test, unsigned paged) static unsigned smoke_check_3(int express_test, unsigned paged) { - hbool_t show_progress = FALSE; - int dirty_unprotects = FALSE; - int dirty_destroys = FALSE; - hbool_t display_stats = FALSE; + bool show_progress = false; + int dirty_unprotects = false; + int dirty_destroys = false; + bool display_stats = false; int32_t max_index = (10 * 1024) - 1; int32_t lag = 10; int mile_stone = 1; @@ -674,7 +676,7 @@ smoke_check_3(int express_test, unsigned paged) break; } - pass = TRUE; + pass = true; if (show_progress) /* 1 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -692,15 +694,15 @@ smoke_check_3(int express_test, unsigned paged) row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ TRUE, - /* do_inserts */ TRUE, - /* do_moves */ TRUE, - /* move_to_main_addr */ FALSE, - /* do_destroys */ TRUE, - /* do_mult_ro_protects */ TRUE, + /* display_detailed_stats */ true, + /* do_inserts */ true, + /* do_moves */ true, + /* move_to_main_addr */ false, + /* do_destroys */ true, + /* do_mult_ro_protects */ true, /* dirty_destroys */ dirty_destroys, /* dirty_unprotects */ dirty_unprotects); @@ -710,15 +712,15 @@ smoke_check_3(int express_test, unsigned paged) row_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ TRUE, - /* do_inserts */ FALSE, - /* do_moves */ TRUE, - /* move_to_main_addr */ TRUE, - /* do_destroys */ FALSE, - /* do_mult_ro_protects */ TRUE, + /* display_detailed_stats */ true, + /* do_inserts */ false, + /* do_moves */ true, + /* move_to_main_addr */ true, + /* do_destroys */ false, + /* do_mult_ro_protects */ true, /* dirty_destroys */ dirty_destroys, /* dirty_unprotects */ dirty_unprotects); @@ -728,15 +730,15 @@ smoke_check_3(int express_test, unsigned paged) row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ TRUE, - /* do_inserts */ TRUE, - /* do_moves */ TRUE, - /* move_to_main_addr */ FALSE, - /* do_destroys */ FALSE, - /* do_mult_ro_protects */ TRUE, + /* display_detailed_stats */ true, + /* do_inserts */ true, + /* do_moves */ true, + /* move_to_main_addr */ false, + /* do_destroys */ false, + /* do_mult_ro_protects */ true, /* dirty_destroys */ dirty_destroys, /* dirty_unprotects */ dirty_unprotects); @@ -746,9 +748,9 @@ smoke_check_3(int express_test, unsigned paged) /* flush and destroy all entries in the cache: */ flush_cache(/* file_ptr */ file_ptr, - /* destroy_entries */ TRUE, - /* dump_stats */ FALSE, - /* dump_detailed_stats */ FALSE); + /* destroy_entries */ true, + /* dump_stats */ false, + /* dump_detailed_stats */ false); if (show_progress) /* 7 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -756,11 +758,11 @@ smoke_check_3(int express_test, unsigned paged) col_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ TRUE, - /* do_inserts */ TRUE, + /* display_detailed_stats */ true, + /* do_inserts */ true, /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 8 */ @@ -769,9 +771,9 @@ smoke_check_3(int express_test, unsigned paged) /* flush all entries in the cache: */ flush_cache(/* file_ptr */ file_ptr, - /* destroy_entries */ FALSE, - /* dump_stats */ FALSE, - /* dump_detailed_stats */ FALSE); + /* destroy_entries */ false, + /* dump_stats */ false, + /* dump_detailed_stats */ false); if (show_progress) /* 9 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -779,17 +781,17 @@ smoke_check_3(int express_test, unsigned paged) col_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ TRUE, - /* do_inserts */ TRUE, + /* display_detailed_stats */ true, + /* do_inserts */ true, /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 10 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); - takedown_cache(file_ptr, display_stats, TRUE); + takedown_cache(file_ptr, display_stats, true); if (show_progress) /* 11 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -829,10 +831,10 @@ smoke_check_3(int express_test, unsigned paged) static unsigned smoke_check_4(int express_test, unsigned paged) { - hbool_t show_progress = FALSE; - int dirty_unprotects = TRUE; - int dirty_destroys = TRUE; - hbool_t display_stats = FALSE; + bool show_progress = false; + int dirty_unprotects = true; + int dirty_destroys = true; + bool display_stats = false; int32_t max_index = (10 * 1024) - 1; int32_t lag = 10; int mile_stone = 1; @@ -869,7 +871,7 @@ smoke_check_4(int express_test, unsigned paged) break; } - pass = TRUE; + pass = true; if (show_progress) /* 1 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -887,15 +889,15 @@ smoke_check_4(int express_test, unsigned paged) row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ TRUE, - /* do_inserts */ TRUE, - /* do_moves */ TRUE, - /* move_to_main_addr */ FALSE, - /* do_destroys */ TRUE, - /* do_mult_ro_protects */ TRUE, + /* display_detailed_stats */ true, + /* do_inserts */ true, + /* do_moves */ true, + /* move_to_main_addr */ false, + /* do_destroys */ true, + /* do_mult_ro_protects */ true, /* dirty_destroys */ dirty_destroys, /* dirty_unprotects */ dirty_unprotects); @@ -905,15 +907,15 @@ smoke_check_4(int express_test, unsigned paged) row_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ TRUE, - /* do_inserts */ FALSE, - /* do_moves */ TRUE, - /* move_to_main_addr */ TRUE, - /* do_destroys */ FALSE, - /* do_mult_ro_protects */ TRUE, + /* display_detailed_stats */ true, + /* do_inserts */ false, + /* do_moves */ true, + /* move_to_main_addr */ true, + /* do_destroys */ false, + /* do_mult_ro_protects */ true, /* dirty_destroys */ dirty_destroys, /* dirty_unprotects */ dirty_unprotects); @@ -923,15 +925,15 @@ smoke_check_4(int express_test, unsigned paged) row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ TRUE, - /* do_inserts */ TRUE, - /* do_moves */ TRUE, - /* move_to_main_addr */ FALSE, - /* do_destroys */ FALSE, - /* do_mult_ro_protects */ TRUE, + /* display_detailed_stats */ true, + /* do_inserts */ true, + /* do_moves */ true, + /* move_to_main_addr */ false, + /* do_destroys */ false, + /* do_mult_ro_protects */ true, /* dirty_destroys */ dirty_destroys, /* dirty_unprotects */ dirty_unprotects); @@ -941,9 +943,9 @@ smoke_check_4(int express_test, unsigned paged) /* flush and destroy all entries in the cache: */ flush_cache(/* file_ptr */ file_ptr, - /* destroy_entries */ TRUE, - /* dump_stats */ FALSE, - /* dump_detailed_stats */ FALSE); + /* destroy_entries */ true, + /* dump_stats */ false, + /* dump_detailed_stats */ false); if (show_progress) /* 7 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -951,11 +953,11 @@ smoke_check_4(int express_test, unsigned paged) col_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ TRUE, - /* do_inserts */ TRUE, + /* display_detailed_stats */ true, + /* do_inserts */ true, /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 8 */ @@ -964,9 +966,9 @@ smoke_check_4(int express_test, unsigned paged) /* flush all entries in the cache: */ flush_cache(/* file_ptr */ file_ptr, - /* destroy_entries */ FALSE, - /* dump_stats */ FALSE, - /* dump_detailed_stats */ FALSE); + /* destroy_entries */ false, + /* dump_stats */ false, + /* dump_detailed_stats */ false); if (show_progress) /* 9 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -974,17 +976,17 @@ smoke_check_4(int express_test, unsigned paged) col_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ TRUE, - /* do_inserts */ TRUE, + /* display_detailed_stats */ true, + /* do_inserts */ true, /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 10 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); - takedown_cache(file_ptr, display_stats, TRUE); + takedown_cache(file_ptr, display_stats, true); if (show_progress) /* 11 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -1025,9 +1027,9 @@ static unsigned smoke_check_5(int express_test, unsigned paged) { herr_t result; - hbool_t show_progress = FALSE; - int dirty_unprotects = FALSE; - hbool_t display_stats = FALSE; + bool show_progress = false; + int dirty_unprotects = false; + bool display_stats = false; int32_t max_index = 1024; int mile_stone = 1; H5F_t *file_ptr = NULL; @@ -1035,7 +1037,7 @@ smoke_check_5(int express_test, unsigned paged) H5C_auto_size_ctl_t auto_size_ctl = { /* int32_t version = */ H5C__CURR_AUTO_SIZE_CTL_VER, /* H5C_auto_resize_report_fcn rpt_fcn = */ NULL, - /* hbool_t set_initial_size = */ TRUE, + /* bool set_initial_size = */ true, /* size_t initial_size = */ (2 * 1024 * 1024), /* double min_clean_fraction = */ 0.1, @@ -1051,7 +1053,7 @@ smoke_check_5(int express_test, unsigned paged) /* double increment = */ 2.0, - /* hbool_t apply_max_increment = */ TRUE, + /* bool apply_max_increment = */ true, /* size_t max_increment = */ (4 * 1024 * 1024), /* enum H5C_cache_flash_incr_mode */ @@ -1065,12 +1067,12 @@ smoke_check_5(int express_test, unsigned paged) /* double decrement = */ 0.9, - /* hbool_t apply_max_decrement = */ TRUE, + /* bool apply_max_decrement = */ true, /* size_t max_decrement = */ (1 * 1024 * 1024), /* int32_t epochs_before_eviction = */ 3, - /* hbool_t apply_empty_reserve = */ TRUE, + /* bool apply_empty_reserve = */ true, /* double empty_reserve = */ 0.5}; if (paged) @@ -1104,7 +1106,7 @@ smoke_check_5(int express_test, unsigned paged) break; } - pass = TRUE; + pass = true; if (show_progress) /* 1 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -1123,7 +1125,7 @@ smoke_check_5(int express_test, unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 1.\n"; } } @@ -1133,33 +1135,33 @@ smoke_check_5(int express_test, unsigned paged) hl_row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ FALSE, - /* do_inserts */ FALSE); + /* display_detailed_stats */ false, + /* do_inserts */ false); if (show_progress) /* 4 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_row_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ FALSE, - /* do_inserts */ FALSE); + /* display_detailed_stats */ false, + /* do_inserts */ false); if (show_progress) /* 5 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ FALSE, - /* do_inserts */ TRUE); + /* display_detailed_stats */ false, + /* do_inserts */ true); if (show_progress) /* 6 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -1167,20 +1169,20 @@ smoke_check_5(int express_test, unsigned paged) /* flush and destroy all entries in the cache: */ flush_cache(/* file_ptr */ file_ptr, - /* destroy_entries */ TRUE, - /* dump_stats */ FALSE, - /* dump_detailed_stats */ FALSE); + /* destroy_entries */ true, + /* dump_stats */ false, + /* dump_detailed_stats */ false); if (show_progress) /* 7 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_col_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ FALSE, - /* do_inserts */ TRUE, + /* display_detailed_stats */ false, + /* do_inserts */ true, /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 8 */ @@ -1189,26 +1191,26 @@ smoke_check_5(int express_test, unsigned paged) /* flush all entries in the cache: */ flush_cache(/* file_ptr */ file_ptr, - /* destroy_entries */ FALSE, - /* dump_stats */ FALSE, - /* dump_detailed_stats */ FALSE); + /* destroy_entries */ false, + /* dump_stats */ false, + /* dump_detailed_stats */ false); if (show_progress) /* 9 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_col_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ FALSE, - /* do_inserts */ TRUE, + /* display_detailed_stats */ false, + /* do_inserts */ true, /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 10 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); - takedown_cache(file_ptr, display_stats, TRUE); + takedown_cache(file_ptr, display_stats, true); if (show_progress) /* 11 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -1249,9 +1251,9 @@ static unsigned smoke_check_6(int express_test, unsigned paged) { herr_t result; - hbool_t show_progress = FALSE; - int dirty_unprotects = FALSE; - hbool_t display_stats = FALSE; + bool show_progress = false; + int dirty_unprotects = false; + bool display_stats = false; int mile_stone = 1; int32_t max_index = 1024; H5F_t *file_ptr = NULL; @@ -1259,7 +1261,7 @@ smoke_check_6(int express_test, unsigned paged) H5C_auto_size_ctl_t auto_size_ctl = { /* int32_t version = */ H5C__CURR_AUTO_SIZE_CTL_VER, /* H5C_auto_resize_report_fcn rpt_fcn = */ NULL, - /* hbool_t set_initial_size = */ TRUE, + /* bool set_initial_size = */ true, /* size_t initial_size = */ (2 * 1024 * 1024), /* double min_clean_fraction = */ 0.1, @@ -1275,7 +1277,7 @@ smoke_check_6(int express_test, unsigned paged) /* double increment = */ 2.0, - /* hbool_t apply_max_increment = */ TRUE, + /* bool apply_max_increment = */ true, /* size_t max_increment = */ (4 * 1024 * 1024), /* enum H5C_cache_flash_incr_mode */ @@ -1289,12 +1291,12 @@ smoke_check_6(int express_test, unsigned paged) /* double decrement = */ 0.9, - /* hbool_t apply_max_decrement = */ TRUE, + /* bool apply_max_decrement = */ true, /* size_t max_decrement = */ (1 * 1024 * 1024), /* int32_t epochs_before_eviction = */ 3, - /* hbool_t apply_empty_reserve = */ TRUE, + /* bool apply_empty_reserve = */ true, /* double empty_reserve = */ 0.05}; if (paged) @@ -1308,7 +1310,7 @@ smoke_check_6(int express_test, unsigned paged) return (0); } - pass = TRUE; + pass = true; switch (express_test) { case 0: @@ -1347,7 +1349,7 @@ smoke_check_6(int express_test, unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 1.\n"; } } @@ -1357,33 +1359,33 @@ smoke_check_6(int express_test, unsigned paged) hl_row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ FALSE, - /* do_inserts */ FALSE); + /* display_detailed_stats */ false, + /* do_inserts */ false); if (show_progress) /* 4 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_row_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ FALSE, - /* do_inserts */ FALSE); + /* display_detailed_stats */ false, + /* do_inserts */ false); if (show_progress) /* 5 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ FALSE, - /* do_inserts */ TRUE); + /* display_detailed_stats */ false, + /* do_inserts */ true); if (show_progress) /* 6 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -1391,20 +1393,20 @@ smoke_check_6(int express_test, unsigned paged) /* flush and destroy all entries in the cache: */ flush_cache(/* file_ptr */ file_ptr, - /* destroy_entries */ TRUE, - /* dump_stats */ FALSE, - /* dump_detailed_stats */ FALSE); + /* destroy_entries */ true, + /* dump_stats */ false, + /* dump_detailed_stats */ false); if (show_progress) /* 7 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_col_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ FALSE, - /* do_inserts */ TRUE, + /* display_detailed_stats */ false, + /* do_inserts */ true, /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 8 */ @@ -1413,26 +1415,26 @@ smoke_check_6(int express_test, unsigned paged) /* flush all entries in the cache: */ flush_cache(/* file_ptr */ file_ptr, - /* destroy_entries */ FALSE, - /* dump_stats */ FALSE, - /* dump_detailed_stats */ FALSE); + /* destroy_entries */ false, + /* dump_stats */ false, + /* dump_detailed_stats */ false); if (show_progress) /* 9 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_col_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ FALSE, - /* do_inserts */ TRUE, + /* display_detailed_stats */ false, + /* do_inserts */ true, /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 10 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); - takedown_cache(file_ptr, display_stats, TRUE); + takedown_cache(file_ptr, display_stats, true); if (show_progress) /* 11 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -1473,9 +1475,9 @@ static unsigned smoke_check_7(int express_test, unsigned paged) { herr_t result; - hbool_t show_progress = FALSE; - int dirty_unprotects = FALSE; - hbool_t display_stats = FALSE; + bool show_progress = false; + int dirty_unprotects = false; + bool display_stats = false; int mile_stone = 1; int32_t max_index = 1024; H5F_t *file_ptr = NULL; @@ -1483,7 +1485,7 @@ smoke_check_7(int express_test, unsigned paged) H5C_auto_size_ctl_t auto_size_ctl = { /* int32_t version = */ H5C__CURR_AUTO_SIZE_CTL_VER, /* H5C_auto_resize_report_fcn rpt_fcn = */ NULL, - /* hbool_t set_initial_size = */ TRUE, + /* bool set_initial_size = */ true, /* size_t initial_size = */ (2 * 1024 * 1024), /* double min_clean_fraction = */ 0.1, @@ -1499,7 +1501,7 @@ smoke_check_7(int express_test, unsigned paged) /* double increment = */ 2.0, - /* hbool_t apply_max_increment = */ TRUE, + /* bool apply_max_increment = */ true, /* size_t max_increment = */ (8 * 1024 * 1024), /* enum H5C_cache_flash_incr_mode */ @@ -1514,12 +1516,12 @@ smoke_check_7(int express_test, unsigned paged) /* double decrement = */ 0.9, - /* hbool_t apply_max_decrement = */ TRUE, + /* bool apply_max_decrement = */ true, /* size_t max_decrement = */ (1 * 1024 * 1024), /* int32_t epochs_before_eviction = */ 3, - /* hbool_t apply_empty_reserve = */ TRUE, + /* bool apply_empty_reserve = */ true, /* double empty_reserve = */ 0.1}; if (paged) @@ -1553,7 +1555,7 @@ smoke_check_7(int express_test, unsigned paged) break; } - pass = TRUE; + pass = true; if (show_progress) /* 1 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -1572,7 +1574,7 @@ smoke_check_7(int express_test, unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 1.\n"; } } @@ -1582,33 +1584,33 @@ smoke_check_7(int express_test, unsigned paged) hl_row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ FALSE, - /* do_inserts */ FALSE); + /* display_detailed_stats */ false, + /* do_inserts */ false); if (show_progress) /* 4 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_row_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ FALSE, - /* do_inserts */ FALSE); + /* display_detailed_stats */ false, + /* do_inserts */ false); if (show_progress) /* 5 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ FALSE, - /* do_inserts */ TRUE); + /* display_detailed_stats */ false, + /* do_inserts */ true); if (show_progress) /* 6 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -1616,20 +1618,20 @@ smoke_check_7(int express_test, unsigned paged) /* flush and destroy all entries in the cache: */ flush_cache(/* file_ptr */ file_ptr, - /* destroy_entries */ TRUE, - /* dump_stats */ FALSE, - /* dump_detailed_stats */ FALSE); + /* destroy_entries */ true, + /* dump_stats */ false, + /* dump_detailed_stats */ false); if (show_progress) /* 7 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_col_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ FALSE, - /* do_inserts */ TRUE, + /* display_detailed_stats */ false, + /* do_inserts */ true, /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 8 */ @@ -1638,26 +1640,26 @@ smoke_check_7(int express_test, unsigned paged) /* flush all entries in the cache: */ flush_cache(/* file_ptr */ file_ptr, - /* destroy_entries */ FALSE, - /* dump_stats */ FALSE, - /* dump_detailed_stats */ FALSE); + /* destroy_entries */ false, + /* dump_stats */ false, + /* dump_detailed_stats */ false); if (show_progress) /* 9 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_col_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ FALSE, - /* do_inserts */ TRUE, + /* display_detailed_stats */ false, + /* do_inserts */ true, /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 10 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); - takedown_cache(file_ptr, display_stats, TRUE); + takedown_cache(file_ptr, display_stats, true); if (show_progress) /* 11 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -1698,9 +1700,9 @@ static unsigned smoke_check_8(int express_test, unsigned paged) { herr_t result; - hbool_t show_progress = FALSE; - int dirty_unprotects = FALSE; - hbool_t display_stats = FALSE; + bool show_progress = false; + int dirty_unprotects = false; + bool display_stats = false; int mile_stone = 1; int32_t max_index = 1024; H5F_t *file_ptr = NULL; @@ -1708,7 +1710,7 @@ smoke_check_8(int express_test, unsigned paged) H5C_auto_size_ctl_t auto_size_ctl = { /* int32_t version = */ H5C__CURR_AUTO_SIZE_CTL_VER, /* H5C_auto_resize_report_fcn rpt_fcn = */ NULL, - /* hbool_t set_initial_size = */ TRUE, + /* bool set_initial_size = */ true, /* size_t initial_size = */ (2 * 1024 * 1024), /* double min_clean_fraction = */ 0.1, @@ -1724,7 +1726,7 @@ smoke_check_8(int express_test, unsigned paged) /* double increment = */ 2.0, - /* hbool_t apply_max_increment = */ TRUE, + /* bool apply_max_increment = */ true, /* size_t max_increment = */ (4 * 1024 * 1024), /* enum H5C_cache_flash_incr_mode */ @@ -1739,12 +1741,12 @@ smoke_check_8(int express_test, unsigned paged) /* double decrement = */ 0.9, - /* hbool_t apply_max_decrement = */ TRUE, + /* bool apply_max_decrement = */ true, /* size_t max_decrement = */ (1 * 1024 * 1024), /* int32_t epochs_before_eviction = */ 3, - /* hbool_t apply_empty_reserve = */ TRUE, + /* bool apply_empty_reserve = */ true, /* double empty_reserve = */ 0.1}; if (paged) @@ -1778,7 +1780,7 @@ smoke_check_8(int express_test, unsigned paged) break; } - pass = TRUE; + pass = true; if (show_progress) /* 1 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -1797,7 +1799,7 @@ smoke_check_8(int express_test, unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 1.\n"; } } @@ -1807,33 +1809,33 @@ smoke_check_8(int express_test, unsigned paged) hl_row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ FALSE, - /* do_inserts */ FALSE); + /* display_detailed_stats */ false, + /* do_inserts */ false); if (show_progress) /* 4 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_row_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ FALSE, - /* do_inserts */ FALSE); + /* display_detailed_stats */ false, + /* do_inserts */ false); if (show_progress) /* 5 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ FALSE, - /* do_inserts */ TRUE); + /* display_detailed_stats */ false, + /* do_inserts */ true); if (show_progress) /* 6 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -1841,20 +1843,20 @@ smoke_check_8(int express_test, unsigned paged) /* flush and destroy all entries in the cache: */ flush_cache(/* file_ptr */ file_ptr, - /* destroy_entries */ TRUE, - /* dump_stats */ FALSE, - /* dump_detailed_stats */ FALSE); + /* destroy_entries */ true, + /* dump_stats */ false, + /* dump_detailed_stats */ false); if (show_progress) /* 7 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_col_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ FALSE, - /* do_inserts */ TRUE, + /* display_detailed_stats */ false, + /* do_inserts */ true, /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 8 */ @@ -1863,26 +1865,26 @@ smoke_check_8(int express_test, unsigned paged) /* flush all entries in the cache: */ flush_cache(/* file_ptr */ file_ptr, - /* destroy_entries */ FALSE, - /* dump_stats */ FALSE, - /* dump_detailed_stats */ FALSE); + /* destroy_entries */ false, + /* dump_stats */ false, + /* dump_detailed_stats */ false); if (show_progress) /* 9 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_col_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ FALSE, - /* do_inserts */ TRUE, + /* display_detailed_stats */ false, + /* do_inserts */ true, /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 10 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); - takedown_cache(file_ptr, display_stats, TRUE); + takedown_cache(file_ptr, display_stats, true); if (show_progress) /* 11 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -1926,11 +1928,11 @@ static unsigned smoke_check_9(int express_test, unsigned paged) { herr_t result; - hbool_t show_progress = FALSE; - int dirty_unprotects = FALSE; - int dirty_destroys = FALSE; - hbool_t display_stats = FALSE; - hbool_t display_detailed_stats = FALSE; + bool show_progress = false; + int dirty_unprotects = false; + int dirty_destroys = false; + bool display_stats = false; + bool display_detailed_stats = false; int32_t max_index = (10 * 1024) - 1; int32_t lag = 10; int mile_stone = 1; @@ -1968,7 +1970,7 @@ smoke_check_9(int express_test, unsigned paged) break; } - pass = TRUE; + pass = true; if (show_progress) /* 1 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -1988,11 +1990,11 @@ smoke_check_9(int express_test, unsigned paged) if (pass) { - result = H5C_set_evictions_enabled(cache_ptr, FALSE); + result = H5C_set_evictions_enabled(cache_ptr, false); if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "can't disable evictions 1.\n"; } } @@ -2003,15 +2005,15 @@ smoke_check_9(int express_test, unsigned paged) row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, /* display_detailed_stats */ display_detailed_stats, - /* do_inserts */ TRUE, - /* do_moves */ TRUE, - /* move_to_main_addr */ FALSE, - /* do_destroys */ TRUE, - /* do_mult_ro_protects */ TRUE, + /* do_inserts */ true, + /* do_moves */ true, + /* move_to_main_addr */ false, + /* do_destroys */ true, + /* do_mult_ro_protects */ true, /* dirty_destroys */ dirty_destroys, /* dirty_unprotects */ dirty_unprotects); @@ -2022,11 +2024,11 @@ smoke_check_9(int express_test, unsigned paged) if (pass) { - result = H5C_set_evictions_enabled(cache_ptr, TRUE); + result = H5C_set_evictions_enabled(cache_ptr, true); if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "can't enable evictions 1.\n"; } } @@ -2037,15 +2039,15 @@ smoke_check_9(int express_test, unsigned paged) row_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, /* display_detailed_stats */ display_detailed_stats, - /* do_inserts */ FALSE, - /* do_moves */ TRUE, - /* move_to_main_addr */ TRUE, - /* do_destroys */ FALSE, - /* do_mult_ro_protects */ TRUE, + /* do_inserts */ false, + /* do_moves */ true, + /* move_to_main_addr */ true, + /* do_destroys */ false, + /* do_mult_ro_protects */ true, /* dirty_destroys */ dirty_destroys, /* dirty_unprotects */ dirty_unprotects); @@ -2054,11 +2056,11 @@ smoke_check_9(int express_test, unsigned paged) if (pass) { - result = H5C_set_evictions_enabled(cache_ptr, FALSE); + result = H5C_set_evictions_enabled(cache_ptr, false); if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "can't disable evictions 2.\n"; } } @@ -2070,15 +2072,15 @@ smoke_check_9(int express_test, unsigned paged) row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, /* display_detailed_stats */ display_detailed_stats, - /* do_inserts */ TRUE, - /* do_moves */ TRUE, - /* move_to_main_addr */ FALSE, - /* do_destroys */ FALSE, - /* do_mult_ro_protects */ TRUE, + /* do_inserts */ true, + /* do_moves */ true, + /* move_to_main_addr */ false, + /* do_destroys */ false, + /* do_mult_ro_protects */ true, /* dirty_destroys */ dirty_destroys, /* dirty_unprotects */ dirty_unprotects); @@ -2087,11 +2089,11 @@ smoke_check_9(int express_test, unsigned paged) if (pass) { - result = H5C_set_evictions_enabled(cache_ptr, TRUE); + result = H5C_set_evictions_enabled(cache_ptr, true); if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "can't enable evictions 2.\n"; } } @@ -2102,20 +2104,20 @@ smoke_check_9(int express_test, unsigned paged) /* flush and destroy all entries in the cache: */ flush_cache(/* file_ptr */ file_ptr, - /* destroy_entries */ TRUE, - /* dump_stats */ FALSE, - /* dump_detailed_stats */ FALSE); + /* destroy_entries */ true, + /* dump_stats */ false, + /* dump_detailed_stats */ false); if (show_progress) /* 11 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { - result = H5C_set_evictions_enabled(cache_ptr, FALSE); + result = H5C_set_evictions_enabled(cache_ptr, false); if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "can't disable evictions 3.\n"; } } @@ -2126,11 +2128,11 @@ smoke_check_9(int express_test, unsigned paged) col_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, /* display_detailed_stats */ display_detailed_stats, - /* do_inserts */ TRUE, + /* do_inserts */ true, /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 13 */ @@ -2139,20 +2141,20 @@ smoke_check_9(int express_test, unsigned paged) /* flush all entries in the cache: */ flush_cache(/* file_ptr */ file_ptr, - /* destroy_entries */ FALSE, - /* dump_stats */ FALSE, - /* dump_detailed_stats */ FALSE); + /* destroy_entries */ false, + /* dump_stats */ false, + /* dump_detailed_stats */ false); if (show_progress) /* 14 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { - result = H5C_set_evictions_enabled(cache_ptr, TRUE); + result = H5C_set_evictions_enabled(cache_ptr, true); if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "can't enable evictions 3.\n"; } } @@ -2163,11 +2165,11 @@ smoke_check_9(int express_test, unsigned paged) col_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, /* display_detailed_stats */ display_detailed_stats, - /* do_inserts */ TRUE, + /* do_inserts */ true, /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 16 */ @@ -2175,11 +2177,11 @@ smoke_check_9(int express_test, unsigned paged) if (pass) { - result = H5C_set_evictions_enabled(cache_ptr, FALSE); + result = H5C_set_evictions_enabled(cache_ptr, false); if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "can't disable evictions 4.\n"; } } @@ -2187,7 +2189,7 @@ smoke_check_9(int express_test, unsigned paged) if (show_progress) /* 17 */ fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, (int)pass); - takedown_cache(file_ptr, display_stats, TRUE); + takedown_cache(file_ptr, display_stats, true); if (show_progress) /* 18 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -2231,11 +2233,11 @@ static unsigned smoke_check_10(int express_test, unsigned paged) { herr_t result; - hbool_t show_progress = FALSE; - int dirty_unprotects = TRUE; - int dirty_destroys = TRUE; - hbool_t display_stats = FALSE; - hbool_t display_detailed_stats = FALSE; + bool show_progress = false; + int dirty_unprotects = true; + int dirty_destroys = true; + bool display_stats = false; + bool display_detailed_stats = false; int32_t max_index = (10 * 1024) - 1; int32_t lag = 10; int mile_stone = 1; @@ -2273,7 +2275,7 @@ smoke_check_10(int express_test, unsigned paged) break; } - pass = TRUE; + pass = true; if (show_progress) /* 1 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -2292,15 +2294,15 @@ smoke_check_10(int express_test, unsigned paged) row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, /* display_detailed_stats */ display_detailed_stats, - /* do_inserts */ TRUE, - /* do_moves */ TRUE, - /* move_to_main_addr */ FALSE, - /* do_destroys */ TRUE, - /* do_mult_ro_protects */ TRUE, + /* do_inserts */ true, + /* do_moves */ true, + /* move_to_main_addr */ false, + /* do_destroys */ true, + /* do_mult_ro_protects */ true, /* dirty_destroys */ dirty_destroys, /* dirty_unprotects */ dirty_unprotects); @@ -2309,11 +2311,11 @@ smoke_check_10(int express_test, unsigned paged) if (pass) { - result = H5C_set_evictions_enabled(cache_ptr, FALSE); + result = H5C_set_evictions_enabled(cache_ptr, false); if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "can't disable evictions 1.\n"; } } @@ -2324,15 +2326,15 @@ smoke_check_10(int express_test, unsigned paged) row_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, /* display_detailed_stats */ display_detailed_stats, - /* do_inserts */ FALSE, - /* do_moves */ TRUE, - /* move_to_main_addr */ TRUE, - /* do_destroys */ FALSE, - /* do_mult_ro_protects */ TRUE, + /* do_inserts */ false, + /* do_moves */ true, + /* move_to_main_addr */ true, + /* do_destroys */ false, + /* do_mult_ro_protects */ true, /* dirty_destroys */ dirty_destroys, /* dirty_unprotects */ dirty_unprotects); @@ -2341,11 +2343,11 @@ smoke_check_10(int express_test, unsigned paged) if (pass) { - result = H5C_set_evictions_enabled(cache_ptr, TRUE); + result = H5C_set_evictions_enabled(cache_ptr, true); if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "can't enable evictions 1.\n"; } } @@ -2356,15 +2358,15 @@ smoke_check_10(int express_test, unsigned paged) row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, /* display_detailed_stats */ display_detailed_stats, - /* do_inserts */ TRUE, - /* do_moves */ TRUE, - /* move_to_main_addr */ FALSE, - /* do_destroys */ FALSE, - /* do_mult_ro_protects */ TRUE, + /* do_inserts */ true, + /* do_moves */ true, + /* move_to_main_addr */ false, + /* do_destroys */ false, + /* do_mult_ro_protects */ true, /* dirty_destroys */ dirty_destroys, /* dirty_unprotects */ dirty_unprotects); @@ -2373,11 +2375,11 @@ smoke_check_10(int express_test, unsigned paged) if (pass) { - result = H5C_set_evictions_enabled(cache_ptr, FALSE); + result = H5C_set_evictions_enabled(cache_ptr, false); if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "can't disable evictions 2.\n"; } } @@ -2388,20 +2390,20 @@ smoke_check_10(int express_test, unsigned paged) /* flush and destroy all entries in the cache: */ flush_cache(/* file_ptr */ file_ptr, - /* destroy_entries */ TRUE, - /* dump_stats */ FALSE, - /* dump_detailed_stats */ FALSE); + /* destroy_entries */ true, + /* dump_stats */ false, + /* dump_detailed_stats */ false); if (show_progress) /* 10 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { - result = H5C_set_evictions_enabled(cache_ptr, TRUE); + result = H5C_set_evictions_enabled(cache_ptr, true); if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "can't enable evictions 2.\n"; } } @@ -2412,11 +2414,11 @@ smoke_check_10(int express_test, unsigned paged) col_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, /* display_detailed_stats */ display_detailed_stats, - /* do_inserts */ TRUE, + /* do_inserts */ true, /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 12 */ @@ -2424,11 +2426,11 @@ smoke_check_10(int express_test, unsigned paged) if (pass) { - result = H5C_set_evictions_enabled(cache_ptr, FALSE); + result = H5C_set_evictions_enabled(cache_ptr, false); if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "can't disable evictions 3.\n"; } } @@ -2439,20 +2441,20 @@ smoke_check_10(int express_test, unsigned paged) /* flush all entries in the cache: */ flush_cache(/* file_ptr */ file_ptr, - /* destroy_entries */ FALSE, - /* dump_stats */ FALSE, - /* dump_detailed_stats */ FALSE); + /* destroy_entries */ false, + /* dump_stats */ false, + /* dump_detailed_stats */ false); if (show_progress) /* 14 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { - result = H5C_set_evictions_enabled(cache_ptr, TRUE); + result = H5C_set_evictions_enabled(cache_ptr, true); if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "can't enable evictions 3.\n"; } } @@ -2463,11 +2465,11 @@ smoke_check_10(int express_test, unsigned paged) col_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, /* display_detailed_stats */ display_detailed_stats, - /* do_inserts */ TRUE, + /* do_inserts */ true, /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 16 */ @@ -2475,11 +2477,11 @@ smoke_check_10(int express_test, unsigned paged) if (pass) { - result = H5C_set_evictions_enabled(cache_ptr, FALSE); + result = H5C_set_evictions_enabled(cache_ptr, false); if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "can't disable evictions 4.\n"; } } @@ -2487,7 +2489,7 @@ smoke_check_10(int express_test, unsigned paged) if (show_progress) /* 17 */ fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, (int)pass); - takedown_cache(file_ptr, display_stats, TRUE); + takedown_cache(file_ptr, display_stats, true); if (show_progress) /* 18 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -2516,9 +2518,9 @@ smoke_check_10(int express_test, unsigned paged) * * Purpose: A basic test of the write permitted function. In essence, * we load the cache up with dirty entryies, set - * write_permitted to FALSE, and then protect a bunch of + * write_permitted to false, and then protect a bunch of * entries. If there are any writes while write_permitted is - * FALSE, the test will fail. + * false, the test will fail. * * Return: void * @@ -2535,8 +2537,8 @@ write_permitted_check(int #if H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS - hbool_t show_progress = FALSE; - hbool_t display_stats = FALSE; + bool show_progress = false; + bool display_stats = false; int32_t max_index = (10 * 1024) - 1; int32_t lag = 10; int mile_stone = 1; @@ -2571,7 +2573,7 @@ write_permitted_check(int break; } - pass = TRUE; + pass = true; if (show_progress) /* 1 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -2589,57 +2591,57 @@ write_permitted_check(int row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ TRUE, - /* do_inserts */ TRUE, - /* do_moves */ TRUE, - /* move_to_main_addr */ FALSE, - /* do_destroys */ TRUE, - /* do_mult_ro_protects */ TRUE, - /* dirty_destroys */ TRUE, - /* dirty_unprotects */ TRUE); + /* display_detailed_stats */ true, + /* do_inserts */ true, + /* do_moves */ true, + /* move_to_main_addr */ false, + /* do_destroys */ true, + /* do_mult_ro_protects */ true, + /* dirty_destroys */ true, + /* dirty_unprotects */ true); if (show_progress) /* 4 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); - write_permitted = FALSE; + write_permitted = false; row_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ TRUE, - /* do_inserts */ FALSE, - /* do_moves */ TRUE, - /* move_to_main_addr */ TRUE, - /* do_destroys */ FALSE, - /* do_mult_ro_protects */ TRUE, - /* dirty_destroys */ FALSE, + /* display_detailed_stats */ true, + /* do_inserts */ false, + /* do_moves */ true, + /* move_to_main_addr */ true, + /* do_destroys */ false, + /* do_mult_ro_protects */ true, + /* dirty_destroys */ false, /* dirty_unprotects */ NO_CHANGE); if (show_progress) /* 5 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); - write_permitted = TRUE; + write_permitted = true; row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ TRUE, - /* do_inserts */ TRUE, - /* do_moves */ TRUE, - /* move_to_main_addr */ FALSE, - /* do_destroys */ FALSE, - /* do_mult_ro_protects */ TRUE, - /* dirty_destroys */ TRUE, - /* dirty_unprotects */ TRUE); + /* display_detailed_stats */ true, + /* do_inserts */ true, + /* do_moves */ true, + /* move_to_main_addr */ false, + /* do_destroys */ false, + /* do_mult_ro_protects */ true, + /* dirty_destroys */ true, + /* dirty_unprotects */ true); if (show_progress) /* 6 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -2647,9 +2649,9 @@ write_permitted_check(int /* flush and destroy all entries in the cache: */ flush_cache(/* file_ptr */ file_ptr, - /* destroy_entries */ TRUE, - /* dump_stats */ FALSE, - /* dump_detailed_stats */ FALSE); + /* destroy_entries */ true, + /* dump_stats */ false, + /* dump_detailed_stats */ false); if (show_progress) /* 7 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -2657,34 +2659,34 @@ write_permitted_check(int col_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ TRUE, - /* do_inserts */ TRUE, - /* dirty_unprotects */ TRUE); + /* display_detailed_stats */ true, + /* do_inserts */ true, + /* dirty_unprotects */ true); if (show_progress) /* 8 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); - write_permitted = FALSE; + write_permitted = false; col_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, /* lag */ lag, - /* verbose */ FALSE, - /* reset_stats */ TRUE, + /* verbose */ false, + /* reset_stats */ true, /* display_stats */ display_stats, - /* display_detailed_stats */ TRUE, - /* do_inserts */ FALSE, + /* display_detailed_stats */ true, + /* do_inserts */ false, /* dirty_unprotects */ NO_CHANGE); - write_permitted = TRUE; + write_permitted = true; if (show_progress) /* 9 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); - takedown_cache(file_ptr, display_stats, TRUE); + takedown_cache(file_ptr, display_stats, true); if (show_progress) /* 10 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -2738,10 +2740,10 @@ check_insert_entry(unsigned paged) int entry_type = PICO_ENTRY_TYPE; int i; herr_t result; - hbool_t in_cache; - hbool_t is_dirty; - hbool_t is_protected; - hbool_t is_pinned; + bool in_cache; + bool is_dirty; + bool is_protected; + bool is_pinned; size_t entry_size; H5F_t *file_ptr = NULL; H5C_t *cache_ptr = NULL; @@ -2754,7 +2756,7 @@ check_insert_entry(unsigned paged) else TESTING("H5C_insert_entry() functionality"); - pass = TRUE; + pass = true; /* Allocate a cache, and insert entries into it using all * combinations of flags. Verify that the entries are inserted, @@ -2796,7 +2798,7 @@ check_insert_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_entry_status() reports failure."; } @@ -2805,7 +2807,7 @@ check_insert_entry(unsigned paged) /* check the universals */ if ((!in_cache) || (!is_dirty) || (is_protected) || (entry_size != entry_sizes[entry_type])) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected insert results 1."; } } @@ -2817,18 +2819,18 @@ check_insert_entry(unsigned paged) if (!is_pinned) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected insert results 2."; } } else if (is_pinned) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected insert results 3."; } else if (is_pinned != ((entry_ptr->header).is_pinned)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected insert results 4."; } } @@ -2844,13 +2846,13 @@ check_insert_entry(unsigned paged) if (!((entry_ptr->header).flush_marker)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected insert results 5."; } } else if ((entry_ptr->header).flush_marker) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected insert results 6."; } } @@ -2868,7 +2870,7 @@ check_insert_entry(unsigned paged) if (search_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected insert results 7."; } } @@ -2887,7 +2889,7 @@ check_insert_entry(unsigned paged) if (search_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected insert results 8."; } } @@ -2907,7 +2909,7 @@ check_insert_entry(unsigned paged) if (search_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected insert results 9."; } } @@ -2938,7 +2940,7 @@ check_insert_entry(unsigned paged) #endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */ ) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected insert results 10."; } } @@ -2958,7 +2960,7 @@ check_insert_entry(unsigned paged) (cache_ptr->max_pl_len != 0) || (cache_ptr->max_pl_size != (size_t)0) || (cache_ptr->max_pel_len != 2) || (cache_ptr->max_pel_size != 2 * entry_sizes[entry_type])) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected insert results 11."; } } @@ -2974,7 +2976,7 @@ check_insert_entry(unsigned paged) if (pass) { - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); } if (pass) { @@ -3014,7 +3016,7 @@ check_flush_cache(unsigned paged) else TESTING("H5C_flush_cache() functionality"); - pass = TRUE; + pass = true; /* allocate a cache, and flush it under various circumstances. * To the extent possible, verify that the desired actions took @@ -3058,7 +3060,7 @@ check_flush_cache(unsigned paged) if (pass) { - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); } if (pass) { @@ -3096,12 +3098,12 @@ check_flush_cache__empty_cache(H5F_t *file_ptr) if (cache_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "cache_ptr NULL on entry to empty cache case."; } else if ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0)) { - pass = FALSE; + pass = false; failure_mssg = "cache not empty at beginning of empty cache case."; } @@ -3154,12 +3156,12 @@ check_flush_cache__multi_entry(H5F_t *file_ptr) if (cache_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "cache_ptr NULL on entry to multi entry case."; } else if ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0)) { - pass = FALSE; + pass = false; failure_mssg = "cache not empty at beginning of multi entry case."; } @@ -3171,67 +3173,67 @@ check_flush_cache__multi_entry(H5F_t *file_ptr) {/* entry_num = */ 0, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 100, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}, {/* entry_num = */ 1, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 75, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}, {/* entry_num = */ 2, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 25, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}, {/* entry_num = */ 3, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 50, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}, {/* entry_num = */ 4, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 10, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}, {/* entry_num = */ 5, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 20, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG | H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}, {/* entry_num = */ 6, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 30, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}, {/* entry_num = */ 7, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 40, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}}; + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}}; check_flush_cache__multi_entry_test(file_ptr, test_num, flush_flags, spec_size, spec); } @@ -3244,67 +3246,67 @@ check_flush_cache__multi_entry(H5F_t *file_ptr) {/* entry_num = */ 0, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 100, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 1, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 75, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}, {/* entry_num = */ 2, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 25, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}, {/* entry_num = */ 3, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 50, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}, {/* entry_num = */ 4, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 10, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 5, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 20, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG | H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}, {/* entry_num = */ 6, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 30, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}, {/* entry_num = */ 7, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 40, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}}; + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}}; check_flush_cache__multi_entry_test(file_ptr, test_num, flush_flags, spec_size, spec); } @@ -3317,67 +3319,67 @@ check_flush_cache__multi_entry(H5F_t *file_ptr) {/* entry_num = */ 0, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 100, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}, {/* entry_num = */ 1, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 75, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}, {/* entry_num = */ 2, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 25, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}, {/* entry_num = */ 3, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 50, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}, {/* entry_num = */ 4, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 10, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}, {/* entry_num = */ 5, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 20, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG | H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}, {/* entry_num = */ 6, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 30, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}, {/* entry_num = */ 7, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 40, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}}; + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}}; check_flush_cache__multi_entry_test(file_ptr, test_num, flush_flags, spec_size, spec); } @@ -3390,67 +3392,67 @@ check_flush_cache__multi_entry(H5F_t *file_ptr) {/* entry_num = */ 0, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 100, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}, {/* entry_num = */ 1, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 75, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}, {/* entry_num = */ 2, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 25, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}, {/* entry_num = */ 3, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 50, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}, {/* entry_num = */ 4, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 10, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}, {/* entry_num = */ 5, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 20, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG | H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}, {/* entry_num = */ 6, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 30, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}, {/* entry_num = */ 7, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 40, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}}; + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}}; check_flush_cache__multi_entry_test(file_ptr, test_num, flush_flags, spec_size, spec); } @@ -3463,67 +3465,67 @@ check_flush_cache__multi_entry(H5F_t *file_ptr) {/* entry_num = */ 0, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 100, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 1, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 75, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 2, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 25, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 3, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 50, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 4, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 10, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 5, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 20, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG | H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 6, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 30, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 7, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 40, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}}; + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}}; check_flush_cache__multi_entry_test(file_ptr, test_num, flush_flags, spec_size, spec); } @@ -3536,67 +3538,67 @@ check_flush_cache__multi_entry(H5F_t *file_ptr) {/* entry_num = */ 0, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 100, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 1, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 75, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}, {/* entry_num = */ 2, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 25, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}, {/* entry_num = */ 3, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 50, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}, {/* entry_num = */ 4, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 10, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 5, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 20, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG | H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}, {/* entry_num = */ 6, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 30, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}, {/* entry_num = */ 7, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 40, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}}; + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}}; check_flush_cache__multi_entry_test(file_ptr, test_num, flush_flags, spec_size, spec); } @@ -3609,67 +3611,67 @@ check_flush_cache__multi_entry(H5F_t *file_ptr) {/* entry_num = */ 0, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 100, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}, {/* entry_num = */ 1, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 75, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}, {/* entry_num = */ 2, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 25, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}, {/* entry_num = */ 3, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 50, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}, {/* entry_num = */ 4, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 10, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}, {/* entry_num = */ 5, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 20, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG | H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}, {/* entry_num = */ 6, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 30, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}, {/* entry_num = */ 7, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 40, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}}; + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}}; check_flush_cache__multi_entry_test(file_ptr, test_num, flush_flags, spec_size, spec); } @@ -3683,67 +3685,67 @@ check_flush_cache__multi_entry(H5F_t *file_ptr) {/* entry_num = */ 0, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 100, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 1, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 75, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 2, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 25, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 3, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 50, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 4, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 10, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 5, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 20, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG | H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 6, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 30, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 7, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 40, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}}; + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}}; check_flush_cache__multi_entry_test(file_ptr, test_num, flush_flags, spec_size, spec); } @@ -3758,67 +3760,67 @@ check_flush_cache__multi_entry(H5F_t *file_ptr) {/* entry_num = */ 0, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 100, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}, {/* entry_num = */ 1, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 75, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}, {/* entry_num = */ 2, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 25, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}, {/* entry_num = */ 3, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 50, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}, {/* entry_num = */ 4, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 10, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}, {/* entry_num = */ 5, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 20, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG | H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}, {/* entry_num = */ 6, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 30, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}, {/* entry_num = */ 7, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 40, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}}; + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}}; check_flush_cache__multi_entry_test(file_ptr, test_num, flush_flags, spec_size, spec); } @@ -3837,99 +3839,99 @@ check_flush_cache__multi_entry(H5F_t *file_ptr) {/* entry_num = */ 0, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 100, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, /* num_pins = */ 0, /* pin_type[MAX_PINS] = */ {-1, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {-1, -1, -1, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}, {/* entry_num = */ 1, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 75, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, /* num_pins = */ 1, /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, -1, -1, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}, {/* entry_num = */ 2, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 25, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, /* num_pins = */ 2, /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, 75, -1, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}, {/* entry_num = */ 3, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 50, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, /* num_pins = */ 3, /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, PICO_ENTRY_TYPE, PICO_ENTRY_TYPE, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, 75, 25, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}, {/* entry_num = */ 4, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 10, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, /* num_pins = */ 4, /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, PICO_ENTRY_TYPE, PICO_ENTRY_TYPE, PICO_ENTRY_TYPE, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, 75, 25, 50, -1, -1, -1, -1}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}, {/* entry_num = */ 5, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 20, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG | H5C__SET_FLUSH_MARKER_FLAG, /* num_pins = */ 5, /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, PICO_ENTRY_TYPE, PICO_ENTRY_TYPE, PICO_ENTRY_TYPE, MONSTER_ENTRY_TYPE, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, 75, 25, 50, 10, -1, -1, -1}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}, {/* entry_num = */ 6, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 30, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, /* num_pins = */ 6, /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, PICO_ENTRY_TYPE, PICO_ENTRY_TYPE, PICO_ENTRY_TYPE, MONSTER_ENTRY_TYPE, MONSTER_ENTRY_TYPE, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, 75, 25, 50, 10, 20, -1, -1}, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}, {/* entry_num = */ 7, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 40, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, /* num_pins = */ 7, /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, PICO_ENTRY_TYPE, PICO_ENTRY_TYPE, PICO_ENTRY_TYPE, MONSTER_ENTRY_TYPE, MONSTER_ENTRY_TYPE, MONSTER_ENTRY_TYPE, -1}, /* pin_idx[MAX_PINS] = */ {100, 75, 25, 50, 10, 20, 30, -1}, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}}; + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}}; check_flush_cache__pe_multi_entry_test(file_ptr, test_num, flush_flags, spec_size, spec); } @@ -3942,93 +3944,93 @@ check_flush_cache__multi_entry(H5F_t *file_ptr) {/* entry_num = */ 0, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 100, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, /* num_pins = */ 0, /* pin_type[MAX_PINS] = */ {-1, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {-1, -1, -1, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 1, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 75, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, /* num_pins = */ 1, /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, -1, -1, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}, {/* entry_num = */ 2, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 25, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, /* num_pins = */ 2, /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, 75, -1, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}, {/* entry_num = */ 3, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 50, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, /* num_pins = */ 3, /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, PICO_ENTRY_TYPE, PICO_ENTRY_TYPE, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, 75, 25, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}, {/* entry_num = */ 4, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 10, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, /* num_pins = */ 0, /* pin_type[MAX_PINS] = */ {-1, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {-1, -1, -1, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 5, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 20, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG | H5C__SET_FLUSH_MARKER_FLAG, /* num_pins = */ 1, /* pin_type[MAX_PINS] = */ {MONSTER_ENTRY_TYPE, -1, -1, -1, -1 - 1, -1, -1}, /* pin_idx[MAX_PINS] = */ {10, -1, -1, -1 - 1, -1, -1, -1}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}, {/* entry_num = */ 6, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 30, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, /* num_pins = */ 2, /* pin_type[MAX_PINS] = */ {MONSTER_ENTRY_TYPE, MONSTER_ENTRY_TYPE, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {10, 20, -1, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}, {/* entry_num = */ 7, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 40, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, /* num_pins = */ 3, /* pin_type[MAX_PINS] = */ {MONSTER_ENTRY_TYPE, MONSTER_ENTRY_TYPE, MONSTER_ENTRY_TYPE, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {10, 20, 30, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}}; + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}}; check_flush_cache__pe_multi_entry_test(file_ptr, test_num, flush_flags, spec_size, spec); } @@ -4041,91 +4043,91 @@ check_flush_cache__multi_entry(H5F_t *file_ptr) {/* entry_num = */ 0, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 100, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, /* num_pins = */ 0, /* pin_type[MAX_PINS] = */ {-1, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {-1, -1, -1, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 1, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 75, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, /* num_pins = */ 1, /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, -1, -1, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 2, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 25, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, /* num_pins = */ 1, /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, -1, -1, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 3, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 50, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, /* num_pins = */ 1, /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, -1, -1, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 4, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 10, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, /* num_pins = */ 0, /* pin_type[MAX_PINS] = */ {-1, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {-1, -1, -1, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 5, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 20, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG | H5C__SET_FLUSH_MARKER_FLAG, /* num_pins = */ 0, /* pin_type[MAX_PINS] = */ {-1, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {-1, -1, -1, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 6, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 30, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, /* num_pins = */ 0, /* pin_type[MAX_PINS] = */ {-1, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {-1, -1, -1, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 7, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 40, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, /* num_pins = */ 0, /* pin_type[MAX_PINS] = */ {-1, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {-1, -1, -1, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}}; + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}}; check_flush_cache__pe_multi_entry_test(file_ptr, test_num, flush_flags, spec_size, spec); } @@ -4138,93 +4140,93 @@ check_flush_cache__multi_entry(H5F_t *file_ptr) {/* entry_num = */ 0, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 100, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, /* num_pins = */ 0, /* pin_type[MAX_PINS] = */ {-1, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {-1, -1, -1, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 1, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 75, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, /* num_pins = */ 1, /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, -1, -1, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}, {/* entry_num = */ 2, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 25, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, /* num_pins = */ 1, /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, -1, -1, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}, {/* entry_num = */ 3, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 50, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, /* num_pins = */ 1, /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, -1, -1, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}, {/* entry_num = */ 4, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 10, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, /* num_pins = */ 0, /* pin_type[MAX_PINS] = */ {-1, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {-1, -1, -1, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 5, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 20, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, /* num_pins = */ 4, /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, PICO_ENTRY_TYPE, PICO_ENTRY_TYPE, PICO_ENTRY_TYPE, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, 75, 25, 50, -1, -1, -1, -1}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}, {/* entry_num = */ 6, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 30, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, /* num_pins = */ 4, /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, PICO_ENTRY_TYPE, PICO_ENTRY_TYPE, PICO_ENTRY_TYPE, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, 75, 25, 50, -1, -1, -1, -1}, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}, {/* entry_num = */ 7, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 40, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, /* num_pins = */ 0, /* pin_type[MAX_PINS] = */ {-1, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {-1, -1, -1, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}}; + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}}; check_flush_cache__pe_multi_entry_test(file_ptr, test_num, flush_flags, spec_size, spec); } @@ -4238,91 +4240,91 @@ check_flush_cache__multi_entry(H5F_t *file_ptr) {/* entry_num = */ 0, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 100, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, /* num_pins = */ 0, /* pin_type[MAX_PINS] = */ {-1, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {-1, -1, -1, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 1, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 75, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, /* num_pins = */ 1, /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, -1, -1, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 2, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 25, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, /* num_pins = */ 1, /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, -1, -1, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 3, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 50, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, /* num_pins = */ 1, /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, -1, -1, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 4, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 10, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, /* num_pins = */ 1, /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, -1, -1, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 5, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 20, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG | H5C__SET_FLUSH_MARKER_FLAG, /* num_pins = */ 1, /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, -1, -1, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 6, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 30, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, /* num_pins = */ 1, /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, -1, -1, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}, {/* entry_num = */ 7, /* entry_type = */ MONSTER_ENTRY_TYPE, /* entry_index = */ 40, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__SET_FLUSH_MARKER_FLAG, /* num_pins = */ 1, /* pin_type[MAX_PINS] = */ {PICO_ENTRY_TYPE, -1, -1, -1, -1, -1, -1, -1}, /* pin_idx[MAX_PINS] = */ {100, -1, -1, -1, -1, -1, -1, -1}, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}}; + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}}; check_flush_cache__pe_multi_entry_test(file_ptr, test_num, flush_flags, spec_size, spec); } @@ -4352,20 +4354,20 @@ check_flush_cache__multi_entry_test(H5F_t *file_ptr, int test_num, unsigned int if (cache_ptr == NULL) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "cache_ptr NULL on entry to single entry test #%d.", test_num); failure_mssg = msg; } else if ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "cache not empty at beginning of multi entry test #%d.", test_num); failure_mssg = msg; } else if ((spec_size < 1) || (spec == NULL)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "missing/bad test spec on entry to multi entry test #%d.", test_num); failure_mssg = msg; } @@ -4377,7 +4379,7 @@ check_flush_cache__multi_entry_test(H5F_t *file_ptr, int test_num, unsigned int (spec[u].entry_type >= NUMBER_OF_ENTRY_TYPES) || (spec[u].entry_index < 0) || (spec[u].entry_index > max_indices[spec[u].entry_type])) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "bad data in spec[%u] on entry to multi entry test #%d.", u, test_num); failure_mssg = msg; @@ -4425,7 +4427,7 @@ check_flush_cache__multi_entry_test(H5F_t *file_ptr, int test_num, unsigned int (entry_ptr->serialized != spec[u].expected_serialized) || (entry_ptr->destroyed != spec[u].expected_destroyed)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Bad status on entry %u after flush in multi entry test #%d.", u, test_num); failure_mssg = msg; @@ -4440,7 +4442,7 @@ check_flush_cache__multi_entry_test(H5F_t *file_ptr, int test_num, unsigned int (((flush_flags & H5C__FLUSH_INVALIDATE_FLAG) != 0) && ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0)))) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache len/size after flush in multi entry test #%d.", test_num); failure_mssg = msg; @@ -4454,13 +4456,13 @@ check_flush_cache__multi_entry_test(H5F_t *file_ptr, int test_num, unsigned int if (!pass) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Flush failed on cleanup in multi entry test #%d.", test_num); failure_mssg = msg; } else if ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache len/size after cleanup in multi entry test #%d.", test_num); failure_mssg = msg; @@ -4473,9 +4475,9 @@ check_flush_cache__multi_entry_test(H5F_t *file_ptr, int test_num, unsigned int base_addr = entries[spec[u].entry_type]; entry_ptr = &(base_addr[spec[u].entry_index]); - entry_ptr->deserialized = FALSE; - entry_ptr->serialized = FALSE; - entry_ptr->destroyed = FALSE; + entry_ptr->deserialized = false; + entry_ptr->serialized = false; + entry_ptr->destroyed = false; u++; } @@ -4507,20 +4509,20 @@ check_flush_cache__pe_multi_entry_test(H5F_t *file_ptr, int test_num, unsigned i if (cache_ptr == NULL) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "cache_ptr NULL on entry to pe multi entry test #%d.", test_num); failure_mssg = msg; } else if ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "cache not empty at beginning of pe multi entry test #%d.", test_num); failure_mssg = msg; } else if ((spec_size < 1) || (spec == NULL)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "missing/bad test spec on entry to pe multi entry test #%d.", test_num); failure_mssg = msg; } @@ -4533,7 +4535,7 @@ check_flush_cache__pe_multi_entry_test(H5F_t *file_ptr, int test_num, unsigned i (spec[u].entry_index > max_indices[spec[u].entry_type]) || (spec[u].num_pins < 0) || (spec[u].num_pins > MAX_PINS)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "bad data in spec[%u] on entry to pe multi entry test #%d.", u, test_num); failure_mssg = msg; @@ -4587,7 +4589,7 @@ check_flush_cache__pe_multi_entry_test(H5F_t *file_ptr, int test_num, unsigned i (entry_ptr->serialized != spec[u].expected_serialized) || (entry_ptr->destroyed != spec[u].expected_destroyed)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Bad status on entry %u after flush in pe multi entry test #%d.", u, test_num); failure_mssg = msg; @@ -4602,7 +4604,7 @@ check_flush_cache__pe_multi_entry_test(H5F_t *file_ptr, int test_num, unsigned i (((flush_flags & H5C__FLUSH_INVALIDATE_FLAG) != 0) && ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0)))) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache len/size after flush in pe multi entry test #%d.", test_num); failure_mssg = msg; @@ -4616,13 +4618,13 @@ check_flush_cache__pe_multi_entry_test(H5F_t *file_ptr, int test_num, unsigned i if (!pass) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Flush failed on cleanup in pe multi entry test #%d.", test_num); failure_mssg = msg; } else if ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache len/size after cleanup in pe multi entry test #%d.", test_num); failure_mssg = msg; @@ -4635,9 +4637,9 @@ check_flush_cache__pe_multi_entry_test(H5F_t *file_ptr, int test_num, unsigned i base_addr = entries[spec[u].entry_type]; entry_ptr = &(base_addr[spec[u].entry_index]); - entry_ptr->deserialized = FALSE; - entry_ptr->serialized = FALSE; - entry_ptr->destroyed = FALSE; + entry_ptr->deserialized = false; + entry_ptr->serialized = false; + entry_ptr->destroyed = false; u++; } @@ -4653,7 +4655,7 @@ check_flush_cache__pe_multi_entry_test(H5F_t *file_ptr, int test_num, unsigned i * the case in which the flush callback dirties, resizes, * and/or moves entries. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -4671,26 +4673,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) if (cache_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "cache_ptr NULL on entry to flush ops test."; } else if ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0)) { - pass = FALSE; + pass = false; failure_mssg = "cache not empty at beginning of flush ops test."; } spec = malloc((size_t)max_num_spec * sizeof(struct fo_flush_cache_test_spec)); if (spec == NULL) { - pass = FALSE; + pass = false; failure_mssg = "couldn't allocate flush ops test spec array"; } checks = malloc((size_t)max_num_check * sizeof(struct fo_flush_entry_check)); if (checks == NULL) { - pass = FALSE; + pass = false; failure_mssg = "couldn't allocate flush ops test check array"; } @@ -4716,9 +4718,9 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* entry_num = */ 0, /* entry_type = */ 0, /* entry_index = */ 0, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -4726,26 +4728,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 0, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; spec[1] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 1, /* entry_type = */ 0, /* entry_index = */ 1, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -4753,32 +4755,32 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 1, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__DIRTY, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__DIRTY, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; checks[0] = (struct fo_flush_entry_check){/* entry_num = */ 0, /* entry_type = */ 0, /* entry_index = */ 0, /* expected_size = */ (size_t)0, - /* in_cache = */ FALSE, - /* at_main_addr = */ FALSE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}; + /* in_cache = */ false, + /* at_main_addr = */ false, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}; check_flush_cache__flush_op_test(file_ptr, test_num, flush_flags, spec_size, spec, init_expected_index_len, init_expected_index_size, @@ -4810,9 +4812,9 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* entry_num = */ 0, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 0, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -4820,26 +4822,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 0, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + {{FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; spec[1] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 1, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 1, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -4847,32 +4849,32 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 1, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr*/ - {{FLUSH_OP__DIRTY, PICO_ENTRY_TYPE, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + {{FLUSH_OP__DIRTY, PICO_ENTRY_TYPE, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; checks[0] = (struct fo_flush_entry_check){/* entry_num = */ 0, /* entry_type = */ 0, /* entry_index = */ 0, /* expected_size = */ (size_t)0, - /* in_cache = */ FALSE, - /* at_main_addr = */ FALSE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}; + /* in_cache = */ false, + /* at_main_addr = */ false, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}; check_flush_cache__flush_op_test(file_ptr, test_num, flush_flags, spec_size, spec, init_expected_index_len, init_expected_index_size, @@ -4901,9 +4903,9 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* entry_num = */ 0, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 0, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ TRUE, + /* resize_flag = */ true, /* new_size = */ VARIABLE_ENTRY_SIZE / 4, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -4911,32 +4913,32 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 1, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr:*/ - {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, false, VARIABLE_ENTRY_SIZE / 2, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; checks[0] = (struct fo_flush_entry_check){/* entry_num = */ 0, /* entry_type = */ 0, /* entry_index = */ 0, /* expected_size = */ (size_t)0, - /* in_cache = */ FALSE, - /* at_main_addr = */ FALSE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}; + /* in_cache = */ false, + /* at_main_addr = */ false, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}; check_flush_cache__flush_op_test(file_ptr, test_num, flush_flags, spec_size, spec, init_expected_index_len, init_expected_index_size, @@ -4967,9 +4969,9 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* entry_num = */ 0, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 0, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ TRUE, + /* resize_flag = */ true, /* new_size = */ VARIABLE_ENTRY_SIZE / 4, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -4977,32 +4979,32 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 1, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, false, VARIABLE_ENTRY_SIZE / 2, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; checks[0] = (struct fo_flush_entry_check){/* entry_num = */ 0, /* entry_type = */ 0, /* entry_index = */ 0, /* expected_size = */ (size_t)0, - /* in_cache = */ FALSE, - /* at_main_addr = */ FALSE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}; + /* in_cache = */ false, + /* at_main_addr = */ false, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}; check_flush_cache__flush_op_test(file_ptr, test_num, flush_flags, spec_size, spec, init_expected_index_len, init_expected_index_size, @@ -5040,9 +5042,9 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* entry_num = */ 0, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 0, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -5050,32 +5052,32 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 2, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL}, - {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, false, VARIABLE_ENTRY_SIZE / 2, NULL}, + {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; checks[0] = (struct fo_flush_entry_check){/* entry_num = */ 0, /* entry_type = */ 0, /* entry_index = */ 0, /* expected_size = */ (size_t)0, - /* in_cache = */ FALSE, - /* at_main_addr = */ FALSE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}; + /* in_cache = */ false, + /* at_main_addr = */ false, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}; check_flush_cache__flush_op_test(file_ptr, test_num, flush_flags, spec_size, spec, init_expected_index_len, init_expected_index_size, @@ -5094,7 +5096,7 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) */ if (pass) { - spec[0].flush_ops[1].flag = TRUE; + spec[0].flush_ops[1].flag = true; test_num = 6; check_flush_cache__flush_op_test(file_ptr, test_num, flush_flags, spec_size, spec, @@ -5137,9 +5139,9 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* entry_num = */ 0, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 0, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -5147,32 +5149,32 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 2, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL}, - {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, false, VARIABLE_ENTRY_SIZE / 2, NULL}, + {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; checks[0] = (struct fo_flush_entry_check){/* entry_num = */ 0, /* entry_type = */ 0, /* entry_index = */ 0, /* expected_size = */ (size_t)0, - /* in_cache = */ FALSE, - /* at_main_addr = */ FALSE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}; + /* in_cache = */ false, + /* at_main_addr = */ false, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}; check_flush_cache__flush_op_test(file_ptr, test_num, flush_flags, spec_size, spec, init_expected_index_len, init_expected_index_size, @@ -5196,8 +5198,8 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) flush_flags = H5C__FLUSH_INVALIDATE_FLAG; expected_index_len = 0; expected_index_size = 0; - spec[0].flush_ops[1].flag = TRUE; - spec[0].expected_destroyed = TRUE; + spec[0].flush_ops[1].flag = true; + spec[0].expected_destroyed = true; check_flush_cache__flush_op_test(file_ptr, test_num, flush_flags, spec_size, spec, init_expected_index_len, init_expected_index_size, @@ -5230,9 +5232,9 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* entry_num = */ 0, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 0, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ TRUE, + /* resize_flag = */ true, /* new_size = */ VARIABLE_ENTRY_SIZE / 2, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -5240,32 +5242,32 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 2, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL}, - {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, false, VARIABLE_ENTRY_SIZE / 4, NULL}, + {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; checks[0] = (struct fo_flush_entry_check){/* entry_num = */ 0, /* entry_type = */ 0, /* entry_index = */ 0, /* expected_size = */ (size_t)0, - /* in_cache = */ FALSE, - /* at_main_addr = */ FALSE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}; + /* in_cache = */ false, + /* at_main_addr = */ false, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}; check_flush_cache__flush_op_test(file_ptr, test_num, flush_flags, spec_size, spec, init_expected_index_len, init_expected_index_size, @@ -5284,7 +5286,7 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) */ if (pass) { - spec[0].flush_ops[1].flag = TRUE; + spec[0].flush_ops[1].flag = true; test_num = 10; check_flush_cache__flush_op_test(file_ptr, test_num, flush_flags, spec_size, spec, @@ -5321,9 +5323,9 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* entry_num = */ 0, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 0, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ TRUE, + /* resize_flag = */ true, /* new_size = */ VARIABLE_ENTRY_SIZE / 2, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -5331,32 +5333,32 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 2, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL}, - {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, false, VARIABLE_ENTRY_SIZE / 4, NULL}, + {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; checks[0] = (struct fo_flush_entry_check){/* entry_num = */ 0, /* entry_type = */ 0, /* entry_index = */ 0, /* expected_size = */ (size_t)0, - /* in_cache = */ FALSE, - /* at_main_addr = */ FALSE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}; + /* in_cache = */ false, + /* at_main_addr = */ false, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}; check_flush_cache__flush_op_test(file_ptr, test_num, flush_flags, spec_size, spec, init_expected_index_len, init_expected_index_size, @@ -5379,8 +5381,8 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) flush_flags = H5C__FLUSH_INVALIDATE_FLAG; expected_index_len = 0; expected_index_size = 0; - spec[0].flush_ops[1].flag = TRUE; - spec[0].expected_destroyed = TRUE; + spec[0].flush_ops[1].flag = true; + spec[0].expected_destroyed = true; check_flush_cache__flush_op_test(file_ptr, test_num, flush_flags, spec_size, spec, init_expected_index_len, init_expected_index_size, @@ -5414,9 +5416,9 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* entry_num = */ 0, /* entry_type = */ 0, /* entry_index = */ 1, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -5424,44 +5426,44 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 2, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__DIRTY, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__DIRTY, 0, 2, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__DIRTY, 0, 0, false, 0, NULL}, + {FLUSH_OP__DIRTY, 0, 2, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; checks[0] = (struct fo_flush_entry_check){/* entry_num = */ 0, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 0, /* expected_size = */ PICO_ENTRY_SIZE, - /* in_cache = */ TRUE, - /* at_main_addr = */ TRUE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + /* in_cache = */ true, + /* at_main_addr = */ true, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; checks[1] = (struct fo_flush_entry_check){/* entry_num = */ 1, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 2, /* expected_size = */ PICO_ENTRY_SIZE, - /* in_cache = */ TRUE, - /* at_main_addr = */ TRUE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + /* in_cache = */ true, + /* at_main_addr = */ true, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; check_flush_cache__flush_op_test(file_ptr, test_num, flush_flags, spec_size, spec, init_expected_index_len, init_expected_index_size, @@ -5496,9 +5498,9 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* entry_num = */ 0, /* entry_type = */ 0, /* entry_index = */ 1, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -5506,44 +5508,44 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 2, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__DIRTY, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__DIRTY, 0, 2, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + {{FLUSH_OP__DIRTY, 0, 0, false, 0, NULL}, + {FLUSH_OP__DIRTY, 0, 2, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; checks[0] = (struct fo_flush_entry_check){/* entry_num = */ 0, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 0, /* expected_size = */ PICO_ENTRY_SIZE, - /* in_cache = */ FALSE, - /* at_main_addr = */ TRUE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + /* in_cache = */ false, + /* at_main_addr = */ true, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; checks[1] = (struct fo_flush_entry_check){/* entry_num = */ 1, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 2, /* expected_size = */ PICO_ENTRY_SIZE, - /* in_cache = */ FALSE, - /* at_main_addr = */ TRUE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + /* in_cache = */ false, + /* at_main_addr = */ true, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; check_flush_cache__flush_op_test(file_ptr, test_num, flush_flags, spec_size, spec, init_expected_index_len, init_expected_index_size, @@ -5576,9 +5578,9 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* entry_num = */ 0, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 1, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -5586,44 +5588,44 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 4, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL}, - {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, false, VARIABLE_ENTRY_SIZE / 4, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, false, 0, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, false, 0, NULL}, + {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2, false, VARIABLE_ENTRY_SIZE / 2, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; checks[0] = (struct fo_flush_entry_check){/* entry_num = */ 0, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 0, /* expected_size = */ VARIABLE_ENTRY_SIZE / 4, - /* in_cache = */ TRUE, - /* at_main_addr = */ TRUE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + /* in_cache = */ true, + /* at_main_addr = */ true, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; checks[1] = (struct fo_flush_entry_check){/* entry_num = */ 1, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 2, /* expected_size = */ VARIABLE_ENTRY_SIZE / 2, - /* in_cache = */ TRUE, - /* at_main_addr = */ TRUE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + /* in_cache = */ true, + /* at_main_addr = */ true, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; check_flush_cache__flush_op_test(file_ptr, test_num, flush_flags, spec_size, spec, init_expected_index_len, init_expected_index_size, @@ -5657,9 +5659,9 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* entry_num = */ 0, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 1, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -5667,44 +5669,44 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 4, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL}, - {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, false, VARIABLE_ENTRY_SIZE / 4, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, false, 0, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, false, 0, NULL}, + {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2, false, VARIABLE_ENTRY_SIZE / 2, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; checks[0] = (struct fo_flush_entry_check){/* entry_num = */ 0, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 0, /* expected_size = */ VARIABLE_ENTRY_SIZE / 4, - /* in_cache = */ FALSE, - /* at_main_addr = */ TRUE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + /* in_cache = */ false, + /* at_main_addr = */ true, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; checks[1] = (struct fo_flush_entry_check){/* entry_num = */ 1, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 2, /* expected_size = */ VARIABLE_ENTRY_SIZE / 2, - /* in_cache = */ FALSE, - /* at_main_addr = */ TRUE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + /* in_cache = */ false, + /* at_main_addr = */ true, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; check_flush_cache__flush_op_test(file_ptr, test_num, flush_flags, spec_size, spec, init_expected_index_len, init_expected_index_size, @@ -5737,9 +5739,9 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* entry_num = */ 0, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 1, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -5747,44 +5749,44 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 6, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL}, - {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL}, - {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL}, - {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, false, VARIABLE_ENTRY_SIZE / 4, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, false, 0, NULL}, + {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, false, 0, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, false, 0, NULL}, + {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2, false, VARIABLE_ENTRY_SIZE / 2, NULL}, + {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; checks[0] = (struct fo_flush_entry_check){/* entry_num = */ 0, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 0, /* expected_size = */ VARIABLE_ENTRY_SIZE / 4, - /* in_cache = */ TRUE, - /* at_main_addr = */ FALSE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + /* in_cache = */ true, + /* at_main_addr = */ false, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; checks[1] = (struct fo_flush_entry_check){/* entry_num = */ 1, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 2, /* expected_size = */ VARIABLE_ENTRY_SIZE / 2, - /* in_cache = */ TRUE, - /* at_main_addr = */ FALSE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + /* in_cache = */ true, + /* at_main_addr = */ false, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; check_flush_cache__flush_op_test(file_ptr, test_num, flush_flags, spec_size, spec, init_expected_index_len, init_expected_index_size, @@ -5801,10 +5803,10 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) if (pass) { test_num = 18; - spec[0].flush_ops[2].flag = TRUE; - spec[0].flush_ops[5].flag = TRUE; - checks[0].at_main_addr = TRUE; - checks[1].at_main_addr = TRUE; + spec[0].flush_ops[2].flag = true; + spec[0].flush_ops[5].flag = true; + checks[0].at_main_addr = true; + checks[1].at_main_addr = true; check_flush_cache__flush_op_test(file_ptr, test_num, flush_flags, spec_size, spec, init_expected_index_len, init_expected_index_size, @@ -5841,9 +5843,9 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* entry_num = */ 0, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 1, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -5851,44 +5853,44 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 6, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL}, - {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL}, - {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL}, - {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, false, VARIABLE_ENTRY_SIZE / 4, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, false, 0, NULL}, + {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, false, 0, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, false, 0, NULL}, + {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2, false, VARIABLE_ENTRY_SIZE / 2, NULL}, + {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; checks[0] = (struct fo_flush_entry_check){/* entry_num = */ 0, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 0, /* expected_size = */ VARIABLE_ENTRY_SIZE / 4, - /* in_cache = */ TRUE, - /* at_main_addr = */ FALSE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + /* in_cache = */ true, + /* at_main_addr = */ false, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; checks[1] = (struct fo_flush_entry_check){/* entry_num = */ 1, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 2, /* expected_size = */ VARIABLE_ENTRY_SIZE / 2, - /* in_cache = */ TRUE, - /* at_main_addr = */ FALSE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + /* in_cache = */ true, + /* at_main_addr = */ false, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; check_flush_cache__flush_op_test(file_ptr, test_num, flush_flags, spec_size, spec, init_expected_index_len, init_expected_index_size, @@ -5908,15 +5910,15 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) flush_flags = H5C__FLUSH_INVALIDATE_FLAG; expected_index_len = 0; expected_index_size = (size_t)0; - spec[0].expected_destroyed = TRUE; - spec[0].flush_ops[2].flag = TRUE; - spec[0].flush_ops[5].flag = TRUE; - checks[0].at_main_addr = TRUE; - checks[0].in_cache = FALSE; - checks[0].expected_destroyed = TRUE; - checks[1].at_main_addr = TRUE; - checks[1].in_cache = FALSE; - checks[1].expected_destroyed = TRUE; + spec[0].expected_destroyed = true; + spec[0].flush_ops[2].flag = true; + spec[0].flush_ops[5].flag = true; + checks[0].at_main_addr = true; + checks[0].in_cache = false; + checks[0].expected_destroyed = true; + checks[1].at_main_addr = true; + checks[1].in_cache = false; + checks[1].expected_destroyed = true; check_flush_cache__flush_op_test(file_ptr, test_num, flush_flags, spec_size, spec, init_expected_index_len, init_expected_index_size, @@ -5956,9 +5958,9 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* entry_num = */ 0, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 1, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG | H5C__SET_FLUSH_MARKER_FLAG, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -5966,26 +5968,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 6, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL}, - {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL}, - {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL}, - {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, false, VARIABLE_ENTRY_SIZE / 4, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, false, 0, NULL}, + {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, false, 0, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, false, 0, NULL}, + {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2, false, VARIABLE_ENTRY_SIZE / 2, NULL}, + {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; spec[1] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 1, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 11, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -5993,26 +5995,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 6, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 10, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 10, FALSE, 0, NULL}, - {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 10, FALSE, 0, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 12, FALSE, 0, NULL}, - {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 12, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL}, - {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 12, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 10, false, VARIABLE_ENTRY_SIZE / 4, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 10, false, 0, NULL}, + {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 10, false, 0, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 12, false, 0, NULL}, + {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 12, false, VARIABLE_ENTRY_SIZE / 2, NULL}, + {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 12, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}; spec[2] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 2, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 0, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG | H5C__SET_FLUSH_MARKER_FLAG, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -6020,26 +6022,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 0, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; spec[3] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 3, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 1, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -6047,68 +6049,68 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 0, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}; checks[0] = (struct fo_flush_entry_check){/* entry_num = */ 0, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 0, /* expected_size = */ VARIABLE_ENTRY_SIZE / 4, - /* in_cache = */ TRUE, - /* at_main_addr = */ FALSE, - /* is_dirty = */ TRUE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}; + /* in_cache = */ true, + /* at_main_addr = */ false, + /* is_dirty = */ true, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}; checks[1] = (struct fo_flush_entry_check){/* entry_num = */ 1, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 2, /* expected_size = */ VARIABLE_ENTRY_SIZE / 2, - /* in_cache = */ TRUE, - /* at_main_addr = */ FALSE, - /* is_dirty = */ TRUE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}; + /* in_cache = */ true, + /* at_main_addr = */ false, + /* is_dirty = */ true, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}; checks[2] = (struct fo_flush_entry_check){/* entry_num = */ 2, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 10, /* expected_size = */ VARIABLE_ENTRY_SIZE, - /* in_cache = */ FALSE, - /* at_main_addr = */ TRUE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}; + /* in_cache = */ false, + /* at_main_addr = */ true, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}; checks[3] = (struct fo_flush_entry_check){/* entry_num = */ 3, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 12, /* expected_size = */ VARIABLE_ENTRY_SIZE, - /* in_cache = */ FALSE, - /* at_main_addr = */ TRUE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}; + /* in_cache = */ false, + /* at_main_addr = */ true, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}; check_flush_cache__flush_op_test(file_ptr, test_num, flush_flags, spec_size, spec, init_expected_index_len, init_expected_index_size, @@ -6144,9 +6146,9 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* entry_num = */ 0, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 1, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -6154,26 +6156,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 6, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL}, - {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL}, - {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL}, - {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, false, VARIABLE_ENTRY_SIZE / 4, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, false, 0, NULL}, + {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, false, 0, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, false, 0, NULL}, + {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2, false, VARIABLE_ENTRY_SIZE / 2, NULL}, + {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; spec[1] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 1, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 11, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -6181,26 +6183,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 6, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 10, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 10, FALSE, 0, NULL}, - {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 10, FALSE, 0, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 12, FALSE, 0, NULL}, - {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 12, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL}, - {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 12, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 10, false, VARIABLE_ENTRY_SIZE / 4, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 10, false, 0, NULL}, + {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 10, false, 0, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 12, false, 0, NULL}, + {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 12, false, VARIABLE_ENTRY_SIZE / 2, NULL}, + {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 12, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; spec[2] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 2, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 0, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -6208,26 +6210,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 0, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; spec[3] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 3, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 1, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -6235,26 +6237,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 0, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}; spec[4] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 4, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 10, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -6262,26 +6264,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 1, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__DIRTY, PICO_ENTRY_TYPE, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__DIRTY, PICO_ENTRY_TYPE, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; spec[5] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 5, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 20, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -6289,68 +6291,68 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 1, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__DIRTY, PICO_ENTRY_TYPE, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__DIRTY, PICO_ENTRY_TYPE, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; checks[0] = (struct fo_flush_entry_check){/* entry_num = */ 0, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 0, /* expected_size = */ VARIABLE_ENTRY_SIZE / 4, - /* in_cache = */ TRUE, - /* at_main_addr = */ FALSE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + /* in_cache = */ true, + /* at_main_addr = */ false, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; checks[1] = (struct fo_flush_entry_check){/* entry_num = */ 1, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 2, /* expected_size = */ VARIABLE_ENTRY_SIZE / 2, - /* in_cache = */ TRUE, - /* at_main_addr = */ FALSE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + /* in_cache = */ true, + /* at_main_addr = */ false, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; checks[2] = (struct fo_flush_entry_check){/* entry_num = */ 2, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 10, /* expected_size = */ VARIABLE_ENTRY_SIZE / 4, - /* in_cache = */ TRUE, - /* at_main_addr = */ FALSE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + /* in_cache = */ true, + /* at_main_addr = */ false, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; checks[3] = (struct fo_flush_entry_check){/* entry_num = */ 3, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 12, /* expected_size = */ VARIABLE_ENTRY_SIZE / 2, - /* in_cache = */ TRUE, - /* at_main_addr = */ FALSE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + /* in_cache = */ true, + /* at_main_addr = */ false, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; check_flush_cache__flush_op_test(file_ptr, test_num, flush_flags, spec_size, spec, init_expected_index_len, init_expected_index_size, @@ -6387,9 +6389,9 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* entry_num = */ 0, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 1, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -6397,26 +6399,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 6, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL}, - {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL}, - {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL}, - {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, false, VARIABLE_ENTRY_SIZE / 4, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, false, 0, NULL}, + {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, false, 0, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, false, 0, NULL}, + {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2, false, VARIABLE_ENTRY_SIZE / 2, NULL}, + {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; spec[1] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 1, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 11, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -6424,26 +6426,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 6, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 10, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 10, FALSE, 0, NULL}, - {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 10, FALSE, 0, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 12, FALSE, 0, NULL}, - {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 12, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL}, - {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 12, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + {{FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 10, false, VARIABLE_ENTRY_SIZE / 4, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 10, false, 0, NULL}, + {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 10, false, 0, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 12, false, 0, NULL}, + {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 12, false, VARIABLE_ENTRY_SIZE / 2, NULL}, + {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 12, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; spec[2] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 2, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 0, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -6451,26 +6453,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 0, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + {{FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; spec[3] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 3, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 1, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -6478,26 +6480,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 0, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ TRUE}; + {{FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ false, + /* expected_destroyed = */ true}; spec[4] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 4, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 10, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -6505,26 +6507,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 1, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__DIRTY, PICO_ENTRY_TYPE, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + {{FLUSH_OP__DIRTY, PICO_ENTRY_TYPE, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; spec[5] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 5, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 20, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -6532,68 +6534,68 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 1, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__DIRTY, PICO_ENTRY_TYPE, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + {{FLUSH_OP__DIRTY, PICO_ENTRY_TYPE, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; checks[0] = (struct fo_flush_entry_check){/* entry_num = */ 0, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 0, /* expected_size = */ VARIABLE_ENTRY_SIZE / 4, - /* in_cache = */ FALSE, - /* at_main_addr = */ FALSE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + /* in_cache = */ false, + /* at_main_addr = */ false, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; checks[1] = (struct fo_flush_entry_check){/* entry_num = */ 1, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 2, /* expected_size = */ VARIABLE_ENTRY_SIZE / 2, - /* in_cache = */ FALSE, - /* at_main_addr = */ FALSE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + /* in_cache = */ false, + /* at_main_addr = */ false, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; checks[2] = (struct fo_flush_entry_check){/* entry_num = */ 2, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 10, /* expected_size = */ VARIABLE_ENTRY_SIZE / 4, - /* in_cache = */ FALSE, - /* at_main_addr = */ FALSE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + /* in_cache = */ false, + /* at_main_addr = */ false, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; checks[3] = (struct fo_flush_entry_check){/* entry_num = */ 3, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 12, /* expected_size = */ VARIABLE_ENTRY_SIZE / 2, - /* in_cache = */ FALSE, - /* at_main_addr = */ FALSE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + /* in_cache = */ false, + /* at_main_addr = */ false, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; check_flush_cache__flush_op_test(file_ptr, test_num, flush_flags, spec_size, spec, init_expected_index_len, init_expected_index_size, @@ -6626,9 +6628,9 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* entry_num = */ 0, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 100, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -6636,26 +6638,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 0, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; spec[1] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 1, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 50, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 1, /* pin_type = */ {PICO_ENTRY_TYPE, 0, 0, 0, 0, 0, 0, 0}, @@ -6663,26 +6665,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 1, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__DIRTY, PICO_ENTRY_TYPE, 100, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__DIRTY, PICO_ENTRY_TYPE, 100, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; spec[2] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 2, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 150, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 1, /* pin_type = */ {PICO_ENTRY_TYPE, 0, 0, 0, 0, 0, 0, 0}, @@ -6690,32 +6692,32 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 1, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__DIRTY, PICO_ENTRY_TYPE, 100, FALSE, 0, NULL}, - {FLUSH_OP__DIRTY, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__DIRTY, PICO_ENTRY_TYPE, 100, false, 0, NULL}, + {FLUSH_OP__DIRTY, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; checks[0] = (struct fo_flush_entry_check){/* entry_num = */ 0, /* entry_type = */ 0, /* entry_index = */ 0, /* expected_size = */ (size_t)0, - /* in_cache = */ FALSE, - /* at_main_addr = */ FALSE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}; + /* in_cache = */ false, + /* at_main_addr = */ false, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}; check_flush_cache__flush_op_test(file_ptr, test_num, flush_flags, spec_size, spec, init_expected_index_len, init_expected_index_size, @@ -6745,9 +6747,9 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* entry_num = */ 0, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 100, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -6755,26 +6757,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 0, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + {{FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; spec[1] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 1, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 50, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 1, /* pin_type = */ {PICO_ENTRY_TYPE, 0, 0, 0, 0, 0, 0, 0}, @@ -6782,26 +6784,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 1, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__DIRTY, PICO_ENTRY_TYPE, 100, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + {{FLUSH_OP__DIRTY, PICO_ENTRY_TYPE, 100, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; spec[2] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 2, /* entry_type = */ PICO_ENTRY_TYPE, /* entry_index = */ 150, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 1, /* pin_type = */ {PICO_ENTRY_TYPE, 0, 0, 0, 0, 0, 0, 0}, @@ -6809,32 +6811,32 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 1, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__DIRTY, PICO_ENTRY_TYPE, 100, FALSE, 0, NULL}, - {FLUSH_OP__DIRTY, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + {{FLUSH_OP__DIRTY, PICO_ENTRY_TYPE, 100, false, 0, NULL}, + {FLUSH_OP__DIRTY, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; checks[0] = (struct fo_flush_entry_check){/* entry_num = */ 0, /* entry_type = */ 0, /* entry_index = */ 0, /* expected_size = */ (size_t)0, - /* in_cache = */ FALSE, - /* at_main_addr = */ FALSE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}; + /* in_cache = */ false, + /* at_main_addr = */ false, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}; check_flush_cache__flush_op_test(file_ptr, test_num, flush_flags, spec_size, spec, init_expected_index_len, init_expected_index_size, @@ -6934,9 +6936,9 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* entry_num = */ 0, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 200, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -6944,26 +6946,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 0, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; spec[1] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 1, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 2100, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -6971,26 +6973,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 0, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; spec[2] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 2, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 2300, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -6998,26 +7000,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 0, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; spec[3] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 3, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 1000, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -7025,26 +7027,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 4, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, FALSE, 0, NULL}, - {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 200, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 300, FALSE, 0, NULL}, - {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 300, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, false, 0, NULL}, + {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 200, false, VARIABLE_ENTRY_SIZE / 2, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 300, false, 0, NULL}, + {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 300, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; spec[4] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 4, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 2000, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -7052,26 +7054,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 3, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2100, FALSE, 0, NULL}, - {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2200, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL}, - {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2300, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2100, false, 0, NULL}, + {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2200, false, VARIABLE_ENTRY_SIZE / 2, NULL}, + {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2300, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; spec[5] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 5, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 350, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 2, /* pin_type = */ {VARIABLE_ENTRY_TYPE, VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0}, @@ -7079,26 +7081,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 3, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, FALSE, 0, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, FALSE, 0, NULL}, - {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 350, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, false, 0, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, false, 0, NULL}, + {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 350, false, VARIABLE_ENTRY_SIZE / 4, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; spec[6] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 6, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 450, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 2, /* pin_type = */ {VARIABLE_ENTRY_TYPE, VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0}, @@ -7106,26 +7108,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 3, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, FALSE, 0, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, FALSE, 0, NULL}, - {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 450, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, false, 0, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, false, 0, NULL}, + {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 450, false, VARIABLE_ENTRY_SIZE / 4, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; spec[7] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 7, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 650, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 2, /* pin_type = */ {VARIABLE_ENTRY_TYPE, VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0}, @@ -7133,26 +7135,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 3, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, FALSE, 0, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, FALSE, 0, NULL}, - {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 650, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, false, 0, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, false, 0, NULL}, + {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 650, false, VARIABLE_ENTRY_SIZE / 4, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; spec[8] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 8, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 750, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 2, /* pin_type = */ {VARIABLE_ENTRY_TYPE, VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0}, @@ -7160,26 +7162,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 3, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, FALSE, 0, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, FALSE, 0, NULL}, - {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 750, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, false, 0, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, false, 0, NULL}, + {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 750, false, VARIABLE_ENTRY_SIZE / 4, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; spec[9] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 9, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 500, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -7187,56 +7189,56 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 4, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 350, FALSE, 0, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 450, FALSE, 0, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 650, FALSE, 0, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 750, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 350, false, 0, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 450, false, 0, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 650, false, 0, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 750, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; checks[0] = (struct fo_flush_entry_check){/* entry_num = */ 0, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 100, /* expected_size = */ VARIABLE_ENTRY_SIZE, - /* in_cache = */ TRUE, - /* at_main_addr = */ TRUE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + /* in_cache = */ true, + /* at_main_addr = */ true, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; checks[1] = (struct fo_flush_entry_check){/* entry_num = */ 1, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 300, /* expected_size = */ VARIABLE_ENTRY_SIZE, - /* in_cache = */ TRUE, - /* at_main_addr = */ FALSE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + /* in_cache = */ true, + /* at_main_addr = */ false, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; checks[2] = (struct fo_flush_entry_check){/* entry_num = */ 2, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 2200, /* expected_size = */ VARIABLE_ENTRY_SIZE / 2, - /* in_cache = */ TRUE, - /* at_main_addr = */ TRUE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + /* in_cache = */ true, + /* at_main_addr = */ true, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; check_flush_cache__flush_op_test(file_ptr, test_num, flush_flags, spec_size, spec, init_expected_index_len, init_expected_index_size, @@ -7342,9 +7344,9 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* entry_num = */ 0, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 200, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -7352,26 +7354,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 0, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + {{FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; spec[1] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 1, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 2100, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -7379,26 +7381,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 0, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + {{FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; spec[2] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 2, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 2300, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -7406,26 +7408,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 0, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + {{FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; spec[3] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 3, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 1000, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -7433,26 +7435,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 4, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, FALSE, 0, NULL}, - {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 200, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 300, FALSE, 0, NULL}, - {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 300, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, false, 0, NULL}, + {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 200, false, VARIABLE_ENTRY_SIZE / 2, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 300, false, 0, NULL}, + {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 300, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; spec[4] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 4, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 2000, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -7460,26 +7462,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 3, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2100, FALSE, 0, NULL}, - {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2200, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL}, - {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2300, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2100, false, 0, NULL}, + {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2200, false, VARIABLE_ENTRY_SIZE / 2, NULL}, + {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2300, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; spec[5] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 5, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 350, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 2, /* pin_type = */ {VARIABLE_ENTRY_TYPE, VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0}, @@ -7487,26 +7489,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 3, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, FALSE, 0, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, FALSE, 0, NULL}, - {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 350, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, false, 0, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, false, 0, NULL}, + {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 350, false, VARIABLE_ENTRY_SIZE / 4, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; spec[6] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 6, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 450, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 2, /* pin_type = */ {VARIABLE_ENTRY_TYPE, VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0}, @@ -7514,26 +7516,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 3, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, FALSE, 0, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, FALSE, 0, NULL}, - {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 450, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, false, 0, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, false, 0, NULL}, + {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 450, false, VARIABLE_ENTRY_SIZE / 4, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; spec[7] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 7, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 650, - /* insert_flag = */ TRUE, + /* insert_flag = */ true, /* flags = */ H5C__NO_FLAGS_SET, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 2, /* pin_type = */ {VARIABLE_ENTRY_TYPE, VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0}, @@ -7541,26 +7543,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 3, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, FALSE, 0, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, FALSE, 0, NULL}, - {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 650, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, false, 0, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, false, 0, NULL}, + {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 650, false, VARIABLE_ENTRY_SIZE / 4, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ false, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; spec[8] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 8, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 750, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 2, /* pin_type = */ {VARIABLE_ENTRY_TYPE, VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0}, @@ -7568,26 +7570,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 3, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, FALSE, 0, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, FALSE, 0, NULL}, - {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 750, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, false, 0, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, false, 0, NULL}, + {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 750, false, VARIABLE_ENTRY_SIZE / 4, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; spec[9] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 9, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 500, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -7595,56 +7597,56 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 4, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 350, FALSE, 0, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 450, FALSE, 0, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 650, FALSE, 0, NULL}, - {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 750, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 350, false, 0, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 450, false, 0, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 650, false, 0, NULL}, + {FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 750, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; checks[0] = (struct fo_flush_entry_check){/* entry_num = */ 0, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 100, /* expected_size = */ VARIABLE_ENTRY_SIZE, - /* in_cache = */ FALSE, - /* at_main_addr = */ TRUE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + /* in_cache = */ false, + /* at_main_addr = */ true, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; checks[1] = (struct fo_flush_entry_check){/* entry_num = */ 1, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 300, /* expected_size = */ VARIABLE_ENTRY_SIZE, - /* in_cache = */ FALSE, - /* at_main_addr = */ FALSE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + /* in_cache = */ false, + /* at_main_addr = */ false, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; checks[2] = (struct fo_flush_entry_check){/* entry_num = */ 2, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 2200, /* expected_size = */ VARIABLE_ENTRY_SIZE / 2, - /* in_cache = */ FALSE, - /* at_main_addr = */ TRUE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + /* in_cache = */ false, + /* at_main_addr = */ true, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; check_flush_cache__flush_op_test(file_ptr, test_num, flush_flags, spec_size, spec, init_expected_index_len, init_expected_index_size, @@ -7675,9 +7677,9 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* entry_num = */ 0, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 100, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -7685,26 +7687,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 0, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; spec[1] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 1, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 200, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ TRUE, + /* resize_flag = */ true, /* new_size = */ VARIABLE_ENTRY_SIZE / 2, /* num_pins = */ 1, /* pin_type = */ {VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0, 0}, @@ -7712,26 +7714,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 3, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, FALSE, 0, NULL}, - {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 200, FALSE, VARIABLE_ENTRY_SIZE, NULL}, - {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 200, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, false, 0, NULL}, + {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 200, false, VARIABLE_ENTRY_SIZE, NULL}, + {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 200, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; spec[2] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 2, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 300, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ TRUE, + /* resize_flag = */ true, /* new_size = */ VARIABLE_ENTRY_SIZE / 4, /* num_pins = */ 1, /* pin_type = */ {VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0, 0}, @@ -7739,26 +7741,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 3, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 400, FALSE, 0, NULL}, - {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 300, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL}, - {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 300, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 400, false, 0, NULL}, + {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 300, false, VARIABLE_ENTRY_SIZE / 2, NULL}, + {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 300, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; spec[3] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 3, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 400, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -7766,26 +7768,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 0, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; spec[4] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 4, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 500, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ TRUE, + /* resize_flag = */ true, /* new_size = */ VARIABLE_ENTRY_SIZE / 4, /* num_pins = */ 1, /* pin_type = */ {VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0, 0}, @@ -7793,32 +7795,32 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 3, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, FALSE, 0, NULL}, - {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 500, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL}, - {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 500, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ FALSE}; + {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, false, 0, NULL}, + {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 500, false, VARIABLE_ENTRY_SIZE / 2, NULL}, + {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 500, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ false}; checks[0] = (struct fo_flush_entry_check){/* entry_num = */ 0, /* entry_type = */ 0, /* entry_index = */ 0, /* expected_size = */ 0, - /* in_cache = */ FALSE, - /* at_main_addr = */ FALSE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}; + /* in_cache = */ false, + /* at_main_addr = */ false, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}; check_flush_cache__flush_op_test(file_ptr, test_num, flush_flags, spec_size, spec, init_expected_index_len, init_expected_index_size, @@ -7851,9 +7853,9 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* entry_num = */ 0, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 100, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -7861,26 +7863,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 0, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + {{FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; spec[1] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 1, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 200, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ TRUE, + /* resize_flag = */ true, /* new_size = */ VARIABLE_ENTRY_SIZE / 2, /* num_pins = */ 1, /* pin_type = */ {VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0, 0}, @@ -7888,26 +7890,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 3, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, FALSE, 0, NULL}, - {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 200, FALSE, VARIABLE_ENTRY_SIZE, NULL}, - {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 200, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, false, 0, NULL}, + {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 200, false, VARIABLE_ENTRY_SIZE, NULL}, + {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 200, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; spec[2] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 2, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 300, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ TRUE, + /* resize_flag = */ true, /* new_size = */ VARIABLE_ENTRY_SIZE / 4, /* num_pins = */ 1, /* pin_type = */ {VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0, 0}, @@ -7915,26 +7917,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 3, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 400, FALSE, 0, NULL}, - {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 300, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL}, - {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 300, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 400, false, 0, NULL}, + {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 300, false, VARIABLE_ENTRY_SIZE / 2, NULL}, + {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 300, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; spec[3] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 3, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 400, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__NO_FLAGS_SET, - /* resize_flag = */ FALSE, + /* resize_flag = */ false, /* new_size = */ 0, /* num_pins = */ 0, /* pin_type = */ {0, 0, 0, 0, 0, 0, 0, 0}, @@ -7942,26 +7944,26 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 0, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + {{FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; spec[4] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 4, /* entry_type = */ VARIABLE_ENTRY_TYPE, /* entry_index = */ 500, - /* insert_flag = */ FALSE, + /* insert_flag = */ false, /* flags = */ H5C__DIRTIED_FLAG, - /* resize_flag = */ TRUE, + /* resize_flag = */ true, /* new_size = */ VARIABLE_ENTRY_SIZE / 4, /* num_pins = */ 1, /* pin_type = */ {VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0, 0}, @@ -7969,32 +7971,32 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) /* num_flush_ops = */ 3, /* flush_ops = */ /* op_code: type: idx: flag: size: order_ptr: */ - {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, FALSE, 0, NULL}, - {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 500, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL}, - {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 500, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}, - {FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL}}, - /* expected_deserialized = */ TRUE, - /* expected_serialized = */ TRUE, - /* expected_destroyed = */ TRUE}; + {{FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, false, 0, NULL}, + {FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 500, false, VARIABLE_ENTRY_SIZE / 2, NULL}, + {FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 500, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}, + {FLUSH_OP__NO_OP, 0, 0, false, 0, NULL}}, + /* expected_deserialized = */ true, + /* expected_serialized = */ true, + /* expected_destroyed = */ true}; checks[0] = (struct fo_flush_entry_check){/* entry_num = */ 0, /* entry_type = */ 0, /* entry_index = */ 0, /* expected_size = */ 0, - /* in_cache = */ FALSE, - /* at_main_addr = */ FALSE, - /* is_dirty = */ FALSE, - /* is_protected = */ FALSE, - /* is_pinned = */ FALSE, - /* expected_deserialized = */ FALSE, - /* expected_serialized = */ FALSE, - /* expected_destroyed = */ FALSE}; + /* in_cache = */ false, + /* at_main_addr = */ false, + /* is_dirty = */ false, + /* is_protected = */ false, + /* is_pinned = */ false, + /* expected_deserialized = */ false, + /* expected_serialized = */ false, + /* expected_destroyed = */ false}; check_flush_cache__flush_op_test(file_ptr, test_num, flush_flags, spec_size, spec, init_expected_index_len, init_expected_index_size, @@ -8038,20 +8040,20 @@ check_flush_cache__flush_op_test(H5F_t *file_ptr, int test_num, unsigned int flu if (cache_ptr == NULL) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "cache_ptr NULL on entry to flush op test #%d.", test_num); failure_mssg = msg; } else if ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "cache not empty at beginning of flush op test #%d.", test_num); failure_mssg = msg; } else if ((spec_size < 1) || (spec == NULL)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "missing/bad test spec on entry to flush op test #%d.", test_num); failure_mssg = msg; } @@ -8065,7 +8067,7 @@ check_flush_cache__flush_op_test(H5F_t *file_ptr, int test_num, unsigned int flu (spec[i].num_pins > MAX_PINS) || (spec[i].num_flush_ops < 0) || (spec[i].num_flush_ops > MAX_FLUSH_OPS)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "bad data in spec[%d] on entry to flush op test #%d.", i, test_num); failure_mssg = msg; } @@ -8080,7 +8082,7 @@ check_flush_cache__flush_op_test(H5F_t *file_ptr, int test_num, unsigned int flu (check[i].entry_index > max_indices[check[i].entry_type]) || (check[i].expected_size <= (size_t)0)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "bad data in check[%d] on entry to flush op test #%d.", i, test_num); failure_mssg = msg; } @@ -8099,7 +8101,7 @@ check_flush_cache__flush_op_test(H5F_t *file_ptr, int test_num, unsigned int flu protect_entry(file_ptr, spec[i].entry_type, spec[i].entry_index); if (spec[i].resize_flag) - resize_entry(file_ptr, spec[i].entry_type, spec[i].entry_index, spec[i].new_size, TRUE); + resize_entry(file_ptr, spec[i].entry_type, spec[i].entry_index, spec[i].new_size, true); unprotect_entry(file_ptr, spec[i].entry_type, spec[i].entry_index, spec[i].flags); } @@ -8124,7 +8126,7 @@ check_flush_cache__flush_op_test(H5F_t *file_ptr, int test_num, unsigned int flu if ((cache_ptr->index_len != init_expected_index_len) || (cache_ptr->index_size != init_expected_index_size)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache len/size before flush in flush op test #%d.", test_num); failure_mssg = msg; @@ -8137,7 +8139,7 @@ check_flush_cache__flush_op_test(H5F_t *file_ptr, int test_num, unsigned int flu if (!pass) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "flush with flags 0x%x failed in flush op test #%d.", flush_flags, test_num); failure_mssg = msg; @@ -8154,7 +8156,7 @@ check_flush_cache__flush_op_test(H5F_t *file_ptr, int test_num, unsigned int flu (entry_ptr->serialized != spec[i].expected_serialized) || (entry_ptr->destroyed != spec[i].expected_destroyed)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Bad status on entry %d after flush op test #%d.", i, test_num); failure_mssg = msg; } @@ -8168,7 +8170,7 @@ check_flush_cache__flush_op_test(H5F_t *file_ptr, int test_num, unsigned int flu if (check[i].in_cache != entry_in_cache(cache_ptr, check[i].entry_type, check[i].entry_index)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Check1 failed on entry %d after flush op test #%d.", i, test_num); failure_mssg = msg; @@ -8191,7 +8193,7 @@ check_flush_cache__flush_op_test(H5F_t *file_ptr, int test_num, unsigned int flu (entry_ptr->serialized != check[i].expected_serialized) || (entry_ptr->destroyed != check[i].expected_destroyed)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Check2 failed on entry %d after flush op test #%d.", i, test_num); failure_mssg = msg; @@ -8208,7 +8210,7 @@ check_flush_cache__flush_op_test(H5F_t *file_ptr, int test_num, unsigned int flu (((flush_flags & H5C__FLUSH_INVALIDATE_FLAG) != 0) && ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0)))) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache len/size after flush in flush op test #%d.", test_num); failure_mssg = msg; @@ -8228,7 +8230,7 @@ check_flush_cache__flush_op_test(H5F_t *file_ptr, int test_num, unsigned int flu else if ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0) || (cache_ptr->clean_index_size != 0) || (cache_ptr->dirty_index_size != 0)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache len/size/cs/ds after cleanup in flush op test #%d.", test_num); failure_mssg = msg; @@ -8243,9 +8245,9 @@ check_flush_cache__flush_op_test(H5F_t *file_ptr, int test_num, unsigned int flu entry_ptr->size = entry_sizes[spec[i].entry_type]; - entry_ptr->deserialized = FALSE; - entry_ptr->serialized = FALSE; - entry_ptr->destroyed = FALSE; + entry_ptr->deserialized = false; + entry_ptr->serialized = false; + entry_ptr->destroyed = false; i++; } @@ -8258,9 +8260,9 @@ check_flush_cache__flush_op_test(H5F_t *file_ptr, int test_num, unsigned int flu entry_ptr->size = entry_sizes[check[i].entry_type]; - entry_ptr->deserialized = FALSE; - entry_ptr->serialized = FALSE; - entry_ptr->destroyed = FALSE; + entry_ptr->deserialized = false; + entry_ptr->serialized = false; + entry_ptr->destroyed = false; i++; } @@ -8273,7 +8275,7 @@ check_flush_cache__flush_op_test(H5F_t *file_ptr, int test_num, unsigned int flu * Purpose: Verify that flush operations work as expected when an * entry is evicted. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -8296,7 +8298,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) expected = malloc((size_t)num_total_entries * sizeof(struct expected_entry_status)); if (expected == NULL) { - pass = FALSE; + pass = false; failure_mssg = "couldn't allocate expected entry status array\n"; } @@ -8310,14 +8312,14 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) expected[i].entry_type = VARIABLE_ENTRY_TYPE; expected[i].entry_index = (int)(i); expected[i].size = VARIABLE_ENTRY_SIZE; - expected[i].in_cache = TRUE; - expected[i].at_main_addr = TRUE; - expected[i].is_dirty = TRUE; - expected[i].is_protected = FALSE; - expected[i].is_pinned = FALSE; - expected[i].deserialized = TRUE; - expected[i].serialized = FALSE; - expected[i].destroyed = FALSE; + expected[i].in_cache = true; + expected[i].at_main_addr = true; + expected[i].is_dirty = true; + expected[i].is_protected = false; + expected[i].is_pinned = false; + expected[i].deserialized = true; + expected[i].serialized = false; + expected[i].destroyed = false; memset(expected[i].flush_dep_par_type, 0, sizeof(expected[i].flush_dep_par_type)); memset(expected[i].flush_dep_par_idx, 0, sizeof(expected[i].flush_dep_par_idx)); @@ -8326,20 +8328,20 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) expected[i].flush_dep_nchd = 0; expected[i].flush_dep_ndirty_chd = 0; expected[i].flush_order = -1; - expected[i].is_corked = FALSE; + expected[i].is_corked = false; } /* NOTE: special cases for particular variable entries */ expected[0].size = VARIABLE_ENTRY_SIZE / 4; - expected[0].is_pinned = TRUE; + expected[0].is_pinned = true; expected[1].size = VARIABLE_ENTRY_SIZE / 4; - expected[2].is_dirty = FALSE; + expected[2].is_dirty = false; expected[3].size = VARIABLE_ENTRY_SIZE / 4; - expected[4].is_dirty = FALSE; + expected[4].is_dirty = false; expected[5].size = VARIABLE_ENTRY_SIZE / 4; @@ -8347,23 +8349,23 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) expected[7].size = VARIABLE_ENTRY_SIZE / 2; - expected[8].is_dirty = FALSE; + expected[8].is_dirty = false; - expected[9].is_dirty = FALSE; - expected[9].is_pinned = TRUE; + expected[9].is_dirty = false; + expected[9].is_pinned = true; for (; i < num_variable_entries + num_monster_entries; i++) { expected[i].entry_type = MONSTER_ENTRY_TYPE; expected[i].entry_index = (int)(i - num_variable_entries); expected[i].size = MONSTER_ENTRY_SIZE; - expected[i].in_cache = TRUE; - expected[i].at_main_addr = TRUE; - expected[i].is_dirty = TRUE; - expected[i].is_protected = FALSE; - expected[i].is_pinned = FALSE; - expected[i].deserialized = TRUE; - expected[i].serialized = FALSE; - expected[i].destroyed = FALSE; + expected[i].in_cache = true; + expected[i].at_main_addr = true; + expected[i].is_dirty = true; + expected[i].is_protected = false; + expected[i].is_pinned = false; + expected[i].deserialized = true; + expected[i].serialized = false; + expected[i].destroyed = false; memset(expected[i].flush_dep_par_type, 0, sizeof(expected[i].flush_dep_par_type)); memset(expected[i].flush_dep_par_idx, 0, sizeof(expected[i].flush_dep_par_idx)); @@ -8372,21 +8374,21 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) expected[i].flush_dep_nchd = 0; expected[i].flush_dep_ndirty_chd = 0; expected[i].flush_order = -1; - expected[i].is_corked = FALSE; + expected[i].is_corked = false; } for (; i < num_total_entries; i++) { expected[i].entry_type = LARGE_ENTRY_TYPE; expected[i].entry_index = (int)(i - num_monster_entries - num_variable_entries); expected[i].size = LARGE_ENTRY_SIZE; - expected[i].in_cache = TRUE; - expected[i].at_main_addr = TRUE; - expected[i].is_dirty = TRUE; - expected[i].is_protected = FALSE; - expected[i].is_pinned = FALSE; - expected[i].deserialized = TRUE; - expected[i].serialized = FALSE; - expected[i].destroyed = FALSE; + expected[i].in_cache = true; + expected[i].at_main_addr = true; + expected[i].is_dirty = true; + expected[i].is_protected = false; + expected[i].is_pinned = false; + expected[i].deserialized = true; + expected[i].serialized = false; + expected[i].destroyed = false; memset(expected[i].flush_dep_par_type, 0, sizeof(expected[i].flush_dep_par_type)); memset(expected[i].flush_dep_par_idx, 0, sizeof(expected[i].flush_dep_par_idx)); @@ -8395,30 +8397,30 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) expected[i].flush_dep_nchd = 0; expected[i].flush_dep_ndirty_chd = 0; expected[i].flush_order = -1; - expected[i].is_corked = FALSE; + expected[i].is_corked = false; } assert(i == num_total_entries); - pass = TRUE; + pass = true; } if (pass) { if (cache_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "cache_ptr NULL on entry to flush ops test."; } else if ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0)) { - pass = FALSE; + pass = false; failure_mssg = "cache not empty at start of flush ops eviction test."; } else if ((cache_ptr->max_cache_size != (2 * 1024 * 1024)) || (cache_ptr->min_clean_size != (1 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "unexpected cache config at start of flush op eviction test."; } else { @@ -8453,33 +8455,33 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) */ protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 0); - resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 0, (VARIABLE_ENTRY_SIZE / 4), TRUE); + resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 0, (VARIABLE_ENTRY_SIZE / 4), true); unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 0, H5C__DIRTIED_FLAG); protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 1); - resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 1, (VARIABLE_ENTRY_SIZE / 4), TRUE); + resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 1, (VARIABLE_ENTRY_SIZE / 4), true); unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 1, H5C__DIRTIED_FLAG); protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 2); unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 2, H5C__NO_FLAGS_SET); protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 3); - resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 3, (VARIABLE_ENTRY_SIZE / 4), TRUE); + resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 3, (VARIABLE_ENTRY_SIZE / 4), true); unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 3, H5C__DIRTIED_FLAG); protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 4); unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 4, H5C__NO_FLAGS_SET); protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 5); - resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 5, (VARIABLE_ENTRY_SIZE / 4), TRUE); + resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 5, (VARIABLE_ENTRY_SIZE / 4), true); unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 5, H5C__DIRTIED_FLAG); protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 6); - resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 6, (VARIABLE_ENTRY_SIZE / 2), TRUE); + resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 6, (VARIABLE_ENTRY_SIZE / 2), true); unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 6, H5C__DIRTIED_FLAG); protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 7); - resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 7, (VARIABLE_ENTRY_SIZE / 2), TRUE); + resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 7, (VARIABLE_ENTRY_SIZE / 2), true); unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 7, H5C__DIRTIED_FLAG); protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 8); @@ -8492,7 +8494,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) (cache_ptr->index_size != (4 * (VARIABLE_ENTRY_SIZE / 4)) + (2 * (VARIABLE_ENTRY_SIZE / 2)) + (4 * VARIABLE_ENTRY_SIZE))) { - pass = FALSE; + pass = false; failure_mssg = "unexpected size/len in flush op eviction test 1."; } } @@ -8526,22 +8528,22 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) * * (VET, 9) dirties (VET, 8) */ - add_flush_op(VARIABLE_ENTRY_TYPE, 1, FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, (size_t)0, NULL); - add_flush_op(VARIABLE_ENTRY_TYPE, 1, FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, TRUE, + add_flush_op(VARIABLE_ENTRY_TYPE, 1, FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, false, (size_t)0, NULL); + add_flush_op(VARIABLE_ENTRY_TYPE, 1, FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, true, 3 * VARIABLE_ENTRY_SIZE / 4, NULL); - add_flush_op(VARIABLE_ENTRY_TYPE, 3, FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, (size_t)0, NULL); - add_flush_op(VARIABLE_ENTRY_TYPE, 3, FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, TRUE, + add_flush_op(VARIABLE_ENTRY_TYPE, 3, FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, false, (size_t)0, NULL); + add_flush_op(VARIABLE_ENTRY_TYPE, 3, FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, true, VARIABLE_ENTRY_SIZE, NULL); - add_flush_op(VARIABLE_ENTRY_TYPE, 3, FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, (size_t)0, NULL); + add_flush_op(VARIABLE_ENTRY_TYPE, 3, FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, false, (size_t)0, NULL); - add_flush_op(VARIABLE_ENTRY_TYPE, 5, FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, (size_t)0, NULL); - add_flush_op(VARIABLE_ENTRY_TYPE, 5, FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 5, TRUE, + add_flush_op(VARIABLE_ENTRY_TYPE, 5, FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, false, (size_t)0, NULL); + add_flush_op(VARIABLE_ENTRY_TYPE, 5, FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 5, true, VARIABLE_ENTRY_SIZE / 2, NULL); - add_flush_op(VARIABLE_ENTRY_TYPE, 7, FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 9, FALSE, (size_t)0, NULL); + add_flush_op(VARIABLE_ENTRY_TYPE, 7, FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 9, false, (size_t)0, NULL); - add_flush_op(VARIABLE_ENTRY_TYPE, 9, FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 8, FALSE, (size_t)0, NULL); + add_flush_op(VARIABLE_ENTRY_TYPE, 9, FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 8, false, (size_t)0, NULL); } if (pass) { @@ -8600,7 +8602,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) ((4 * VARIABLE_ENTRY_SIZE / 4) + (2 * VARIABLE_ENTRY_SIZE / 2) + (4 * VARIABLE_ENTRY_SIZE) + (31 * MONSTER_ENTRY_SIZE) + (1 * LARGE_ENTRY_SIZE)))) { - pass = FALSE; + pass = false; failure_mssg = "unexpected size/len in flush op eviction test 2."; } else { @@ -8650,10 +8652,10 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) * Start by updating the expected table for the expected changes in entry status: */ expected[0].size = 3 * VARIABLE_ENTRY_SIZE / 4; - expected[1].is_dirty = FALSE; - expected[1].serialized = TRUE; - expected[2].in_cache = FALSE; - expected[2].destroyed = TRUE; + expected[1].is_dirty = false; + expected[1].serialized = true; + expected[2].in_cache = false; + expected[2].destroyed = true; num_large_entries = 2; @@ -8666,7 +8668,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) (cache_ptr->index_size != ((1 * (3 * VARIABLE_ENTRY_SIZE / 4)) + (3 * VARIABLE_ENTRY_SIZE / 4) + (2 * VARIABLE_ENTRY_SIZE / 2) + (3 * VARIABLE_ENTRY_SIZE) + (31 * MONSTER_ENTRY_SIZE) + (2 * LARGE_ENTRY_SIZE)))) { - pass = FALSE; + pass = false; failure_mssg = "unexpected size/len in flush op eviction test 3."; } @@ -8712,11 +8714,11 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) * Start by updating the expected table for the expected changes in entry status: */ expected[0].size = VARIABLE_ENTRY_SIZE; - expected[0].at_main_addr = FALSE; - expected[3].is_dirty = FALSE; - expected[3].serialized = TRUE; - expected[4].in_cache = FALSE; - expected[4].destroyed = TRUE; + expected[0].at_main_addr = false; + expected[3].is_dirty = false; + expected[3].serialized = true; + expected[4].in_cache = false; + expected[4].destroyed = true; num_large_entries = 3; @@ -8730,7 +8732,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) ((3 * VARIABLE_ENTRY_SIZE / 4) + (2 * VARIABLE_ENTRY_SIZE / 2) + (3 * VARIABLE_ENTRY_SIZE) + (31 * MONSTER_ENTRY_SIZE) + (3 * LARGE_ENTRY_SIZE)))) { - pass = FALSE; + pass = false; failure_mssg = "unexpected size/len in flush op eviction test 4."; } @@ -8780,15 +8782,15 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) */ expected[5].size = VARIABLE_ENTRY_SIZE / 2; - expected[5].is_dirty = FALSE; - expected[5].serialized = TRUE; - expected[6].is_dirty = FALSE; - expected[6].serialized = TRUE; - expected[7].is_dirty = FALSE; - expected[7].serialized = TRUE; - expected[8].in_cache = FALSE; - expected[8].destroyed = TRUE; - expected[9].is_dirty = TRUE; + expected[5].is_dirty = false; + expected[5].serialized = true; + expected[6].is_dirty = false; + expected[6].serialized = true; + expected[7].is_dirty = false; + expected[7].serialized = true; + expected[8].in_cache = false; + expected[8].destroyed = true; + expected[9].is_dirty = true; num_large_entries = 5; @@ -8807,7 +8809,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) ((2 * VARIABLE_ENTRY_SIZE / 4) + (3 * VARIABLE_ENTRY_SIZE / 2) + (2 * VARIABLE_ENTRY_SIZE) + (31 * MONSTER_ENTRY_SIZE) + (5 * LARGE_ENTRY_SIZE)))) { - pass = FALSE; + pass = false; failure_mssg = "unexpected size/len in flush op eviction test 5."; } @@ -8844,7 +8846,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) ((2 * VARIABLE_ENTRY_SIZE / 4) + (3 * VARIABLE_ENTRY_SIZE / 2) + (2 * VARIABLE_ENTRY_SIZE) + (31 * MONSTER_ENTRY_SIZE) + (5 * LARGE_ENTRY_SIZE)))) { - pass = FALSE; + pass = false; failure_mssg = "unexpected size/len in flush op eviction test 6."; } @@ -8888,13 +8890,13 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) * Start by updating the expected table for the expected changes in entry status: */ - expected[0].is_pinned = FALSE; - expected[1].in_cache = FALSE; - expected[1].destroyed = TRUE; - expected[3].in_cache = FALSE; - expected[3].destroyed = TRUE; - expected[5].in_cache = FALSE; - expected[5].destroyed = TRUE; + expected[0].is_pinned = false; + expected[1].in_cache = false; + expected[1].destroyed = true; + expected[3].in_cache = false; + expected[3].destroyed = true; + expected[5].in_cache = false; + expected[5].destroyed = true; num_large_entries = 8; @@ -8911,7 +8913,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) (cache_ptr->index_size != ((2 * VARIABLE_ENTRY_SIZE / 2) + (2 * VARIABLE_ENTRY_SIZE) + (31 * MONSTER_ENTRY_SIZE) + (8 * LARGE_ENTRY_SIZE)))) { - pass = FALSE; + pass = false; failure_mssg = "unexpected size/len in flush op eviction test 7."; } @@ -8953,8 +8955,8 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) * Start by updating the expected table for the expected changes in entry status: */ - expected[6].in_cache = FALSE; - expected[6].destroyed = TRUE; + expected[6].in_cache = false; + expected[6].destroyed = true; num_large_entries = 9; @@ -8970,7 +8972,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) (cache_ptr->index_size != ((1 * VARIABLE_ENTRY_SIZE / 2) + (2 * VARIABLE_ENTRY_SIZE) + (31 * MONSTER_ENTRY_SIZE) + (9 * LARGE_ENTRY_SIZE)))) { - pass = FALSE; + pass = false; failure_mssg = "unexpected size/len in flush op eviction test 8."; } @@ -9014,9 +9016,9 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) * Start by updating the expected table for the expected changes in entry status: */ - expected[7].in_cache = FALSE; - expected[7].destroyed = TRUE; - expected[9].is_pinned = FALSE; + expected[7].in_cache = false; + expected[7].destroyed = true; + expected[9].is_pinned = false; num_large_entries = 10; @@ -9032,7 +9034,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) (cache_ptr->index_size != ((2 * VARIABLE_ENTRY_SIZE) + (31 * MONSTER_ENTRY_SIZE) + (10 * LARGE_ENTRY_SIZE)))) { - pass = FALSE; + pass = false; failure_mssg = "unexpected size/len in flush op eviction test 9."; } @@ -9067,7 +9069,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) (cache_ptr->index_size != ((2 * VARIABLE_ENTRY_SIZE) + (31 * MONSTER_ENTRY_SIZE) + (10 * LARGE_ENTRY_SIZE)))) { - pass = FALSE; + pass = false; failure_mssg = "unexpected size/len in flush op eviction test 10."; } @@ -9175,35 +9177,35 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) */ base_addr = entries[VARIABLE_ENTRY_TYPE]; entry_ptr = &(base_addr[8]); - entry_ptr->deserialized = FALSE; - entry_ptr->deserialized = FALSE; - entry_ptr->destroyed = FALSE; - - expected[0].in_cache = FALSE; - expected[0].is_dirty = FALSE; - expected[0].serialized = TRUE; - expected[0].destroyed = TRUE; - expected[8].in_cache = TRUE; - expected[8].is_dirty = FALSE; - expected[8].deserialized = TRUE; - expected[8].serialized = TRUE; - expected[8].destroyed = FALSE; - expected[9].in_cache = FALSE; - expected[9].is_dirty = FALSE; - expected[9].serialized = TRUE; - expected[9].destroyed = TRUE; - - expected[10].in_cache = TRUE; - expected[10].is_dirty = FALSE; - expected[10].serialized = TRUE; - expected[10].destroyed = FALSE; + entry_ptr->deserialized = false; + entry_ptr->deserialized = false; + entry_ptr->destroyed = false; + + expected[0].in_cache = false; + expected[0].is_dirty = false; + expected[0].serialized = true; + expected[0].destroyed = true; + expected[8].in_cache = true; + expected[8].is_dirty = false; + expected[8].deserialized = true; + expected[8].serialized = true; + expected[8].destroyed = false; + expected[9].in_cache = false; + expected[9].is_dirty = false; + expected[9].serialized = true; + expected[9].destroyed = true; + + expected[10].in_cache = true; + expected[10].is_dirty = false; + expected[10].serialized = true; + expected[10].destroyed = false; num_large_entries = 12; for (i = num_variable_entries; i < num_variable_entries + num_monster_entries + num_large_entries - 1; i++) { - expected[i].is_dirty = FALSE; - expected[i].serialized = TRUE; + expected[i].is_dirty = false; + expected[i].serialized = true; } for (i = 10; i < 12; i++) { @@ -9217,7 +9219,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) (cache_ptr->index_size != ((1 * VARIABLE_ENTRY_SIZE) + (31 * MONSTER_ENTRY_SIZE) + (12 * LARGE_ENTRY_SIZE)))) { - pass = FALSE; + pass = false; failure_mssg = "unexpected size/len in flush op eviction test 11."; } @@ -9238,7 +9240,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) */ base_addr = entries[VARIABLE_ENTRY_TYPE]; entry_ptr = &(base_addr[8]); - entry_ptr->serialized = FALSE; + entry_ptr->serialized = false; protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 8); unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 8, H5C__DIRTIED_FLAG); @@ -9256,7 +9258,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) */ base_addr = entries[MONSTER_ENTRY_TYPE]; entry_ptr = &(base_addr[0]); - entry_ptr->destroyed = FALSE; + entry_ptr->destroyed = false; for (i = 1; i < num_monster_entries; i++) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i); @@ -9281,25 +9283,25 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) /* update the expected array to mark all these entries dirty again. */ for (i = num_variable_entries; i < num_variable_entries + num_monster_entries + num_large_entries - 1; i++) { - expected[i].is_dirty = TRUE; + expected[i].is_dirty = true; } /* update MET 0 to set its in cache flag, and reset * its destroyed flag */ - expected[10].in_cache = TRUE; + expected[10].in_cache = true; /* pass through non variable entries will flush VET 8, and evict VET 9. * Update accordingly. */ - expected[8].in_cache = TRUE; - expected[8].is_dirty = TRUE; - expected[8].serialized = FALSE; - expected[8].destroyed = FALSE; - expected[9].in_cache = FALSE; - expected[9].is_dirty = FALSE; - expected[9].serialized = TRUE; - expected[9].destroyed = TRUE; + expected[8].in_cache = true; + expected[8].is_dirty = true; + expected[8].serialized = false; + expected[8].destroyed = false; + expected[9].in_cache = false; + expected[9].is_dirty = false; + expected[9].serialized = true; + expected[9].destroyed = true; /* verify cache size */ if ((cache_ptr->index_len != 44) || @@ -9308,7 +9310,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) (cache_ptr->index_size != ((1 * VARIABLE_ENTRY_SIZE) + (31 * MONSTER_ENTRY_SIZE) + (12 * LARGE_ENTRY_SIZE)))) { - pass = FALSE; + pass = false; failure_mssg = "unexpected size/len in flush op eviction test 12."; } @@ -9363,10 +9365,10 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) * entry status: */ - expected[8].in_cache = FALSE; - expected[8].is_dirty = FALSE; - expected[8].serialized = TRUE; - expected[8].destroyed = TRUE; + expected[8].in_cache = false; + expected[8].is_dirty = false; + expected[8].serialized = true; + expected[8].destroyed = true; num_large_entries = 14; @@ -9375,8 +9377,8 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) */ for (i = num_variable_entries; i < num_variable_entries + num_monster_entries + num_large_entries - 1; i++) { - expected[i].is_dirty = FALSE; - expected[i].serialized = TRUE; + expected[i].is_dirty = false; + expected[i].serialized = true; } for (i = 12; i < 14; i++) { @@ -9390,7 +9392,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) (2 * 1024 * 1024) - (6 * VARIABLE_ENTRY_SIZE) + (13 * LARGE_ENTRY_SIZE)) || (cache_ptr->index_size != ((31 * MONSTER_ENTRY_SIZE) + (14 * LARGE_ENTRY_SIZE)))) { - pass = FALSE; + pass = false; failure_mssg = "unexpected size/len in flush op eviction test 13."; } @@ -9418,7 +9420,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) if ((pass) && ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache len/size after cleanup of flush op eviction test"; } } @@ -9451,7 +9453,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) (cache_ptr->entry_flush_size_changes[VARIABLE_ENTRY_TYPE] != 1) || (cache_ptr->cache_flush_size_changes[VARIABLE_ENTRY_TYPE] != 0)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected variable size entry stats in check_flush_cache__flush_op_eviction_test()."; } @@ -9476,7 +9478,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) (cache_ptr->entry_flush_size_changes[LARGE_ENTRY_TYPE] != 0) || (cache_ptr->cache_flush_size_changes[LARGE_ENTRY_TYPE] != 0)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected large entry stats in check_flush_cache__flush_op_eviction_test()."; } } @@ -9500,7 +9502,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) (cache_ptr->entry_flush_size_changes[MONSTER_ENTRY_TYPE] != 0) || (cache_ptr->cache_flush_size_changes[MONSTER_ENTRY_TYPE] != 0)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected monster entry stats in check_flush_cache__flush_op_eviction_test()."; } } @@ -9533,12 +9535,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) if (cache_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "cache_ptr NULL on entry to single entry case."; } else if ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0)) { - pass = FALSE; + pass = false; failure_mssg = "cache not empty at beginning of single entry case."; } @@ -9549,12 +9551,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 1, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__NO_FLAGS_SET, /* flush_flags */ H5C__NO_FLAGS_SET, - /* expected_deserialized */ TRUE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ true, + /* expected_serialized */ false, + /* expected_destroyed */ false); } if (pass) { @@ -9564,12 +9566,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 2, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__DIRTIED_FLAG, /* flush_flags */ H5C__NO_FLAGS_SET, - /* expected_deserialized */ TRUE, - /* expected_serialized */ TRUE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ true, + /* expected_serialized */ true, + /* expected_destroyed */ false); } if (pass) { @@ -9579,12 +9581,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 3, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__NO_FLAGS_SET, /* flush_flags */ H5C__FLUSH_CLEAR_ONLY_FLAG, - /* expected_deserialized */ TRUE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ true, + /* expected_serialized */ false, + /* expected_destroyed */ false); } if (pass) { @@ -9594,12 +9596,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 4, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__DIRTIED_FLAG, /* flush_flags */ H5C__FLUSH_CLEAR_ONLY_FLAG, - /* expected_deserialized */ TRUE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ true, + /* expected_serialized */ false, + /* expected_destroyed */ false); } if (pass) { @@ -9609,12 +9611,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 5, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__NO_FLAGS_SET, /* flush_flags */ H5C__FLUSH_INVALIDATE_FLAG, - /* expected_deserialized */ TRUE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ true, + /* expected_serialized */ false, + /* expected_destroyed */ true); } if (pass) { @@ -9624,12 +9626,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 6, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__DIRTIED_FLAG, /* flush_flags */ H5C__FLUSH_INVALIDATE_FLAG, - /* expected_deserialized */ TRUE, - /* expected_serialized */ TRUE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ true, + /* expected_serialized */ true, + /* expected_destroyed */ true); } if (pass) { @@ -9639,12 +9641,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 7, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__NO_FLAGS_SET, /* flush_flags */ H5C__FLUSH_MARKED_ENTRIES_FLAG, - /* expected_deserialized */ TRUE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ true, + /* expected_serialized */ false, + /* expected_destroyed */ false); } if (pass) { @@ -9654,12 +9656,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 8, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__DIRTIED_FLAG, /* flush_flags */ H5C__FLUSH_MARKED_ENTRIES_FLAG, - /* expected_deserialized */ TRUE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ true, + /* expected_serialized */ false, + /* expected_destroyed */ false); } if (pass) { @@ -9669,12 +9671,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 9, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__NO_FLAGS_SET, /* flush_flags */ H5C__FLUSH_INVALIDATE_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, - /* expected_deserialized */ TRUE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ true, + /* expected_serialized */ false, + /* expected_destroyed */ true); } if (pass) { @@ -9684,12 +9686,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 10, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__DIRTIED_FLAG, /* flush_flags */ H5C__FLUSH_INVALIDATE_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, - /* expected_deserialized */ TRUE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ true, + /* expected_serialized */ false, + /* expected_destroyed */ true); } if (pass) { @@ -9699,12 +9701,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 11, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__NO_FLAGS_SET, /* flush_flags */ H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, - /* expected_deserialized */ TRUE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ true, + /* expected_serialized */ false, + /* expected_destroyed */ false); } if (pass) { @@ -9714,12 +9716,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 12, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__DIRTIED_FLAG, /* flush_flags */ H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, - /* expected_deserialized */ TRUE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ true, + /* expected_serialized */ false, + /* expected_destroyed */ false); } if (pass) { @@ -9729,12 +9731,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 13, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__NO_FLAGS_SET, /* flush_flags */ H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_INVALIDATE_FLAG, - /* expected_deserialized */ TRUE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ true, + /* expected_serialized */ false, + /* expected_destroyed */ true); } if (pass) { @@ -9744,12 +9746,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 14, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__DIRTIED_FLAG, /* flush_flags */ H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_INVALIDATE_FLAG, - /* expected_deserialized */ TRUE, - /* expected_serialized */ TRUE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ true, + /* expected_serialized */ true, + /* expected_destroyed */ true); } if (pass) { @@ -9759,13 +9761,13 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 15, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__NO_FLAGS_SET, /* flush_flags */ H5C__FLUSH_INVALIDATE_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG | H5C__FLUSH_MARKED_ENTRIES_FLAG, - /* expected_deserialized */ TRUE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ true, + /* expected_serialized */ false, + /* expected_destroyed */ true); } if (pass) { @@ -9775,13 +9777,13 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 16, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__DIRTIED_FLAG, /* flush_flags */ H5C__FLUSH_INVALIDATE_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG | H5C__FLUSH_MARKED_ENTRIES_FLAG, - /* expected_deserialized */ TRUE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ true, + /* expected_serialized */ false, + /* expected_destroyed */ true); } if (pass) { @@ -9791,12 +9793,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 17, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__NO_FLAGS_SET, - /* expected_deserialized */ TRUE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ true, + /* expected_serialized */ false, + /* expected_destroyed */ false); } if (pass) { @@ -9806,12 +9808,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 18, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__DIRTIED_FLAG | H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__NO_FLAGS_SET, - /* expected_deserialized */ TRUE, - /* expected_serialized */ TRUE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ true, + /* expected_serialized */ true, + /* expected_destroyed */ false); } if (pass) { @@ -9821,12 +9823,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 19, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__FLUSH_CLEAR_ONLY_FLAG, - /* expected_deserialized */ TRUE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ true, + /* expected_serialized */ false, + /* expected_destroyed */ false); } if (pass) { @@ -9836,12 +9838,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 20, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__DIRTIED_FLAG | H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__FLUSH_CLEAR_ONLY_FLAG, - /* expected_deserialized */ TRUE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ true, + /* expected_serialized */ false, + /* expected_destroyed */ false); } if (pass) { @@ -9851,12 +9853,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 21, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__FLUSH_INVALIDATE_FLAG, - /* expected_deserialized */ TRUE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ true, + /* expected_serialized */ false, + /* expected_destroyed */ true); } if (pass) { @@ -9866,12 +9868,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 22, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__DIRTIED_FLAG | H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__FLUSH_INVALIDATE_FLAG, - /* expected_deserialized */ TRUE, - /* expected_serialized */ TRUE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ true, + /* expected_serialized */ true, + /* expected_destroyed */ true); } if (pass) { @@ -9881,12 +9883,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 23, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__FLUSH_MARKED_ENTRIES_FLAG, - /* expected_deserialized */ TRUE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ true, + /* expected_serialized */ false, + /* expected_destroyed */ false); } if (pass) { @@ -9896,12 +9898,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 24, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__DIRTIED_FLAG | H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__FLUSH_MARKED_ENTRIES_FLAG, - /* expected_deserialized */ TRUE, - /* expected_serialized */ TRUE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ true, + /* expected_serialized */ true, + /* expected_destroyed */ false); } if (pass) { @@ -9911,12 +9913,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 25, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__FLUSH_INVALIDATE_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, - /* expected_deserialized */ TRUE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ true, + /* expected_serialized */ false, + /* expected_destroyed */ true); } if (pass) { @@ -9926,12 +9928,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 26, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__DIRTIED_FLAG | H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__FLUSH_INVALIDATE_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, - /* expected_deserialized */ TRUE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ true, + /* expected_serialized */ false, + /* expected_destroyed */ true); } if (pass) { @@ -9941,12 +9943,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 27, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, - /* expected_deserialized */ TRUE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ true, + /* expected_serialized */ false, + /* expected_destroyed */ false); } if (pass) { @@ -9956,12 +9958,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 28, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__DIRTIED_FLAG | H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, - /* expected_deserialized */ TRUE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ true, + /* expected_serialized */ false, + /* expected_destroyed */ false); } if (pass) { @@ -9971,12 +9973,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 29, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_INVALIDATE_FLAG, - /* expected_deserialized */ TRUE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ true, + /* expected_serialized */ false, + /* expected_destroyed */ true); } if (pass) { @@ -9986,12 +9988,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 30, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__DIRTIED_FLAG | H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_INVALIDATE_FLAG, - /* expected_deserialized */ TRUE, - /* expected_serialized */ TRUE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ true, + /* expected_serialized */ true, + /* expected_destroyed */ true); } if (pass) { @@ -10001,13 +10003,13 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 31, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__FLUSH_INVALIDATE_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG | H5C__FLUSH_MARKED_ENTRIES_FLAG, - /* expected_deserialized */ TRUE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ true, + /* expected_serialized */ false, + /* expected_destroyed */ true); } if (pass) { @@ -10017,13 +10019,13 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 32, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ FALSE, + /* insert_flag */ false, /* flags */ H5C__DIRTIED_FLAG | H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__FLUSH_INVALIDATE_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG | H5C__FLUSH_MARKED_ENTRIES_FLAG, - /* expected_deserialized */ TRUE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ true, + /* expected_serialized */ false, + /* expected_destroyed */ true); } if (pass) { @@ -10033,12 +10035,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 33, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__NO_FLAGS_SET, /* flush_flags */ H5C__NO_FLAGS_SET, - /* expected_deserialized */ FALSE, - /* expected_serialized */ TRUE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ false, + /* expected_serialized */ true, + /* expected_destroyed */ false); } if (pass) { @@ -10048,12 +10050,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 34, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__NO_FLAGS_SET, /* flush_flags */ H5C__NO_FLAGS_SET, - /* expected_deserialized */ FALSE, - /* expected_serialized */ TRUE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ false, + /* expected_serialized */ true, + /* expected_destroyed */ false); } if (pass) { @@ -10063,12 +10065,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 35, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__NO_FLAGS_SET, /* flush_flags */ H5C__FLUSH_CLEAR_ONLY_FLAG, - /* expected_deserialized */ FALSE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ false, + /* expected_serialized */ false, + /* expected_destroyed */ false); } if (pass) { @@ -10078,12 +10080,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 36, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__NO_FLAGS_SET, /* flush_flags */ H5C__FLUSH_CLEAR_ONLY_FLAG, - /* expected_deserialized */ FALSE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ false, + /* expected_serialized */ false, + /* expected_destroyed */ false); } if (pass) { @@ -10093,12 +10095,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 37, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__NO_FLAGS_SET, /* flush_flags */ H5C__FLUSH_INVALIDATE_FLAG, - /* expected_deserialized */ FALSE, - /* expected_serialized */ TRUE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ false, + /* expected_serialized */ true, + /* expected_destroyed */ true); } if (pass) { @@ -10108,12 +10110,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 38, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__NO_FLAGS_SET, /* flush_flags */ H5C__FLUSH_INVALIDATE_FLAG, - /* expected_deserialized */ FALSE, - /* expected_serialized */ TRUE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ false, + /* expected_serialized */ true, + /* expected_destroyed */ true); } if (pass) { @@ -10123,12 +10125,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 39, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__NO_FLAGS_SET, /* flush_flags */ H5C__FLUSH_MARKED_ENTRIES_FLAG, - /* expected_deserialized */ FALSE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ false, + /* expected_serialized */ false, + /* expected_destroyed */ false); } if (pass) { @@ -10138,12 +10140,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 40, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__NO_FLAGS_SET, /* flush_flags */ H5C__FLUSH_MARKED_ENTRIES_FLAG, - /* expected_deserialized */ FALSE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ false, + /* expected_serialized */ false, + /* expected_destroyed */ false); } if (pass) { @@ -10153,12 +10155,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 41, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__NO_FLAGS_SET, /* flush_flags */ H5C__FLUSH_INVALIDATE_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, - /* expected_deserialized */ FALSE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ false, + /* expected_serialized */ false, + /* expected_destroyed */ true); } if (pass) { @@ -10168,12 +10170,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 42, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__NO_FLAGS_SET, /* flush_flags */ H5C__FLUSH_INVALIDATE_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, - /* expected_deserialized */ FALSE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ false, + /* expected_serialized */ false, + /* expected_destroyed */ true); } if (pass) { @@ -10183,12 +10185,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 43, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__NO_FLAGS_SET, /* flush_flags */ H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, - /* expected_deserialized */ FALSE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ false, + /* expected_serialized */ false, + /* expected_destroyed */ false); } if (pass) { @@ -10198,12 +10200,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 44, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__NO_FLAGS_SET, /* flush_flags */ H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, - /* expected_deserialized */ FALSE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ false, + /* expected_serialized */ false, + /* expected_destroyed */ false); } if (pass) { @@ -10213,12 +10215,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 45, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__NO_FLAGS_SET, /* flush_flags */ H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_INVALIDATE_FLAG, - /* expected_deserialized */ FALSE, - /* expected_serialized */ TRUE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ false, + /* expected_serialized */ true, + /* expected_destroyed */ true); } if (pass) { @@ -10228,12 +10230,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 46, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__NO_FLAGS_SET, /* flush_flags */ H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_INVALIDATE_FLAG, - /* expected_deserialized */ FALSE, - /* expected_serialized */ TRUE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ false, + /* expected_serialized */ true, + /* expected_destroyed */ true); } if (pass) { @@ -10243,13 +10245,13 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 47, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__NO_FLAGS_SET, /* flush_flags */ H5C__FLUSH_INVALIDATE_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG | H5C__FLUSH_MARKED_ENTRIES_FLAG, - /* expected_deserialized */ FALSE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ false, + /* expected_serialized */ false, + /* expected_destroyed */ true); } if (pass) { @@ -10259,13 +10261,13 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 48, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__NO_FLAGS_SET, /* flush_flags */ H5C__FLUSH_INVALIDATE_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG | H5C__FLUSH_MARKED_ENTRIES_FLAG, - /* expected_deserialized */ FALSE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ false, + /* expected_serialized */ false, + /* expected_destroyed */ true); } if (pass) { @@ -10275,12 +10277,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 49, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__NO_FLAGS_SET, - /* expected_deserialized */ FALSE, - /* expected_serialized */ TRUE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ false, + /* expected_serialized */ true, + /* expected_destroyed */ false); } if (pass) { @@ -10290,12 +10292,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 50, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__NO_FLAGS_SET, - /* expected_deserialized */ FALSE, - /* expected_serialized */ TRUE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ false, + /* expected_serialized */ true, + /* expected_destroyed */ false); } if (pass) { @@ -10305,12 +10307,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 51, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__FLUSH_CLEAR_ONLY_FLAG, - /* expected_deserialized */ FALSE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ false, + /* expected_serialized */ false, + /* expected_destroyed */ false); } if (pass) { @@ -10320,12 +10322,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 52, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__FLUSH_CLEAR_ONLY_FLAG, - /* expected_deserialized */ FALSE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ false, + /* expected_serialized */ false, + /* expected_destroyed */ false); } if (pass) { @@ -10335,12 +10337,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 53, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__FLUSH_INVALIDATE_FLAG, - /* expected_deserialized */ FALSE, - /* expected_serialized */ TRUE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ false, + /* expected_serialized */ true, + /* expected_destroyed */ true); } if (pass) { @@ -10350,12 +10352,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 54, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__FLUSH_INVALIDATE_FLAG, - /* expected_deserialized */ FALSE, - /* expected_serialized */ TRUE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ false, + /* expected_serialized */ true, + /* expected_destroyed */ true); } if (pass) { @@ -10365,12 +10367,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 55, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__FLUSH_MARKED_ENTRIES_FLAG, - /* expected_deserialized */ FALSE, - /* expected_serialized */ TRUE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ false, + /* expected_serialized */ true, + /* expected_destroyed */ false); } if (pass) { @@ -10380,12 +10382,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 56, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__FLUSH_MARKED_ENTRIES_FLAG, - /* expected_deserialized */ FALSE, - /* expected_serialized */ TRUE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ false, + /* expected_serialized */ true, + /* expected_destroyed */ false); } if (pass) { @@ -10395,12 +10397,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 57, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__FLUSH_INVALIDATE_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, - /* expected_deserialized */ FALSE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ false, + /* expected_serialized */ false, + /* expected_destroyed */ true); } if (pass) { @@ -10410,12 +10412,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 58, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__FLUSH_INVALIDATE_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, - /* expected_deserialized */ FALSE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ false, + /* expected_serialized */ false, + /* expected_destroyed */ true); } if (pass) { @@ -10425,12 +10427,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 59, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, - /* expected_deserialized */ FALSE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ false, + /* expected_serialized */ false, + /* expected_destroyed */ false); } if (pass) { @@ -10440,12 +10442,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 60, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, - /* expected_deserialized */ FALSE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ FALSE); + /* expected_deserialized */ false, + /* expected_serialized */ false, + /* expected_destroyed */ false); } if (pass) { @@ -10455,12 +10457,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 61, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_INVALIDATE_FLAG, - /* expected_deserialized */ FALSE, - /* expected_serialized */ TRUE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ false, + /* expected_serialized */ true, + /* expected_destroyed */ true); } if (pass) { @@ -10470,12 +10472,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 62, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_INVALIDATE_FLAG, - /* expected_deserialized */ FALSE, - /* expected_serialized */ TRUE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ false, + /* expected_serialized */ true, + /* expected_destroyed */ true); } if (pass) { @@ -10485,13 +10487,13 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 63, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__FLUSH_INVALIDATE_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG | H5C__FLUSH_MARKED_ENTRIES_FLAG, - /* expected_deserialized */ FALSE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ false, + /* expected_serialized */ false, + /* expected_destroyed */ true); } if (pass) { @@ -10501,13 +10503,13 @@ check_flush_cache__single_entry(H5F_t *file_ptr) /* test_num */ 64, /* entry_type */ PICO_ENTRY_TYPE, /* entry_idx */ 0, - /* insert_flag */ TRUE, + /* insert_flag */ true, /* flags */ H5C__SET_FLUSH_MARKER_FLAG, /* flush_flags */ H5C__FLUSH_INVALIDATE_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG | H5C__FLUSH_MARKED_ENTRIES_FLAG, - /* expected_deserialized */ FALSE, - /* expected_serialized */ FALSE, - /* expected_destroyed */ TRUE); + /* expected_deserialized */ false, + /* expected_serialized */ false, + /* expected_destroyed */ true); } /* Now run single entry tests for pinned entries. Test all combinations @@ -10539,12 +10541,12 @@ check_flush_cache__single_entry(H5F_t *file_ptr) * * In addition to simply checking to see if the test case runs, * we also check to see if the desired operations take place on the - * cache entry. Thus expected_serialized is set to TRUE if we + * cache entry. Thus expected_serialized is set to true if we * we expect the entry to be flushed, and expected_destroyed is set - * to TRUE if we expect the entry to be destroyed. + * to true if we expect the entry to be destroyed. * * In this test, we are working with pinned entries which can't be - * evicted, so expected_destroyed is always FALSE. We could pull it + * evicted, so expected_destroyed is always false. We could pull it * from the table, but it is a hold over from the code this test * was adapted from, and it doesn't do any particular harm. * @@ -10577,7 +10579,7 @@ check_flush_cache__single_entry(H5F_t *file_ptr) spec = malloc(256 * sizeof(struct pinned_single_entry_test_spec)); if (spec == NULL) { - pass = FALSE; + pass = false; failure_mssg = "couldn't allocated pinned single entry test spec array"; } @@ -10585,21 +10587,21 @@ check_flush_cache__single_entry(H5F_t *file_ptr) int test_num; int entry_type; int entry_idx; - hbool_t dirty_flag; - hbool_t mark_dirty; - hbool_t pop_mark_dirty_prot; - hbool_t pop_mark_dirty_pinned; - hbool_t unprotect_unpin; + bool dirty_flag; + bool mark_dirty; + bool pop_mark_dirty_prot; + bool pop_mark_dirty_pinned; + bool unprotect_unpin; unsigned int flags; unsigned int flush_flags; - hbool_t expected_serialized; - hbool_t expected_destroyed; + bool expected_serialized; + bool expected_destroyed; test_num = (int)(i + 1); entry_type = PICO_ENTRY_TYPE; entry_idx = 0; - /* Generate alternating sequences of TRUE/FALSE */ + /* Generate alternating sequences of true/false */ dirty_flag = (i / 16) % 2; mark_dirty = (i / 8) % 2; pop_mark_dirty_prot = (i / 4) % 2; @@ -10637,25 +10639,25 @@ check_flush_cache__single_entry(H5F_t *file_ptr) break; } - expected_serialized = FALSE; + expected_serialized = false; if (0 == (flush_flags & H5C__FLUSH_CLEAR_ONLY_FLAG)) { if (flush_flags & H5C__FLUSH_MARKED_ENTRIES_FLAG) { if (flags & H5C__SET_FLUSH_MARKER_FLAG) { if (mark_dirty && pop_mark_dirty_prot) { - expected_serialized = TRUE; + expected_serialized = true; } else if (dirty_flag || pop_mark_dirty_prot) { - expected_serialized = TRUE; + expected_serialized = true; } } } else { if (dirty_flag || mark_dirty || pop_mark_dirty_prot || pop_mark_dirty_pinned) - expected_serialized = TRUE; + expected_serialized = true; } } - expected_destroyed = FALSE; + expected_destroyed = false; spec[i] = (struct pinned_single_entry_test_spec){ test_num, @@ -10709,9 +10711,9 @@ check_flush_cache__single_entry(H5F_t *file_ptr) static void check_flush_cache__single_entry_test(H5F_t *file_ptr, int test_num, int entry_type, int entry_idx, - hbool_t insert_flag, unsigned int flags, unsigned int flush_flags, - hbool_t expected_deserialized, hbool_t expected_serialized, - hbool_t expected_destroyed) + bool insert_flag, unsigned int flags, unsigned int flush_flags, + bool expected_deserialized, bool expected_serialized, + bool expected_destroyed) { H5C_t *cache_ptr = file_ptr->shared->cache; static char msg[128]; @@ -10720,20 +10722,20 @@ check_flush_cache__single_entry_test(H5F_t *file_ptr, int test_num, int entry_ty if (cache_ptr == NULL) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "cache_ptr NULL on entry to single entry test #%d.", test_num); failure_mssg = msg; } else if ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "cache not empty at beginning of single entry test #%d.", test_num); failure_mssg = msg; } else if ((entry_type < 0) || (entry_type >= NUMBER_OF_ENTRY_TYPES) || (entry_idx < 0) || (entry_idx > max_indices[entry_type])) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Bad parameters on entry to single entry test #%d.", test_num); failure_mssg = msg; } @@ -10770,7 +10772,7 @@ check_flush_cache__single_entry_test(H5F_t *file_ptr, int test_num, int entry_ty (entry_ptr->serialized != expected_serialized) || (entry_ptr->destroyed != expected_destroyed)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected entry status after flush in single entry test #%d.", test_num); failure_mssg = msg; @@ -10780,7 +10782,7 @@ check_flush_cache__single_entry_test(H5F_t *file_ptr, int test_num, int entry_ty (((flush_flags & H5C__FLUSH_INVALIDATE_FLAG) != 0) && ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0)))) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache len/size after flush in single entry test #%d.", test_num); failure_mssg = msg; @@ -10799,16 +10801,16 @@ check_flush_cache__single_entry_test(H5F_t *file_ptr, int test_num, int entry_ty } else if ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache len/size after cleanup in single entry test #%d.", test_num); failure_mssg = msg; } else { - entry_ptr->deserialized = FALSE; - entry_ptr->serialized = FALSE; - entry_ptr->destroyed = FALSE; + entry_ptr->deserialized = false; + entry_ptr->serialized = false; + entry_ptr->destroyed = false; } } @@ -10826,27 +10828,26 @@ check_flush_cache__single_entry_test(H5F_t *file_ptr, int test_num, int entry_ty static void check_flush_cache__pinned_single_entry_test(H5F_t *file_ptr, int test_num, int entry_type, int entry_idx, - hbool_t unprot_dirty_flag, hbool_t mark_dirty, - hbool_t pop_mark_dirty_prot, hbool_t pop_mark_dirty_pinned, - hbool_t unprotect_unpin, unsigned int flags, - unsigned int flush_flags, hbool_t expected_serialized, - hbool_t expected_destroyed) + bool unprot_dirty_flag, bool mark_dirty, bool pop_mark_dirty_prot, + bool pop_mark_dirty_pinned, bool unprotect_unpin, + unsigned int flags, unsigned int flush_flags, + bool expected_serialized, bool expected_destroyed) { H5C_t *cache_ptr = file_ptr->shared->cache; static char msg[128]; - hbool_t expected_deserialized = TRUE; + bool expected_deserialized = true; test_entry_t *base_addr; test_entry_t *entry_ptr = NULL; if (cache_ptr == NULL) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "cache_ptr NULL on entry to pinned single entry test #%d.", test_num); failure_mssg = msg; } else if ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "cache not empty at beginning of pinned single entry test #%d.", test_num); failure_mssg = msg; @@ -10854,7 +10855,7 @@ check_flush_cache__pinned_single_entry_test(H5F_t *file_ptr, int test_num, int e else if ((entry_type < 0) || (entry_type >= NUMBER_OF_ENTRY_TYPES) || (entry_idx < 0) || (entry_idx > max_indices[entry_type])) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Bad parameters on entry to pinned single entry test #%d.", test_num); failure_mssg = msg; } @@ -10900,7 +10901,7 @@ check_flush_cache__pinned_single_entry_test(H5F_t *file_ptr, int test_num, int e (entry_ptr->serialized != expected_serialized) || (entry_ptr->destroyed != expected_destroyed)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected entry status after flush in pinned single entry test #%d.", test_num); failure_mssg = msg; @@ -10910,7 +10911,7 @@ check_flush_cache__pinned_single_entry_test(H5F_t *file_ptr, int test_num, int e (((flush_flags & H5C__FLUSH_INVALIDATE_FLAG) != 0) && ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0)))) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache len/size after flush in pinned single entry test #%d.", test_num); failure_mssg = msg; @@ -10946,16 +10947,16 @@ check_flush_cache__pinned_single_entry_test(H5F_t *file_ptr, int test_num, int e } else if ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache len/size after cleanup in pinned single entry test #%d.", test_num); failure_mssg = msg; } else { - entry_ptr->deserialized = FALSE; - entry_ptr->serialized = FALSE; - entry_ptr->destroyed = FALSE; + entry_ptr->deserialized = false; + entry_ptr->serialized = false; + entry_ptr->destroyed = false; } } @@ -10976,10 +10977,10 @@ check_get_entry_status(unsigned paged) { static char msg[128]; herr_t result; - hbool_t in_cache; - hbool_t is_dirty; - hbool_t is_protected; - hbool_t is_pinned; + bool in_cache; + bool is_dirty; + bool is_protected; + bool is_pinned; size_t entry_size; H5F_t *file_ptr = NULL; test_entry_t *base_addr = NULL; @@ -10990,7 +10991,7 @@ check_get_entry_status(unsigned paged) else TESTING("H5C_get_entry_status() functionality"); - pass = TRUE; + pass = true; if (pass) { @@ -11000,7 +11001,7 @@ check_get_entry_status(unsigned paged) if (file_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "file_ptr NULL from setup_cache."; } else { @@ -11021,13 +11022,13 @@ check_get_entry_status(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_get_entry_status() reports failure 1."); failure_mssg = msg; } else if (in_cache) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected status 1."); failure_mssg = msg; } @@ -11047,13 +11048,13 @@ check_get_entry_status(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_get_entry_status() reports failure 2."); failure_mssg = msg; } else if (!in_cache || is_dirty || is_protected || is_pinned) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected status 2."); failure_mssg = msg; } @@ -11071,13 +11072,13 @@ check_get_entry_status(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_get_entry_status() reports failure 3."); failure_mssg = msg; } else if (!in_cache || is_dirty || !is_protected || is_pinned) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected status 3."); failure_mssg = msg; } @@ -11095,13 +11096,13 @@ check_get_entry_status(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_get_entry_status() reports failure 4."); failure_mssg = msg; } else if (!in_cache || is_dirty || is_protected || !is_pinned) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected status 4."); failure_mssg = msg; } @@ -11119,13 +11120,13 @@ check_get_entry_status(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_get_entry_status() reports failure 5."); failure_mssg = msg; } else if (!in_cache || !is_dirty || is_protected || !is_pinned) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected status 5."); failure_mssg = msg; } @@ -11143,13 +11144,13 @@ check_get_entry_status(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_get_entry_status() reports failure 6."); failure_mssg = msg; } else if (!in_cache || !is_dirty || is_protected || is_pinned) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected status 6."); failure_mssg = msg; } @@ -11157,7 +11158,7 @@ check_get_entry_status(unsigned paged) if (pass) { - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); } if (pass) { @@ -11191,10 +11192,10 @@ check_expunge_entry(unsigned paged) { static char msg[128]; herr_t result; - hbool_t in_cache; - hbool_t is_dirty; - hbool_t is_protected; - hbool_t is_pinned; + bool in_cache; + bool is_dirty; + bool is_protected; + bool is_pinned; size_t entry_size; H5F_t *file_ptr = NULL; test_entry_t *base_addr; @@ -11205,7 +11206,7 @@ check_expunge_entry(unsigned paged) else TESTING("H5C_expunge_entry() functionality"); - pass = TRUE; + pass = true; if (pass) { @@ -11228,19 +11229,19 @@ check_expunge_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_get_entry_status() reports failure 1."); failure_mssg = msg; } else if (in_cache) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected status 1."); failure_mssg = msg; } else if ((entry_ptr->deserialized) || (entry_ptr->serialized) || (entry_ptr->destroyed)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected entry history 1."); failure_mssg = msg; } @@ -11264,19 +11265,19 @@ check_expunge_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_get_entry_status() reports failure 2."); failure_mssg = msg; } else if (!in_cache || is_dirty || is_protected || is_pinned) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected status 2."); failure_mssg = msg; } else if ((!entry_ptr->deserialized) || (entry_ptr->serialized) || (entry_ptr->destroyed)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected entry history 2."); failure_mssg = msg; } @@ -11302,19 +11303,19 @@ check_expunge_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_get_entry_status() reports failure 3."); failure_mssg = msg; } else if (in_cache) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected status 3."); failure_mssg = msg; } else if ((!entry_ptr->deserialized) || (entry_ptr->serialized) || (!entry_ptr->destroyed)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected entry history 3."); failure_mssg = msg; } @@ -11338,19 +11339,19 @@ check_expunge_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_get_entry_status() reports failure 4."); failure_mssg = msg; } else if (in_cache) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected status 4."); failure_mssg = msg; } else if ((entry_ptr->deserialized) || (entry_ptr->serialized) || (entry_ptr->destroyed)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected entry history 4."); failure_mssg = msg; } @@ -11374,19 +11375,19 @@ check_expunge_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_get_entry_status() reports failure 5."); failure_mssg = msg; } else if (!in_cache || !is_dirty || is_protected || is_pinned) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected status 5."); failure_mssg = msg; } else if ((!entry_ptr->deserialized) || (entry_ptr->serialized) || (entry_ptr->destroyed)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected entry history 5."); failure_mssg = msg; } @@ -11412,19 +11413,19 @@ check_expunge_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_get_entry_status() reports failure 6."); failure_mssg = msg; } else if (in_cache) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected status 6."); failure_mssg = msg; } else if ((!entry_ptr->deserialized) || (entry_ptr->serialized) || (!entry_ptr->destroyed)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected entry history 6."); failure_mssg = msg; } @@ -11432,7 +11433,7 @@ check_expunge_entry(unsigned paged) if (pass) { - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); } if (pass) { @@ -11475,7 +11476,7 @@ check_multiple_read_protect(unsigned paged) else TESTING("multiple read only protects on a single entry"); - pass = TRUE; + pass = true; /* allocate a cache. Should succeed. * @@ -11512,7 +11513,7 @@ check_multiple_read_protect(unsigned paged) if ((entry_ptr->header.is_protected) || (entry_ptr->header.is_read_only) || (entry_ptr->header.ro_ref_count != 0)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected ro protected status 1.\n"; } } @@ -11521,7 +11522,7 @@ check_multiple_read_protect(unsigned paged) if ((cache_ptr->write_protects[0] != 0) || (cache_ptr->read_protects[0] != 0) || (cache_ptr->max_read_protects[0] != 0)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected protect stats 1.\n"; } #endif /* H5C_COLLECT_CACHE_STATS */ @@ -11532,7 +11533,7 @@ check_multiple_read_protect(unsigned paged) if ((!(entry_ptr->header.is_protected)) || (!(entry_ptr->header.is_read_only)) || (entry_ptr->header.ro_ref_count != 1)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected ro protected status 2.\n"; } } @@ -11541,7 +11542,7 @@ check_multiple_read_protect(unsigned paged) if ((cache_ptr->write_protects[0] != 0) || (cache_ptr->read_protects[0] != 1) || (cache_ptr->max_read_protects[0] != 1)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected protect stats 2.\n"; } #endif /* H5C_COLLECT_CACHE_STATS */ @@ -11552,7 +11553,7 @@ check_multiple_read_protect(unsigned paged) if ((!(entry_ptr->header.is_protected)) || (!(entry_ptr->header.is_read_only)) || (entry_ptr->header.ro_ref_count != 2)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected ro protected status 3.\n"; } } @@ -11561,7 +11562,7 @@ check_multiple_read_protect(unsigned paged) if ((cache_ptr->write_protects[0] != 0) || (cache_ptr->read_protects[0] != 2) || (cache_ptr->max_read_protects[0] != 2)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected protect stats 3.\n"; } #endif /* H5C_COLLECT_CACHE_STATS */ @@ -11572,7 +11573,7 @@ check_multiple_read_protect(unsigned paged) if ((!(entry_ptr->header.is_protected)) || (!(entry_ptr->header.is_read_only)) || (entry_ptr->header.ro_ref_count != 1)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected ro protected status 4.\n"; } } @@ -11581,7 +11582,7 @@ check_multiple_read_protect(unsigned paged) if ((cache_ptr->write_protects[0] != 0) || (cache_ptr->read_protects[0] != 2) || (cache_ptr->max_read_protects[0] != 2)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected protect stats 4.\n"; } #endif /* H5C_COLLECT_CACHE_STATS */ @@ -11592,7 +11593,7 @@ check_multiple_read_protect(unsigned paged) if ((!(entry_ptr->header.is_protected)) || (!(entry_ptr->header.is_read_only)) || (entry_ptr->header.ro_ref_count != 2)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected ro protected status 5.\n"; } } @@ -11601,7 +11602,7 @@ check_multiple_read_protect(unsigned paged) if ((cache_ptr->write_protects[0] != 0) || (cache_ptr->read_protects[0] != 3) || (cache_ptr->max_read_protects[0] != 2)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected protect stats 5.\n"; } #endif /* H5C_COLLECT_CACHE_STATS */ @@ -11612,7 +11613,7 @@ check_multiple_read_protect(unsigned paged) if ((!(entry_ptr->header.is_protected)) || (!(entry_ptr->header.is_read_only)) || (entry_ptr->header.ro_ref_count != 3)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected ro protected status 6.\n"; } } @@ -11621,7 +11622,7 @@ check_multiple_read_protect(unsigned paged) if ((cache_ptr->write_protects[0] != 0) || (cache_ptr->read_protects[0] != 4) || (cache_ptr->max_read_protects[0] != 3)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected protect stats 6.\n"; } #endif /* H5C_COLLECT_CACHE_STATS */ @@ -11632,7 +11633,7 @@ check_multiple_read_protect(unsigned paged) if ((!(entry_ptr->header.is_protected)) || (!(entry_ptr->header.is_read_only)) || (entry_ptr->header.ro_ref_count != 2)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected ro protected status 7.\n"; } } @@ -11641,7 +11642,7 @@ check_multiple_read_protect(unsigned paged) if ((cache_ptr->write_protects[0] != 0) || (cache_ptr->read_protects[0] != 4) || (cache_ptr->max_read_protects[0] != 3)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected protect stats 7.\n"; } #endif /* H5C_COLLECT_CACHE_STATS */ @@ -11652,7 +11653,7 @@ check_multiple_read_protect(unsigned paged) if ((!(entry_ptr->header.is_protected)) || (!(entry_ptr->header.is_read_only)) || (entry_ptr->header.ro_ref_count != 1)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected ro protected status 8.\n"; } } @@ -11661,7 +11662,7 @@ check_multiple_read_protect(unsigned paged) if ((cache_ptr->write_protects[0] != 0) || (cache_ptr->read_protects[0] != 4) || (cache_ptr->max_read_protects[0] != 3)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected protect stats 8.\n"; } #endif /* H5C_COLLECT_CACHE_STATS */ @@ -11672,7 +11673,7 @@ check_multiple_read_protect(unsigned paged) if ((entry_ptr->header.is_protected) || (entry_ptr->header.is_read_only) || (entry_ptr->header.ro_ref_count != 0)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected ro protected status 9.\n"; } } @@ -11681,7 +11682,7 @@ check_multiple_read_protect(unsigned paged) if ((cache_ptr->write_protects[0] != 0) || (cache_ptr->read_protects[0] != 4) || (cache_ptr->max_read_protects[0] != 3)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected protect stats 9.\n"; } #endif /* H5C_COLLECT_CACHE_STATS */ @@ -11696,7 +11697,7 @@ check_multiple_read_protect(unsigned paged) if ((!(entry_ptr->header.is_protected)) || (entry_ptr->header.is_read_only) || (entry_ptr->header.ro_ref_count != 0)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected ro protected status 10.\n"; } } @@ -11705,7 +11706,7 @@ check_multiple_read_protect(unsigned paged) if ((cache_ptr->write_protects[0] != 1) || (cache_ptr->read_protects[0] != 4) || (cache_ptr->max_read_protects[0] != 3)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected protect stats 10.\n"; } #endif /* H5C_COLLECT_CACHE_STATS */ @@ -11716,7 +11717,7 @@ check_multiple_read_protect(unsigned paged) if ((entry_ptr->header.is_protected) || (entry_ptr->header.is_read_only) || (entry_ptr->header.ro_ref_count != 0)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected ro protected status 11.\n"; } } @@ -11725,7 +11726,7 @@ check_multiple_read_protect(unsigned paged) if ((cache_ptr->write_protects[0] != 1) || (cache_ptr->read_protects[0] != 4) || (cache_ptr->max_read_protects[0] != 3)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected protect stats 11.\n"; } #endif /* H5C_COLLECT_CACHE_STATS */ @@ -11771,18 +11772,18 @@ check_multiple_read_protect(unsigned paged) if (H5C_pin_protected_entry((void *)entry_ptr) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5C_pin_protected_entry() failed.\n"; } else if (!(entry_ptr->header.is_pinned)) { - pass = FALSE; + pass = false; failure_mssg = "entry (0,4) not pinned.\n"; } else { /* keep test bed sanity checks happy */ - entry_ptr->is_pinned = TRUE; + entry_ptr->is_pinned = true; } } @@ -11793,7 +11794,7 @@ check_multiple_read_protect(unsigned paged) if (pass && (entry_ptr->header.is_pinned)) { - pass = FALSE; + pass = false; failure_mssg = "entry (0,4) still pinned.\n"; } @@ -11809,14 +11810,14 @@ check_multiple_read_protect(unsigned paged) if ((cache_ptr->write_protects[0] != 5) || (cache_ptr->read_protects[0] != 9) || (cache_ptr->max_read_protects[0] != 3)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected protect stats 11.\n"; } #endif /* H5C_COLLECT_CACHE_STATS */ if (pass) { - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); } if (pass) { @@ -11855,20 +11856,20 @@ check_move_entry(unsigned paged) struct move_entry_test_spec test_specs[4] = { {/* int entry_type = */ PICO_ENTRY_TYPE, /* int entry_index = */ 10, - /* hbool_t is_pinned = */ FALSE, - /* hbool_t is_protected = */ FALSE}, + /* bool is_pinned = */ false, + /* bool is_protected = */ false}, {/* int entry_type = */ PICO_ENTRY_TYPE, /* int entry_index = */ 20, - /* hbool_t is_pinned = */ TRUE, - /* hbool_t is_protected = */ FALSE}, + /* bool is_pinned = */ true, + /* bool is_protected = */ false}, {/* int entry_type = */ PICO_ENTRY_TYPE, /* int entry_index = */ 30, - /* hbool_t is_pinned = */ FALSE, - /* hbool_t is_protected = */ TRUE}, + /* bool is_pinned = */ false, + /* bool is_protected = */ true}, {/* int entry_type = */ PICO_ENTRY_TYPE, /* int entry_index = */ 40, - /* hbool_t is_pinned = */ TRUE, - /* hbool_t is_protected = */ TRUE}, + /* bool is_pinned = */ true, + /* bool is_protected = */ true}, }; if (paged) @@ -11876,7 +11877,7 @@ check_move_entry(unsigned paged) else TESTING("H5C_move_entry() functionality"); - pass = TRUE; + pass = true; /* allocate a cache, load entries into it, and then move * them. To the extent possible, verify that the desired @@ -11917,7 +11918,7 @@ check_move_entry(unsigned paged) } if (pass) - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); if (pass) PASSED(); @@ -11935,7 +11936,7 @@ check_move_entry(unsigned paged) * * Purpose: Run a move entry test. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -11954,13 +11955,13 @@ check_move_entry__run_test(H5F_t *file_ptr, unsigned test_num, struct move_entry if (cache_ptr == NULL) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "cache_ptr NULL on entry to move test #%u.", test_num); failure_mssg = msg; } else if (spec_ptr == NULL) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "spec_ptr NULL on entry to move test #%u.", test_num); failure_mssg = msg; } @@ -11974,7 +11975,7 @@ check_move_entry__run_test(H5F_t *file_ptr, unsigned test_num, struct move_entry ((entry_ptr->cache_ptr != cache_ptr) && (entry_ptr->cache_ptr != NULL)) || (!(entry_ptr->at_main_addr)) || (entry_ptr->addr != entry_ptr->main_addr)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "bad entry_ptr in move test #%u.", test_num); failure_mssg = msg; } @@ -11990,7 +11991,7 @@ check_move_entry__run_test(H5F_t *file_ptr, unsigned test_num, struct move_entry if (!spec_ptr->is_protected) unprotect_entry(file_ptr, spec_ptr->entry_type, spec_ptr->entry_index, flags); - move_entry(cache_ptr, spec_ptr->entry_type, spec_ptr->entry_index, FALSE); + move_entry(cache_ptr, spec_ptr->entry_type, spec_ptr->entry_index, false); } if (pass) { @@ -12004,7 +12005,7 @@ check_move_entry__run_test(H5F_t *file_ptr, unsigned test_num, struct move_entry if (!(entry_ptr->header.is_pinned)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Pinned entry not pinned after move in test #%u.", test_num); failure_mssg = msg; } @@ -12021,7 +12022,7 @@ check_move_entry__run_test(H5F_t *file_ptr, unsigned test_num, struct move_entry if (test_ptr == NULL) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Pinned entry not in pel after move in test #%u.", test_num); failure_mssg = msg; @@ -12035,7 +12036,7 @@ check_move_entry__run_test(H5F_t *file_ptr, unsigned test_num, struct move_entry if (entry_ptr->header.is_pinned) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unpinned entry pinned after move in test #%u.", test_num); failure_mssg = msg; } @@ -12045,7 +12046,7 @@ check_move_entry__run_test(H5F_t *file_ptr, unsigned test_num, struct move_entry else { if ((entry_ptr->header.prev != NULL) || (cache_ptr->LRU_head_ptr != (H5C_cache_entry_t *)entry_ptr)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Entry not at head of LRU after move in test #%u.", test_num); failure_mssg = msg; @@ -12056,7 +12057,7 @@ check_move_entry__run_test(H5F_t *file_ptr, unsigned test_num, struct move_entry if (spec_ptr->is_protected) { if (!(entry_ptr->header.is_protected)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Protected entry not protected after move in test #%u.", test_num); failure_mssg = msg; @@ -12068,7 +12069,7 @@ check_move_entry__run_test(H5F_t *file_ptr, unsigned test_num, struct move_entry else { if (entry_ptr->header.is_protected) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unprotected entry not unprotected after move in test #%u.", test_num); failure_mssg = msg; @@ -12077,7 +12078,7 @@ check_move_entry__run_test(H5F_t *file_ptr, unsigned test_num, struct move_entry } /* put the entry back where it started from */ - move_entry(cache_ptr, spec_ptr->entry_type, spec_ptr->entry_index, TRUE); + move_entry(cache_ptr, spec_ptr->entry_type, spec_ptr->entry_index, true); } /* check_move_entry__run_test() */ @@ -12105,7 +12106,7 @@ check_pin_protected_entry(unsigned paged) else TESTING("H5C_pin_protected_entry() functionality"); - pass = TRUE; + pass = true; /* Create a cache, protect an entry, and then use H5C_pin_protected_entry() * to pin it. Verify that the entry is in fact pined. Unprotect the entry @@ -12120,7 +12121,7 @@ check_pin_protected_entry(unsigned paged) if (file_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "file_ptr NULL from setup_cache."; } } @@ -12139,19 +12140,19 @@ check_pin_protected_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_pin_protected_entry() reports failure."); failure_mssg = msg; } else if (!(entry_ptr->header.is_pinned)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "entry not pinned when it should be."); failure_mssg = msg; } else { - entry_ptr->is_pinned = TRUE; + entry_ptr->is_pinned = true; } } @@ -12159,7 +12160,7 @@ check_pin_protected_entry(unsigned paged) if (pass) { - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); } if (pass) { @@ -12194,10 +12195,10 @@ check_resize_entry(unsigned paged) { static char msg[128]; herr_t result; - hbool_t in_cache; - hbool_t is_dirty; - hbool_t is_protected; - hbool_t is_pinned; + bool in_cache; + bool is_dirty; + bool is_protected; + bool is_pinned; size_t entry_size; size_t reported_entry_size; H5F_t *file_ptr = NULL; @@ -12239,7 +12240,7 @@ check_resize_entry(unsigned paged) * the cache. */ - pass = TRUE; + pass = true; /* tests with only one entry in the cache: */ @@ -12251,7 +12252,7 @@ check_resize_entry(unsigned paged) if (file_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "file_ptr NULL from setup_cache."; } else { @@ -12268,7 +12269,7 @@ check_resize_entry(unsigned paged) if ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0) || (cache_ptr->slist_len != 0) || (cache_ptr->slist_size != 0)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache status 1."); failure_mssg = msg; } @@ -12284,7 +12285,7 @@ check_resize_entry(unsigned paged) if ((cache_ptr->index_len != 1) || (cache_ptr->index_size != LARGE_ENTRY_SIZE) || (cache_ptr->slist_len != 0) || (cache_ptr->slist_size != 0)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache status 2."); failure_mssg = msg; } @@ -12297,19 +12298,19 @@ check_resize_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_get_entry_status() reports failure 1."); failure_mssg = msg; } else if (!in_cache || is_dirty || !is_protected || is_pinned) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected status 1."); failure_mssg = msg; } else if ((!entry_ptr->deserialized) || (entry_ptr->serialized) || (entry_ptr->destroyed)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected entry history 1."); failure_mssg = msg; } @@ -12321,7 +12322,7 @@ check_resize_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "error(s) in H5C_resize_entry()."); failure_mssg = msg; } @@ -12331,7 +12332,7 @@ check_resize_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_unprotect() reports failure 1."); failure_mssg = msg; } @@ -12340,8 +12341,8 @@ check_resize_entry(unsigned paged) /* tidy up so we play nice with the standard protect / unprotect * calls. */ - entry_ptr->is_protected = FALSE; - entry_ptr->is_dirty = TRUE; + entry_ptr->is_protected = false; + entry_ptr->is_dirty = true; entry_ptr->size = LARGE_ENTRY_SIZE / 2; } } @@ -12353,7 +12354,7 @@ check_resize_entry(unsigned paged) ((cache_ptr->slist_enabled) && ((cache_ptr->slist_len != 1) || (cache_ptr->slist_size != (LARGE_ENTRY_SIZE / 2))))) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache status 3."); failure_mssg = msg; } @@ -12366,20 +12367,20 @@ check_resize_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_get_entry_status() reports failure 2."); failure_mssg = msg; } else if (!in_cache || !is_dirty || is_protected || is_pinned || (reported_entry_size != (LARGE_ENTRY_SIZE / 2))) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected status 2."); failure_mssg = msg; } else if ((!entry_ptr->deserialized) || (entry_ptr->serialized) || (entry_ptr->destroyed)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected entry history 2."); failure_mssg = msg; } @@ -12396,7 +12397,7 @@ check_resize_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "error(s) in H5C_resize_entry()."); failure_mssg = msg; } @@ -12406,7 +12407,7 @@ check_resize_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_unprotect() reports failure 2."); failure_mssg = msg; } @@ -12415,8 +12416,8 @@ check_resize_entry(unsigned paged) /* tidy up so we play nice with the standard protect / unprotect * calls. */ - entry_ptr->is_protected = FALSE; - entry_ptr->is_dirty = TRUE; + entry_ptr->is_protected = false; + entry_ptr->is_dirty = true; entry_ptr->size = LARGE_ENTRY_SIZE; } } @@ -12428,7 +12429,7 @@ check_resize_entry(unsigned paged) ((cache_ptr->slist_enabled) && ((cache_ptr->slist_len != 1) || (cache_ptr->slist_size != LARGE_ENTRY_SIZE)))) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache status 4."); failure_mssg = msg; } @@ -12441,20 +12442,20 @@ check_resize_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_get_entry_status() reports failure 3."); failure_mssg = msg; } else if (!in_cache || !is_dirty || is_protected || is_pinned || (reported_entry_size != LARGE_ENTRY_SIZE)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected status 3."); failure_mssg = msg; } else if ((!entry_ptr->deserialized) || (entry_ptr->serialized) || (entry_ptr->destroyed)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected entry history 3."); failure_mssg = msg; } @@ -12473,7 +12474,7 @@ check_resize_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_resize_entry() reports failure 1."); failure_mssg = msg; } @@ -12485,7 +12486,7 @@ check_resize_entry(unsigned paged) ((cache_ptr->slist_enabled) && ((cache_ptr->slist_len != 1) || (cache_ptr->slist_size != (LARGE_ENTRY_SIZE / 4))))) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache status 5."); failure_mssg = msg; } @@ -12498,20 +12499,20 @@ check_resize_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_get_entry_status() reports failure 4."); failure_mssg = msg; } else if (!in_cache || !is_dirty || is_protected || !is_pinned || (reported_entry_size != (LARGE_ENTRY_SIZE / 4))) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected status 4."); failure_mssg = msg; } else if ((!entry_ptr->deserialized) || (entry_ptr->serialized) || (entry_ptr->destroyed)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected entry history 4."); failure_mssg = msg; } @@ -12523,7 +12524,7 @@ check_resize_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_resize_entry() reports failure 2."); failure_mssg = msg; } @@ -12535,7 +12536,7 @@ check_resize_entry(unsigned paged) ((cache_ptr->slist_enabled) && ((cache_ptr->slist_len != 1) || (cache_ptr->slist_size != LARGE_ENTRY_SIZE)))) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache status 6."); failure_mssg = msg; } @@ -12548,20 +12549,20 @@ check_resize_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_get_entry_status() reports failure 5."); failure_mssg = msg; } else if (!in_cache || !is_dirty || is_protected || !is_pinned || (reported_entry_size != LARGE_ENTRY_SIZE)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected status 5."); failure_mssg = msg; } else if ((!entry_ptr->deserialized) || (entry_ptr->serialized) || (entry_ptr->destroyed)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected entry history 5."); failure_mssg = msg; } @@ -12581,19 +12582,19 @@ check_resize_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_get_entry_status() reports failure 6."); failure_mssg = msg; } else if (in_cache) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected status 6."); failure_mssg = msg; } else if ((!entry_ptr->deserialized) || (entry_ptr->serialized) || (!entry_ptr->destroyed)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected entry history 6."); failure_mssg = msg; } @@ -12604,7 +12605,7 @@ check_resize_entry(unsigned paged) if ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0) || ((cache_ptr->slist_enabled) && ((cache_ptr->slist_len != 0) || (cache_ptr->slist_size != 0)))) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache status 7."); failure_mssg = msg; } @@ -12617,7 +12618,7 @@ check_resize_entry(unsigned paged) if ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0) || ((cache_ptr->slist_enabled) && ((cache_ptr->slist_len != 0) || (cache_ptr->slist_size != 0)))) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache status 8."); failure_mssg = msg; } @@ -12645,7 +12646,7 @@ check_resize_entry(unsigned paged) ((cache_ptr->slist_enabled) && ((cache_ptr->slist_len != 1) || (cache_ptr->slist_size != LARGE_ENTRY_SIZE)))) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache status 9."); failure_mssg = msg; } @@ -12662,7 +12663,7 @@ check_resize_entry(unsigned paged) ((cache_ptr->slist_enabled) && ((cache_ptr->slist_len != 1) || (cache_ptr->slist_size != LARGE_ENTRY_SIZE)))) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache status 10."); failure_mssg = msg; } @@ -12675,19 +12676,19 @@ check_resize_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_get_entry_status() reports failure 7."); failure_mssg = msg; } else if (!in_cache || is_dirty || !is_protected || is_pinned) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected status 7."); failure_mssg = msg; } else if ((!entry_ptr->deserialized) || (entry_ptr->serialized) || (entry_ptr->destroyed)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected entry history 7."); failure_mssg = msg; } @@ -12699,7 +12700,7 @@ check_resize_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "error(s) in H5C_resize_entry()."); failure_mssg = msg; } @@ -12709,7 +12710,7 @@ check_resize_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_unprotect() reports failure 3."); failure_mssg = msg; } @@ -12718,8 +12719,8 @@ check_resize_entry(unsigned paged) /* tidy up so we play nice with the standard protect / unprotect * calls. */ - entry_ptr->is_protected = FALSE; - entry_ptr->is_dirty = TRUE; + entry_ptr->is_protected = false; + entry_ptr->is_dirty = true; entry_ptr->size = LARGE_ENTRY_SIZE / 2; } } @@ -12733,7 +12734,7 @@ check_resize_entry(unsigned paged) ((cache_ptr->slist_len != 2) || (cache_ptr->slist_size != (LARGE_ENTRY_SIZE + (LARGE_ENTRY_SIZE / 2)))))) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache status 11."); failure_mssg = msg; } @@ -12746,20 +12747,20 @@ check_resize_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_get_entry_status() reports failure 8."); failure_mssg = msg; } else if (!in_cache || !is_dirty || is_protected || is_pinned || (reported_entry_size != (LARGE_ENTRY_SIZE / 2))) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected status 8."); failure_mssg = msg; } else if ((!entry_ptr->deserialized) || (entry_ptr->serialized) || (entry_ptr->destroyed)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected entry history 8."); failure_mssg = msg; } @@ -12776,7 +12777,7 @@ check_resize_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "error(s) in H5C_resize_entry()."); failure_mssg = msg; } @@ -12786,7 +12787,7 @@ check_resize_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_unprotect() reports failure 4."); failure_mssg = msg; } @@ -12795,8 +12796,8 @@ check_resize_entry(unsigned paged) /* tidy up so we play nice with the standard protect / unprotect * calls. */ - entry_ptr->is_protected = FALSE; - entry_ptr->is_dirty = TRUE; + entry_ptr->is_protected = false; + entry_ptr->is_dirty = true; entry_ptr->size = LARGE_ENTRY_SIZE; } } @@ -12808,7 +12809,7 @@ check_resize_entry(unsigned paged) ((cache_ptr->slist_enabled) && ((cache_ptr->slist_len != 2) || (cache_ptr->slist_size != 2 * LARGE_ENTRY_SIZE)))) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache status 12."); failure_mssg = msg; } @@ -12821,20 +12822,20 @@ check_resize_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_get_entry_status() reports failure 9."); failure_mssg = msg; } else if (!in_cache || !is_dirty || is_protected || is_pinned || (reported_entry_size != LARGE_ENTRY_SIZE)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected status 9."); failure_mssg = msg; } else if ((!entry_ptr->deserialized) || (entry_ptr->serialized) || (entry_ptr->destroyed)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected entry history 9."); failure_mssg = msg; } @@ -12853,7 +12854,7 @@ check_resize_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_resize_entry() reports failure 3."); failure_mssg = msg; } @@ -12867,7 +12868,7 @@ check_resize_entry(unsigned paged) ((cache_ptr->slist_len != 2) || (cache_ptr->slist_size != (LARGE_ENTRY_SIZE + (LARGE_ENTRY_SIZE / 4)))))) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache status 13."); failure_mssg = msg; } @@ -12880,20 +12881,20 @@ check_resize_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_get_entry_status() reports failure 10."); failure_mssg = msg; } else if (!in_cache || !is_dirty || is_protected || !is_pinned || (reported_entry_size != (LARGE_ENTRY_SIZE / 4))) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected status 10."); failure_mssg = msg; } else if ((!entry_ptr->deserialized) || (entry_ptr->serialized) || (entry_ptr->destroyed)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected entry history 10."); failure_mssg = msg; } @@ -12905,7 +12906,7 @@ check_resize_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_resize_entry() reports failure 4."); failure_mssg = msg; } @@ -12917,7 +12918,7 @@ check_resize_entry(unsigned paged) ((cache_ptr->slist_enabled) && ((cache_ptr->slist_len != 2) || (cache_ptr->slist_size != (2 * LARGE_ENTRY_SIZE))))) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache status 14."); failure_mssg = msg; } @@ -12930,20 +12931,20 @@ check_resize_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_get_entry_status() reports failure 11."); failure_mssg = msg; } else if (!in_cache || !is_dirty || is_protected || !is_pinned || (reported_entry_size != LARGE_ENTRY_SIZE)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected status 11."); failure_mssg = msg; } else if ((!entry_ptr->deserialized) || (entry_ptr->serialized) || (entry_ptr->destroyed)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected entry history 11."); failure_mssg = msg; } @@ -12963,19 +12964,19 @@ check_resize_entry(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_get_entry_status() reports failure 12."); failure_mssg = msg; } else if (in_cache) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected status 12."); failure_mssg = msg; } else if ((!entry_ptr->deserialized) || (entry_ptr->serialized) || (!entry_ptr->destroyed)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected entry history 12."); failure_mssg = msg; } @@ -12987,7 +12988,7 @@ check_resize_entry(unsigned paged) ((cache_ptr->slist_enabled) && ((cache_ptr->slist_len != 1) || (cache_ptr->slist_size != LARGE_ENTRY_SIZE)))) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache status 15."); failure_mssg = msg; } @@ -13010,7 +13011,7 @@ check_resize_entry(unsigned paged) if ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0) || ((cache_ptr->slist_enabled) && ((cache_ptr->slist_len != 0) || (cache_ptr->slist_size != 0)))) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache status 16."); failure_mssg = msg; } @@ -13018,7 +13019,7 @@ check_resize_entry(unsigned paged) if (pass) { - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); } if (pass) { @@ -13053,9 +13054,9 @@ check_evictions_enabled(unsigned paged) { static char msg[128]; herr_t result; - hbool_t show_progress = FALSE; - hbool_t evictions_enabled; - hbool_t in_cache; + bool show_progress = false; + bool evictions_enabled; + bool in_cache; int i; int mile_stone = 1; H5F_t *file_ptr = NULL; @@ -13103,7 +13104,7 @@ check_evictions_enabled(unsigned paged) * Now flush and discard the cache -- should succeed. */ - pass = TRUE; + pass = true; if (show_progress) /* 1 */ fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); @@ -13117,7 +13118,7 @@ check_evictions_enabled(unsigned paged) if (file_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "file_ptr NULL from setup_cache."; } else { @@ -13135,9 +13136,9 @@ check_evictions_enabled(unsigned paged) if ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0) || ((cache_ptr->slist_enabled) && ((cache_ptr->slist_len != 0) || (cache_ptr->slist_size != 0))) || - (cache_ptr->evictions_enabled != TRUE)) { + (cache_ptr->evictions_enabled != true)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache status 1."); failure_mssg = msg; } @@ -13151,9 +13152,9 @@ check_evictions_enabled(unsigned paged) result = H5C_get_evictions_enabled(cache_ptr, &evictions_enabled); - if ((result != SUCCEED) || (evictions_enabled != TRUE)) { + if ((result != SUCCEED) || (evictions_enabled != true)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected evictions enabled 1."); failure_mssg = msg; } @@ -13179,9 +13180,9 @@ check_evictions_enabled(unsigned paged) if ((cache_ptr->index_len != 16) || (cache_ptr->index_size != 16 * MONSTER_ENTRY_SIZE) || ((cache_ptr->slist_enabled) && ((cache_ptr->slist_len != 0) || (cache_ptr->slist_size != 0))) || - (cache_ptr->evictions_enabled != TRUE)) { + (cache_ptr->evictions_enabled != true)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache status 2."); failure_mssg = msg; } @@ -13205,9 +13206,9 @@ check_evictions_enabled(unsigned paged) if ((cache_ptr->index_len != 16) || (cache_ptr->index_size != 16 * MONSTER_ENTRY_SIZE) || ((cache_ptr->slist_enabled) && ((cache_ptr->slist_len != 0) || (cache_ptr->slist_size != 0))) || - (cache_ptr->evictions_enabled != TRUE)) { + (cache_ptr->evictions_enabled != true)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache status 3."); failure_mssg = msg; } @@ -13225,19 +13226,19 @@ check_evictions_enabled(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_get_entry_status() reports failure 1."); failure_mssg = msg; } else if (in_cache) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected status 1."); failure_mssg = msg; } else if ((!entry_ptr->deserialized) || (entry_ptr->serialized) || (!entry_ptr->destroyed)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected entry history 1."); failure_mssg = msg; } @@ -13261,9 +13262,9 @@ check_evictions_enabled(unsigned paged) if ((cache_ptr->index_len != 16) || (cache_ptr->index_size != 16 * MONSTER_ENTRY_SIZE) || ((cache_ptr->slist_enabled) && ((cache_ptr->slist_len != 1) || (cache_ptr->slist_size != MONSTER_ENTRY_SIZE))) || - (cache_ptr->evictions_enabled != TRUE)) { + (cache_ptr->evictions_enabled != true)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache status 4."); failure_mssg = msg; } @@ -13281,19 +13282,19 @@ check_evictions_enabled(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_get_entry_status() reports failure 2."); failure_mssg = msg; } else if (in_cache) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected status 2."); failure_mssg = msg; } else if ((!entry_ptr->deserialized) || (entry_ptr->serialized) || (!entry_ptr->destroyed)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected entry history 2."); failure_mssg = msg; } @@ -13305,11 +13306,11 @@ check_evictions_enabled(unsigned paged) /* disable evictions */ if (pass) { - result = H5C_set_evictions_enabled(cache_ptr, FALSE); + result = H5C_set_evictions_enabled(cache_ptr, false); if (result != SUCCEED) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "can't disable evictions 1."); failure_mssg = msg; } @@ -13324,9 +13325,9 @@ check_evictions_enabled(unsigned paged) if ((cache_ptr->index_len != 16) || (cache_ptr->index_size != 16 * MONSTER_ENTRY_SIZE) || ((cache_ptr->slist_enabled) && ((cache_ptr->slist_len != 1) || (cache_ptr->slist_size != MONSTER_ENTRY_SIZE))) || - (cache_ptr->evictions_enabled != FALSE)) { + (cache_ptr->evictions_enabled != false)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache status 5."); failure_mssg = msg; } @@ -13351,9 +13352,9 @@ check_evictions_enabled(unsigned paged) if ((cache_ptr->index_len != 17) || (cache_ptr->index_size != 17 * MONSTER_ENTRY_SIZE) || ((cache_ptr->slist_enabled) && ((cache_ptr->slist_len != 1) || (cache_ptr->slist_size != MONSTER_ENTRY_SIZE))) || - (cache_ptr->evictions_enabled != FALSE)) { + (cache_ptr->evictions_enabled != false)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache status 6."); failure_mssg = msg; } @@ -13377,9 +13378,9 @@ check_evictions_enabled(unsigned paged) if ((cache_ptr->index_len != 18) || (cache_ptr->index_size != 18 * MONSTER_ENTRY_SIZE) || ((cache_ptr->slist_enabled) && ((cache_ptr->slist_len != 2) || (cache_ptr->slist_size != 2 * MONSTER_ENTRY_SIZE))) || - (cache_ptr->evictions_enabled != FALSE)) { + (cache_ptr->evictions_enabled != false)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache status 7."); failure_mssg = msg; } @@ -13391,11 +13392,11 @@ check_evictions_enabled(unsigned paged) /* re-enable evictions */ if (pass) { - result = H5C_set_evictions_enabled(cache_ptr, TRUE); + result = H5C_set_evictions_enabled(cache_ptr, true); if (result != SUCCEED) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "can't enable evictions 1."); failure_mssg = msg; } @@ -13420,9 +13421,9 @@ check_evictions_enabled(unsigned paged) if ((cache_ptr->index_len != 18) || (cache_ptr->index_size != 18 * MONSTER_ENTRY_SIZE) || ((cache_ptr->slist_enabled) && ((cache_ptr->slist_len != 2) || (cache_ptr->slist_size != 2 * MONSTER_ENTRY_SIZE))) || - (cache_ptr->evictions_enabled != TRUE)) { + (cache_ptr->evictions_enabled != true)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache status 8."); failure_mssg = msg; } @@ -13450,9 +13451,9 @@ check_evictions_enabled(unsigned paged) if ((cache_ptr->index_len != 16) || (cache_ptr->index_size != 16 * MONSTER_ENTRY_SIZE) || ((cache_ptr->slist_enabled) && ((cache_ptr->slist_len != 2) || (cache_ptr->slist_size != 2 * MONSTER_ENTRY_SIZE))) || - (cache_ptr->evictions_enabled != TRUE)) { + (cache_ptr->evictions_enabled != true)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache status 9."); failure_mssg = msg; } @@ -13470,19 +13471,19 @@ check_evictions_enabled(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_get_entry_status() reports failure 3."); failure_mssg = msg; } else if (in_cache) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected status 3."); failure_mssg = msg; } else if ((!entry_ptr->deserialized) || (entry_ptr->serialized) || (!entry_ptr->destroyed)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected entry history 3."); failure_mssg = msg; } @@ -13500,19 +13501,19 @@ check_evictions_enabled(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_get_entry_status() reports failure 4."); failure_mssg = msg; } else if (in_cache) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected status 4."); failure_mssg = msg; } else if ((!entry_ptr->deserialized) || (entry_ptr->serialized) || (!entry_ptr->destroyed)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected entry history 4."); failure_mssg = msg; } @@ -13524,11 +13525,11 @@ check_evictions_enabled(unsigned paged) /* disable evictions again */ if (pass) { - result = H5C_set_evictions_enabled(cache_ptr, FALSE); + result = H5C_set_evictions_enabled(cache_ptr, false); if (result != SUCCEED) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "can't disable evictions 2."); failure_mssg = msg; } @@ -13555,9 +13556,9 @@ check_evictions_enabled(unsigned paged) if ((cache_ptr->index_len != 17) || (cache_ptr->index_size != 17 * MONSTER_ENTRY_SIZE) || ((cache_ptr->slist_enabled) && ((cache_ptr->slist_len != 2) || (cache_ptr->slist_size != 2 * MONSTER_ENTRY_SIZE))) || - (cache_ptr->evictions_enabled != FALSE)) { + (cache_ptr->evictions_enabled != false)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache status 10."); failure_mssg = msg; } @@ -13569,11 +13570,11 @@ check_evictions_enabled(unsigned paged) /* re-enable evictions again */ if (pass) { - result = H5C_set_evictions_enabled(cache_ptr, TRUE); + result = H5C_set_evictions_enabled(cache_ptr, true); if (result != SUCCEED) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "can't enable evictions 2."); failure_mssg = msg; } @@ -13597,9 +13598,9 @@ check_evictions_enabled(unsigned paged) if ((cache_ptr->index_len != 16) || (cache_ptr->index_size != 16 * MONSTER_ENTRY_SIZE) || ((cache_ptr->slist_enabled) && ((cache_ptr->slist_len != 3) || (cache_ptr->slist_size != 3 * MONSTER_ENTRY_SIZE))) || - (cache_ptr->evictions_enabled != TRUE)) { + (cache_ptr->evictions_enabled != true)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected cache status 11."); failure_mssg = msg; } @@ -13617,19 +13618,19 @@ check_evictions_enabled(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5C_get_entry_status() reports failure 5."); failure_mssg = msg; } else if (in_cache) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected status 5."); failure_mssg = msg; } else if ((!entry_ptr->deserialized) || (entry_ptr->serialized) || (!entry_ptr->destroyed)) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "Unexpected entry history 5."); failure_mssg = msg; } @@ -13641,11 +13642,11 @@ check_evictions_enabled(unsigned paged) /* disable evictions one last time before we shut down */ if (pass) { - result = H5C_set_evictions_enabled(cache_ptr, FALSE); + result = H5C_set_evictions_enabled(cache_ptr, false); if (result != SUCCEED) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "can't disable evictions 3."); failure_mssg = msg; } @@ -13656,7 +13657,7 @@ check_evictions_enabled(unsigned paged) if (pass) { - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); } if (show_progress) /* 34 */ @@ -13700,7 +13701,7 @@ check_flush_protected_err(unsigned paged) else TESTING("flush cache with protected entry error"); - pass = TRUE; + pass = true; /* allocate a cache, protect an entry, and try to flush. This * should fail. Unprotect the entry and flush again -- should @@ -13721,22 +13722,22 @@ check_flush_protected_err(unsigned paged) protect_entry(file_ptr, 0, 0); /* enable slist prior to flush */ - if ((pass) && (H5C_set_slist_enabled(cache_ptr, TRUE, FALSE) < 0)) { + if ((pass) && (H5C_set_slist_enabled(cache_ptr, true, false) < 0)) { - pass = FALSE; + pass = false; failure_mssg = "unable to enable slist prior to flush.\n"; } if ((pass) && (H5C_flush_cache(file_ptr, H5C__NO_FLAGS_SET) >= 0)) { - pass = FALSE; + pass = false; failure_mssg = "flush succeeded on cache with protected entry.\n"; } /* disable the slist after the flush */ - if ((pass) && (H5C_set_slist_enabled(cache_ptr, FALSE, FALSE) < 0)) { + if ((pass) && (H5C_set_slist_enabled(cache_ptr, false, false) < 0)) { - pass = FALSE; + pass = false; failure_mssg = "unable to disable slist after flush.\n"; } @@ -13747,7 +13748,7 @@ check_flush_protected_err(unsigned paged) H5C_FLUSH_CACHE(file_ptr, H5C__NO_FLAGS_SET, "flush failed after unprotect.\n") } - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); } if (pass) { @@ -13787,7 +13788,7 @@ check_destroy_pinned_err(unsigned paged) else TESTING("destroy cache with permanently pinned entry error"); - pass = TRUE; + pass = true; /* allocate a cache, pin an entry, and try to flush destroy. This * should fail. Unpin the entry and flush destroy again -- should @@ -13803,19 +13804,19 @@ check_destroy_pinned_err(unsigned paged) unprotect_entry(file_ptr, 0, 0, H5C__PIN_ENTRY_FLAG); if (H5C_prep_for_file_close(file_ptr) < 0) { - pass = FALSE; + pass = false; failure_mssg = "unexpected failure of prep for file close.\n"; } /* end if */ if (H5C_dest(file_ptr) >= 0) { - pass = FALSE; + pass = false; failure_mssg = "destroy succeeded on cache with pinned entry.\n"; } /* end if */ else { unpin_entry(0, 0); if (H5C_dest(file_ptr) < 0) { - pass = FALSE; + pass = false; failure_mssg = "destroy failed after unpin.\n"; } /* end if */ else @@ -13831,7 +13832,7 @@ check_destroy_pinned_err(unsigned paged) * This causes the function to close and delete the file, * while skipping the call to H5C_dest(). */ - takedown_cache(NULL, FALSE, FALSE); + takedown_cache(NULL, false, false); } /* end if */ if (pass) { @@ -13869,7 +13870,7 @@ check_destroy_protected_err(unsigned paged) else TESTING("destroy cache with protected entry error"); - pass = TRUE; + pass = true; /* allocate a cache, protect an entry, and try to flush. This * should fail. Unprotect the entry and flush again -- should @@ -13892,20 +13893,20 @@ check_destroy_protected_err(unsigned paged) * prior to the final protect call. */ if (H5C_prep_for_file_close(file_ptr) < 0) { - pass = FALSE; + pass = false; failure_mssg = "unexpected failure of prep for file close.\n"; } /* end if */ protect_entry(file_ptr, 0, 0); if (H5C_dest(file_ptr) >= 0) { - pass = FALSE; + pass = false; failure_mssg = "destroy succeeded on cache with protected entry.\n"; } /* end if */ else { unprotect_entry(file_ptr, 0, 0, H5C__DIRTIED_FLAG); if (H5C_dest(file_ptr) < 0) { - pass = FALSE; + pass = false; failure_mssg = "destroy failed after unprotect.\n"; } /* end if */ else { @@ -13922,7 +13923,7 @@ check_destroy_protected_err(unsigned paged) * This causes the function to close and delete the file, * while skipping the call to H5C_dest(). */ - takedown_cache(NULL, FALSE, FALSE); + takedown_cache(NULL, false, false); } /* end if */ if (pass) { @@ -13963,7 +13964,7 @@ check_duplicate_insert_err(unsigned paged) else TESTING("duplicate entry insertion error"); - pass = TRUE; + pass = true; /* allocate a cache, protect an entry, and then try to insert * the entry again. This should fail. Unprotect the entry and @@ -13988,14 +13989,14 @@ check_duplicate_insert_err(unsigned paged) if (result >= 0) { - pass = FALSE; + pass = false; failure_mssg = "insert of duplicate entry succeeded.\n"; } else { unprotect_entry(file_ptr, 0, 0, H5C__DIRTIED_FLAG); - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); } } } @@ -14039,7 +14040,7 @@ check_double_pin_err(unsigned paged) else TESTING("pin a pinned entry error"); - pass = TRUE; + pass = true; /* allocate a cache, protect an entry, unprotect it with the pin flag, * protect it again, and then try to unprotect it again with the pin @@ -14068,7 +14069,7 @@ check_double_pin_err(unsigned paged) if (result > 0) { - pass = FALSE; + pass = false; failure_mssg = "attempt to pin a pinned entry succeeded.\n"; } else { @@ -14079,7 +14080,7 @@ check_double_pin_err(unsigned paged) if (pass) { - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); } if (pass) { @@ -14121,7 +14122,7 @@ check_double_unpin_err(unsigned paged) else TESTING("unpin an unpinned entry error"); - pass = TRUE; + pass = true; /* allocate a cache, protect an entry, unprotect it with the unpin flag. * -- This should fail. @@ -14148,7 +14149,7 @@ check_double_unpin_err(unsigned paged) if (result > 0) { - pass = FALSE; + pass = false; failure_mssg = "attempt to unpin an unpinned entry succeeded 1.\n"; } else { @@ -14163,14 +14164,14 @@ check_double_unpin_err(unsigned paged) if (result > 0) { - pass = FALSE; + pass = false; failure_mssg = "attempt to unpin an unpinned entry succeeded 2.\n"; } } if (pass) { - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); } if (pass) { @@ -14212,7 +14213,7 @@ check_pin_entry_errs(unsigned paged) else TESTING("pin entry related errors"); - pass = TRUE; + pass = true; /* Allocate a cache, protect an entry, unprotect it with no flags, * and then call H5C_pin_protected_entry() to pin it -- This should fail. @@ -14245,7 +14246,7 @@ check_pin_entry_errs(unsigned paged) if (result > 0) { - pass = FALSE; + pass = false; failure_mssg = "attempt to pin an unprotected entry succeeded.\n"; } else { @@ -14264,7 +14265,7 @@ check_pin_entry_errs(unsigned paged) if (result > 0) { - pass = FALSE; + pass = false; failure_mssg = "attempt to pin a pinned, protected entry succeeded.\n"; } else { @@ -14275,7 +14276,7 @@ check_pin_entry_errs(unsigned paged) if (pass) { - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); } if (pass) { @@ -14317,7 +14318,7 @@ check_double_protect_err(unsigned paged) else TESTING("protect a protected entry error"); - pass = TRUE; + pass = true; /* allocate a cache, protect an entry, and then try to protect * the entry again. This should fail. Unprotect the entry and @@ -14342,7 +14343,7 @@ check_double_protect_err(unsigned paged) if (cache_entry_ptr != NULL) { - pass = FALSE; + pass = false; failure_mssg = "attempt to protect a protected entry succeeded.\n"; } } @@ -14354,7 +14355,7 @@ check_double_protect_err(unsigned paged) if (pass) { - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); } if (pass) { @@ -14396,7 +14397,7 @@ check_double_unprotect_err(unsigned paged) else TESTING("unprotect an unprotected entry error"); - pass = TRUE; + pass = true; /* allocate a cache, protect an entry, unprotect it, and then try to * unprotect the entry again. This should fail. Destroy the cache @@ -14422,14 +14423,14 @@ check_double_unprotect_err(unsigned paged) if (result > 0) { - pass = FALSE; + pass = false; failure_mssg = "attempt to unprotect an unprotected entry succeeded 1.\n"; } } if (pass) { - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); } if (pass) { @@ -14474,7 +14475,7 @@ check_mark_entry_dirty_errs(unsigned paged) else TESTING("mark entry dirty related errors"); - pass = TRUE; + pass = true; /* allocate a cache, protect an entry, unprotect the entry without * pinning it, and try to mark it dirty -- this should fail. @@ -14501,14 +14502,14 @@ check_mark_entry_dirty_errs(unsigned paged) if (result > 0) { - pass = FALSE; + pass = false; failure_mssg = "attempt to dirty a unpinned and unprotected entry succeeded.\n"; } } if (pass) { - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); } if (pass) { @@ -14550,7 +14551,7 @@ check_expunge_entry_errs(unsigned paged) else TESTING("expunge entry related errors"); - pass = TRUE; + pass = true; /* Allocate a cache, protect an entry, and then call H5C_expunge_entry() * to expunge it -- this should fail @@ -14581,7 +14582,7 @@ check_expunge_entry_errs(unsigned paged) if (result > 0) { - pass = FALSE; + pass = false; failure_mssg = "attempt to expunge a protected entry succeeded.\n"; } else { @@ -14596,7 +14597,7 @@ check_expunge_entry_errs(unsigned paged) if (result > 0) { - pass = FALSE; + pass = false; failure_mssg = "attempt to expunge a pinned entry succeeded.\n"; } else { @@ -14611,14 +14612,14 @@ check_expunge_entry_errs(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "attempt to expunge an unpinned and unprotected entry failed.\n"; } } if (pass) { - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); } if (pass) { @@ -14663,7 +14664,7 @@ check_move_entry_errs(unsigned paged) else TESTING("move entry related errors"); - pass = TRUE; + pass = true; /* allocate a cache, and insert several entries. Try to move * entries to other entries resident in the cache. This should @@ -14689,7 +14690,7 @@ check_move_entry_errs(unsigned paged) result = H5C_move_entry(cache_ptr, types[0], entry_0_0_ptr->addr, entry_0_1_ptr->addr); if (result >= 0) { - pass = FALSE; + pass = false; failure_mssg = "move to addr of same type succeeded.\n"; } /* end if */ } /* end if */ @@ -14698,13 +14699,13 @@ check_move_entry_errs(unsigned paged) result = H5C_move_entry(cache_ptr, types[0], entry_0_0_ptr->addr, entry_1_0_ptr->addr); if (result >= 0) { - pass = FALSE; + pass = false; failure_mssg = "move to addr of different type succeeded.\n"; } /* end if */ } /* end if */ if (pass) - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); /* Allocate a cache, protect an entry R/O, and then call * H5C_move_entry() to move it -- this should fail. @@ -14729,7 +14730,7 @@ check_move_entry_errs(unsigned paged) result = H5C_move_entry(cache_ptr, types[0], entry_ptr->header.addr, entry_ptr->header.addr + 10); if (result >= 0) { - pass = FALSE; + pass = false; failure_mssg = "Call to H5C_move_entry on a R/O protected entry succeeded.\n"; } /* end if */ else @@ -14737,7 +14738,7 @@ check_move_entry_errs(unsigned paged) } /* end if */ if (pass) - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); if (pass) PASSED(); @@ -14773,7 +14774,7 @@ check_resize_entry_errs(unsigned paged) else TESTING("resize entry related errors"); - pass = TRUE; + pass = true; /* Allocate a cache, protect an entry, and then call * H5C_resize_entry() to resize it -- this should succeed. @@ -14803,7 +14804,7 @@ check_resize_entry_errs(unsigned paged) if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "Call to H5C_resize_entry on a protected entry failed.\n"; } else { @@ -14818,7 +14819,7 @@ check_resize_entry_errs(unsigned paged) if (result >= 0) { - pass = FALSE; + pass = false; failure_mssg = "Call to H5C_resize_entry with 0 new size succeeded.\n"; } else { @@ -14829,7 +14830,7 @@ check_resize_entry_errs(unsigned paged) if (pass) { - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); } if (pass) { @@ -14871,7 +14872,7 @@ check_unprotect_ro_dirty_err(unsigned paged) else TESTING("unprotect a read only entry dirty error"); - pass = TRUE; + pass = true; /* allocate a cache, protect an entry read only, and then unprotect it * with the dirtied flag set. This should fail. Destroy the cache @@ -14895,7 +14896,7 @@ check_unprotect_ro_dirty_err(unsigned paged) if (result >= 0) { - pass = FALSE; + pass = false; failure_mssg = "attempt to unprotect a ro entry dirty succeeded 1.\n"; } } @@ -14907,7 +14908,7 @@ check_unprotect_ro_dirty_err(unsigned paged) if (pass) { - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); } /* allocate a another cache, protect an entry read only twice, and @@ -14934,7 +14935,7 @@ check_unprotect_ro_dirty_err(unsigned paged) if (result > 0) { - pass = FALSE; + pass = false; failure_mssg = "attempt to unprotect a ro entry dirty succeeded 2.\n"; } } @@ -14947,7 +14948,7 @@ check_unprotect_ro_dirty_err(unsigned paged) if (pass) { - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); } if (pass) { @@ -14989,7 +14990,7 @@ check_protect_ro_rw_err(unsigned paged) else TESTING("protect a read only entry rw error"); - pass = TRUE; + pass = true; /* allocate a cache, protect an entry read only, and then try to protect * it again rw. This should fail. @@ -15015,7 +15016,7 @@ check_protect_ro_rw_err(unsigned paged) if (thing_ptr != NULL) { - pass = FALSE; + pass = false; failure_mssg = "attempt to protect a ro entry rw succeeded.\n"; } } @@ -15027,7 +15028,7 @@ check_protect_ro_rw_err(unsigned paged) if (pass) { - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); } if (pass) { @@ -15072,7 +15073,7 @@ check_protect_retries(unsigned paged) else TESTING("protect an entry to verify retries"); - pass = TRUE; + pass = true; /* Set up the cache */ if (pass) { @@ -15098,7 +15099,7 @@ check_protect_retries(unsigned paged) /* test case (1): * --actual_len is smaller the initial length from get_load_size() - * --verify_chksum() returns TRUE after max_verify_ct is reached + * --verify_chksum() returns true after max_verify_ct is reached * */ entry_ptr->actual_len = entry_ptr->size / 2; @@ -15114,7 +15115,7 @@ check_protect_retries(unsigned paged) (entry_ptr->addr != entry_ptr->header.addr) || (entry_ptr->verify_ct != entry_ptr->max_verify_ct)) { - pass = FALSE; + pass = false; failure_mssg = "error from H5C_protect()."; } else { @@ -15123,8 +15124,8 @@ check_protect_retries(unsigned paged) entry_ptr->cache_ptr = cache_ptr; entry_ptr->file_ptr = file_ptr; - entry_ptr->is_protected = TRUE; - entry_ptr->is_read_only = TRUE; + entry_ptr->is_protected = true; + entry_ptr->is_read_only = true; entry_ptr->ro_ref_count++; } @@ -15139,7 +15140,7 @@ check_protect_retries(unsigned paged) /* test case (2): * --actual_len is greater the initial length from get_load_size() - * --verify_chksum() returns FALSE even after all tries is reached + * --verify_chksum() returns false even after all tries is reached * (file_ptr->shared->read_attempts is smaller then max_verify_ct) */ entry_ptr->actual_len = entry_ptr->size * 2; @@ -15151,10 +15152,10 @@ check_protect_retries(unsigned paged) /* H5C_protect() should fail after all retries fail */ if (cache_entry_ptr != NULL) - pass = FALSE; + pass = false; } - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); reset_entries(); if (pass) { @@ -15187,17 +15188,17 @@ check_protect_retries(unsigned paged) static unsigned check_check_evictions_enabled_err(unsigned paged) { - herr_t result; - hbool_t evictions_enabled; - H5F_t *file_ptr = NULL; - H5C_t *cache_ptr = NULL; + herr_t result; + bool evictions_enabled; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; if (paged) TESTING("get/set evictions enabled errors (paged aggregation)"); else TESTING("get/set evictions enabled errors"); - pass = TRUE; + pass = true; /* allocate a cache. * @@ -15226,7 +15227,7 @@ check_check_evictions_enabled_err(unsigned paged) if (result == SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_evictions_enabled succeeded() 1.\n"; } } @@ -15237,18 +15238,18 @@ check_check_evictions_enabled_err(unsigned paged) if (result == SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_evictions_enabled succeeded() 2.\n"; } } if (pass) { - result = H5C_set_evictions_enabled(cache_ptr, TRUE); + result = H5C_set_evictions_enabled(cache_ptr, true); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_evictions_enabled failed().\n"; } } @@ -15257,14 +15258,14 @@ check_check_evictions_enabled_err(unsigned paged) (cache_ptr->resize_ctl).incr_mode = H5C_incr__threshold; - result = H5C_get_evictions_enabled(cache_ptr, FALSE); + result = H5C_get_evictions_enabled(cache_ptr, false); if (result == SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_evictions_enabled succeeded() 1.\n"; } - else if (cache_ptr->evictions_enabled == TRUE) { + else if (cache_ptr->evictions_enabled == true) { } (cache_ptr->resize_ctl).incr_mode = H5C_incr__off; @@ -15274,11 +15275,11 @@ check_check_evictions_enabled_err(unsigned paged) (cache_ptr->resize_ctl).decr_mode = H5C_decr__threshold; - result = H5C_get_evictions_enabled(cache_ptr, FALSE); + result = H5C_get_evictions_enabled(cache_ptr, false); if (result == SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_evictions_enabled succeeded() 2.\n"; } @@ -15287,7 +15288,7 @@ check_check_evictions_enabled_err(unsigned paged) if (cache_ptr) { - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); } if (pass) { @@ -15319,7 +15320,7 @@ check_check_evictions_enabled_err(unsigned paged) *------------------------------------------------------------------------- */ -hbool_t rpt_fcn_called = FALSE; +bool rpt_fcn_called = false; enum H5C_resize_status rpt_status; static void @@ -15328,14 +15329,14 @@ test_rpt_fcn(H5_ATTR_UNUSED H5C_t *cache_ptr, H5_ATTR_UNUSED int32_t version, H5 H5_ATTR_UNUSED size_t new_max_cache_size, H5_ATTR_UNUSED size_t old_min_clean_size, H5_ATTR_UNUSED size_t new_min_clean_size) { - rpt_fcn_called = TRUE; + rpt_fcn_called = true; rpt_status = status; } static unsigned -check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) +check_auto_cache_resize(bool cork_ageout, unsigned paged) { - hbool_t show_progress = FALSE; + bool show_progress = false; herr_t result; int32_t i; int32_t checkpoint = 0; @@ -15345,7 +15346,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) /* int32_t version = */ H5C__CURR_AUTO_SIZE_CTL_VER, /* H5C_auto_resize_report_fcn rpt_fcn = */ test_rpt_fcn, - /* hbool_t set_initial_size = */ TRUE, + /* bool set_initial_size = */ true, /* size_t initial_size = */ (512 * 1024), /* double min_clean_fraction = */ 0.5, @@ -15361,7 +15362,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) /* double increment = */ 2.0, - /* hbool_t apply_max_increment = */ TRUE, + /* bool apply_max_increment = */ true, /* size_t max_increment = */ (4 * 1024 * 1024), /* enum H5C_cache_flash_incr_mode */ @@ -15375,12 +15376,12 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) /* double decrement = */ 0.1, - /* hbool_t apply_max_decrement = */ TRUE, + /* bool apply_max_decrement = */ true, /* size_t max_decrement = */ (1 * 1024 * 1024), /* int32_t epochs_before_eviction = */ 3, - /* hbool_t apply_empty_reserve = */ TRUE, + /* bool apply_empty_reserve = */ true, /* double empty_reserve = */ 0.05}; if (paged) @@ -15388,7 +15389,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) else TESTING("automatic cache resizing"); - pass = TRUE; + pass = true; if (show_progress) fprintf(stderr, "check point %d\n", checkpoint++); @@ -15408,7 +15409,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if (pass) { result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 1.\n"; } } @@ -15416,7 +15417,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if (pass) { if ((cache_ptr->max_cache_size != (512 * 1024)) || (cache_ptr->min_clean_size != (256 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "bad cache size after initialization.\n"; } } @@ -15428,7 +15429,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) * full status. */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, PICO_ENTRY_TYPE, i); @@ -15441,7 +15442,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((!rpt_fcn_called) || (rpt_status != not_full) || (cache_ptr->max_cache_size != (512 * 1024)) || (cache_ptr->min_clean_size != (256 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 1.\n"; } } @@ -15454,7 +15455,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i); @@ -15467,7 +15468,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((!rpt_fcn_called) || (rpt_status != increase) || (cache_ptr->max_cache_size != (1 * 1024 * 1024)) || (cache_ptr->min_clean_size != (512 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 2.\n"; } } @@ -15480,7 +15481,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, PICO_ENTRY_TYPE, i); @@ -15493,7 +15494,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((!rpt_fcn_called) || (rpt_status != not_full) || (cache_ptr->max_cache_size != (1 * 1024 * 1024)) || (cache_ptr->min_clean_size != (512 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 3.\n"; } } @@ -15506,7 +15507,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i); @@ -15520,7 +15521,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (2 * 1024 * 1024)) || (cache_ptr->min_clean_size != (1 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 4.\n"; } } @@ -15533,7 +15534,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i); @@ -15547,7 +15548,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 5.\n"; } } @@ -15560,7 +15561,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i); @@ -15574,7 +15575,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (8 * 1024 * 1024)) || (cache_ptr->min_clean_size != (4 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 6.\n"; } } @@ -15588,7 +15589,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i); @@ -15602,7 +15603,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (12 * 1024 * 1024)) || (cache_ptr->min_clean_size != (6 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 7.\n"; } } @@ -15615,7 +15616,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i); @@ -15629,7 +15630,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (14 * 1024 * 1024)) || (cache_ptr->min_clean_size != (7 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 8.\n"; } } @@ -15642,7 +15643,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i); @@ -15656,7 +15657,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (14 * 1024 * 1024)) || (cache_ptr->min_clean_size != (7 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 9.\n"; } } @@ -15670,7 +15671,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -15684,7 +15685,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (13 * 1024 * 1024)) || (cache_ptr->min_clean_size != (6 * 1024 * 1024 + 512 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 10.\n"; } } @@ -15702,7 +15703,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; auto_size_ctl.rpt_fcn = test_rpt_fcn; - auto_size_ctl.set_initial_size = TRUE; + auto_size_ctl.set_initial_size = true; auto_size_ctl.initial_size = 4 * 1000 * 1000 + 10; auto_size_ctl.min_clean_fraction = 0.1; @@ -15718,7 +15719,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) auto_size_ctl.increment = 2.0; - auto_size_ctl.apply_max_increment = TRUE; + auto_size_ctl.apply_max_increment = true; auto_size_ctl.max_increment = (4 * 1000 * 1000); auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -15731,17 +15732,17 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) auto_size_ctl.decrement = 0.5; - auto_size_ctl.apply_max_decrement = TRUE; + auto_size_ctl.apply_max_decrement = true; auto_size_ctl.max_decrement = (1 * 1000 * 1000); auto_size_ctl.epochs_before_eviction = 3; - auto_size_ctl.apply_empty_reserve = TRUE; + auto_size_ctl.apply_empty_reserve = true; auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 2.\n"; } } @@ -15751,7 +15752,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((cache_ptr->max_cache_size != (4 * 1000 * 1000 + 10)) || (cache_ptr->min_clean_size != (400 * 1000 + 1))) { - pass = FALSE; + pass = false; failure_mssg = "bad cache size after set resize re-config 1.\n"; } } @@ -15764,7 +15765,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -15778,7 +15779,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (3 * 1000 * 1000 + 10)) || (cache_ptr->min_clean_size != (300 * 1000 + 1))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 11.\n"; } } @@ -15792,7 +15793,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -15806,7 +15807,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (2 * 1000 * 1000 + 10)) || (cache_ptr->min_clean_size != (200 * 1000 + 1))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 12.\n"; } } @@ -15820,7 +15821,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -15834,7 +15835,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (1 * 1000 * 1000 + 10)) || (cache_ptr->min_clean_size != (100 * 1000 + 1))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 13.\n"; } } @@ -15848,7 +15849,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -15861,7 +15862,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((!rpt_fcn_called) || (rpt_status != decrease) || (cache_ptr->max_cache_size != (500 * 1000 + 5)) || (cache_ptr->min_clean_size != (50 * 1000))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 14.\n"; } } @@ -15874,7 +15875,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -15887,7 +15888,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((!rpt_fcn_called) || (rpt_status != decrease) || (cache_ptr->max_cache_size != (500 * 1000)) || (cache_ptr->min_clean_size != (50 * 1000))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 15.\n"; } } @@ -15900,7 +15901,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -15913,7 +15914,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((!rpt_fcn_called) || (rpt_status != at_min_size) || (cache_ptr->max_cache_size != (500 * 1000)) || (cache_ptr->min_clean_size != (50 * 1000))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 16.\n"; } } @@ -15926,7 +15927,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 900)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -15947,7 +15948,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((!rpt_fcn_called) || (rpt_status != in_spec) || (cache_ptr->max_cache_size != (500 * 1000)) || (cache_ptr->min_clean_size != (50 * 1000))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 17.\n"; } } @@ -15960,7 +15961,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i); @@ -15973,7 +15974,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((!rpt_fcn_called) || (rpt_status != increase) || (cache_ptr->max_cache_size != (1 * 1000 * 1000)) || (cache_ptr->min_clean_size != (100 * 1000))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 18.\n"; } } @@ -15986,7 +15987,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -15999,7 +16000,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((!rpt_fcn_called) || (rpt_status != decrease) || (cache_ptr->max_cache_size != (500 * 1000)) || (cache_ptr->min_clean_size != (50 * 1000))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 19.\n"; } } @@ -16017,7 +16018,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; auto_size_ctl.rpt_fcn = test_rpt_fcn; - auto_size_ctl.set_initial_size = TRUE; + auto_size_ctl.set_initial_size = true; auto_size_ctl.initial_size = 4 * 1024 * 1024; auto_size_ctl.min_clean_fraction = 0.5; @@ -16033,7 +16034,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) auto_size_ctl.increment = 4.0; - auto_size_ctl.apply_max_increment = FALSE; + auto_size_ctl.apply_max_increment = false; auto_size_ctl.max_increment = (4 * 1024 * 1024); auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -16046,17 +16047,17 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) auto_size_ctl.decrement = 0.25; - auto_size_ctl.apply_max_decrement = FALSE; + auto_size_ctl.apply_max_decrement = false; auto_size_ctl.max_decrement = (1 * 1024 * 1024); auto_size_ctl.epochs_before_eviction = 3; - auto_size_ctl.apply_empty_reserve = TRUE; + auto_size_ctl.apply_empty_reserve = true; auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 3.\n"; } } @@ -16066,7 +16067,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "bad cache size after set resize re-config 2.\n"; } } @@ -16079,7 +16080,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -16092,7 +16093,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((!rpt_fcn_called) || (rpt_status != decrease) || (cache_ptr->max_cache_size != (1 * 1024 * 1024)) || (cache_ptr->min_clean_size != (512 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 20.\n"; } } @@ -16105,7 +16106,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i); @@ -16119,7 +16120,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 21.\n"; } } @@ -16132,7 +16133,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i); @@ -16146,7 +16147,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (16 * 1024 * 1024)) || (cache_ptr->min_clean_size != (8 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 22.\n"; } } @@ -16159,7 +16160,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -16173,7 +16174,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 23.\n"; } } @@ -16193,7 +16194,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; auto_size_ctl.rpt_fcn = test_rpt_fcn; - auto_size_ctl.set_initial_size = TRUE; + auto_size_ctl.set_initial_size = true; auto_size_ctl.initial_size = 8 * 1024 * 1024; auto_size_ctl.min_clean_fraction = 0.5; @@ -16209,7 +16210,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) auto_size_ctl.increment = 2.0; - auto_size_ctl.apply_max_increment = TRUE; + auto_size_ctl.apply_max_increment = true; auto_size_ctl.max_increment = (4 * 1024 * 1024); auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -16222,17 +16223,17 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) auto_size_ctl.decrement = 0.5; - auto_size_ctl.apply_max_decrement = FALSE; + auto_size_ctl.apply_max_decrement = false; auto_size_ctl.max_decrement = (1 * 1024 * 1024); auto_size_ctl.epochs_before_eviction = 3; - auto_size_ctl.apply_empty_reserve = FALSE; + auto_size_ctl.apply_empty_reserve = false; auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 4.\n"; } } @@ -16242,7 +16243,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((cache_ptr->max_cache_size != (8 * 1024 * 1024)) || (cache_ptr->min_clean_size != (4 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "bad cache size after set resize re-config 3.\n"; } } @@ -16261,7 +16262,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) * not be able to. */ if (pass) { /* first epoch */ - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -16275,7 +16276,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (8 * 1024 * 1024)) || (cache_ptr->min_clean_size != (4 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 24.\n"; } } @@ -16284,7 +16285,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { /* second epoch */ - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 1000; while (pass && (i < 2000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -16298,7 +16299,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (8 * 1024 * 1024)) || (cache_ptr->min_clean_size != (4 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 25.\n"; } } @@ -16307,7 +16308,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { /* third epoch */ - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 2000; while (pass && (i < 3000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -16321,7 +16322,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (8 * 1024 * 1024)) || (cache_ptr->min_clean_size != (4 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 26.\n"; } } @@ -16334,7 +16335,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) * happen until we get the hit rate above the lower threshold. */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 3000; while (pass && (i < 4000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -16348,7 +16349,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (8 * 1024 * 1024)) || (cache_ptr->min_clean_size != (4 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 27.\n"; } } @@ -16360,7 +16361,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) * reduction now. */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 3000; while (pass && (i < 4000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -16373,7 +16374,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((!rpt_fcn_called) || (rpt_status != decrease) || (cache_ptr->max_cache_size != (2001 * 1024)) || (cache_ptr->min_clean_size != (int)(2001 * 512))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 28.\n"; } } @@ -16384,7 +16385,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) /* sixth epoch -- force the hit rate to 100% again. */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 3000; while (pass && (i < 4000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -16397,7 +16398,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((!rpt_fcn_called) || (rpt_status != decrease) || (cache_ptr->max_cache_size != (1001 * 1024)) || (cache_ptr->min_clean_size != (int)(1001 * 512))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 29.\n"; } } @@ -16408,7 +16409,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) /* seventh epoch -- force the hit rate to 100% again. */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 3000; while (pass && (i < 4000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -16421,7 +16422,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((!rpt_fcn_called) || (rpt_status != decrease) || (cache_ptr->max_cache_size != (1000 * 1024)) || (cache_ptr->min_clean_size != (int)(1000 * 512))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 30.\n"; } } @@ -16433,7 +16434,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) * state. */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 3000; while (pass && (i < 4000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -16446,7 +16447,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((!rpt_fcn_called) || (rpt_status != in_spec) || (cache_ptr->max_cache_size != (1000 * 1024)) || (cache_ptr->min_clean_size != (int)(1000 * 512))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 31.\n"; } } @@ -16459,7 +16460,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) * should be decreased to the minimum. */ if (pass) { /* ninth epoch */ - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -16472,7 +16473,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((!rpt_fcn_called) || (rpt_status != in_spec) || (cache_ptr->max_cache_size != (1000 * 1024)) || (cache_ptr->min_clean_size != (int)(1000 * 512))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 32.\n"; } } @@ -16481,7 +16482,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { /* tenth epoch */ - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -16494,7 +16495,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((!rpt_fcn_called) || (rpt_status != in_spec) || (cache_ptr->max_cache_size != (1000 * 1024)) || (cache_ptr->min_clean_size != (int)(1000 * 512))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 33.\n"; } } @@ -16503,7 +16504,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { /* eleventh epoch -- cache size reduction */ - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -16517,7 +16518,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->min_clean_size != (256 * 1024)) || (cache_ptr->index_len != 2) || (cache_ptr->index_size != MONSTER_ENTRY_SIZE + MEDIUM_ENTRY_SIZE)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 34.\n"; } } @@ -16526,7 +16527,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { /* twelfth epoch -- at minimum size so no more ageouts */ - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -16540,7 +16541,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->min_clean_size != (256 * 1024)) || (cache_ptr->index_len != 2) || (cache_ptr->index_size != MONSTER_ENTRY_SIZE + MEDIUM_ENTRY_SIZE)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 35.\n"; } } @@ -16561,7 +16562,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; auto_size_ctl.rpt_fcn = test_rpt_fcn; - auto_size_ctl.set_initial_size = TRUE; + auto_size_ctl.set_initial_size = true; auto_size_ctl.initial_size = 8 * 1024 * 1024; auto_size_ctl.min_clean_fraction = 0.5; @@ -16577,7 +16578,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) auto_size_ctl.increment = 2.0; - auto_size_ctl.apply_max_increment = TRUE; + auto_size_ctl.apply_max_increment = true; auto_size_ctl.max_increment = (4 * 1024 * 1024); auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -16590,19 +16591,19 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) auto_size_ctl.decrement = 0.5; - auto_size_ctl.apply_max_decrement = TRUE; + auto_size_ctl.apply_max_decrement = true; auto_size_ctl.max_decrement = (1 * 1024 * 1024); auto_size_ctl.epochs_before_eviction = 3; - auto_size_ctl.apply_empty_reserve = FALSE; + auto_size_ctl.apply_empty_reserve = false; auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 5.\n"; } } @@ -16612,7 +16613,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((cache_ptr->max_cache_size != (8 * 1024 * 1024)) || (cache_ptr->min_clean_size != (4 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "bad cache size after set resize re-config 4.\n"; } } @@ -16629,7 +16630,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { /* first epoch */ - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -16643,7 +16644,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (8 * 1024 * 1024)) || (cache_ptr->min_clean_size != (4 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 36.\n"; } } @@ -16653,7 +16654,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if (pass) { /* second epoch */ - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 1000; while (pass && (i < 2000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -16667,7 +16668,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (8 * 1024 * 1024)) || (cache_ptr->min_clean_size != (4 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 37.\n"; } } @@ -16677,7 +16678,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if (pass) { /* third epoch */ - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 2000; while (pass && (i < 3000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -16691,7 +16692,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (8 * 1024 * 1024)) || (cache_ptr->min_clean_size != (4 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 38.\n"; } } @@ -16705,7 +16706,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 3000; while (pass && (i < 4000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -16719,7 +16720,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (8 * 1024 * 1024)) || (cache_ptr->min_clean_size != (4 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 39.\n"; } } @@ -16732,7 +16733,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 3000; while (pass && (i < 4000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -16746,7 +16747,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (7 * 1024 * 1024)) || (cache_ptr->min_clean_size != (7 * 512 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 40.\n"; } } @@ -16758,7 +16759,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 2000; while (pass && (i < 3000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -16772,7 +16773,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (6 * 1024 * 1024)) || (cache_ptr->min_clean_size != (6 * 512 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 41.\n"; } } @@ -16784,7 +16785,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 3000; while (pass && (i < 4000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -16798,7 +16799,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (5 * 1024 * 1024)) || (cache_ptr->min_clean_size != (5 * 512 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 42.\n"; } } @@ -16810,7 +16811,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 2000; while (pass && (i < 3000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -16824,7 +16825,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (4 * 512 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 43.\n"; } } @@ -16836,7 +16837,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 3000; while (pass && (i < 4000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -16850,7 +16851,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (3 * 1024 * 1024)) || (cache_ptr->min_clean_size != (3 * 512 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 44.\n"; } } @@ -16862,7 +16863,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 2000; while (pass && (i < 3000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -16876,7 +16877,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (2 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 512 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 45.\n"; } } @@ -16888,7 +16889,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 3000; while (pass && (i < 4000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -16901,7 +16902,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((!rpt_fcn_called) || (rpt_status != decrease) || (cache_ptr->max_cache_size != (2000 * 1024)) || (cache_ptr->min_clean_size != (int)(2000 * 512))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 46.\n"; } } @@ -16914,7 +16915,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 2000; while (pass && (i < 3000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -16927,7 +16928,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((!rpt_fcn_called) || (rpt_status != in_spec) || (cache_ptr->max_cache_size != (2000 * 1024)) || (cache_ptr->min_clean_size != (int)(2000 * 512))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 47.\n"; } } @@ -16941,7 +16942,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { /* thirteenth epoch */ - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -16954,7 +16955,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((!rpt_fcn_called) || (rpt_status != in_spec) || (cache_ptr->max_cache_size != (2000 * 1024)) || (cache_ptr->min_clean_size != (int)(2000 * 512))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 48.\n"; } } @@ -16964,7 +16965,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if (pass) { /* fourteenth epoch */ - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -16978,7 +16979,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (1001 * 1024 + MONSTER_ENTRY_SIZE)) || (cache_ptr->min_clean_size != (1001 * 512 + MONSTER_ENTRY_SIZE / 2))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 49.\n"; } } @@ -16988,7 +16989,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if (pass) { /* fifteenth epoch -- cache size reduction */ - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -17002,7 +17003,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->min_clean_size != (256 * 1024)) || (cache_ptr->index_len != 2) || (cache_ptr->index_size != MONSTER_ENTRY_SIZE + MEDIUM_ENTRY_SIZE)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 50.\n"; } } @@ -17012,7 +17013,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if (pass) { /* sixteenth epoch -- at minimum size so no more ageouts */ - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -17026,7 +17027,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->min_clean_size != (256 * 1024)) || (cache_ptr->index_len != 2) || (cache_ptr->index_size != MONSTER_ENTRY_SIZE + MEDIUM_ENTRY_SIZE)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 51.\n"; } } @@ -17043,7 +17044,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; auto_size_ctl.rpt_fcn = test_rpt_fcn; - auto_size_ctl.set_initial_size = TRUE; + auto_size_ctl.set_initial_size = true; auto_size_ctl.initial_size = 8 * 1024 * 1024; auto_size_ctl.min_clean_fraction = 0.5; @@ -17059,7 +17060,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) auto_size_ctl.increment = 2.0; - auto_size_ctl.apply_max_increment = TRUE; + auto_size_ctl.apply_max_increment = true; auto_size_ctl.max_increment = (4 * 1024 * 1024); auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -17072,19 +17073,19 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) auto_size_ctl.decrement = 0.5; - auto_size_ctl.apply_max_decrement = FALSE; + auto_size_ctl.apply_max_decrement = false; auto_size_ctl.max_decrement = (1 * 1024 * 1024); auto_size_ctl.epochs_before_eviction = 3; - auto_size_ctl.apply_empty_reserve = TRUE; + auto_size_ctl.apply_empty_reserve = true; auto_size_ctl.empty_reserve = 0.5; /* for ease of testing */ result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 6.\n"; } } @@ -17094,7 +17095,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((cache_ptr->max_cache_size != (8 * 1024 * 1024)) || (cache_ptr->min_clean_size != (4 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "bad cache size after set resize re-config 5.\n"; } } @@ -17111,7 +17112,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { /* first epoch */ - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -17125,7 +17126,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (8 * 1024 * 1024)) || (cache_ptr->min_clean_size != (4 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 52.\n"; } } @@ -17135,7 +17136,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if (pass) { /* second epoch */ - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 1000; while (pass && (i < 2000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -17149,7 +17150,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (8 * 1024 * 1024)) || (cache_ptr->min_clean_size != (4 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 53.\n"; } } @@ -17159,7 +17160,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if (pass) { /* third epoch */ - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 2000; while (pass && (i < 3000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -17173,7 +17174,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (8 * 1024 * 1024)) || (cache_ptr->min_clean_size != (4 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 54.\n"; } } @@ -17187,7 +17188,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 3000; while (pass && (i < 4000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -17201,7 +17202,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (8 * 1024 * 1024)) || (cache_ptr->min_clean_size != (4 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 55.\n"; } } @@ -17214,7 +17215,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 3000; while (pass && (i < 4000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -17227,7 +17228,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((!rpt_fcn_called) || (rpt_status != decrease) || (cache_ptr->max_cache_size != (4002 * 1024)) || (cache_ptr->min_clean_size != (int)(4002 * 512))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 56.\n"; } } @@ -17239,7 +17240,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 3000; while (pass && (i < 4000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -17252,7 +17253,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((!rpt_fcn_called) || (rpt_status != decrease) || (cache_ptr->max_cache_size != (2002 * 1024)) || (cache_ptr->min_clean_size != (int)(2002 * 512))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 57.\n"; } } @@ -17264,7 +17265,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 3000; while (pass && (i < 4000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -17277,7 +17278,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((!rpt_fcn_called) || (rpt_status != decrease) || (cache_ptr->max_cache_size != (2000 * 1024)) || (cache_ptr->min_clean_size != (int)(2000 * 512))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 58.\n"; } } @@ -17290,7 +17291,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 3000; while (pass && (i < 4000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -17303,7 +17304,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((!rpt_fcn_called) || (rpt_status != in_spec) || (cache_ptr->max_cache_size != (2000 * 1024)) || (cache_ptr->min_clean_size != (int)(2000 * 512))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 59.\n"; } } @@ -17317,7 +17318,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { /* ninth epoch */ - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -17330,7 +17331,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((!rpt_fcn_called) || (rpt_status != in_spec) || (cache_ptr->max_cache_size != (2000 * 1024)) || (cache_ptr->min_clean_size != (int)(2000 * 512))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 60.\n"; } } @@ -17340,7 +17341,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if (pass) { /* tenth epoch */ - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -17353,7 +17354,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((!rpt_fcn_called) || (rpt_status != in_spec) || (cache_ptr->max_cache_size != (2000 * 1024)) || (cache_ptr->min_clean_size != (2000 * 512))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 61.\n"; } } @@ -17363,7 +17364,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if (pass) { /* eleventh epoch -- cache size reduction */ - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -17377,7 +17378,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->min_clean_size != (256 * 1024)) || (cache_ptr->index_len != 2) || (cache_ptr->index_size != MONSTER_ENTRY_SIZE + MEDIUM_ENTRY_SIZE)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 62.\n"; } } @@ -17387,7 +17388,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if (pass) { /* twelfth epoch -- at minimum size so no more ageouts */ - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -17401,7 +17402,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->min_clean_size != (256 * 1024)) || (cache_ptr->index_len != 2) || (cache_ptr->index_size != MONSTER_ENTRY_SIZE + MEDIUM_ENTRY_SIZE)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 63.\n"; } } @@ -17420,7 +17421,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; auto_size_ctl.rpt_fcn = test_rpt_fcn; - auto_size_ctl.set_initial_size = TRUE; + auto_size_ctl.set_initial_size = true; auto_size_ctl.initial_size = 8 * 1024 * 1024; auto_size_ctl.min_clean_fraction = 0.5; @@ -17436,7 +17437,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) auto_size_ctl.increment = 2.0; - auto_size_ctl.apply_max_increment = TRUE; + auto_size_ctl.apply_max_increment = true; auto_size_ctl.max_increment = (4 * 1024 * 1024); auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -17452,17 +17453,17 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) auto_size_ctl.decrement = 0.5; - auto_size_ctl.apply_max_decrement = FALSE; + auto_size_ctl.apply_max_decrement = false; auto_size_ctl.max_decrement = (1 * 1024 * 1024); auto_size_ctl.epochs_before_eviction = 1; /* for ease of testing */ - auto_size_ctl.apply_empty_reserve = FALSE; + auto_size_ctl.apply_empty_reserve = false; auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 7.\n"; } } @@ -17472,7 +17473,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((cache_ptr->max_cache_size != (8 * 1024 * 1024)) || (cache_ptr->min_clean_size != (4 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "bad cache size after set resize re-config 6.\n"; } } @@ -17486,7 +17487,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { /* first epoch -- hit rate 0 */ - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, LARGE_ENTRY_TYPE, i); @@ -17500,7 +17501,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (8 * 1024 * 1024)) || (cache_ptr->min_clean_size != (4 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 64.\n"; } } @@ -17510,7 +17511,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if (pass) { /* second epoch -- hit rate 0 */ - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 1000; while (pass && (i < 2000)) { protect_entry(file_ptr, LARGE_ENTRY_TYPE, i); @@ -17524,7 +17525,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (8 * 1024 * 1024)) || (cache_ptr->min_clean_size != (4 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 65.\n"; } } @@ -17534,7 +17535,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if (pass) { /* third epoch -- hit rate 1.0 -- should see decrease */ - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, LARGE_ENTRY_TYPE, i); @@ -17548,7 +17549,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (1001 * LARGE_ENTRY_SIZE)) || (cache_ptr->min_clean_size != (1001 * LARGE_ENTRY_SIZE / 2))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 66.\n"; } } @@ -17559,7 +17560,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) /* fourth epoch -- load up the cache again -- hit rate 0 */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -17573,7 +17574,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (1001 * LARGE_ENTRY_SIZE)) || (cache_ptr->min_clean_size != (1001 * LARGE_ENTRY_SIZE / 2))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 67.\n"; } } @@ -17584,7 +17585,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) /* fifth epoch -- still loading up the cache -- hit rate 0 */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 1000; while (pass && (i < 2000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -17598,7 +17599,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (1001 * LARGE_ENTRY_SIZE)) || (cache_ptr->min_clean_size != (1001 * LARGE_ENTRY_SIZE / 2))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 68.\n"; } } @@ -17609,7 +17610,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) /* sixth epoch -- force hit rate to .998 -- should be no reduction */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 1002; while (pass && (i < 2002)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -17623,7 +17624,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (1001 * LARGE_ENTRY_SIZE)) || (cache_ptr->min_clean_size != (1001 * LARGE_ENTRY_SIZE / 2))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 69.\n"; } } @@ -17635,7 +17636,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 1003; while (pass && (i < 2003)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -17649,7 +17650,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (1000 * MEDIUM_ENTRY_SIZE)) || (cache_ptr->min_clean_size != (1000 * MEDIUM_ENTRY_SIZE / 2))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 70.\n"; } } @@ -17667,7 +17668,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; auto_size_ctl.rpt_fcn = test_rpt_fcn; - auto_size_ctl.set_initial_size = TRUE; + auto_size_ctl.set_initial_size = true; auto_size_ctl.initial_size = 8 * 1000 * 1024; auto_size_ctl.min_clean_fraction = 0.5; @@ -17683,7 +17684,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) auto_size_ctl.increment = 2.0; - auto_size_ctl.apply_max_increment = TRUE; + auto_size_ctl.apply_max_increment = true; auto_size_ctl.max_increment = (4 * 1024 * 1024); auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -17696,17 +17697,17 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) auto_size_ctl.decrement = 0.5; - auto_size_ctl.apply_max_decrement = TRUE; + auto_size_ctl.apply_max_decrement = true; auto_size_ctl.max_decrement = (1 * 1000 * 1024); auto_size_ctl.epochs_before_eviction = 1; /* for ease of testing */ - auto_size_ctl.apply_empty_reserve = TRUE; + auto_size_ctl.apply_empty_reserve = true; auto_size_ctl.empty_reserve = 0.5; /* for ease of testing */ result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 8.\n"; } } @@ -17716,7 +17717,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((cache_ptr->max_cache_size != (8 * 1000 * 1024)) || (cache_ptr->min_clean_size != (4 * 1000 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "bad cache size after set resize re-config 7.\n"; } } @@ -17730,7 +17731,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { /* first epoch -- hit rate 0 */ - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, LARGE_ENTRY_TYPE, i); @@ -17744,7 +17745,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (8 * 1000 * 1024)) || (cache_ptr->min_clean_size != (4 * 1000 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 71.\n"; } } @@ -17754,7 +17755,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if (pass) { /* second epoch -- hit rate 0 */ - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 1000; while (pass && (i < 2000)) { protect_entry(file_ptr, LARGE_ENTRY_TYPE, i); @@ -17768,7 +17769,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->max_cache_size != (8 * 1000 * 1024)) || (cache_ptr->min_clean_size != (4 * 1000 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 72.\n"; } } @@ -17786,7 +17787,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, LARGE_ENTRY_TYPE, i); @@ -17801,7 +17802,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->min_clean_size != (4 * 1000 * 1024)) || (cache_ptr->index_size != (7 * 1000 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 73.\n"; } } @@ -17814,7 +17815,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, LARGE_ENTRY_TYPE, i); @@ -17829,7 +17830,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->min_clean_size != (4 * 1000 * 1024)) || (cache_ptr->index_size != (6 * 1000 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 74.\n"; } } @@ -17842,7 +17843,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, LARGE_ENTRY_TYPE, i); @@ -17857,7 +17858,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->min_clean_size != (4 * 1000 * 1024)) || (cache_ptr->index_size != (5 * 1000 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 75.\n"; } } @@ -17871,7 +17872,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, LARGE_ENTRY_TYPE, i); @@ -17886,7 +17887,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->min_clean_size != (4 * 1000 * 1024)) || (cache_ptr->index_size != (4 * 1000 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 76.\n"; } } @@ -17898,7 +17899,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, LARGE_ENTRY_TYPE, i); @@ -17913,7 +17914,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->min_clean_size != (4 * 1000 * 1024)) || (cache_ptr->index_size != (4 * 1000 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 77.\n"; } } @@ -17926,7 +17927,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -17941,7 +17942,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->min_clean_size != (4 * 1000 * 1024)) || (cache_ptr->index_size != (5 * 1000 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 78.\n"; } } @@ -17955,7 +17956,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -17970,7 +17971,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->min_clean_size != (4 * 1000 * 1024)) || (cache_ptr->index_size != (4 * 1000 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 79.\n"; } } @@ -17984,7 +17985,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -17999,7 +18000,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->min_clean_size != (7 * 1000 * 1024 / 2)) || (cache_ptr->index_size != (3 * 1000 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 80.\n"; } } @@ -18013,7 +18014,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -18028,7 +18029,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->min_clean_size != (3 * 1000 * 1024)) || (cache_ptr->index_size != (2 * 1000 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 81.\n"; } } @@ -18040,7 +18041,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -18055,7 +18056,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->min_clean_size != (5 * 1000 * 1024 / 2)) || (cache_ptr->index_size != (1 * 1000 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 82.\n"; } } @@ -18067,7 +18068,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -18082,7 +18083,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->min_clean_size != (2 * 1000 * 1024)) || (cache_ptr->index_size != (1 * 1000 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 83.\n"; } } @@ -18094,7 +18095,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -18109,7 +18110,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->min_clean_size != (3 * 1000 * 1024 / 2)) || (cache_ptr->index_size != (1 * 1000 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 84.\n"; } } @@ -18121,7 +18122,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -18136,7 +18137,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->min_clean_size != (1 * 1000 * 1024)) || (cache_ptr->index_size != (1 * 1000 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 85.\n"; } } @@ -18148,7 +18149,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -18163,7 +18164,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->min_clean_size != (1 * 1000 * 1024)) || (cache_ptr->index_size != (1 * 1000 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 86.\n"; } } @@ -18193,7 +18194,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - flush_cache(file_ptr, TRUE, FALSE, FALSE); + flush_cache(file_ptr, true, false, false); reset_entries(); } @@ -18209,7 +18210,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; auto_size_ctl.rpt_fcn = test_rpt_fcn; - auto_size_ctl.set_initial_size = TRUE; + auto_size_ctl.set_initial_size = true; auto_size_ctl.initial_size = 64 * 1024; auto_size_ctl.min_clean_fraction = 0.5; @@ -18225,7 +18226,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) auto_size_ctl.increment = 2.0; - auto_size_ctl.apply_max_increment = TRUE; + auto_size_ctl.apply_max_increment = true; auto_size_ctl.max_increment = (32 * 1024); auto_size_ctl.flash_incr_mode = H5C_flash_incr__add_space; @@ -18238,17 +18239,17 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) auto_size_ctl.decrement = 0.5; - auto_size_ctl.apply_max_decrement = TRUE; + auto_size_ctl.apply_max_decrement = true; auto_size_ctl.max_decrement = (1 * 1000 * 1024); auto_size_ctl.epochs_before_eviction = 1; /* for ease of testing */ - auto_size_ctl.apply_empty_reserve = TRUE; + auto_size_ctl.apply_empty_reserve = true; auto_size_ctl.empty_reserve = 0.5; /* for ease of testing */ result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 12.\n"; } } @@ -18258,7 +18259,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((cache_ptr->max_cache_size != (64 * 1024)) || (cache_ptr->min_clean_size != (32 * 1024)) || (cache_ptr->index_len != 0) || (cache_ptr->index_size != 0) || (cache_ptr->cache_accesses != 0)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (0).\n"; } } @@ -18278,7 +18279,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->min_clean_size != (32 * 1024)) || (cache_ptr->index_len != 1) || (cache_ptr->index_size != HUGE_ENTRY_SIZE) || (cache_ptr->cache_accesses != 1)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (1).\n"; } } @@ -18303,7 +18304,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->index_size != (HUGE_ENTRY_SIZE + MONSTER_ENTRY_SIZE)) || (cache_ptr->cache_accesses != 1)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (2).\n"; } } @@ -18327,7 +18328,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->index_size != ((2 * MONSTER_ENTRY_SIZE) + HUGE_ENTRY_SIZE)) || (cache_ptr->cache_accesses != 1)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (3).\n"; } } @@ -18349,7 +18350,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->index_len != 2) || (cache_ptr->index_size != (2 * MONSTER_ENTRY_SIZE)) || (cache_ptr->cache_accesses != 2)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (4).\n"; } } @@ -18369,7 +18370,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 13.\n"; } } @@ -18378,7 +18379,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->min_clean_size != (32 * 1024)) || (cache_ptr->index_len != 0) || (cache_ptr->index_size != 0) || (cache_ptr->cache_accesses != 0)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (5).\n"; } } @@ -18405,7 +18406,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->min_clean_size != (32 * 1024)) || (cache_ptr->index_len != 1) || (cache_ptr->index_size != HUGE_ENTRY_SIZE) || (cache_ptr->cache_accesses != 2)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (6).\n"; } } @@ -18427,7 +18428,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->index_size != HUGE_ENTRY_SIZE + MONSTER_ENTRY_SIZE) || (cache_ptr->cache_accesses != 0)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (7).\n"; } } @@ -18446,7 +18447,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->index_size != 2 * MONSTER_ENTRY_SIZE + HUGE_ENTRY_SIZE) || (cache_ptr->cache_accesses != 0)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (8).\n"; } } @@ -18468,7 +18469,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->index_len != 2) || (cache_ptr->index_size != (2 * MONSTER_ENTRY_SIZE)) || (cache_ptr->cache_accesses != 1)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (9).\n"; } } @@ -18487,22 +18488,22 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) expunge_entry(file_ptr, MONSTER_ENTRY_TYPE, 6); protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10); - resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, 1024, TRUE); + resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, 1024, true); unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, H5C__DIRTIED_FLAG); protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11); - resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, 1024, TRUE); + resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, 1024, true); unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, H5C__DIRTIED_FLAG); protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12); - resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, 1024, TRUE); + resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, 1024, true); unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, H5C__DIRTIED_FLAG); protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 13); - resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 13, 1024, TRUE); + resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 13, 1024, true); unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 13, H5C__DIRTIED_FLAG); - flush_cache(file_ptr, TRUE, FALSE, FALSE); + flush_cache(file_ptr, true, false, false); if (pass) { @@ -18511,7 +18512,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 13.\n"; } } @@ -18520,7 +18521,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->min_clean_size != (3 * 1024)) || (cache_ptr->index_len != 0) || (cache_ptr->index_size != 0) || (cache_ptr->cache_accesses != 0)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (10).\n"; } } @@ -18547,7 +18548,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->min_clean_size != (3 * 1024)) || (cache_ptr->index_len != 4) || (cache_ptr->index_size != 4 * 1024) || (cache_ptr->cache_accesses != 4)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (11).\n"; } } @@ -18561,14 +18562,14 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if (pass) { protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10); - resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, (3 * 1024), TRUE); + resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, (3 * 1024), true); unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, H5C__DIRTIED_FLAG); if (pass && (((cache_ptr->max_cache_size != (6 * 1024)) || (cache_ptr->min_clean_size != (3 * 1024)) || (cache_ptr->index_len != 4) || (cache_ptr->index_size != 6 * 1024) || (cache_ptr->cache_accesses != 5)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (12).\n"; } } @@ -18583,14 +18584,14 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if (pass) { protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10); - resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, (10 * 1024), TRUE); + resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, (10 * 1024), true); unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, H5C__DIRTIED_FLAG); if (pass && (((cache_ptr->max_cache_size != (13 * 1024)) || (cache_ptr->min_clean_size != (13 * 512)) || (cache_ptr->index_len != 4) || (cache_ptr->index_size != 13 * 1024) || (cache_ptr->cache_accesses != 0)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (13).\n"; } } @@ -18604,14 +18605,14 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if (pass) { protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11); - resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, (10 * 1024), TRUE); + resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, (10 * 1024), true); unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, H5C__DIRTIED_FLAG); if (pass && (((cache_ptr->max_cache_size != (22 * 1024)) || (cache_ptr->min_clean_size != (11 * 1024)) || (cache_ptr->index_len != 4) || (cache_ptr->index_size != 22 * 1024) || (cache_ptr->cache_accesses != 0)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (14).\n"; } } @@ -18625,14 +18626,14 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if (pass) { protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12); - resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, (10 * 1024), TRUE); + resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, (10 * 1024), true); unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, H5C__DIRTIED_FLAG); if (pass && (((cache_ptr->max_cache_size != (22 * 1024)) || (cache_ptr->min_clean_size != (11 * 1024)) || (cache_ptr->index_len != 4) || (cache_ptr->index_size != 31 * 1024) || (cache_ptr->cache_accesses != 1)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (15).\n"; } } @@ -18647,15 +18648,15 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if (pass) { protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10); - resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, (1 * 1024), TRUE); + resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, (1 * 1024), true); unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, H5C__DIRTIED_FLAG); protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11); - resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, (1 * 1024), TRUE); + resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, (1 * 1024), true); unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, H5C__DIRTIED_FLAG); protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12); - resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, (1 * 1024), TRUE); + resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, (1 * 1024), true); unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, H5C__DIRTIED_FLAG); if (pass) { @@ -18665,7 +18666,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 14.\n"; } } @@ -18674,7 +18675,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->min_clean_size != (3 * 1024)) || (cache_ptr->index_len != 4) || (cache_ptr->index_size != 4 * 1024) || (cache_ptr->cache_accesses != 0)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (16).\n"; } } @@ -18688,13 +18689,13 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10); unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, H5C__PIN_ENTRY_FLAG); - resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, 2 * 1024, TRUE); + resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, 2 * 1024, true); if (pass && (((cache_ptr->max_cache_size != (6 * 1024)) || (cache_ptr->min_clean_size != (6 * 512)) || (cache_ptr->index_len != 4) || (cache_ptr->index_size != 5 * 1024) || (cache_ptr->cache_accesses != 1)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (17).\n"; } } @@ -18704,13 +18705,13 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if (pass) { - resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, 10 * 1024, TRUE); + resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, 10 * 1024, true); if (pass && (((cache_ptr->max_cache_size != (13 * 1024)) || (cache_ptr->min_clean_size != (13 * 512)) || (cache_ptr->index_len != 4) || (cache_ptr->index_size != 13 * 1024) || (cache_ptr->cache_accesses != 0)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (18).\n"; } } @@ -18722,13 +18723,13 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11); unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, H5C__PIN_ENTRY_FLAG); - resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, 10 * 1024, TRUE); + resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, 10 * 1024, true); if (pass && (((cache_ptr->max_cache_size != (22 * 1024)) || (cache_ptr->min_clean_size != (11 * 1024)) || (cache_ptr->index_len != 4) || (cache_ptr->index_size != 22 * 1024) || (cache_ptr->cache_accesses != 0)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (19).\n"; } } @@ -18740,13 +18741,13 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12); unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, H5C__PIN_ENTRY_FLAG); - resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, 10 * 1024, TRUE); + resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, 10 * 1024, true); if (pass && (((cache_ptr->max_cache_size != (22 * 1024)) || (cache_ptr->min_clean_size != (11 * 1024)) || (cache_ptr->index_len != 4) || (cache_ptr->index_size != 31 * 1024) || (cache_ptr->cache_accesses != 1)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (20).\n"; } } @@ -18772,7 +18773,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->min_clean_size != (11 * 1024)) || (cache_ptr->index_len != 4) || (cache_ptr->index_size != 31 * 1024) || (cache_ptr->cache_accesses != 4)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (21).\n"; } } @@ -18787,15 +18788,15 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if (pass) { protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10); - resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, (1 * 1024), TRUE); + resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, (1 * 1024), true); unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, H5C__DIRTIED_FLAG); protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11); - resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, (1 * 1024), TRUE); + resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, (1 * 1024), true); unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, H5C__DIRTIED_FLAG); protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12); - resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, (1 * 1024), TRUE); + resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, (1 * 1024), true); unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, H5C__DIRTIED_FLAG); if (pass) { @@ -18805,7 +18806,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 15.\n"; } } @@ -18814,7 +18815,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->min_clean_size != (3 * 1024)) || (cache_ptr->index_len != 4) || (cache_ptr->index_size != 4 * 1024) || (cache_ptr->cache_accesses != 0)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (22).\n"; } } @@ -18823,13 +18824,13 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10); unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, H5C__PIN_ENTRY_FLAG); - resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, 2 * 1024, TRUE); + resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, 2 * 1024, true); if (pass && (((cache_ptr->max_cache_size != (6 * 1024)) || (cache_ptr->min_clean_size != (6 * 512)) || (cache_ptr->index_len != 4) || (cache_ptr->index_size != 5 * 1024) || (cache_ptr->cache_accesses != 1)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (23).\n"; } } @@ -18839,13 +18840,13 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if (pass) { - resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, 10 * 1024, TRUE); + resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, 10 * 1024, true); if (pass && (((cache_ptr->max_cache_size != (13 * 1024)) || (cache_ptr->min_clean_size != (13 * 512)) || (cache_ptr->index_len != 4) || (cache_ptr->index_size != 13 * 1024) || (cache_ptr->cache_accesses != 0)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (24).\n"; } } @@ -18857,13 +18858,13 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11); unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, H5C__PIN_ENTRY_FLAG); - resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, 10 * 1024, TRUE); + resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, 10 * 1024, true); if (pass && (((cache_ptr->max_cache_size != (22 * 1024)) || (cache_ptr->min_clean_size != (11 * 1024)) || (cache_ptr->index_len != 4) || (cache_ptr->index_size != 22 * 1024) || (cache_ptr->cache_accesses != 0)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (25).\n"; } } @@ -18875,13 +18876,13 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12); unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, H5C__PIN_ENTRY_FLAG); - resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, 10 * 1024, TRUE); + resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, 10 * 1024, true); if (pass && (((cache_ptr->max_cache_size != (22 * 1024)) || (cache_ptr->min_clean_size != (11 * 1024)) || (cache_ptr->index_len != 4) || (cache_ptr->index_size != 31 * 1024) || (cache_ptr->cache_accesses != 1)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (26).\n"; } } @@ -18907,7 +18908,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->min_clean_size != (11 * 1024)) || (cache_ptr->index_len != 4) || (cache_ptr->index_size != 31 * 1024) || (cache_ptr->cache_accesses != 4)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (27).\n"; } } @@ -18926,7 +18927,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) (cache_ptr->min_clean_size != (11 * 1024)) || (cache_ptr->index_len != 0) || (cache_ptr->index_size != 0) || (cache_ptr->cache_accesses != 4)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (28).\n"; } } @@ -18943,7 +18944,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; auto_size_ctl.rpt_fcn = test_rpt_fcn; - auto_size_ctl.set_initial_size = TRUE; + auto_size_ctl.set_initial_size = true; auto_size_ctl.initial_size = 4 * 1024; auto_size_ctl.min_clean_fraction = 0.5; @@ -18959,7 +18960,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) auto_size_ctl.increment = 2.0; - auto_size_ctl.apply_max_increment = TRUE; + auto_size_ctl.apply_max_increment = true; auto_size_ctl.max_increment = (4 * 1024); auto_size_ctl.flash_incr_mode = H5C_flash_incr__add_space; @@ -18972,17 +18973,17 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) auto_size_ctl.decrement = 0.5; - auto_size_ctl.apply_max_decrement = TRUE; + auto_size_ctl.apply_max_decrement = true; auto_size_ctl.max_decrement = (2 * 1024); auto_size_ctl.epochs_before_eviction = 1; /* for ease of testing */ - auto_size_ctl.apply_empty_reserve = TRUE; + auto_size_ctl.apply_empty_reserve = true; auto_size_ctl.empty_reserve = 0.5; /* for ease of testing */ result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 15.\n"; } } @@ -18995,7 +18996,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((cache_ptr->max_cache_size != (4 * 1024)) || (cache_ptr->min_clean_size != (4 * 512)) || (cache_ptr->index_len != 0) || (cache_ptr->index_size != 0) || (cache_ptr->cache_accesses != 0)) { - pass = FALSE; + pass = false; failure_mssg = "bad cache after initialization 15.\n"; } } @@ -19008,16 +19009,16 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; protect_entry(file_ptr, LARGE_ENTRY_TYPE, 0); unprotect_entry(file_ptr, LARGE_ENTRY_TYPE, 0, H5C__NO_FLAGS_SET); if (pass && (((cache_ptr->max_cache_size != (4 * 1024)) || (cache_ptr->min_clean_size != (4 * 512)) || (cache_ptr->index_len != 1) || (cache_ptr->index_size != LARGE_ENTRY_SIZE) || - (cache_ptr->cache_accesses != 1) || (rpt_fcn_called == TRUE)))) { + (cache_ptr->cache_accesses != 1) || (rpt_fcn_called == true)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (29).\n"; } } @@ -19031,7 +19032,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; protect_entry(file_ptr, LARGE_ENTRY_TYPE, 1); unprotect_entry(file_ptr, LARGE_ENTRY_TYPE, 1, H5C__NO_FLAGS_SET); @@ -19039,9 +19040,9 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if (pass && (((cache_ptr->max_cache_size != (12 * 1024)) || (cache_ptr->min_clean_size != (12 * 512)) || (cache_ptr->index_len != 2) || (cache_ptr->index_size != 2 * LARGE_ENTRY_SIZE) || - (cache_ptr->cache_accesses != 1) || (rpt_fcn_called != TRUE)))) { + (cache_ptr->cache_accesses != 1) || (rpt_fcn_called != true)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (30).\n"; } } @@ -19054,7 +19055,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; protect_entry(file_ptr, LARGE_ENTRY_TYPE, 2); unprotect_entry(file_ptr, LARGE_ENTRY_TYPE, 2, H5C__NO_FLAGS_SET); @@ -19064,9 +19065,9 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if (pass && (((cache_ptr->max_cache_size != (12 * 1024)) || (cache_ptr->min_clean_size != (12 * 512)) || (cache_ptr->index_len != 3) || (cache_ptr->index_size != 3 * LARGE_ENTRY_SIZE) || - (cache_ptr->cache_accesses != 3) || (rpt_fcn_called != FALSE)))) { + (cache_ptr->cache_accesses != 3) || (rpt_fcn_called != false)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (31).\n"; } } @@ -19079,7 +19080,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, TINY_ENTRY_TYPE, 0); @@ -19092,7 +19093,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if ((!rpt_fcn_called) || (cache_ptr->max_cache_size != (4 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024)) || (cache_ptr->index_size != (1 * TINY_ENTRY_SIZE))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (32).\n"; } } @@ -19103,7 +19104,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) /* Force another flash increase */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; protect_entry(file_ptr, LARGE_ENTRY_TYPE, 0); unprotect_entry(file_ptr, LARGE_ENTRY_TYPE, 0, H5C__NO_FLAGS_SET); @@ -19111,10 +19112,10 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if (pass && (((cache_ptr->max_cache_size != (4 * 1024 + 128)) || (cache_ptr->min_clean_size != (2 * 1024 + 64)) || (cache_ptr->index_len != 2) || (cache_ptr->index_size != LARGE_ENTRY_SIZE + TINY_ENTRY_SIZE) || - (cache_ptr->cache_accesses != 1) || (rpt_fcn_called == FALSE) || + (cache_ptr->cache_accesses != 1) || (rpt_fcn_called == false) || (rpt_status != flash_increase)))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (33).\n"; } } @@ -19125,7 +19126,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) /* force regular size increase up to maximum */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 500)) { protect_entry(file_ptr, TINY_ENTRY_TYPE, i); @@ -19136,9 +19137,9 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if ((cache_ptr->max_cache_size != (20 * 1024)) || (cache_ptr->min_clean_size != (10 * 1024)) || - (rpt_fcn_called == FALSE) || (rpt_status != at_max_size)) { + (rpt_fcn_called == false) || (rpt_status != at_max_size)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache config (34).\n"; } } @@ -19148,7 +19149,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) if (pass) { - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); } if (show_progress) @@ -19181,7 +19182,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) static unsigned check_auto_cache_resize_disable(unsigned paged) { - hbool_t show_progress = FALSE; + bool show_progress = false; herr_t result; int32_t i; int32_t checkpoint = 0; @@ -19191,7 +19192,7 @@ check_auto_cache_resize_disable(unsigned paged) /* int32_t version = */ H5C__CURR_AUTO_SIZE_CTL_VER, /* H5C_auto_resize_report_fcn rpt_fcn = */ test_rpt_fcn, - /* hbool_t set_initial_size = */ TRUE, + /* bool set_initial_size = */ true, /* size_t initial_size = */ (512 * 1024), /* double min_clean_fraction = */ 0.5, @@ -19207,7 +19208,7 @@ check_auto_cache_resize_disable(unsigned paged) /* double increment = */ 2.0, - /* hbool_t apply_max_increment = */ TRUE, + /* bool apply_max_increment = */ true, /* size_t max_increment = */ (4 * 1024 * 1024), /* enum H5C_cache_flash_incr_mode */ @@ -19221,12 +19222,12 @@ check_auto_cache_resize_disable(unsigned paged) /* double decrement = */ 0.1, - /* hbool_t apply_max_decrement = */ TRUE, + /* bool apply_max_decrement = */ true, /* size_t max_decrement = */ (1 * 1024 * 1024), /* int32_t epochs_before_eviction = */ 3, - /* hbool_t apply_empty_reserve = */ TRUE, + /* bool apply_empty_reserve = */ true, /* double empty_reserve = */ 0.05}; if (paged) @@ -19234,7 +19235,7 @@ check_auto_cache_resize_disable(unsigned paged) else TESTING("automatic cache resize disable"); - pass = TRUE; + pass = true; if (show_progress) fprintf(stderr, "check point %d\n", checkpoint++); @@ -19252,7 +19253,7 @@ check_auto_cache_resize_disable(unsigned paged) if (file_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "file_ptr NULL from setup_cache."; } else { @@ -19267,7 +19268,7 @@ check_auto_cache_resize_disable(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 1.\n"; } } @@ -19276,7 +19277,7 @@ check_auto_cache_resize_disable(unsigned paged) if ((cache_ptr->max_cache_size != (512 * 1024)) || (cache_ptr->min_clean_size != (256 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "bad cache size after initialization.\n"; } } @@ -19296,7 +19297,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; auto_size_ctl.rpt_fcn = test_rpt_fcn; - auto_size_ctl.set_initial_size = TRUE; + auto_size_ctl.set_initial_size = true; auto_size_ctl.initial_size = 4 * 1024 * 1024; auto_size_ctl.min_clean_fraction = 0.5; @@ -19312,7 +19313,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.increment = 1.0; /* disable size increases */ - auto_size_ctl.apply_max_increment = FALSE; + auto_size_ctl.apply_max_increment = false; auto_size_ctl.max_increment = (4 * 1024 * 1024); auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -19325,19 +19326,19 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.decrement = 0.5; - auto_size_ctl.apply_max_decrement = FALSE; + auto_size_ctl.apply_max_decrement = false; auto_size_ctl.max_decrement = (1 * 1024 * 1024); auto_size_ctl.epochs_before_eviction = 3; - auto_size_ctl.apply_empty_reserve = TRUE; + auto_size_ctl.apply_empty_reserve = true; auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 2.\n"; } } @@ -19347,7 +19348,7 @@ check_auto_cache_resize_disable(unsigned paged) if ((cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "bad cache size after set resize re-config 1.\n"; } } @@ -19360,7 +19361,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i); @@ -19375,7 +19376,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 1.\n"; } } @@ -19388,7 +19389,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -19403,7 +19404,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (2 * 1024 * 1024)) || (cache_ptr->min_clean_size != (1 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 2.\n"; } } @@ -19416,7 +19417,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i); @@ -19431,7 +19432,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (2 * 1024 * 1024)) || (cache_ptr->min_clean_size != (1 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 3.\n"; } } @@ -19448,7 +19449,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; auto_size_ctl.rpt_fcn = test_rpt_fcn; - auto_size_ctl.set_initial_size = TRUE; + auto_size_ctl.set_initial_size = true; auto_size_ctl.initial_size = 4 * 1024 * 1024; auto_size_ctl.min_clean_fraction = 0.5; @@ -19464,7 +19465,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.increment = 2.0; - auto_size_ctl.apply_max_increment = FALSE; + auto_size_ctl.apply_max_increment = false; auto_size_ctl.max_increment = (4 * 1024 * 1024); auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -19476,19 +19477,19 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.upper_hr_threshold = 0.995; auto_size_ctl.decrement = 0.5; - auto_size_ctl.apply_max_decrement = FALSE; + auto_size_ctl.apply_max_decrement = false; auto_size_ctl.max_decrement = (1 * 1024 * 1024); auto_size_ctl.epochs_before_eviction = 3; - auto_size_ctl.apply_empty_reserve = TRUE; + auto_size_ctl.apply_empty_reserve = true; auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 3.\n"; } } @@ -19498,7 +19499,7 @@ check_auto_cache_resize_disable(unsigned paged) if ((cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "bad cache size after set resize re-config 2.\n"; } } @@ -19511,7 +19512,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i); @@ -19526,7 +19527,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 4.\n"; } } @@ -19539,7 +19540,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -19554,7 +19555,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (2 * 1024 * 1024)) || (cache_ptr->min_clean_size != (1 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 5.\n"; } } @@ -19567,7 +19568,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i); @@ -19582,7 +19583,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (2 * 1024 * 1024)) || (cache_ptr->min_clean_size != (1 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 6.\n"; } } @@ -19599,7 +19600,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; auto_size_ctl.rpt_fcn = test_rpt_fcn; - auto_size_ctl.set_initial_size = TRUE; + auto_size_ctl.set_initial_size = true; auto_size_ctl.initial_size = 4 * 1024 * 1024; auto_size_ctl.min_clean_fraction = 0.5; @@ -19615,7 +19616,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.increment = 2.0; - auto_size_ctl.apply_max_increment = FALSE; + auto_size_ctl.apply_max_increment = false; auto_size_ctl.max_increment = (4 * 1024 * 1024); auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -19628,19 +19629,19 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.decrement = 0.5; - auto_size_ctl.apply_max_decrement = FALSE; + auto_size_ctl.apply_max_decrement = false; auto_size_ctl.max_decrement = (1 * 1024 * 1024); auto_size_ctl.epochs_before_eviction = 3; - auto_size_ctl.apply_empty_reserve = TRUE; + auto_size_ctl.apply_empty_reserve = true; auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 4.\n"; } } @@ -19650,7 +19651,7 @@ check_auto_cache_resize_disable(unsigned paged) if ((cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "bad cache size after set resize re-config 3.\n"; } } @@ -19663,7 +19664,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i); @@ -19678,7 +19679,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 7.\n"; } } @@ -19691,7 +19692,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -19706,7 +19707,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (2 * 1024 * 1024)) || (cache_ptr->min_clean_size != (1 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 8.\n"; } } @@ -19719,7 +19720,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i); @@ -19734,7 +19735,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (2 * 1024 * 1024)) || (cache_ptr->min_clean_size != (1 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 9.\n"; } } @@ -19750,7 +19751,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; auto_size_ctl.rpt_fcn = test_rpt_fcn; - auto_size_ctl.set_initial_size = TRUE; + auto_size_ctl.set_initial_size = true; auto_size_ctl.initial_size = 4 * 1024 * 1024; auto_size_ctl.min_clean_fraction = 0.5; @@ -19766,7 +19767,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.increment = 2.0; - auto_size_ctl.apply_max_increment = TRUE; + auto_size_ctl.apply_max_increment = true; auto_size_ctl.max_increment = (2 * 1024 * 1024); auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -19779,19 +19780,19 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.decrement = 1.0; /* disable size decreases */ - auto_size_ctl.apply_max_decrement = TRUE; + auto_size_ctl.apply_max_decrement = true; auto_size_ctl.max_decrement = (1 * 1024 * 1024); auto_size_ctl.epochs_before_eviction = 3; - auto_size_ctl.apply_empty_reserve = TRUE; + auto_size_ctl.apply_empty_reserve = true; auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 5.\n"; } } @@ -19804,7 +19805,7 @@ check_auto_cache_resize_disable(unsigned paged) if ((cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "bad cache size after set resize re-config 4.\n"; } } @@ -19817,7 +19818,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -19832,7 +19833,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 10.\n"; } } @@ -19844,7 +19845,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i); @@ -19859,7 +19860,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (6 * 1024 * 1024)) || (cache_ptr->min_clean_size != (3 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 11.\n"; } } @@ -19872,7 +19873,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -19887,7 +19888,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (6 * 1024 * 1024)) || (cache_ptr->min_clean_size != (3 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 12.\n"; } } @@ -19904,7 +19905,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; auto_size_ctl.rpt_fcn = test_rpt_fcn; - auto_size_ctl.set_initial_size = TRUE; + auto_size_ctl.set_initial_size = true; auto_size_ctl.initial_size = 4 * 1024 * 1024; auto_size_ctl.min_clean_fraction = 0.5; @@ -19920,7 +19921,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.increment = 2.0; - auto_size_ctl.apply_max_increment = TRUE; + auto_size_ctl.apply_max_increment = true; auto_size_ctl.max_increment = (2 * 1024 * 1024); auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -19933,19 +19934,19 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.decrement = 0.5; - auto_size_ctl.apply_max_decrement = TRUE; + auto_size_ctl.apply_max_decrement = true; auto_size_ctl.max_decrement = (1 * 1024 * 1024); auto_size_ctl.epochs_before_eviction = 3; - auto_size_ctl.apply_empty_reserve = TRUE; + auto_size_ctl.apply_empty_reserve = true; auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 6.\n"; } } @@ -19955,7 +19956,7 @@ check_auto_cache_resize_disable(unsigned paged) if ((cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "bad cache size after set resize re-config 5.\n"; } } @@ -19968,7 +19969,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -19983,7 +19984,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 13.\n"; } } @@ -19995,7 +19996,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i); @@ -20010,7 +20011,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (6 * 1024 * 1024)) || (cache_ptr->min_clean_size != (3 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 14.\n"; } } @@ -20023,7 +20024,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -20038,7 +20039,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (6 * 1024 * 1024)) || (cache_ptr->min_clean_size != (3 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 15.\n"; } } @@ -20054,7 +20055,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; auto_size_ctl.rpt_fcn = test_rpt_fcn; - auto_size_ctl.set_initial_size = TRUE; + auto_size_ctl.set_initial_size = true; auto_size_ctl.initial_size = 4 * 1024 * 1024; auto_size_ctl.min_clean_fraction = 0.5; @@ -20070,7 +20071,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.increment = 2.0; - auto_size_ctl.apply_max_increment = TRUE; + auto_size_ctl.apply_max_increment = true; auto_size_ctl.max_increment = (2 * 1024 * 1024); auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -20083,19 +20084,19 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.decrement = 0.5; - auto_size_ctl.apply_max_decrement = TRUE; + auto_size_ctl.apply_max_decrement = true; auto_size_ctl.max_decrement = (1 * 1024 * 1024); auto_size_ctl.epochs_before_eviction = 3; - auto_size_ctl.apply_empty_reserve = TRUE; + auto_size_ctl.apply_empty_reserve = true; auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 7.\n"; } } @@ -20105,7 +20106,7 @@ check_auto_cache_resize_disable(unsigned paged) if ((cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "bad cache size after set resize re-config 6.\n"; } } @@ -20118,7 +20119,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -20133,7 +20134,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 16.\n"; } } @@ -20145,7 +20146,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i); @@ -20160,7 +20161,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (6 * 1024 * 1024)) || (cache_ptr->min_clean_size != (3 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 17.\n"; } } @@ -20173,7 +20174,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -20188,7 +20189,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (6 * 1024 * 1024)) || (cache_ptr->min_clean_size != (3 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 18.\n"; } } @@ -20206,7 +20207,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; auto_size_ctl.rpt_fcn = test_rpt_fcn; - auto_size_ctl.set_initial_size = TRUE; + auto_size_ctl.set_initial_size = true; auto_size_ctl.initial_size = 4 * 1024 * 1024; auto_size_ctl.min_clean_fraction = 0.5; @@ -20222,7 +20223,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.increment = 2.0; - auto_size_ctl.apply_max_increment = TRUE; + auto_size_ctl.apply_max_increment = true; auto_size_ctl.max_increment = (2 * 1024 * 1024); auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -20235,19 +20236,19 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.decrement = 0.5; - auto_size_ctl.apply_max_decrement = TRUE; + auto_size_ctl.apply_max_decrement = true; auto_size_ctl.max_decrement = 0; /* disable decrement */ auto_size_ctl.epochs_before_eviction = 1; - auto_size_ctl.apply_empty_reserve = TRUE; + auto_size_ctl.apply_empty_reserve = true; auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 8.\n"; } } @@ -20257,7 +20258,7 @@ check_auto_cache_resize_disable(unsigned paged) if ((cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "bad cache size after set resize re-config 7.\n"; } } @@ -20268,7 +20269,7 @@ check_auto_cache_resize_disable(unsigned paged) if (pass) { /* flush the cache and destroy all entries so we start from a known point */ - flush_cache(file_ptr, TRUE, FALSE, FALSE); + flush_cache(file_ptr, true, false, false); } if (show_progress) @@ -20279,7 +20280,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, SMALL_ENTRY_TYPE, i); @@ -20294,7 +20295,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 19.\n"; } } @@ -20306,7 +20307,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 1000; while (pass && (i < 2000)) { protect_entry(file_ptr, SMALL_ENTRY_TYPE, i); @@ -20321,7 +20322,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 20.\n"; } } @@ -20335,7 +20336,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, SMALL_ENTRY_TYPE, i); @@ -20350,7 +20351,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 21.\n"; } } @@ -20362,7 +20363,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i); @@ -20377,7 +20378,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (6 * 1024 * 1024)) || (cache_ptr->min_clean_size != (3 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 22.\n"; } } @@ -20392,7 +20393,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -20407,7 +20408,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (6 * 1024 * 1024)) || (cache_ptr->min_clean_size != (3 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 23.\n"; } } @@ -20423,7 +20424,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; auto_size_ctl.rpt_fcn = test_rpt_fcn; - auto_size_ctl.set_initial_size = TRUE; + auto_size_ctl.set_initial_size = true; auto_size_ctl.initial_size = 4 * 1024 * 1024; auto_size_ctl.min_clean_fraction = 0.5; @@ -20439,7 +20440,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.increment = 2.0; - auto_size_ctl.apply_max_increment = TRUE; + auto_size_ctl.apply_max_increment = true; auto_size_ctl.max_increment = (2 * 1024 * 1024); auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -20452,19 +20453,19 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.decrement = 0.5; - auto_size_ctl.apply_max_decrement = TRUE; + auto_size_ctl.apply_max_decrement = true; auto_size_ctl.max_decrement = (1 * 1024 * 1024); auto_size_ctl.epochs_before_eviction = 1; - auto_size_ctl.apply_empty_reserve = TRUE; + auto_size_ctl.apply_empty_reserve = true; auto_size_ctl.empty_reserve = 1.0; /* disable decrement */ result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 9.\n"; } } @@ -20474,7 +20475,7 @@ check_auto_cache_resize_disable(unsigned paged) if ((cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "bad cache size after set resize re-config 8.\n"; } } @@ -20485,7 +20486,7 @@ check_auto_cache_resize_disable(unsigned paged) if (pass) { /* flush the cache and destroy all entries so we start from a known point */ - flush_cache(file_ptr, TRUE, FALSE, FALSE); + flush_cache(file_ptr, true, false, false); } if (show_progress) @@ -20496,7 +20497,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, SMALL_ENTRY_TYPE, i); @@ -20511,7 +20512,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 24.\n"; } } @@ -20523,7 +20524,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 1000; while (pass && (i < 2000)) { protect_entry(file_ptr, SMALL_ENTRY_TYPE, i); @@ -20538,7 +20539,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 25.\n"; } } @@ -20552,7 +20553,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, SMALL_ENTRY_TYPE, i); @@ -20567,7 +20568,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 26.\n"; } } @@ -20579,7 +20580,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i); @@ -20594,7 +20595,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (6 * 1024 * 1024)) || (cache_ptr->min_clean_size != (3 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 27.\n"; } } @@ -20609,7 +20610,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -20624,7 +20625,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (6 * 1024 * 1024)) || (cache_ptr->min_clean_size != (3 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 28.\n"; } } @@ -20647,7 +20648,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; auto_size_ctl.rpt_fcn = test_rpt_fcn; - auto_size_ctl.set_initial_size = TRUE; + auto_size_ctl.set_initial_size = true; auto_size_ctl.initial_size = 4 * 1024 * 1024; auto_size_ctl.min_clean_fraction = 0.5; @@ -20663,7 +20664,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.increment = 2.0; - auto_size_ctl.apply_max_increment = TRUE; + auto_size_ctl.apply_max_increment = true; auto_size_ctl.max_increment = (2 * 1024 * 1024); auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -20676,19 +20677,19 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.decrement = 0.5; - auto_size_ctl.apply_max_decrement = TRUE; + auto_size_ctl.apply_max_decrement = true; auto_size_ctl.max_decrement = (1 * 1024 * 1024); auto_size_ctl.epochs_before_eviction = 1; - auto_size_ctl.apply_empty_reserve = TRUE; + auto_size_ctl.apply_empty_reserve = true; auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 10.\n"; } } @@ -20698,7 +20699,7 @@ check_auto_cache_resize_disable(unsigned paged) if ((cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "bad cache size after set resize re-config 9.\n"; } } @@ -20709,7 +20710,7 @@ check_auto_cache_resize_disable(unsigned paged) if (pass) { /* flush the cache and destroy all entries so we start from a known point */ - flush_cache(file_ptr, TRUE, FALSE, FALSE); + flush_cache(file_ptr, true, false, false); } if (show_progress) @@ -20720,7 +20721,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, SMALL_ENTRY_TYPE, i); @@ -20735,7 +20736,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 29.\n"; } } @@ -20747,7 +20748,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 1000; while (pass && (i < 2000)) { protect_entry(file_ptr, SMALL_ENTRY_TYPE, i); @@ -20762,7 +20763,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 30.\n"; } } @@ -20778,7 +20779,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, SMALL_ENTRY_TYPE, i); @@ -20794,7 +20795,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->min_clean_size != (2 * 1024 * 1024)) || (cache_ptr->index_len != 2000) || (cache_ptr->index_size != 2000 * SMALL_ENTRY_SIZE)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 31.\n"; } } @@ -20806,7 +20807,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i); @@ -20821,7 +20822,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (6 * 1024 * 1024)) || (cache_ptr->min_clean_size != (3 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 32.\n"; } } @@ -20838,7 +20839,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 999); @@ -20853,7 +20854,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->max_cache_size != (6 * 1024 * 1024)) || (cache_ptr->min_clean_size != (3 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 33.\n"; } } @@ -20873,7 +20874,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; auto_size_ctl.rpt_fcn = test_rpt_fcn; - auto_size_ctl.set_initial_size = TRUE; + auto_size_ctl.set_initial_size = true; auto_size_ctl.initial_size = 2 * 1024 * 1024; auto_size_ctl.min_clean_fraction = 0.5; @@ -20889,7 +20890,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.increment = 2.0; - auto_size_ctl.apply_max_increment = TRUE; + auto_size_ctl.apply_max_increment = true; auto_size_ctl.max_increment = (2 * 1024 * 1024); auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -20902,19 +20903,19 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.decrement = 0.5; - auto_size_ctl.apply_max_decrement = TRUE; + auto_size_ctl.apply_max_decrement = true; auto_size_ctl.max_decrement = (1 * 1024 * 1024); auto_size_ctl.epochs_before_eviction = 3; - auto_size_ctl.apply_empty_reserve = TRUE; + auto_size_ctl.apply_empty_reserve = true; auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 11.\n"; } } @@ -20924,7 +20925,7 @@ check_auto_cache_resize_disable(unsigned paged) if ((cache_ptr->max_cache_size != (2 * 1024 * 1024)) || (cache_ptr->min_clean_size != (1 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "bad cache size after set resize re-config 10.\n"; } } @@ -20937,7 +20938,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i); @@ -20952,7 +20953,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->size_decrease_possible) || (cache_ptr->max_cache_size != (2 * 1024 * 1024)) || (cache_ptr->min_clean_size != (1 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 34.\n"; } } @@ -20965,7 +20966,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -20980,7 +20981,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->size_decrease_possible) || (cache_ptr->max_cache_size != (2 * 1024 * 1024)) || (cache_ptr->min_clean_size != (1 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 35.\n"; } } @@ -20993,7 +20994,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; auto_size_ctl.rpt_fcn = test_rpt_fcn; - auto_size_ctl.set_initial_size = TRUE; + auto_size_ctl.set_initial_size = true; auto_size_ctl.initial_size = 4 * 1024 * 1024; auto_size_ctl.min_clean_fraction = 0.25; @@ -21009,7 +21010,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.increment = 1.0; /* disable size increment */ - auto_size_ctl.apply_max_increment = TRUE; + auto_size_ctl.apply_max_increment = true; auto_size_ctl.max_increment = (2 * 1024 * 1024); auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -21022,19 +21023,19 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.decrement = 1.0; /* disable size decrement */ - auto_size_ctl.apply_max_decrement = TRUE; + auto_size_ctl.apply_max_decrement = true; auto_size_ctl.max_decrement = (1 * 1024 * 1024); auto_size_ctl.epochs_before_eviction = 3; - auto_size_ctl.apply_empty_reserve = TRUE; + auto_size_ctl.apply_empty_reserve = true; auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 12.\n"; } } @@ -21044,7 +21045,7 @@ check_auto_cache_resize_disable(unsigned paged) if ((cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (1 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "bad cache size after set resize re-config 11.\n"; } } @@ -21057,7 +21058,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i); @@ -21072,7 +21073,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->size_decrease_possible) || (cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (1 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 36.\n"; } } @@ -21085,7 +21086,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -21100,7 +21101,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->size_decrease_possible) || (cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (1 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 37.\n"; } } @@ -21113,7 +21114,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; auto_size_ctl.rpt_fcn = test_rpt_fcn; - auto_size_ctl.set_initial_size = FALSE; + auto_size_ctl.set_initial_size = false; auto_size_ctl.initial_size = 2 * 1024 * 1024; auto_size_ctl.min_clean_fraction = 0.5; @@ -21129,7 +21130,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.increment = 2.0; - auto_size_ctl.apply_max_increment = TRUE; + auto_size_ctl.apply_max_increment = true; auto_size_ctl.max_increment = (2 * 1024 * 1024); auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -21142,19 +21143,19 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.decrement = 0.5; - auto_size_ctl.apply_max_decrement = TRUE; + auto_size_ctl.apply_max_decrement = true; auto_size_ctl.max_decrement = (1 * 1024 * 1024); auto_size_ctl.epochs_before_eviction = 3; - auto_size_ctl.apply_empty_reserve = TRUE; + auto_size_ctl.apply_empty_reserve = true; auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 13.\n"; } } @@ -21164,7 +21165,7 @@ check_auto_cache_resize_disable(unsigned paged) if ((cache_ptr->max_cache_size != (6 * 1024 * 1024)) || (cache_ptr->min_clean_size != (3 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "bad cache size after set resize re-config 12.\n"; } } @@ -21177,7 +21178,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i); @@ -21192,7 +21193,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->size_decrease_possible) || (cache_ptr->max_cache_size != (6 * 1024 * 1024)) || (cache_ptr->min_clean_size != (3 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 38.\n"; } } @@ -21205,7 +21206,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -21220,7 +21221,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->size_decrease_possible) || (cache_ptr->max_cache_size != (6 * 1024 * 1024)) || (cache_ptr->min_clean_size != (3 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 39.\n"; } } @@ -21233,7 +21234,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; auto_size_ctl.rpt_fcn = test_rpt_fcn; - auto_size_ctl.set_initial_size = TRUE; + auto_size_ctl.set_initial_size = true; auto_size_ctl.initial_size = 4 * 1024 * 1024; auto_size_ctl.min_clean_fraction = 0.25; @@ -21249,7 +21250,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.increment = 1.0; /* disable size increment */ - auto_size_ctl.apply_max_increment = TRUE; + auto_size_ctl.apply_max_increment = true; auto_size_ctl.max_increment = (2 * 1024 * 1024); auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -21262,19 +21263,19 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.decrement = 0.5; - auto_size_ctl.apply_max_decrement = TRUE; + auto_size_ctl.apply_max_decrement = true; auto_size_ctl.max_decrement = (1 * 1024 * 1024); auto_size_ctl.epochs_before_eviction = 3; - auto_size_ctl.apply_empty_reserve = TRUE; + auto_size_ctl.apply_empty_reserve = true; auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 14.\n"; } } @@ -21284,7 +21285,7 @@ check_auto_cache_resize_disable(unsigned paged) if ((cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (1 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "bad cache size after set resize re-config 13.\n"; } } @@ -21297,7 +21298,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i); @@ -21312,7 +21313,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->size_decrease_possible) || (cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (1 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 40.\n"; } } @@ -21325,7 +21326,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -21340,7 +21341,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->size_decrease_possible) || (cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (1 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 41.\n"; } } @@ -21353,7 +21354,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; auto_size_ctl.rpt_fcn = test_rpt_fcn; - auto_size_ctl.set_initial_size = TRUE; + auto_size_ctl.set_initial_size = true; auto_size_ctl.initial_size = 4 * 1024 * 1024; auto_size_ctl.min_clean_fraction = 0.5; @@ -21369,7 +21370,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.increment = 2.0; - auto_size_ctl.apply_max_increment = TRUE; + auto_size_ctl.apply_max_increment = true; auto_size_ctl.max_increment = (2 * 1024 * 1024); auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -21382,19 +21383,19 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.decrement = 1.0; /* disable size decrement */ - auto_size_ctl.apply_max_decrement = TRUE; + auto_size_ctl.apply_max_decrement = true; auto_size_ctl.max_decrement = (1 * 1024 * 1024); auto_size_ctl.epochs_before_eviction = 3; - auto_size_ctl.apply_empty_reserve = TRUE; + auto_size_ctl.apply_empty_reserve = true; auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 15.\n"; } } @@ -21404,7 +21405,7 @@ check_auto_cache_resize_disable(unsigned paged) if ((cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "bad cache size after set resize re-config 14.\n"; } } @@ -21417,7 +21418,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i); @@ -21432,7 +21433,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->size_decrease_possible) || (cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 42.\n"; } } @@ -21445,7 +21446,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -21460,7 +21461,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->size_decrease_possible) || (cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 43.\n"; } } @@ -21473,7 +21474,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; auto_size_ctl.rpt_fcn = test_rpt_fcn; - auto_size_ctl.set_initial_size = TRUE; + auto_size_ctl.set_initial_size = true; auto_size_ctl.initial_size = 4 * 1024 * 1024; auto_size_ctl.min_clean_fraction = 0.5; @@ -21489,7 +21490,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.increment = 2.0; - auto_size_ctl.apply_max_increment = TRUE; + auto_size_ctl.apply_max_increment = true; auto_size_ctl.max_increment = (2 * 1024 * 1024); auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -21502,19 +21503,19 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.decrement = 0.5; - auto_size_ctl.apply_max_decrement = TRUE; + auto_size_ctl.apply_max_decrement = true; auto_size_ctl.max_decrement = (1 * 1024 * 1024); auto_size_ctl.epochs_before_eviction = 3; - auto_size_ctl.apply_empty_reserve = TRUE; + auto_size_ctl.apply_empty_reserve = true; auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 16.\n"; } } @@ -21524,7 +21525,7 @@ check_auto_cache_resize_disable(unsigned paged) if ((cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "bad cache size after set resize re-config 15.\n"; } } @@ -21537,7 +21538,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i); @@ -21552,7 +21553,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->size_decrease_possible) || (cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 44.\n"; } } @@ -21565,7 +21566,7 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); @@ -21580,7 +21581,7 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->size_decrease_possible) || (cache_ptr->max_cache_size != (4 * 1024 * 1024)) || (cache_ptr->min_clean_size != (2 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 45.\n"; } } @@ -21620,7 +21621,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; auto_size_ctl.rpt_fcn = test_rpt_fcn; - auto_size_ctl.set_initial_size = TRUE; + auto_size_ctl.set_initial_size = true; auto_size_ctl.initial_size = 64 * 1024; auto_size_ctl.min_clean_fraction = 0.5; @@ -21636,7 +21637,7 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.increment = 2.0; - auto_size_ctl.apply_max_increment = TRUE; + auto_size_ctl.apply_max_increment = true; auto_size_ctl.max_increment = (2 * 1024); auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -21649,19 +21650,19 @@ check_auto_cache_resize_disable(unsigned paged) auto_size_ctl.decrement = 0.5; - auto_size_ctl.apply_max_decrement = TRUE; + auto_size_ctl.apply_max_decrement = true; auto_size_ctl.max_decrement = (1 * 1024); auto_size_ctl.epochs_before_eviction = 3; - auto_size_ctl.apply_empty_reserve = TRUE; + auto_size_ctl.apply_empty_reserve = true; auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 17.\n"; } } @@ -21670,7 +21671,7 @@ check_auto_cache_resize_disable(unsigned paged) if ((cache_ptr->max_cache_size != (64 * 1024)) || (cache_ptr->min_clean_size != (32 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "bad cache size after set resize re-config 16.\n"; } } @@ -21681,14 +21682,14 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; protect_entry(file_ptr, LARGE_ENTRY_TYPE, 0); unprotect_entry(file_ptr, LARGE_ENTRY_TYPE, 0, H5C__NO_FLAGS_SET); if (pass && (((cache_ptr->max_cache_size != (64 * 1024)) || (cache_ptr->min_clean_size != (32 * 1024)) || (cache_ptr->index_len != 1) || - (cache_ptr->index_size != LARGE_ENTRY_SIZE) || (rpt_fcn_called != FALSE)))) { + (cache_ptr->index_size != LARGE_ENTRY_SIZE) || (rpt_fcn_called != false)))) { fprintf(stdout, "\nmax_cache_size = %ld.\n", (long)(cache_ptr->max_cache_size)); fprintf(stdout, "min_clean_size = %ld.\n", (long)(cache_ptr->min_clean_size)); @@ -21696,7 +21697,7 @@ check_auto_cache_resize_disable(unsigned paged) fprintf(stdout, "index_size = %ld.\n", (long)(cache_ptr->index_size)); fprintf(stdout, "rpt_fcn_called = %ld.\n", (long)(rpt_fcn_called)); - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 46.\n"; } } @@ -21713,14 +21714,14 @@ check_auto_cache_resize_disable(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0); unprotect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0, H5C__NO_FLAGS_SET); if (pass && (((cache_ptr->max_cache_size != (64 * 1024)) || (cache_ptr->min_clean_size != (32 * 1024)) || (cache_ptr->index_len != 1) || - (cache_ptr->index_size != MONSTER_ENTRY_SIZE) || (rpt_fcn_called != FALSE)))) { + (cache_ptr->index_size != MONSTER_ENTRY_SIZE) || (rpt_fcn_called != false)))) { fprintf(stdout, "\nmax_cache_size = %ld.\n", (long)(cache_ptr->max_cache_size)); fprintf(stdout, "min_clean_size = %ld.\n", (long)(cache_ptr->min_clean_size)); @@ -21728,7 +21729,7 @@ check_auto_cache_resize_disable(unsigned paged) fprintf(stdout, "index_size = %ld.\n", (long)(cache_ptr->index_size)); fprintf(stdout, "rpt_fcn_called = %ld.\n", (long)(rpt_fcn_called)); - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 47.\n"; } } @@ -21738,7 +21739,7 @@ check_auto_cache_resize_disable(unsigned paged) if (pass) { - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); } if (show_progress) @@ -21774,7 +21775,7 @@ check_auto_cache_resize_disable(unsigned paged) static unsigned check_auto_cache_resize_epoch_markers(unsigned paged) { - hbool_t show_progress = FALSE; + bool show_progress = false; herr_t result; int32_t i; int32_t j; @@ -21785,7 +21786,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) /* int32_t version = */ H5C__CURR_AUTO_SIZE_CTL_VER, /* H5C_auto_resize_report_fcn rpt_fcn = */ test_rpt_fcn, - /* hbool_t set_initial_size = */ TRUE, + /* bool set_initial_size = */ true, /* size_t initial_size = */ (512 * 1024), /* double min_clean_fraction = */ 0.5, @@ -21801,7 +21802,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) /* double increment = */ 2.0, - /* hbool_t apply_max_increment = */ TRUE, + /* bool apply_max_increment = */ true, /* size_t max_increment = */ (4 * 1024 * 1024), /* enum H5C_cache_flash_incr_mode */ @@ -21815,12 +21816,12 @@ check_auto_cache_resize_epoch_markers(unsigned paged) /* double decrement = */ 0.1, - /* hbool_t apply_max_decrement = */ TRUE, + /* bool apply_max_decrement = */ true, /* size_t max_decrement = */ (1 * 1024 * 1024), /* int32_t epochs_before_eviction = */ 3, - /* hbool_t apply_empty_reserve = */ TRUE, + /* bool apply_empty_reserve = */ true, /* double empty_reserve = */ 0.05}; if (paged) @@ -21828,7 +21829,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) else TESTING("automatic cache resize epoch marker management"); - pass = TRUE; + pass = true; if (show_progress) fprintf(stderr, "check point %d\n", checkpoint++); @@ -21847,7 +21848,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 1.\n"; } } @@ -21856,7 +21857,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) if ((cache_ptr->max_cache_size != (512 * 1024)) || (cache_ptr->min_clean_size != (256 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "bad cache size after initialization.\n"; } } @@ -21872,7 +21873,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; auto_size_ctl.rpt_fcn = test_rpt_fcn; - auto_size_ctl.set_initial_size = TRUE; + auto_size_ctl.set_initial_size = true; auto_size_ctl.initial_size = 8 * 1024 * 1024; auto_size_ctl.min_clean_fraction = 0.5; @@ -21888,7 +21889,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) auto_size_ctl.increment = 2.0; - auto_size_ctl.apply_max_increment = TRUE; + auto_size_ctl.apply_max_increment = true; auto_size_ctl.max_increment = (4 * 1024 * 1024); auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -21901,19 +21902,19 @@ check_auto_cache_resize_epoch_markers(unsigned paged) auto_size_ctl.decrement = 0.5; - auto_size_ctl.apply_max_decrement = FALSE; + auto_size_ctl.apply_max_decrement = false; auto_size_ctl.max_decrement = (1 * 1024 * 1024); auto_size_ctl.epochs_before_eviction = 10; - auto_size_ctl.apply_empty_reserve = FALSE; + auto_size_ctl.apply_empty_reserve = false; auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 2.\n"; } } @@ -21923,7 +21924,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) if ((cache_ptr->max_cache_size != (8 * 1024 * 1024)) || (cache_ptr->min_clean_size != (4 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "bad cache size after set resize re-config 1.\n"; } } @@ -21939,14 +21940,14 @@ check_auto_cache_resize_epoch_markers(unsigned paged) if (cache_ptr->epoch_markers_active != 0) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected # of epoch markers 1.\n"; } } if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, MEDIUM_ENTRY_TYPE, i); @@ -21962,7 +21963,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) (cache_ptr->min_clean_size != (4 * 1024 * 1024)) || (cache_ptr->index_size != (1 * 1000 * MEDIUM_ENTRY_SIZE))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 0.\n"; } } @@ -21975,7 +21976,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) j = 2; while (pass && (j <= 10)) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = (j - 2) * 1000; while (pass && (i < (j - 1) * 1000)) { protect_entry(file_ptr, SMALL_ENTRY_TYPE, i); @@ -21988,7 +21989,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) if ((!rpt_fcn_called) || (rpt_status != in_spec) || (cache_ptr->epoch_markers_active != j)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected # of epoch markers 2.\n"; } @@ -22004,7 +22005,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 9000; while (pass && (i < 10000)) { protect_entry(file_ptr, SMALL_ENTRY_TYPE, i); @@ -22020,7 +22021,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) (cache_ptr->min_clean_size != ((10 * 1000 * SMALL_ENTRY_SIZE + MEDIUM_ENTRY_SIZE) / 2)) || (cache_ptr->index_size != (10 * 1000 * SMALL_ENTRY_SIZE + MEDIUM_ENTRY_SIZE))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 1.\n"; } } @@ -22036,7 +22037,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; auto_size_ctl.rpt_fcn = test_rpt_fcn; - auto_size_ctl.set_initial_size = TRUE; + auto_size_ctl.set_initial_size = true; auto_size_ctl.initial_size = 8 * 1024 * 1024; auto_size_ctl.min_clean_fraction = 0.5; @@ -22052,7 +22053,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) auto_size_ctl.increment = 2.0; - auto_size_ctl.apply_max_increment = TRUE; + auto_size_ctl.apply_max_increment = true; auto_size_ctl.max_increment = (4 * 1024 * 1024); auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -22065,19 +22066,19 @@ check_auto_cache_resize_epoch_markers(unsigned paged) auto_size_ctl.decrement = 0.5; - auto_size_ctl.apply_max_decrement = FALSE; + auto_size_ctl.apply_max_decrement = false; auto_size_ctl.max_decrement = (1 * 1024 * 1024); auto_size_ctl.epochs_before_eviction = 1; - auto_size_ctl.apply_empty_reserve = FALSE; + auto_size_ctl.apply_empty_reserve = false; auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 3.\n"; } } @@ -22087,7 +22088,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) if ((cache_ptr->max_cache_size != (8 * 1024 * 1024)) || (cache_ptr->min_clean_size != (4 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "bad cache size after set resize re-config 2.\n"; } } @@ -22101,7 +22102,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) if (cache_ptr->epoch_markers_active != 1) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected # of epoch markers 3.\n"; } } @@ -22112,7 +22113,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) */ if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 9000; while (pass && (i < 10000)) { protect_entry(file_ptr, SMALL_ENTRY_TYPE, i); @@ -22127,7 +22128,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) (cache_ptr->min_clean_size != (256 * 1024)) || (cache_ptr->index_size != (1 * 1000 * SMALL_ENTRY_SIZE))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 2.\n"; } } @@ -22141,7 +22142,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) if (cache_ptr->epoch_markers_active != 1) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected # of epoch markers 4.\n"; } } @@ -22154,7 +22155,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; auto_size_ctl.rpt_fcn = test_rpt_fcn; - auto_size_ctl.set_initial_size = TRUE; + auto_size_ctl.set_initial_size = true; auto_size_ctl.initial_size = 8 * 1024 * 1024; auto_size_ctl.min_clean_fraction = 0.5; @@ -22170,7 +22171,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) auto_size_ctl.increment = 2.0; - auto_size_ctl.apply_max_increment = TRUE; + auto_size_ctl.apply_max_increment = true; auto_size_ctl.max_increment = (4 * 1024 * 1024); auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -22183,19 +22184,19 @@ check_auto_cache_resize_epoch_markers(unsigned paged) auto_size_ctl.decrement = 0.5; - auto_size_ctl.apply_max_decrement = FALSE; + auto_size_ctl.apply_max_decrement = false; auto_size_ctl.max_decrement = (1 * 1024 * 1024); auto_size_ctl.epochs_before_eviction = 1; - auto_size_ctl.apply_empty_reserve = FALSE; + auto_size_ctl.apply_empty_reserve = false; auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 4.\n"; } } @@ -22205,7 +22206,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) if ((cache_ptr->max_cache_size != (8 * 1024 * 1024)) || (cache_ptr->min_clean_size != (4 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "bad cache size after set resize re-config 3.\n"; } } @@ -22216,7 +22217,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) if (cache_ptr->epoch_markers_active != 0) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected # of epoch markers 5.\n"; } } @@ -22232,7 +22233,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; auto_size_ctl.rpt_fcn = test_rpt_fcn; - auto_size_ctl.set_initial_size = TRUE; + auto_size_ctl.set_initial_size = true; auto_size_ctl.initial_size = 8 * 1024 * 1024; auto_size_ctl.min_clean_fraction = 0.5; @@ -22248,7 +22249,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) auto_size_ctl.increment = 2.0; - auto_size_ctl.apply_max_increment = TRUE; + auto_size_ctl.apply_max_increment = true; auto_size_ctl.max_increment = (4 * 1024 * 1024); auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -22261,19 +22262,19 @@ check_auto_cache_resize_epoch_markers(unsigned paged) auto_size_ctl.decrement = 0.5; - auto_size_ctl.apply_max_decrement = FALSE; + auto_size_ctl.apply_max_decrement = false; auto_size_ctl.max_decrement = (1 * 1024 * 1024); auto_size_ctl.epochs_before_eviction = 10; - auto_size_ctl.apply_empty_reserve = FALSE; + auto_size_ctl.apply_empty_reserve = false; auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 5.\n"; } } @@ -22284,7 +22285,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) if (cache_ptr->epoch_markers_active != 0) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected # of epoch markers 6.\n"; } } @@ -22298,7 +22299,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) j = 1; while (pass && (j <= 10)) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = (j - 1) * 1000; while (pass && (i < j * 1000)) { protect_entry(file_ptr, SMALL_ENTRY_TYPE, i); @@ -22311,7 +22312,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) if ((!rpt_fcn_called) || (rpt_status != in_spec) || (cache_ptr->epoch_markers_active != j)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected # of epoch markers 7.\n"; } @@ -22328,7 +22329,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) if (cache_ptr->epoch_markers_active != 10) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected # of epoch markers 8.\n"; } } @@ -22341,7 +22342,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; auto_size_ctl.rpt_fcn = test_rpt_fcn; - auto_size_ctl.set_initial_size = TRUE; + auto_size_ctl.set_initial_size = true; auto_size_ctl.initial_size = 8 * 1024 * 1024; auto_size_ctl.min_clean_fraction = 0.5; @@ -22357,7 +22358,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) auto_size_ctl.increment = 2.0; - auto_size_ctl.apply_max_increment = TRUE; + auto_size_ctl.apply_max_increment = true; auto_size_ctl.max_increment = (4 * 1024 * 1024); auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -22370,19 +22371,19 @@ check_auto_cache_resize_epoch_markers(unsigned paged) auto_size_ctl.decrement = 0.5; - auto_size_ctl.apply_max_decrement = FALSE; + auto_size_ctl.apply_max_decrement = false; auto_size_ctl.max_decrement = (1 * 1024 * 1024); auto_size_ctl.epochs_before_eviction = 10; - auto_size_ctl.apply_empty_reserve = FALSE; + auto_size_ctl.apply_empty_reserve = false; auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 6.\n"; } } @@ -22393,7 +22394,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) if (cache_ptr->epoch_markers_active != 0) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected # of epoch markers 9.\n"; } } @@ -22410,7 +22411,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) (cache_ptr->min_clean_size != (4 * 1024 * 1024)) || (cache_ptr->index_size != (10 * 1000 * SMALL_ENTRY_SIZE)) || (cache_ptr->index_len != 10000)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache size change results 3.\n"; } } @@ -22420,7 +22421,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) if (pass) { - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); } if (show_progress) @@ -22463,7 +22464,7 @@ check_auto_cache_resize_input_errs(unsigned paged) /* int32_t version = */ H5C__CURR_AUTO_SIZE_CTL_VER, /* H5C_auto_resize_report_fcn rpt_fcn = */ test_rpt_fcn, - /* hbool_t set_initial_size = */ TRUE, + /* bool set_initial_size = */ true, /* size_t initial_size = */ (512 * 1024), /* double min_clean_fraction = */ 0.5, @@ -22479,7 +22480,7 @@ check_auto_cache_resize_input_errs(unsigned paged) /* double increment = */ 2.0, - /* hbool_t apply_max_increment = */ TRUE, + /* bool apply_max_increment = */ true, /* size_t max_increment = */ (4 * 1024 * 1024), /* enum H5C_cache_flash_incr_mode */ @@ -22493,12 +22494,12 @@ check_auto_cache_resize_input_errs(unsigned paged) /* double decrement = */ 0.1, - /* hbool_t apply_max_decrement = */ TRUE, + /* bool apply_max_decrement = */ true, /* size_t max_decrement = */ (1 * 1024 * 1024), /* int32_t epochs_before_eviction = */ 3, - /* hbool_t apply_empty_reserve = */ TRUE, + /* bool apply_empty_reserve = */ true, /* double empty_reserve = */ 0.05}; H5C_auto_size_ctl_t invalid_auto_size_ctl; @@ -22509,7 +22510,7 @@ check_auto_cache_resize_input_errs(unsigned paged) else TESTING("automatic cache resize input errors"); - pass = TRUE; + pass = true; /* allocate a cache, and set a reference automatic cache control * configuration. Then feed H5C_set_cache_auto_resize_config() @@ -22531,7 +22532,7 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 1.\n"; } } @@ -22540,7 +22541,7 @@ check_auto_cache_resize_input_errs(unsigned paged) if ((cache_ptr->max_cache_size != (512 * 1024)) || (cache_ptr->min_clean_size != (256 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "bad cache size after initialization.\n"; } } @@ -22551,12 +22552,12 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed 1."; } - else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, FALSE)) { + else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, false)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected auto resize config 1."; } } @@ -22566,7 +22567,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; invalid_auto_size_ctl.rpt_fcn = NULL; - invalid_auto_size_ctl.set_initial_size = TRUE; + invalid_auto_size_ctl.set_initial_size = true; invalid_auto_size_ctl.initial_size = 4 * 1024 * 1024; invalid_auto_size_ctl.min_clean_fraction = 0.5; @@ -22582,7 +22583,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.increment = 2.0; - invalid_auto_size_ctl.apply_max_increment = TRUE; + invalid_auto_size_ctl.apply_max_increment = true; invalid_auto_size_ctl.max_increment = (2 * 1024 * 1024); invalid_auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -22595,19 +22596,19 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.decrement = 0.5; - invalid_auto_size_ctl.apply_max_decrement = TRUE; + invalid_auto_size_ctl.apply_max_decrement = true; invalid_auto_size_ctl.max_decrement = (1 * 1024 * 1024); invalid_auto_size_ctl.epochs_before_eviction = 3; - invalid_auto_size_ctl.apply_empty_reserve = TRUE; + invalid_auto_size_ctl.apply_empty_reserve = true; invalid_auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(NULL, &invalid_auto_size_ctl); if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config accepted NULL cache_ptr.\n"; } } @@ -22618,12 +22619,12 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed 2."; } - else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, FALSE)) { + else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, false)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected auto resize config 2."; } } @@ -22635,7 +22636,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.version = -1; /* INVALID */ invalid_auto_size_ctl.rpt_fcn = NULL; - invalid_auto_size_ctl.set_initial_size = TRUE; + invalid_auto_size_ctl.set_initial_size = true; invalid_auto_size_ctl.initial_size = 4 * 1024 * 1024; invalid_auto_size_ctl.min_clean_fraction = 0.5; @@ -22651,7 +22652,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.increment = 2.0; - invalid_auto_size_ctl.apply_max_increment = TRUE; + invalid_auto_size_ctl.apply_max_increment = true; invalid_auto_size_ctl.max_increment = (2 * 1024 * 1024); invalid_auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -22664,19 +22665,19 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.decrement = 0.5; - invalid_auto_size_ctl.apply_max_decrement = TRUE; + invalid_auto_size_ctl.apply_max_decrement = true; invalid_auto_size_ctl.max_decrement = (1 * 1024 * 1024); invalid_auto_size_ctl.epochs_before_eviction = 3; - invalid_auto_size_ctl.apply_empty_reserve = TRUE; + invalid_auto_size_ctl.apply_empty_reserve = true; invalid_auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &invalid_auto_size_ctl); if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config accepted bad version.\n"; } } @@ -22687,12 +22688,12 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed 3."; } - else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, FALSE)) { + else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, false)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected auto resize config 3."; } } @@ -22704,7 +22705,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; invalid_auto_size_ctl.rpt_fcn = NULL; - invalid_auto_size_ctl.set_initial_size = TRUE; + invalid_auto_size_ctl.set_initial_size = true; invalid_auto_size_ctl.initial_size = 16 * 1024 * 1024 + 1; /* INVALID */ @@ -22721,7 +22722,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.increment = 2.0; - invalid_auto_size_ctl.apply_max_increment = TRUE; + invalid_auto_size_ctl.apply_max_increment = true; invalid_auto_size_ctl.max_increment = (2 * 1024 * 1024); invalid_auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -22734,19 +22735,19 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.decrement = 0.5; - invalid_auto_size_ctl.apply_max_decrement = TRUE; + invalid_auto_size_ctl.apply_max_decrement = true; invalid_auto_size_ctl.max_decrement = (1 * 1024 * 1024); invalid_auto_size_ctl.epochs_before_eviction = 3; - invalid_auto_size_ctl.apply_empty_reserve = TRUE; + invalid_auto_size_ctl.apply_empty_reserve = true; invalid_auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &invalid_auto_size_ctl); if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config accepted bad init size 1.\n"; } } @@ -22757,12 +22758,12 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed 4."; } - else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, FALSE)) { + else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, false)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected auto resize config 4."; } } @@ -22772,7 +22773,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; invalid_auto_size_ctl.rpt_fcn = NULL; - invalid_auto_size_ctl.set_initial_size = TRUE; + invalid_auto_size_ctl.set_initial_size = true; invalid_auto_size_ctl.initial_size = 1 * 1024 * 1024 - 1; /* INVALID */ @@ -22789,7 +22790,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.increment = 2.0; - invalid_auto_size_ctl.apply_max_increment = TRUE; + invalid_auto_size_ctl.apply_max_increment = true; invalid_auto_size_ctl.max_increment = (2 * 1024 * 1024); invalid_auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -22802,19 +22803,19 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.decrement = 0.5; - invalid_auto_size_ctl.apply_max_decrement = TRUE; + invalid_auto_size_ctl.apply_max_decrement = true; invalid_auto_size_ctl.max_decrement = (1 * 1024 * 1024); invalid_auto_size_ctl.epochs_before_eviction = 3; - invalid_auto_size_ctl.apply_empty_reserve = TRUE; + invalid_auto_size_ctl.apply_empty_reserve = true; invalid_auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &invalid_auto_size_ctl); if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config accepted bad init size 2.\n"; } } @@ -22825,12 +22826,12 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed 5."; } - else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, FALSE)) { + else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, false)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected auto resize config 5."; } } @@ -22842,7 +22843,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; invalid_auto_size_ctl.rpt_fcn = NULL; - invalid_auto_size_ctl.set_initial_size = TRUE; + invalid_auto_size_ctl.set_initial_size = true; invalid_auto_size_ctl.initial_size = 4 * 1024 * 1024; invalid_auto_size_ctl.min_clean_fraction = 1.00001; /* INVALID */ @@ -22858,7 +22859,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.increment = 2.0; - invalid_auto_size_ctl.apply_max_increment = TRUE; + invalid_auto_size_ctl.apply_max_increment = true; invalid_auto_size_ctl.max_increment = (2 * 1024 * 1024); invalid_auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -22871,19 +22872,19 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.decrement = 0.5; - invalid_auto_size_ctl.apply_max_decrement = TRUE; + invalid_auto_size_ctl.apply_max_decrement = true; invalid_auto_size_ctl.max_decrement = (1 * 1024 * 1024); invalid_auto_size_ctl.epochs_before_eviction = 3; - invalid_auto_size_ctl.apply_empty_reserve = TRUE; + invalid_auto_size_ctl.apply_empty_reserve = true; invalid_auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &invalid_auto_size_ctl); if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config accepted bad min clean frac 1.\n"; } } @@ -22894,12 +22895,12 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed 6."; } - else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, FALSE)) { + else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, false)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected auto resize config 6."; } } @@ -22909,7 +22910,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; invalid_auto_size_ctl.rpt_fcn = NULL; - invalid_auto_size_ctl.set_initial_size = TRUE; + invalid_auto_size_ctl.set_initial_size = true; invalid_auto_size_ctl.initial_size = 4 * 1024 * 1024; invalid_auto_size_ctl.min_clean_fraction = -0.00001; /* INVALID */ @@ -22925,7 +22926,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.increment = 2.0; - invalid_auto_size_ctl.apply_max_increment = TRUE; + invalid_auto_size_ctl.apply_max_increment = true; invalid_auto_size_ctl.max_increment = (2 * 1024 * 1024); invalid_auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -22938,19 +22939,19 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.decrement = 0.5; - invalid_auto_size_ctl.apply_max_decrement = TRUE; + invalid_auto_size_ctl.apply_max_decrement = true; invalid_auto_size_ctl.max_decrement = (1 * 1024 * 1024); invalid_auto_size_ctl.epochs_before_eviction = 3; - invalid_auto_size_ctl.apply_empty_reserve = TRUE; + invalid_auto_size_ctl.apply_empty_reserve = true; invalid_auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &invalid_auto_size_ctl); if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config accepted bad min clean frac 2.\n"; } } @@ -22961,12 +22962,12 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed 7."; } - else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, FALSE)) { + else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, false)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected auto resize config 7."; } } @@ -22978,7 +22979,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; invalid_auto_size_ctl.rpt_fcn = NULL; - invalid_auto_size_ctl.set_initial_size = TRUE; + invalid_auto_size_ctl.set_initial_size = true; invalid_auto_size_ctl.initial_size = 4 * 1024 * 1024; invalid_auto_size_ctl.min_clean_fraction = 0.5; @@ -22995,7 +22996,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.increment = 2.0; - invalid_auto_size_ctl.apply_max_increment = TRUE; + invalid_auto_size_ctl.apply_max_increment = true; invalid_auto_size_ctl.max_increment = (2 * 1024 * 1024); invalid_auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -23008,19 +23009,19 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.decrement = 0.5; - invalid_auto_size_ctl.apply_max_decrement = TRUE; + invalid_auto_size_ctl.apply_max_decrement = true; invalid_auto_size_ctl.max_decrement = (1 * 1024 * 1024); invalid_auto_size_ctl.epochs_before_eviction = 3; - invalid_auto_size_ctl.apply_empty_reserve = TRUE; + invalid_auto_size_ctl.apply_empty_reserve = true; invalid_auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &invalid_auto_size_ctl); if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config accepted bad max_size.\n"; } } @@ -23031,12 +23032,12 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed 8."; } - else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, FALSE)) { + else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, false)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected auto resize config 8."; } } @@ -23046,7 +23047,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; invalid_auto_size_ctl.rpt_fcn = NULL; - invalid_auto_size_ctl.set_initial_size = TRUE; + invalid_auto_size_ctl.set_initial_size = true; invalid_auto_size_ctl.initial_size = 4 * 1024 * 1024; invalid_auto_size_ctl.min_clean_fraction = 0.5; @@ -23062,7 +23063,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.increment = 2.0; - invalid_auto_size_ctl.apply_max_increment = TRUE; + invalid_auto_size_ctl.apply_max_increment = true; invalid_auto_size_ctl.max_increment = (2 * 1024 * 1024); invalid_auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -23075,19 +23076,19 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.decrement = 0.5; - invalid_auto_size_ctl.apply_max_decrement = TRUE; + invalid_auto_size_ctl.apply_max_decrement = true; invalid_auto_size_ctl.max_decrement = (1 * 1024 * 1024); invalid_auto_size_ctl.epochs_before_eviction = 3; - invalid_auto_size_ctl.apply_empty_reserve = TRUE; + invalid_auto_size_ctl.apply_empty_reserve = true; invalid_auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &invalid_auto_size_ctl); if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config accepted bad size pair.\n"; } } @@ -23098,12 +23099,12 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed 9."; } - else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, FALSE)) { + else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, false)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected auto resize config 9."; } } @@ -23113,7 +23114,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; invalid_auto_size_ctl.rpt_fcn = NULL; - invalid_auto_size_ctl.set_initial_size = TRUE; + invalid_auto_size_ctl.set_initial_size = true; invalid_auto_size_ctl.initial_size = 4 * 1024 * 1024; invalid_auto_size_ctl.min_clean_fraction = 0.5; @@ -23129,7 +23130,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.increment = 2.0; - invalid_auto_size_ctl.apply_max_increment = TRUE; + invalid_auto_size_ctl.apply_max_increment = true; invalid_auto_size_ctl.max_increment = (2 * 1024 * 1024); invalid_auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -23142,19 +23143,19 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.decrement = 0.5; - invalid_auto_size_ctl.apply_max_decrement = TRUE; + invalid_auto_size_ctl.apply_max_decrement = true; invalid_auto_size_ctl.max_decrement = (1 * 1024 * 1024); invalid_auto_size_ctl.epochs_before_eviction = 3; - invalid_auto_size_ctl.apply_empty_reserve = TRUE; + invalid_auto_size_ctl.apply_empty_reserve = true; invalid_auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &invalid_auto_size_ctl); if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config accepted bad min_size.\n"; } } @@ -23165,12 +23166,12 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed 10."; } - else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, FALSE)) { + else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, false)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected auto resize config 10."; } } @@ -23182,7 +23183,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; invalid_auto_size_ctl.rpt_fcn = NULL; - invalid_auto_size_ctl.set_initial_size = TRUE; + invalid_auto_size_ctl.set_initial_size = true; invalid_auto_size_ctl.initial_size = 4 * 1024 * 1024; invalid_auto_size_ctl.min_clean_fraction = 0.1; @@ -23199,7 +23200,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.increment = 2.0; - invalid_auto_size_ctl.apply_max_increment = TRUE; + invalid_auto_size_ctl.apply_max_increment = true; invalid_auto_size_ctl.max_increment = (2 * 1024 * 1024); invalid_auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -23212,19 +23213,19 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.decrement = 0.9; - invalid_auto_size_ctl.apply_max_decrement = TRUE; + invalid_auto_size_ctl.apply_max_decrement = true; invalid_auto_size_ctl.max_decrement = (1 * 1024 * 1024); invalid_auto_size_ctl.epochs_before_eviction = 3; - invalid_auto_size_ctl.apply_empty_reserve = TRUE; + invalid_auto_size_ctl.apply_empty_reserve = true; invalid_auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &invalid_auto_size_ctl); if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config accepted bad epoch len 1.\n"; } } @@ -23235,12 +23236,12 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed 11."; } - else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, FALSE)) { + else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, false)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected auto resize config 11."; } } @@ -23250,7 +23251,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; invalid_auto_size_ctl.rpt_fcn = NULL; - invalid_auto_size_ctl.set_initial_size = TRUE; + invalid_auto_size_ctl.set_initial_size = true; invalid_auto_size_ctl.initial_size = 4 * 1024 * 1024; invalid_auto_size_ctl.min_clean_fraction = 0.1; @@ -23267,7 +23268,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.increment = 2.0; - invalid_auto_size_ctl.apply_max_increment = TRUE; + invalid_auto_size_ctl.apply_max_increment = true; invalid_auto_size_ctl.max_increment = (2 * 1024 * 1024); invalid_auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -23280,19 +23281,19 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.decrement = 0.9; - invalid_auto_size_ctl.apply_max_decrement = TRUE; + invalid_auto_size_ctl.apply_max_decrement = true; invalid_auto_size_ctl.max_decrement = (1 * 1024 * 1024); invalid_auto_size_ctl.epochs_before_eviction = 3; - invalid_auto_size_ctl.apply_empty_reserve = TRUE; + invalid_auto_size_ctl.apply_empty_reserve = true; invalid_auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &invalid_auto_size_ctl); if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config accepted bad epoch len 2.\n"; } } @@ -23303,12 +23304,12 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed 12."; } - else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, FALSE)) { + else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, false)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected auto resize config 12."; } } @@ -23320,7 +23321,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; invalid_auto_size_ctl.rpt_fcn = NULL; - invalid_auto_size_ctl.set_initial_size = TRUE; + invalid_auto_size_ctl.set_initial_size = true; invalid_auto_size_ctl.initial_size = 4 * 1024 * 1024; invalid_auto_size_ctl.min_clean_fraction = 0.1; @@ -23336,7 +23337,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.increment = 2.0; - invalid_auto_size_ctl.apply_max_increment = TRUE; + invalid_auto_size_ctl.apply_max_increment = true; invalid_auto_size_ctl.max_increment = (2 * 1024 * 1024); invalid_auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -23349,19 +23350,19 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.decrement = 0.9; - invalid_auto_size_ctl.apply_max_decrement = TRUE; + invalid_auto_size_ctl.apply_max_decrement = true; invalid_auto_size_ctl.max_decrement = (1 * 1024 * 1024); invalid_auto_size_ctl.epochs_before_eviction = 3; - invalid_auto_size_ctl.apply_empty_reserve = TRUE; + invalid_auto_size_ctl.apply_empty_reserve = true; invalid_auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &invalid_auto_size_ctl); if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config accepted bad incr_mode 1.\n"; } } @@ -23372,12 +23373,12 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed 13."; } - else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, FALSE)) { + else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, false)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected auto resize config 13."; } } @@ -23387,7 +23388,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; invalid_auto_size_ctl.rpt_fcn = NULL; - invalid_auto_size_ctl.set_initial_size = TRUE; + invalid_auto_size_ctl.set_initial_size = true; invalid_auto_size_ctl.initial_size = 4 * 1024 * 1024; invalid_auto_size_ctl.min_clean_fraction = 0.1; @@ -23403,7 +23404,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.increment = 2.0; - invalid_auto_size_ctl.apply_max_increment = TRUE; + invalid_auto_size_ctl.apply_max_increment = true; invalid_auto_size_ctl.max_increment = (2 * 1024 * 1024); invalid_auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -23416,19 +23417,19 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.decrement = 0.9; - invalid_auto_size_ctl.apply_max_decrement = TRUE; + invalid_auto_size_ctl.apply_max_decrement = true; invalid_auto_size_ctl.max_decrement = (1 * 1024 * 1024); invalid_auto_size_ctl.epochs_before_eviction = 3; - invalid_auto_size_ctl.apply_empty_reserve = TRUE; + invalid_auto_size_ctl.apply_empty_reserve = true; invalid_auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &invalid_auto_size_ctl); if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config accepted bad incr_mode 2.\n"; } } @@ -23439,12 +23440,12 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed 14."; } - else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, FALSE)) { + else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, false)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected auto resize config 14."; } } @@ -23456,7 +23457,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; invalid_auto_size_ctl.rpt_fcn = NULL; - invalid_auto_size_ctl.set_initial_size = TRUE; + invalid_auto_size_ctl.set_initial_size = true; invalid_auto_size_ctl.initial_size = 4 * 1024 * 1024; invalid_auto_size_ctl.min_clean_fraction = 0.5; @@ -23472,7 +23473,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.increment = 2.0; - invalid_auto_size_ctl.apply_max_increment = TRUE; + invalid_auto_size_ctl.apply_max_increment = true; invalid_auto_size_ctl.max_increment = (2 * 1024 * 1024); invalid_auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -23485,19 +23486,19 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.decrement = 0.5; - invalid_auto_size_ctl.apply_max_decrement = TRUE; + invalid_auto_size_ctl.apply_max_decrement = true; invalid_auto_size_ctl.max_decrement = (1 * 1024 * 1024); invalid_auto_size_ctl.epochs_before_eviction = 3; - invalid_auto_size_ctl.apply_empty_reserve = TRUE; + invalid_auto_size_ctl.apply_empty_reserve = true; invalid_auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &invalid_auto_size_ctl); if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config accepted bad upper threshold.\n"; } } @@ -23508,12 +23509,12 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed 15."; } - else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, FALSE)) { + else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, false)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected auto resize config 15."; } } @@ -23523,7 +23524,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; invalid_auto_size_ctl.rpt_fcn = NULL; - invalid_auto_size_ctl.set_initial_size = TRUE; + invalid_auto_size_ctl.set_initial_size = true; invalid_auto_size_ctl.initial_size = 4 * 1024 * 1024; invalid_auto_size_ctl.min_clean_fraction = 0.5; @@ -23539,7 +23540,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.increment = 2.0; - invalid_auto_size_ctl.apply_max_increment = TRUE; + invalid_auto_size_ctl.apply_max_increment = true; invalid_auto_size_ctl.max_increment = (2 * 1024 * 1024); invalid_auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -23552,19 +23553,19 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.decrement = 0.5; - invalid_auto_size_ctl.apply_max_decrement = TRUE; + invalid_auto_size_ctl.apply_max_decrement = true; invalid_auto_size_ctl.max_decrement = (1 * 1024 * 1024); invalid_auto_size_ctl.epochs_before_eviction = 3; - invalid_auto_size_ctl.apply_empty_reserve = TRUE; + invalid_auto_size_ctl.apply_empty_reserve = true; invalid_auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &invalid_auto_size_ctl); if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config accepted bad threshold pair.\n"; } } @@ -23575,12 +23576,12 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed 16."; } - else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, FALSE)) { + else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, false)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected auto resize config 16."; } } @@ -23590,7 +23591,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; invalid_auto_size_ctl.rpt_fcn = NULL; - invalid_auto_size_ctl.set_initial_size = TRUE; + invalid_auto_size_ctl.set_initial_size = true; invalid_auto_size_ctl.initial_size = 4 * 1024 * 1024; invalid_auto_size_ctl.min_clean_fraction = 0.5; @@ -23606,7 +23607,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.increment = 2.0; - invalid_auto_size_ctl.apply_max_increment = TRUE; + invalid_auto_size_ctl.apply_max_increment = true; invalid_auto_size_ctl.max_increment = (2 * 1024 * 1024); invalid_auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -23619,19 +23620,19 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.decrement = 0.5; - invalid_auto_size_ctl.apply_max_decrement = TRUE; + invalid_auto_size_ctl.apply_max_decrement = true; invalid_auto_size_ctl.max_decrement = (1 * 1024 * 1024); invalid_auto_size_ctl.epochs_before_eviction = 3; - invalid_auto_size_ctl.apply_empty_reserve = TRUE; + invalid_auto_size_ctl.apply_empty_reserve = true; invalid_auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &invalid_auto_size_ctl); if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config accepted bad lower threshold.\n"; } } @@ -23642,12 +23643,12 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed 17."; } - else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, FALSE)) { + else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, false)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected auto resize config 17."; } } @@ -23659,7 +23660,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; invalid_auto_size_ctl.rpt_fcn = NULL; - invalid_auto_size_ctl.set_initial_size = TRUE; + invalid_auto_size_ctl.set_initial_size = true; invalid_auto_size_ctl.initial_size = 4 * 1024 * 1024; invalid_auto_size_ctl.min_clean_fraction = 0.1; @@ -23675,7 +23676,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.increment = 0.99999; /* INVALID */ - invalid_auto_size_ctl.apply_max_increment = TRUE; + invalid_auto_size_ctl.apply_max_increment = true; invalid_auto_size_ctl.max_increment = (2 * 1024 * 1024); invalid_auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -23688,19 +23689,19 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.decrement = 0.5; - invalid_auto_size_ctl.apply_max_decrement = TRUE; + invalid_auto_size_ctl.apply_max_decrement = true; invalid_auto_size_ctl.max_decrement = (1 * 1024 * 1024); invalid_auto_size_ctl.epochs_before_eviction = 3; - invalid_auto_size_ctl.apply_empty_reserve = TRUE; + invalid_auto_size_ctl.apply_empty_reserve = true; invalid_auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &invalid_auto_size_ctl); if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config accepted bad increment.\n"; } } @@ -23711,12 +23712,12 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed 18."; } - else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, FALSE)) { + else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, false)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected auto resize config 18."; } } @@ -23728,7 +23729,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; invalid_auto_size_ctl.rpt_fcn = NULL; - invalid_auto_size_ctl.set_initial_size = TRUE; + invalid_auto_size_ctl.set_initial_size = true; invalid_auto_size_ctl.initial_size = 4 * 1024 * 1024; invalid_auto_size_ctl.min_clean_fraction = 0.1; @@ -23744,7 +23745,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.increment = 2.0; - invalid_auto_size_ctl.apply_max_increment = TRUE; + invalid_auto_size_ctl.apply_max_increment = true; invalid_auto_size_ctl.max_increment = (2 * 1024 * 1024); invalid_auto_size_ctl.flash_incr_mode = (enum H5C_cache_flash_incr_mode) - 1; /* INVALID */ @@ -23757,19 +23758,19 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.decrement = 0.9; - invalid_auto_size_ctl.apply_max_decrement = TRUE; + invalid_auto_size_ctl.apply_max_decrement = true; invalid_auto_size_ctl.max_decrement = (1 * 1024 * 1024); invalid_auto_size_ctl.epochs_before_eviction = 3; - invalid_auto_size_ctl.apply_empty_reserve = TRUE; + invalid_auto_size_ctl.apply_empty_reserve = true; invalid_auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &invalid_auto_size_ctl); if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config accepted bad flash_incr_mode.\n"; } } @@ -23780,12 +23781,12 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed 19."; } - else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, FALSE)) { + else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, false)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected auto resize config 19."; } } @@ -23797,7 +23798,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; invalid_auto_size_ctl.rpt_fcn = NULL; - invalid_auto_size_ctl.set_initial_size = TRUE; + invalid_auto_size_ctl.set_initial_size = true; invalid_auto_size_ctl.initial_size = 4 * 1024 * 1024; invalid_auto_size_ctl.min_clean_fraction = 0.1; @@ -23813,7 +23814,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.increment = 2.0; - invalid_auto_size_ctl.apply_max_increment = TRUE; + invalid_auto_size_ctl.apply_max_increment = true; invalid_auto_size_ctl.max_increment = (2 * 1024 * 1024); invalid_auto_size_ctl.flash_incr_mode = H5C_flash_incr__add_space; @@ -23826,19 +23827,19 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.decrement = 0.9; - invalid_auto_size_ctl.apply_max_decrement = TRUE; + invalid_auto_size_ctl.apply_max_decrement = true; invalid_auto_size_ctl.max_decrement = (1 * 1024 * 1024); invalid_auto_size_ctl.epochs_before_eviction = 3; - invalid_auto_size_ctl.apply_empty_reserve = TRUE; + invalid_auto_size_ctl.apply_empty_reserve = true; invalid_auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &invalid_auto_size_ctl); if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config accepted bad flash_multiple(1).\n"; } } @@ -23849,12 +23850,12 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed 20."; } - else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, FALSE)) { + else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, false)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected auto resize config 20."; } } @@ -23864,7 +23865,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; invalid_auto_size_ctl.rpt_fcn = NULL; - invalid_auto_size_ctl.set_initial_size = TRUE; + invalid_auto_size_ctl.set_initial_size = true; invalid_auto_size_ctl.initial_size = 4 * 1024 * 1024; invalid_auto_size_ctl.min_clean_fraction = 0.1; @@ -23880,7 +23881,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.increment = 2.0; - invalid_auto_size_ctl.apply_max_increment = TRUE; + invalid_auto_size_ctl.apply_max_increment = true; invalid_auto_size_ctl.max_increment = (2 * 1024 * 1024); invalid_auto_size_ctl.flash_incr_mode = H5C_flash_incr__add_space; @@ -23893,19 +23894,19 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.decrement = 0.9; - invalid_auto_size_ctl.apply_max_decrement = TRUE; + invalid_auto_size_ctl.apply_max_decrement = true; invalid_auto_size_ctl.max_decrement = (1 * 1024 * 1024); invalid_auto_size_ctl.epochs_before_eviction = 3; - invalid_auto_size_ctl.apply_empty_reserve = TRUE; + invalid_auto_size_ctl.apply_empty_reserve = true; invalid_auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &invalid_auto_size_ctl); if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config accepted bad flash_multiple(2).\n"; } } @@ -23916,12 +23917,12 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed 21."; } - else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, FALSE)) { + else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, false)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected auto resize config 21."; } } @@ -23933,7 +23934,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; invalid_auto_size_ctl.rpt_fcn = NULL; - invalid_auto_size_ctl.set_initial_size = TRUE; + invalid_auto_size_ctl.set_initial_size = true; invalid_auto_size_ctl.initial_size = 4 * 1024 * 1024; invalid_auto_size_ctl.min_clean_fraction = 0.1; @@ -23949,7 +23950,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.increment = 2.0; - invalid_auto_size_ctl.apply_max_increment = TRUE; + invalid_auto_size_ctl.apply_max_increment = true; invalid_auto_size_ctl.max_increment = (2 * 1024 * 1024); invalid_auto_size_ctl.flash_incr_mode = H5C_flash_incr__add_space; @@ -23962,19 +23963,19 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.decrement = 0.9; - invalid_auto_size_ctl.apply_max_decrement = TRUE; + invalid_auto_size_ctl.apply_max_decrement = true; invalid_auto_size_ctl.max_decrement = (1 * 1024 * 1024); invalid_auto_size_ctl.epochs_before_eviction = 3; - invalid_auto_size_ctl.apply_empty_reserve = TRUE; + invalid_auto_size_ctl.apply_empty_reserve = true; invalid_auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &invalid_auto_size_ctl); if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config accepted bad flash_threshold(1).\n"; } } @@ -23985,12 +23986,12 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed 22."; } - else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, FALSE)) { + else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, false)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected auto resize config 22."; } } @@ -24000,7 +24001,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; invalid_auto_size_ctl.rpt_fcn = NULL; - invalid_auto_size_ctl.set_initial_size = TRUE; + invalid_auto_size_ctl.set_initial_size = true; invalid_auto_size_ctl.initial_size = 4 * 1024 * 1024; invalid_auto_size_ctl.min_clean_fraction = 0.1; @@ -24016,7 +24017,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.increment = 2.0; - invalid_auto_size_ctl.apply_max_increment = TRUE; + invalid_auto_size_ctl.apply_max_increment = true; invalid_auto_size_ctl.max_increment = (2 * 1024 * 1024); invalid_auto_size_ctl.flash_incr_mode = H5C_flash_incr__add_space; @@ -24029,19 +24030,19 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.decrement = 0.9; - invalid_auto_size_ctl.apply_max_decrement = TRUE; + invalid_auto_size_ctl.apply_max_decrement = true; invalid_auto_size_ctl.max_decrement = (1 * 1024 * 1024); invalid_auto_size_ctl.epochs_before_eviction = 3; - invalid_auto_size_ctl.apply_empty_reserve = TRUE; + invalid_auto_size_ctl.apply_empty_reserve = true; invalid_auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &invalid_auto_size_ctl); if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config accepted bad flash_threshold(2).\n"; } } @@ -24052,12 +24053,12 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed 23."; } - else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, FALSE)) { + else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, false)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected auto resize config 23."; } } @@ -24069,7 +24070,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; invalid_auto_size_ctl.rpt_fcn = NULL; - invalid_auto_size_ctl.set_initial_size = TRUE; + invalid_auto_size_ctl.set_initial_size = true; invalid_auto_size_ctl.initial_size = 4 * 1024 * 1024; invalid_auto_size_ctl.min_clean_fraction = 0.1; @@ -24085,7 +24086,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.increment = 2.0; - invalid_auto_size_ctl.apply_max_increment = TRUE; + invalid_auto_size_ctl.apply_max_increment = true; invalid_auto_size_ctl.max_increment = (2 * 1024 * 1024); invalid_auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -24098,19 +24099,19 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.decrement = 0.9; - invalid_auto_size_ctl.apply_max_decrement = TRUE; + invalid_auto_size_ctl.apply_max_decrement = true; invalid_auto_size_ctl.max_decrement = (1 * 1024 * 1024); invalid_auto_size_ctl.epochs_before_eviction = 3; - invalid_auto_size_ctl.apply_empty_reserve = TRUE; + invalid_auto_size_ctl.apply_empty_reserve = true; invalid_auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &invalid_auto_size_ctl); if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config accepted bad decr_mode 1.\n"; } } @@ -24121,12 +24122,12 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed 24."; } - else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, FALSE)) { + else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, false)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected auto resize config 24."; } } @@ -24136,7 +24137,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; invalid_auto_size_ctl.rpt_fcn = NULL; - invalid_auto_size_ctl.set_initial_size = TRUE; + invalid_auto_size_ctl.set_initial_size = true; invalid_auto_size_ctl.initial_size = 4 * 1024 * 1024; invalid_auto_size_ctl.min_clean_fraction = 0.1; @@ -24152,7 +24153,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.increment = 2.0; - invalid_auto_size_ctl.apply_max_increment = TRUE; + invalid_auto_size_ctl.apply_max_increment = true; invalid_auto_size_ctl.max_increment = (2 * 1024 * 1024); invalid_auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -24165,19 +24166,19 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.decrement = 0.9; - invalid_auto_size_ctl.apply_max_decrement = TRUE; + invalid_auto_size_ctl.apply_max_decrement = true; invalid_auto_size_ctl.max_decrement = (1 * 1024 * 1024); invalid_auto_size_ctl.epochs_before_eviction = 3; - invalid_auto_size_ctl.apply_empty_reserve = TRUE; + invalid_auto_size_ctl.apply_empty_reserve = true; invalid_auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &invalid_auto_size_ctl); if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config accepted bad decr_mode 2.\n"; } } @@ -24188,12 +24189,12 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed 25."; } - else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, FALSE)) { + else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, false)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected auto resize config 25."; } } @@ -24205,7 +24206,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; invalid_auto_size_ctl.rpt_fcn = NULL; - invalid_auto_size_ctl.set_initial_size = TRUE; + invalid_auto_size_ctl.set_initial_size = true; invalid_auto_size_ctl.initial_size = 4 * 1024 * 1024; invalid_auto_size_ctl.min_clean_fraction = 0.1; @@ -24221,7 +24222,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.increment = 2.0; - invalid_auto_size_ctl.apply_max_increment = TRUE; + invalid_auto_size_ctl.apply_max_increment = true; invalid_auto_size_ctl.max_increment = (2 * 1024 * 1024); invalid_auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -24234,19 +24235,19 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.decrement = 1.000001; /* INVALID */ - invalid_auto_size_ctl.apply_max_decrement = TRUE; + invalid_auto_size_ctl.apply_max_decrement = true; invalid_auto_size_ctl.max_decrement = (1 * 1024 * 1024); invalid_auto_size_ctl.epochs_before_eviction = 3; - invalid_auto_size_ctl.apply_empty_reserve = TRUE; + invalid_auto_size_ctl.apply_empty_reserve = true; invalid_auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &invalid_auto_size_ctl); if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config accepted bad decrement 1.\n"; } } @@ -24257,12 +24258,12 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed 26."; } - else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, FALSE)) { + else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, false)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected auto resize config 26."; } } @@ -24272,7 +24273,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; invalid_auto_size_ctl.rpt_fcn = NULL; - invalid_auto_size_ctl.set_initial_size = TRUE; + invalid_auto_size_ctl.set_initial_size = true; invalid_auto_size_ctl.initial_size = 4 * 1024 * 1024; invalid_auto_size_ctl.min_clean_fraction = 0.1; @@ -24288,7 +24289,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.increment = 2.0; - invalid_auto_size_ctl.apply_max_increment = TRUE; + invalid_auto_size_ctl.apply_max_increment = true; invalid_auto_size_ctl.max_increment = (2 * 1024 * 1024); invalid_auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -24301,19 +24302,19 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.decrement = -0.000001; /* INVALID */ - invalid_auto_size_ctl.apply_max_decrement = TRUE; + invalid_auto_size_ctl.apply_max_decrement = true; invalid_auto_size_ctl.max_decrement = (1 * 1024 * 1024); invalid_auto_size_ctl.epochs_before_eviction = 3; - invalid_auto_size_ctl.apply_empty_reserve = TRUE; + invalid_auto_size_ctl.apply_empty_reserve = true; invalid_auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &invalid_auto_size_ctl); if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config accepted bad decrement 2.\n"; } } @@ -24324,12 +24325,12 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed 27."; } - else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, FALSE)) { + else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, false)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected auto resize config 27."; } } @@ -24341,7 +24342,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; invalid_auto_size_ctl.rpt_fcn = NULL; - invalid_auto_size_ctl.set_initial_size = TRUE; + invalid_auto_size_ctl.set_initial_size = true; invalid_auto_size_ctl.initial_size = 4 * 1024 * 1024; invalid_auto_size_ctl.min_clean_fraction = 0.1; @@ -24357,7 +24358,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.increment = 2.0; - invalid_auto_size_ctl.apply_max_increment = TRUE; + invalid_auto_size_ctl.apply_max_increment = true; invalid_auto_size_ctl.max_increment = (2 * 1024 * 1024); invalid_auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -24370,19 +24371,19 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.decrement = 0.9; - invalid_auto_size_ctl.apply_max_decrement = TRUE; + invalid_auto_size_ctl.apply_max_decrement = true; invalid_auto_size_ctl.max_decrement = (1 * 1024 * 1024); invalid_auto_size_ctl.epochs_before_eviction = 0; /* INVALID */ - invalid_auto_size_ctl.apply_empty_reserve = TRUE; + invalid_auto_size_ctl.apply_empty_reserve = true; invalid_auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &invalid_auto_size_ctl); if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config accepted bad epochs_before_eviction 1.\n"; } } @@ -24393,12 +24394,12 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed 28."; } - else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, FALSE)) { + else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, false)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected auto resize config 28."; } } @@ -24408,7 +24409,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; invalid_auto_size_ctl.rpt_fcn = NULL; - invalid_auto_size_ctl.set_initial_size = TRUE; + invalid_auto_size_ctl.set_initial_size = true; invalid_auto_size_ctl.initial_size = 4 * 1024 * 1024; invalid_auto_size_ctl.min_clean_fraction = 0.1; @@ -24424,7 +24425,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.increment = 2.0; - invalid_auto_size_ctl.apply_max_increment = TRUE; + invalid_auto_size_ctl.apply_max_increment = true; invalid_auto_size_ctl.max_increment = (2 * 1024 * 1024); invalid_auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -24437,19 +24438,19 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.decrement = 0.9; - invalid_auto_size_ctl.apply_max_decrement = TRUE; + invalid_auto_size_ctl.apply_max_decrement = true; invalid_auto_size_ctl.max_decrement = (1 * 1024 * 1024); invalid_auto_size_ctl.epochs_before_eviction = H5C__MAX_EPOCH_MARKERS + 1; /* INVALID */ - invalid_auto_size_ctl.apply_empty_reserve = TRUE; + invalid_auto_size_ctl.apply_empty_reserve = true; invalid_auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &invalid_auto_size_ctl); if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config accepted bad epochs_before_eviction 2.\n"; } } @@ -24460,12 +24461,12 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed 29."; } - else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, FALSE)) { + else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, false)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected auto resize config 29."; } } @@ -24477,7 +24478,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; invalid_auto_size_ctl.rpt_fcn = NULL; - invalid_auto_size_ctl.set_initial_size = TRUE; + invalid_auto_size_ctl.set_initial_size = true; invalid_auto_size_ctl.initial_size = 4 * 1024 * 1024; invalid_auto_size_ctl.min_clean_fraction = 0.1; @@ -24493,7 +24494,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.increment = 2.0; - invalid_auto_size_ctl.apply_max_increment = TRUE; + invalid_auto_size_ctl.apply_max_increment = true; invalid_auto_size_ctl.max_increment = (2 * 1024 * 1024); invalid_auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -24506,19 +24507,19 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.decrement = 0.9; - invalid_auto_size_ctl.apply_max_decrement = TRUE; + invalid_auto_size_ctl.apply_max_decrement = true; invalid_auto_size_ctl.max_decrement = (1 * 1024 * 1024); invalid_auto_size_ctl.epochs_before_eviction = 3; - invalid_auto_size_ctl.apply_empty_reserve = TRUE; + invalid_auto_size_ctl.apply_empty_reserve = true; invalid_auto_size_ctl.empty_reserve = -0.0000001; /* INVALID */ result = H5C_set_cache_auto_resize_config(cache_ptr, &invalid_auto_size_ctl); if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config accepted bad empty_reserve 1.\n"; } } @@ -24529,12 +24530,12 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed 30."; } - else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, FALSE)) { + else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, false)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected auto resize config 30."; } } @@ -24544,7 +24545,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.version = H5C__CURR_AUTO_SIZE_CTL_VER; invalid_auto_size_ctl.rpt_fcn = NULL; - invalid_auto_size_ctl.set_initial_size = TRUE; + invalid_auto_size_ctl.set_initial_size = true; invalid_auto_size_ctl.initial_size = 4 * 1024 * 1024; invalid_auto_size_ctl.min_clean_fraction = 0.1; @@ -24560,7 +24561,7 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.increment = 2.0; - invalid_auto_size_ctl.apply_max_increment = TRUE; + invalid_auto_size_ctl.apply_max_increment = true; invalid_auto_size_ctl.max_increment = (2 * 1024 * 1024); invalid_auto_size_ctl.flash_incr_mode = H5C_flash_incr__off; @@ -24573,19 +24574,19 @@ check_auto_cache_resize_input_errs(unsigned paged) invalid_auto_size_ctl.decrement = 0.9; - invalid_auto_size_ctl.apply_max_decrement = TRUE; + invalid_auto_size_ctl.apply_max_decrement = true; invalid_auto_size_ctl.max_decrement = (1 * 1024 * 1024); invalid_auto_size_ctl.epochs_before_eviction = H5C__MAX_EPOCH_MARKERS + 1; /* INVALID */ - invalid_auto_size_ctl.apply_empty_reserve = TRUE; + invalid_auto_size_ctl.apply_empty_reserve = true; invalid_auto_size_ctl.empty_reserve = 0.05; result = H5C_set_cache_auto_resize_config(cache_ptr, &invalid_auto_size_ctl); if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config accepted bad empty_reserve 2.\n"; } } @@ -24596,12 +24597,12 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed 31."; } - else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, FALSE)) { + else if (!resize_configs_are_equal(&test_auto_size_ctl, &ref_auto_size_ctl, false)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected auto resize config 31."; } } @@ -24616,7 +24617,7 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config accepted NULL cache_ptr.\n"; } } @@ -24627,14 +24628,14 @@ check_auto_cache_resize_input_errs(unsigned paged) if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config accepted NULL config ptr.\n"; } } if (cache_ptr) { - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); } if (pass) { @@ -24684,7 +24685,7 @@ check_auto_cache_resize_aux_fcns(unsigned paged) H5C_auto_size_ctl_t auto_size_ctl = { /* int32_t version = */ H5C__CURR_AUTO_SIZE_CTL_VER, /* H5C_auto_resize_report_fcn rpt_fcn = */ NULL, - /* hbool_t set_initial_size = */ TRUE, + /* bool set_initial_size = */ true, /* size_t initial_size = */ (1 * 1024 * 1024), /* double min_clean_fraction = */ 0.5, @@ -24700,7 +24701,7 @@ check_auto_cache_resize_aux_fcns(unsigned paged) /* double increment = */ 2.0, - /* hbool_t apply_max_increment = */ TRUE, + /* bool apply_max_increment = */ true, /* size_t max_increment = */ (4 * 1024 * 1024), /* enum H5C_cache_flash_incr_mode */ @@ -24714,12 +24715,12 @@ check_auto_cache_resize_aux_fcns(unsigned paged) /* double decrement = */ 0.9, - /* hbool_t apply_max_decrement = */ TRUE, + /* bool apply_max_decrement = */ true, /* size_t max_decrement = */ (1 * 1024 * 1024), /* int32_t epochs_before_eviction = */ 3, - /* hbool_t apply_empty_reserve = */ TRUE, + /* bool apply_empty_reserve = */ true, /* double empty_reserve = */ 0.5}; if (paged) @@ -24727,7 +24728,7 @@ check_auto_cache_resize_aux_fcns(unsigned paged) else TESTING("automatic cache resize auxiliary functions"); - pass = TRUE; + pass = true; /* allocate a cache, and then test the various auxiliary functions. */ @@ -24746,7 +24747,7 @@ check_auto_cache_resize_aux_fcns(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 1.\n"; } } @@ -24755,7 +24756,7 @@ check_auto_cache_resize_aux_fcns(unsigned paged) if ((cache_ptr->max_cache_size != (1 * 1024 * 1024)) || (cache_ptr->min_clean_size != (512 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "bad cache size after initialization.\n"; } } @@ -24769,7 +24770,7 @@ check_auto_cache_resize_aux_fcns(unsigned paged) if ((H5C_get_cache_hit_rate(NULL, &hit_rate) != FAIL) || (H5C_get_cache_hit_rate(cache_ptr, NULL) != FAIL)) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_hit_rate accepts bad params.\n"; } } @@ -24780,19 +24781,19 @@ check_auto_cache_resize_aux_fcns(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_hit_rate failed.\n"; } else if (!H5_DBL_ABS_EQUAL(hit_rate, 0.0)) { /* i.e. hit_rate != 0.0 */ - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_hit_rate returned unexpected hit rate 1.\n"; } } if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, PICO_ENTRY_TYPE, i); @@ -24811,29 +24812,29 @@ check_auto_cache_resize_aux_fcns(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_hit_rate failed.\n"; } else if (!H5_DBL_ABS_EQUAL(hit_rate, 0.0)) { /* i.e. hit_rate != 0.0 */ - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_hit_rate returned unexpected hit rate 2.\n"; } else if ((cache_ptr->cache_accesses != 1000) || (cache_ptr->cache_hits != 0)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache hit rate stats.\n"; } else if (rpt_fcn_called) { - pass = FALSE; + pass = false; failure_mssg = "Report function called?.\n"; } } if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, PICO_ENTRY_TYPE, 0); @@ -24852,22 +24853,22 @@ check_auto_cache_resize_aux_fcns(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_hit_rate failed.\n"; } else if (!H5_DBL_ABS_EQUAL(hit_rate, 0.5)) { /* i.e. hit_rate != 0.5 */ - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_hit_rate returned unexpected hit rate 3.\n"; } else if ((cache_ptr->cache_accesses != 2000) || (cache_ptr->cache_hits != 1000)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache hit rate stats.\n"; } else if (rpt_fcn_called) { - pass = FALSE; + pass = false; failure_mssg = "Report function called?.\n"; } } @@ -24878,12 +24879,12 @@ check_auto_cache_resize_aux_fcns(unsigned paged) if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_reset_cache_hit_rate_stats accepted NULL cache_ptr.\n"; } else if ((cache_ptr->cache_accesses != 2000) || (cache_ptr->cache_hits != 1000)) { - pass = FALSE; + pass = false; failure_mssg = "Failed call to H5C_reset_cache_hit_rate_stats altered stats?\n"; } } @@ -24894,19 +24895,19 @@ check_auto_cache_resize_aux_fcns(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_reset_cache_hit_rate_stats failed.\n"; } else if ((cache_ptr->cache_accesses != 0) || (cache_ptr->cache_hits != 0)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache hit rate stats.\n"; } } if (pass) { - rpt_fcn_called = FALSE; + rpt_fcn_called = false; i = 0; while (pass && (i < 1000)) { protect_entry(file_ptr, PICO_ENTRY_TYPE, i + 500); @@ -24925,22 +24926,22 @@ check_auto_cache_resize_aux_fcns(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_hit_rate failed.\n"; } else if (!H5_DBL_ABS_EQUAL(hit_rate, 0.5)) { /* i.e. hit_rate != 0.5 */ - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_hit_rate returned unexpected hit rate 4.\n"; } else if ((cache_ptr->cache_accesses != 1000) || (cache_ptr->cache_hits != 500)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache hit rate stats.\n"; } else if (rpt_fcn_called) { - pass = FALSE; + pass = false; failure_mssg = "Report function called?.\n"; } } @@ -24957,7 +24958,7 @@ check_auto_cache_resize_aux_fcns(unsigned paged) if (result != FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_size accepted NULL cache_ptr.\n"; } } @@ -24973,27 +24974,27 @@ check_auto_cache_resize_aux_fcns(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_size failed 1.\n"; } else if (max_size != (1 * 1024 * 1024)) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_size reports unexpected max_size 1.\n"; } else if (min_clean_size != (512 * 1024)) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_size reports unexpected min_clean_size 1.\n"; } else if (cur_size != (1500 * PICO_ENTRY_SIZE)) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_size reports unexpected cur_size 1.\n"; } else if (cur_num_entries != 1500) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_size reports unexpected cur_num_entries 1.\n"; } } @@ -25021,27 +25022,27 @@ check_auto_cache_resize_aux_fcns(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_size failed 2.\n"; } else if (max_size != (1 * 1024 * 1024)) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_size reports unexpected max_size 2.\n"; } else if (min_clean_size != (512 * 1024)) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_size reports unexpected min_clean_size 2.\n"; } else if (cur_size != ((1500 * PICO_ENTRY_SIZE) + MONSTER_ENTRY_SIZE)) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_size reports unexpected cur_size 2.\n"; } else if (cur_num_entries != 1501) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_size reports unexpected cur_num_entries 2.\n"; } } @@ -25054,12 +25055,12 @@ check_auto_cache_resize_aux_fcns(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_size failed 3.\n"; } else if (max_size != (1 * 1024 * 1024)) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_size reports unexpected max_size 3.\n"; } } @@ -25072,12 +25073,12 @@ check_auto_cache_resize_aux_fcns(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_size failed 4.\n"; } else if (min_clean_size != (512 * 1024)) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_size reports unexpected min_clean_size 4.\n"; } } @@ -25090,12 +25091,12 @@ check_auto_cache_resize_aux_fcns(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_size failed 5.\n"; } else if (cur_size != ((1500 * PICO_ENTRY_SIZE) + MONSTER_ENTRY_SIZE)) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_size reports unexpected cur_size 5.\n"; } } @@ -25108,19 +25109,19 @@ check_auto_cache_resize_aux_fcns(unsigned paged) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_size failed 6.\n"; } else if (cur_num_entries != 1501) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_size reports unexpected cur_num_entries 2.\n"; } } if (cache_ptr) { - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); } if (pass) { @@ -25162,14 +25163,14 @@ check_auto_cache_resize_aux_fcns(unsigned paged) */ static unsigned -check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) +check_metadata_blizzard_absence(bool fill_via_insertion, unsigned paged) { struct expected_entry_status *expected = NULL; int entry_type = HUGE_ENTRY_TYPE; size_t entry_size = HUGE_ENTRY_SIZE; /* 16 KB */ H5F_t *file_ptr = NULL; H5C_t *cache_ptr = NULL; - hbool_t show_progress = FALSE; + bool show_progress = false; int32_t checkpoint = 0; int32_t entry_idx = 0; int32_t i; @@ -25177,12 +25178,12 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) /* Expected deserialized status of entries depends on how they get into * the cache. Insertions = not deserialized, protect/unprotect = deserialized. */ - hbool_t deserialized = (hbool_t) !(fill_via_insertion); + bool deserialized = (bool)!(fill_via_insertion); expected = malloc(150 * sizeof(struct expected_entry_status)); if (expected == NULL) { - pass = FALSE; + pass = false; failure_mssg = "couldn't allocate expected entry status array\n"; } @@ -25194,14 +25195,14 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) expected[i].entry_type = HUGE_ENTRY_TYPE; expected[i].entry_index = (int)i; expected[i].size = HUGE_ENTRY_SIZE; - expected[i].in_cache = FALSE; - expected[i].at_main_addr = TRUE; - expected[i].is_dirty = FALSE; - expected[i].is_protected = FALSE; - expected[i].is_pinned = FALSE; - expected[i].deserialized = FALSE; - expected[i].serialized = FALSE; - expected[i].destroyed = FALSE; + expected[i].in_cache = false; + expected[i].at_main_addr = true; + expected[i].is_dirty = false; + expected[i].is_protected = false; + expected[i].is_pinned = false; + expected[i].deserialized = false; + expected[i].serialized = false; + expected[i].destroyed = false; memset(expected[i].flush_dep_par_type, 0, sizeof(expected[i].flush_dep_par_type)); memset(expected[i].flush_dep_par_idx, 0, sizeof(expected[i].flush_dep_par_idx)); @@ -25210,10 +25211,10 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) expected[i].flush_dep_nchd = 0; expected[i].flush_dep_ndirty_chd = 0; expected[i].flush_order = -1; - expected[i].is_corked = FALSE; + expected[i].is_corked = false; } - pass = TRUE; + pass = true; } reset_entries(); @@ -25245,7 +25246,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) if (file_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "bad return from cache initialization.\n"; } else @@ -25304,8 +25305,8 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) /* Change expected values, and verify the status of the entries * after each insertion */ - expected[entry_idx].in_cache = TRUE; - expected[entry_idx].is_dirty = TRUE; + expected[entry_idx].in_cache = true; + expected[entry_idx].is_dirty = true; expected[entry_idx].deserialized = (unsigned char)deserialized; verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */ @@ -25370,12 +25371,12 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) */ /* entry w/ index 0 has now been flushed and is now clean. */ - expected[0].is_dirty = FALSE; - expected[0].serialized = TRUE; + expected[0].is_dirty = false; + expected[0].serialized = true; /* entry w/ index 26 is now in the cache and dirty. */ - expected[26].in_cache = TRUE; - expected[26].is_dirty = TRUE; + expected[26].in_cache = true; + expected[26].is_dirty = true; expected[26].deserialized = (unsigned char)deserialized; /* verify the status */ @@ -25424,12 +25425,12 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) */ /* entry w/ index 1 has now been flushed and is now clean. */ - expected[1].is_dirty = FALSE; - expected[1].serialized = TRUE; + expected[1].is_dirty = false; + expected[1].serialized = true; /* entry w/ index 27 is now in the cache and dirty. */ - expected[27].in_cache = TRUE; - expected[27].is_dirty = TRUE; + expected[27].in_cache = true; + expected[27].is_dirty = true; expected[27].deserialized = (unsigned char)deserialized; /* verify the status */ @@ -25470,11 +25471,11 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) * entry currently getting inserted is now in the cache and * dirty. */ - expected[entry_idx - 26].is_dirty = FALSE; - expected[entry_idx - 26].serialized = TRUE; + expected[entry_idx - 26].is_dirty = false; + expected[entry_idx - 26].serialized = true; - expected[entry_idx].in_cache = TRUE; - expected[entry_idx].is_dirty = TRUE; + expected[entry_idx].in_cache = true; + expected[entry_idx].is_dirty = true; expected[entry_idx].deserialized = (unsigned char)deserialized; /* verify the status */ @@ -25485,9 +25486,9 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) } /* Verify that the cache is now full */ - if (cache_ptr->cache_full != TRUE) { + if (cache_ptr->cache_full != true) { - pass = FALSE; + pass = false; failure_mssg = "cache not completely filled.\n"; } } @@ -25546,18 +25547,18 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) */ /* entry w/ index 0 has been evicted. */ - expected[0].in_cache = FALSE; - expected[0].destroyed = TRUE; + expected[0].in_cache = false; + expected[0].destroyed = true; /* entries w/ indices 24,25 have now been flushed and are clean. */ - expected[24].is_dirty = FALSE; - expected[24].serialized = TRUE; - expected[25].is_dirty = FALSE; - expected[25].serialized = TRUE; + expected[24].is_dirty = false; + expected[24].serialized = true; + expected[25].is_dirty = false; + expected[25].serialized = true; /* entry w/ index 50 is now in the cache and dirty */ - expected[50].in_cache = TRUE; - expected[50].is_dirty = TRUE; + expected[50].in_cache = true; + expected[50].is_dirty = true; expected[50].deserialized = (unsigned char)deserialized; /* verify the status */ @@ -25600,13 +25601,13 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) } /* This past inserted entry is now in the cache and dirty */ - expected[entry_idx].in_cache = TRUE; - expected[entry_idx].is_dirty = TRUE; + expected[entry_idx].in_cache = true; + expected[entry_idx].is_dirty = true; expected[entry_idx].deserialized = (unsigned char)deserialized; /* The entry inserted 50 insertions ago has been evicted */ - expected[entry_idx - 50].in_cache = FALSE; - expected[entry_idx - 50].destroyed = TRUE; + expected[entry_idx - 50].in_cache = false; + expected[entry_idx - 50].destroyed = true; /* If the newly inserted entry is among the first 24 * insertions in this loop, then the insertion will @@ -25614,8 +25615,8 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) * 25 insertions ago. */ if (entry_idx < 75) { - expected[entry_idx - 25].is_dirty = FALSE; - expected[entry_idx - 25].serialized = TRUE; + expected[entry_idx - 25].is_dirty = false; + expected[entry_idx - 25].serialized = true; } /* If the newly inserted entry is among the last * 25 insertions in this loop, then the insertion will @@ -25626,8 +25627,8 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) * flush-then-evict, it switches to evict-then-flush. */ else { - expected[entry_idx - 26].is_dirty = FALSE; - expected[entry_idx - 26].serialized = TRUE; + expected[entry_idx - 26].is_dirty = false; + expected[entry_idx - 26].serialized = true; } /* Verify this expected status */ @@ -25672,9 +25673,9 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) */ flush_cache(file_ptr, /* H5F_t * file_ptr */ - FALSE, /* hbool_t destory_entries */ - FALSE, /* hbool_t dump_stats */ - FALSE); /* hbool_t dump_detailed_stats */ + false, /* bool destory_entries */ + false, /* bool dump_stats */ + false); /* bool dump_detailed_stats */ /* Verify that the cache is clean */ verify_clean(); @@ -25688,8 +25689,8 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) /* entries w/ indices 74-99 have been flushed. */ for (i = 74; i < 100; i++) { - expected[i].is_dirty = FALSE; - expected[i].serialized = TRUE; + expected[i].is_dirty = false; + expected[i].serialized = true; } verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */ 0, /* int tag */ @@ -25729,13 +25730,13 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) } /* This past inserted entry is now in the cache and dirty */ - expected[entry_idx].in_cache = TRUE; - expected[entry_idx].is_dirty = TRUE; + expected[entry_idx].in_cache = true; + expected[entry_idx].is_dirty = true; expected[entry_idx].deserialized = (unsigned char)deserialized; /* The entry with ID minus 50 will have been evicted */ - expected[entry_idx - 50].in_cache = FALSE; - expected[entry_idx - 50].destroyed = TRUE; + expected[entry_idx - 50].in_cache = false; + expected[entry_idx - 50].destroyed = true; /* verify the status */ verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */ @@ -25777,16 +25778,16 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) */ /* entry w/ index 76 has been evicted. */ - expected[76].in_cache = FALSE; - expected[76].destroyed = TRUE; + expected[76].in_cache = false; + expected[76].destroyed = true; /* entry w/ index 100 has now been flushed and is now clean. */ - expected[100].is_dirty = FALSE; - expected[100].serialized = TRUE; + expected[100].is_dirty = false; + expected[100].serialized = true; /* entry w/ index 26 is now in the cache and dirty. */ - expected[126].in_cache = TRUE; - expected[126].is_dirty = TRUE; + expected[126].in_cache = true; + expected[126].is_dirty = true; expected[126].deserialized = (unsigned char)deserialized; /* verify the status */ @@ -25822,17 +25823,17 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) } /* This past inserted entry is now in the cache and dirty */ - expected[entry_idx].in_cache = TRUE; - expected[entry_idx].is_dirty = TRUE; + expected[entry_idx].in_cache = true; + expected[entry_idx].is_dirty = true; expected[entry_idx].deserialized = (unsigned char)deserialized; /* The entry with ID minus 50 will have been evicted */ - expected[entry_idx - 50].in_cache = FALSE; - expected[entry_idx - 50].destroyed = TRUE; + expected[entry_idx - 50].in_cache = false; + expected[entry_idx - 50].destroyed = true; /* The entry with ID minus 26 will now be clean */ - expected[entry_idx - 26].is_dirty = FALSE; - expected[entry_idx - 26].serialized = TRUE; + expected[entry_idx - 26].is_dirty = false; + expected[entry_idx - 26].serialized = true; /* verify the status */ verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */ @@ -25848,7 +25849,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) if (cache_ptr) { /* We're done with testing. We can take down the cache. */ - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); reset_entries(); } @@ -25892,11 +25893,11 @@ check_flush_deps(unsigned paged) { /* entry entry in at main flush dep flush dep child flush flush flush */ /* type: index: size: cache: addr: dirty: prot: pinned: dsrlzd: srlzd: dest: par type[]: par idx[]: dep npart: dep nchd: dep ndirty chd: order: corked: */ - { PICO_ENTRY_TYPE, 0, PICO_ENTRY_SIZE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 0, 0, 0, -1, FALSE}, - { PICO_ENTRY_TYPE, 1, PICO_ENTRY_SIZE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 0, 0, 0, -1, FALSE}, - { PICO_ENTRY_TYPE, 2, PICO_ENTRY_SIZE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 0, 0, 0, -1, FALSE}, - { PICO_ENTRY_TYPE, 3, PICO_ENTRY_SIZE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 0, 0, 0, -1, FALSE}, - { PICO_ENTRY_TYPE, 4, PICO_ENTRY_SIZE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 0, 0, 0, -1, FALSE} + { PICO_ENTRY_TYPE, 0, PICO_ENTRY_SIZE, false, true, false, false, false, false, false, false, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 0, 0, 0, -1, false}, + { PICO_ENTRY_TYPE, 1, PICO_ENTRY_SIZE, false, true, false, false, false, false, false, false, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 0, 0, 0, -1, false}, + { PICO_ENTRY_TYPE, 2, PICO_ENTRY_SIZE, false, true, false, false, false, false, false, false, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 0, 0, 0, -1, false}, + { PICO_ENTRY_TYPE, 3, PICO_ENTRY_SIZE, false, true, false, false, false, false, false, false, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 0, 0, 0, -1, false}, + { PICO_ENTRY_TYPE, 4, PICO_ENTRY_SIZE, false, true, false, false, false, false, false, false, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 0, 0, 0, -1, false} }; /* clang-format on */ @@ -25905,7 +25906,7 @@ check_flush_deps(unsigned paged) else TESTING("flush dependencies"); - pass = TRUE; + pass = true; /* allocate a cache, build up flush dependency hierarchy and tear it down. * Verify that all performs as expected. @@ -25928,8 +25929,8 @@ check_flush_deps(unsigned paged) /* Change expected values, and verify the status of the entries * after each insertion */ - expected[u].in_cache = TRUE; - expected[u].is_dirty = TRUE; + expected[u].in_cache = true; + expected[u].is_dirty = true; /* Verify the status */ verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */ @@ -25944,7 +25945,7 @@ check_flush_deps(unsigned paged) /* Create flush dependency between entries 0 (child) & 1 (parent) */ { - hbool_t in_cache, is_flush_dep_parent, is_flush_dep_child; + bool in_cache, is_flush_dep_parent, is_flush_dep_child; test_entry_t *entry_ptr; protect_entry(file_ptr, entry_type, 1); @@ -25993,8 +25994,8 @@ check_flush_deps(unsigned paged) expected[0].flush_dep_par_type[0] = entry_type; expected[0].flush_dep_par_idx[0] = 1; expected[0].flush_dep_npar = 1; - expected[1].is_protected = TRUE; - expected[1].is_pinned = TRUE; + expected[1].is_protected = true; + expected[1].is_pinned = true; expected[1].flush_dep_nchd = 1; expected[1].flush_dep_ndirty_chd = 1; @@ -26024,8 +26025,8 @@ check_flush_deps(unsigned paged) * after destroy flush dependency */ expected[0].flush_dep_npar = 0; - expected[1].is_protected = FALSE; - expected[1].is_pinned = FALSE; + expected[1].is_protected = false; + expected[1].is_pinned = false; expected[1].flush_dep_nchd = 0; expected[1].flush_dep_ndirty_chd = 0; @@ -26063,8 +26064,8 @@ check_flush_deps(unsigned paged) expected[1].flush_dep_par_type[0] = entry_type; expected[1].flush_dep_par_idx[0] = 2; expected[1].flush_dep_npar = 1; - expected[2].is_protected = TRUE; - expected[2].is_pinned = TRUE; + expected[2].is_protected = true; + expected[2].is_pinned = true; expected[2].flush_dep_nchd = 2; expected[2].flush_dep_ndirty_chd = 2; @@ -26099,8 +26100,8 @@ check_flush_deps(unsigned paged) */ expected[0].flush_dep_npar = 0; expected[1].flush_dep_npar = 0; - expected[2].is_protected = FALSE; - expected[2].is_pinned = FALSE; + expected[2].is_protected = false; + expected[2].is_pinned = false; expected[2].flush_dep_nchd = 0; expected[2].flush_dep_ndirty_chd = 0; @@ -26133,8 +26134,8 @@ check_flush_deps(unsigned paged) expected[0].flush_dep_par_type[0] = entry_type; expected[0].flush_dep_par_idx[0] = 1; expected[0].flush_dep_npar = 1; - expected[1].is_protected = TRUE; - expected[1].is_pinned = TRUE; + expected[1].is_protected = true; + expected[1].is_pinned = true; expected[1].flush_dep_nchd = 1; expected[1].flush_dep_ndirty_chd = 1; @@ -26160,8 +26161,8 @@ check_flush_deps(unsigned paged) expected[1].flush_dep_par_type[0] = entry_type; expected[1].flush_dep_par_idx[0] = 2; expected[1].flush_dep_npar = 1; - expected[2].is_protected = TRUE; - expected[2].is_pinned = TRUE; + expected[2].is_protected = true; + expected[2].is_pinned = true; expected[2].flush_dep_nchd = 1; expected[2].flush_dep_ndirty_chd = 1; @@ -26187,8 +26188,8 @@ check_flush_deps(unsigned paged) expected[2].flush_dep_par_type[0] = entry_type; expected[2].flush_dep_par_idx[0] = 3; expected[2].flush_dep_npar = 1; - expected[3].is_protected = TRUE; - expected[3].is_pinned = TRUE; + expected[3].is_protected = true; + expected[3].is_pinned = true; expected[3].flush_dep_nchd = 1; expected[3].flush_dep_ndirty_chd = 1; @@ -26218,8 +26219,8 @@ check_flush_deps(unsigned paged) * after destroying flush dependency */ expected[2].flush_dep_npar = 0; - expected[3].is_protected = FALSE; - expected[3].is_pinned = FALSE; + expected[3].is_protected = false; + expected[3].is_pinned = false; expected[3].flush_dep_nchd = 0; expected[3].flush_dep_ndirty_chd = 0; @@ -26246,8 +26247,8 @@ check_flush_deps(unsigned paged) * after destroying flush dependency */ expected[1].flush_dep_npar = 0; - expected[2].is_protected = FALSE; - expected[2].is_pinned = FALSE; + expected[2].is_protected = false; + expected[2].is_pinned = false; expected[2].flush_dep_nchd = 0; expected[2].flush_dep_ndirty_chd = 0; @@ -26274,8 +26275,8 @@ check_flush_deps(unsigned paged) * after destroying flush dependency */ expected[0].flush_dep_npar = 0; - expected[1].is_protected = FALSE; - expected[1].is_pinned = FALSE; + expected[1].is_protected = false; + expected[1].is_pinned = false; expected[1].flush_dep_nchd = 0; expected[1].flush_dep_ndirty_chd = 0; @@ -26308,8 +26309,8 @@ check_flush_deps(unsigned paged) expected[0].flush_dep_par_type[0] = entry_type; expected[0].flush_dep_par_idx[0] = 1; expected[0].flush_dep_npar = 1; - expected[1].is_protected = TRUE; - expected[1].is_pinned = TRUE; + expected[1].is_protected = true; + expected[1].is_pinned = true; expected[1].flush_dep_nchd = 1; expected[1].flush_dep_ndirty_chd = 1; @@ -26335,8 +26336,8 @@ check_flush_deps(unsigned paged) expected[1].flush_dep_par_type[0] = entry_type; expected[1].flush_dep_par_idx[0] = 2; expected[1].flush_dep_npar = 1; - expected[2].is_protected = TRUE; - expected[2].is_pinned = TRUE; + expected[2].is_protected = true; + expected[2].is_pinned = true; expected[2].flush_dep_nchd = 1; expected[2].flush_dep_ndirty_chd = 1; @@ -26362,8 +26363,8 @@ check_flush_deps(unsigned paged) expected[2].flush_dep_par_type[0] = entry_type; expected[2].flush_dep_par_idx[0] = 3; expected[2].flush_dep_npar = 1; - expected[3].is_protected = TRUE; - expected[3].is_pinned = TRUE; + expected[3].is_protected = true; + expected[3].is_pinned = true; expected[3].flush_dep_nchd = 1; expected[3].flush_dep_ndirty_chd = 1; @@ -26393,8 +26394,8 @@ check_flush_deps(unsigned paged) * after destroying flush dependency */ expected[0].flush_dep_npar = 0; - expected[1].is_protected = FALSE; - expected[1].is_pinned = FALSE; + expected[1].is_protected = false; + expected[1].is_pinned = false; expected[1].flush_dep_nchd = 0; expected[1].flush_dep_ndirty_chd = 0; @@ -26421,8 +26422,8 @@ check_flush_deps(unsigned paged) * after destroying flush dependency */ expected[1].flush_dep_npar = 0; - expected[2].is_protected = FALSE; - expected[2].is_pinned = FALSE; + expected[2].is_protected = false; + expected[2].is_pinned = false; expected[2].flush_dep_nchd = 0; expected[2].flush_dep_ndirty_chd = 0; @@ -26449,8 +26450,8 @@ check_flush_deps(unsigned paged) * after destroying flush dependency */ expected[2].flush_dep_npar = 0; - expected[3].is_protected = FALSE; - expected[3].is_pinned = FALSE; + expected[3].is_protected = false; + expected[3].is_pinned = false; expected[3].flush_dep_nchd = 0; expected[3].flush_dep_ndirty_chd = 0; @@ -26483,8 +26484,8 @@ check_flush_deps(unsigned paged) expected[2].flush_dep_par_type[0] = entry_type; expected[2].flush_dep_par_idx[0] = 3; expected[2].flush_dep_npar = 1; - expected[3].is_protected = TRUE; - expected[3].is_pinned = TRUE; + expected[3].is_protected = true; + expected[3].is_pinned = true; expected[3].flush_dep_nchd = 1; expected[3].flush_dep_ndirty_chd = 1; @@ -26510,8 +26511,8 @@ check_flush_deps(unsigned paged) expected[1].flush_dep_par_type[0] = entry_type; expected[1].flush_dep_par_idx[0] = 2; expected[1].flush_dep_npar = 1; - expected[2].is_protected = TRUE; - expected[2].is_pinned = TRUE; + expected[2].is_protected = true; + expected[2].is_pinned = true; expected[2].flush_dep_nchd = 1; expected[2].flush_dep_ndirty_chd = 1; @@ -26537,8 +26538,8 @@ check_flush_deps(unsigned paged) expected[0].flush_dep_par_type[0] = entry_type; expected[0].flush_dep_par_idx[0] = 1; expected[0].flush_dep_npar = 1; - expected[1].is_protected = TRUE; - expected[1].is_pinned = TRUE; + expected[1].is_protected = true; + expected[1].is_pinned = true; expected[1].flush_dep_nchd = 1; expected[1].flush_dep_ndirty_chd = 1; @@ -26568,8 +26569,8 @@ check_flush_deps(unsigned paged) * after destroying flush dependency */ expected[2].flush_dep_npar = 0; - expected[3].is_protected = FALSE; - expected[3].is_pinned = FALSE; + expected[3].is_protected = false; + expected[3].is_pinned = false; expected[3].flush_dep_nchd = 0; expected[3].flush_dep_ndirty_chd = 0; @@ -26596,8 +26597,8 @@ check_flush_deps(unsigned paged) * after destroying flush dependency */ expected[1].flush_dep_npar = 0; - expected[2].is_protected = FALSE; - expected[2].is_pinned = FALSE; + expected[2].is_protected = false; + expected[2].is_pinned = false; expected[2].flush_dep_nchd = 0; expected[2].flush_dep_ndirty_chd = 0; @@ -26624,8 +26625,8 @@ check_flush_deps(unsigned paged) * after destroying flush dependency */ expected[0].flush_dep_npar = 0; - expected[1].is_protected = FALSE; - expected[1].is_pinned = FALSE; + expected[1].is_protected = false; + expected[1].is_pinned = false; expected[1].flush_dep_nchd = 0; expected[1].flush_dep_ndirty_chd = 0; @@ -26658,8 +26659,8 @@ check_flush_deps(unsigned paged) expected[2].flush_dep_par_type[0] = entry_type; expected[2].flush_dep_par_idx[0] = 3; expected[2].flush_dep_npar = 1; - expected[3].is_protected = TRUE; - expected[3].is_pinned = TRUE; + expected[3].is_protected = true; + expected[3].is_pinned = true; expected[3].flush_dep_nchd = 1; expected[3].flush_dep_ndirty_chd = 1; @@ -26685,8 +26686,8 @@ check_flush_deps(unsigned paged) expected[1].flush_dep_par_type[0] = entry_type; expected[1].flush_dep_par_idx[0] = 2; expected[1].flush_dep_npar = 1; - expected[2].is_protected = TRUE; - expected[2].is_pinned = TRUE; + expected[2].is_protected = true; + expected[2].is_pinned = true; expected[2].flush_dep_nchd = 1; expected[2].flush_dep_ndirty_chd = 1; @@ -26712,8 +26713,8 @@ check_flush_deps(unsigned paged) expected[0].flush_dep_par_type[0] = entry_type; expected[0].flush_dep_par_idx[0] = 1; expected[0].flush_dep_npar = 1; - expected[1].is_protected = TRUE; - expected[1].is_pinned = TRUE; + expected[1].is_protected = true; + expected[1].is_pinned = true; expected[1].flush_dep_nchd = 1; expected[1].flush_dep_ndirty_chd = 1; @@ -26743,8 +26744,8 @@ check_flush_deps(unsigned paged) * after destroying flush dependency */ expected[0].flush_dep_npar = 0; - expected[1].is_protected = FALSE; - expected[1].is_pinned = FALSE; + expected[1].is_protected = false; + expected[1].is_pinned = false; expected[1].flush_dep_nchd = 0; expected[1].flush_dep_ndirty_chd = 0; @@ -26771,8 +26772,8 @@ check_flush_deps(unsigned paged) * after destroying flush dependency */ expected[1].flush_dep_npar = 0; - expected[2].is_protected = FALSE; - expected[2].is_pinned = FALSE; + expected[2].is_protected = false; + expected[2].is_pinned = false; expected[2].flush_dep_nchd = 0; expected[2].flush_dep_ndirty_chd = 0; @@ -26799,8 +26800,8 @@ check_flush_deps(unsigned paged) * after destroying flush dependency */ expected[2].flush_dep_npar = 0; - expected[3].is_protected = FALSE; - expected[3].is_pinned = FALSE; + expected[3].is_protected = false; + expected[3].is_pinned = false; expected[3].flush_dep_nchd = 0; expected[3].flush_dep_ndirty_chd = 0; @@ -26832,8 +26833,8 @@ check_flush_deps(unsigned paged) expected[u].flush_dep_par_type[0] = entry_type; expected[u].flush_dep_par_idx[0] = 4; expected[u].flush_dep_npar = 1; - expected[4].is_protected = TRUE; - expected[4].is_pinned = TRUE; + expected[4].is_protected = true; + expected[4].is_pinned = true; expected[4].flush_dep_nchd++; expected[4].flush_dep_ndirty_chd++; @@ -26873,8 +26874,8 @@ check_flush_deps(unsigned paged) /* Change expected values, and verify the status of the entries * after destroying flush dependency */ - expected[4].is_protected = FALSE; - expected[4].is_pinned = FALSE; + expected[4].is_protected = false; + expected[4].is_pinned = false; } /* end if */ /* Verify the status */ @@ -26909,8 +26910,8 @@ check_flush_deps(unsigned paged) expected[0].flush_dep_par_type[0] = entry_type; expected[0].flush_dep_par_idx[0] = 1; expected[0].flush_dep_npar = 1; - expected[1].is_protected = TRUE; - expected[1].is_pinned = TRUE; + expected[1].is_protected = true; + expected[1].is_pinned = true; expected[1].flush_dep_nchd = 1; expected[1].flush_dep_ndirty_chd = 1; @@ -26936,8 +26937,8 @@ check_flush_deps(unsigned paged) expected[3].flush_dep_par_type[0] = entry_type; expected[3].flush_dep_par_idx[0] = 4; expected[3].flush_dep_npar = 1; - expected[4].is_protected = TRUE; - expected[4].is_pinned = TRUE; + expected[4].is_protected = true; + expected[4].is_pinned = true; expected[4].flush_dep_nchd = 1; expected[4].flush_dep_ndirty_chd = 1; @@ -26963,8 +26964,8 @@ check_flush_deps(unsigned paged) expected[4].flush_dep_par_type[0] = entry_type; expected[4].flush_dep_par_idx[0] = 0; expected[4].flush_dep_npar = 1; - expected[0].is_protected = TRUE; - expected[0].is_pinned = TRUE; + expected[0].is_protected = true; + expected[0].is_pinned = true; expected[0].flush_dep_nchd = 1; expected[0].flush_dep_ndirty_chd = 1; @@ -26994,8 +26995,8 @@ check_flush_deps(unsigned paged) * after destroying flush dependency */ expected[4].flush_dep_npar = 0; - expected[0].is_protected = FALSE; - expected[0].is_pinned = FALSE; + expected[0].is_protected = false; + expected[0].is_pinned = false; expected[0].flush_dep_nchd = 0; expected[0].flush_dep_ndirty_chd = 0; @@ -27022,8 +27023,8 @@ check_flush_deps(unsigned paged) * after destroying flush dependency */ expected[3].flush_dep_npar = 0; - expected[4].is_protected = FALSE; - expected[4].is_pinned = FALSE; + expected[4].is_protected = false; + expected[4].is_pinned = false; expected[4].flush_dep_nchd = 0; expected[4].flush_dep_ndirty_chd = 0; @@ -27050,8 +27051,8 @@ check_flush_deps(unsigned paged) * after destroying flush dependency */ expected[0].flush_dep_npar = 0; - expected[1].is_protected = FALSE; - expected[1].is_pinned = FALSE; + expected[1].is_protected = false; + expected[1].is_pinned = false; expected[1].flush_dep_nchd = 0; expected[1].flush_dep_ndirty_chd = 0; @@ -27086,8 +27087,8 @@ check_flush_deps(unsigned paged) expected[0].flush_dep_par_type[0] = entry_type; expected[0].flush_dep_par_idx[0] = 1; expected[0].flush_dep_npar = 1; - expected[1].is_protected = TRUE; - expected[1].is_pinned = TRUE; + expected[1].is_protected = true; + expected[1].is_pinned = true; expected[1].flush_dep_nchd = 1; expected[1].flush_dep_ndirty_chd = 1; @@ -27113,8 +27114,8 @@ check_flush_deps(unsigned paged) expected[1].flush_dep_par_type[0] = entry_type; expected[1].flush_dep_par_idx[0] = 2; expected[1].flush_dep_npar = 1; - expected[2].is_protected = TRUE; - expected[2].is_pinned = TRUE; + expected[2].is_protected = true; + expected[2].is_pinned = true; expected[2].flush_dep_nchd = 1; expected[2].flush_dep_ndirty_chd = 1; @@ -27140,8 +27141,8 @@ check_flush_deps(unsigned paged) expected[3].flush_dep_par_type[0] = entry_type; expected[3].flush_dep_par_idx[0] = 4; expected[3].flush_dep_npar = 1; - expected[4].is_protected = TRUE; - expected[4].is_pinned = TRUE; + expected[4].is_protected = true; + expected[4].is_pinned = true; expected[4].flush_dep_nchd = 1; expected[4].flush_dep_ndirty_chd = 1; @@ -27211,8 +27212,8 @@ check_flush_deps(unsigned paged) * after destroying flush dependency */ expected[3].flush_dep_npar = 0; - expected[4].is_protected = FALSE; - expected[4].is_pinned = FALSE; + expected[4].is_protected = false; + expected[4].is_pinned = false; expected[4].flush_dep_nchd = 0; expected[4].flush_dep_ndirty_chd = 0; @@ -27239,8 +27240,8 @@ check_flush_deps(unsigned paged) * after destroying flush dependency */ expected[1].flush_dep_npar = 0; - expected[2].is_protected = FALSE; - expected[2].is_pinned = FALSE; + expected[2].is_protected = false; + expected[2].is_pinned = false; expected[2].flush_dep_nchd = 0; expected[2].flush_dep_ndirty_chd = 0; @@ -27267,8 +27268,8 @@ check_flush_deps(unsigned paged) * after destroying flush dependency */ expected[0].flush_dep_npar = 0; - expected[1].is_protected = FALSE; - expected[1].is_pinned = FALSE; + expected[1].is_protected = false; + expected[1].is_pinned = false; expected[1].flush_dep_nchd = 0; expected[1].flush_dep_ndirty_chd = 0; @@ -27303,8 +27304,8 @@ check_flush_deps(unsigned paged) expected[0].flush_dep_par_type[0] = entry_type; expected[0].flush_dep_par_idx[0] = 1; expected[0].flush_dep_npar = 1; - expected[1].is_protected = TRUE; - expected[1].is_pinned = TRUE; + expected[1].is_protected = true; + expected[1].is_pinned = true; expected[1].flush_dep_nchd = 1; expected[1].flush_dep_ndirty_chd = 1; @@ -27330,8 +27331,8 @@ check_flush_deps(unsigned paged) expected[1].flush_dep_par_type[0] = entry_type; expected[1].flush_dep_par_idx[0] = 2; expected[1].flush_dep_npar = 1; - expected[2].is_protected = TRUE; - expected[2].is_pinned = TRUE; + expected[2].is_protected = true; + expected[2].is_pinned = true; expected[2].flush_dep_nchd = 1; expected[2].flush_dep_ndirty_chd = 1; @@ -27357,8 +27358,8 @@ check_flush_deps(unsigned paged) expected[3].flush_dep_par_type[0] = entry_type; expected[3].flush_dep_par_idx[0] = 4; expected[3].flush_dep_npar = 1; - expected[4].is_protected = TRUE; - expected[4].is_pinned = TRUE; + expected[4].is_protected = true; + expected[4].is_pinned = true; expected[4].flush_dep_nchd = 1; expected[4].flush_dep_ndirty_chd = 1; @@ -27428,8 +27429,8 @@ check_flush_deps(unsigned paged) * after destroying flush dependency */ expected[3].flush_dep_npar = 0; - expected[4].is_protected = FALSE; - expected[4].is_pinned = FALSE; + expected[4].is_protected = false; + expected[4].is_pinned = false; expected[4].flush_dep_nchd = 0; expected[4].flush_dep_ndirty_chd = 0; @@ -27456,8 +27457,8 @@ check_flush_deps(unsigned paged) * after destroying flush dependency */ expected[1].flush_dep_npar = 0; - expected[2].is_protected = FALSE; - expected[2].is_pinned = FALSE; + expected[2].is_protected = false; + expected[2].is_pinned = false; expected[2].flush_dep_nchd = 0; expected[2].flush_dep_ndirty_chd = 0; @@ -27484,8 +27485,8 @@ check_flush_deps(unsigned paged) * after destroying flush dependency */ expected[0].flush_dep_npar = 0; - expected[1].is_protected = FALSE; - expected[1].is_pinned = FALSE; + expected[1].is_protected = false; + expected[1].is_pinned = false; expected[1].flush_dep_nchd = 0; expected[1].flush_dep_ndirty_chd = 0; @@ -27522,8 +27523,8 @@ check_flush_deps(unsigned paged) expected[0].flush_dep_par_type[0] = entry_type; expected[0].flush_dep_par_idx[0] = 1; expected[0].flush_dep_npar = 1; - expected[1].is_protected = TRUE; - expected[1].is_pinned = TRUE; + expected[1].is_protected = true; + expected[1].is_pinned = true; expected[1].flush_dep_nchd = 1; expected[1].flush_dep_ndirty_chd = 1; @@ -27557,8 +27558,8 @@ check_flush_deps(unsigned paged) * after destroy flush dependency */ expected[0].flush_dep_npar = 0; - expected[1].is_protected = FALSE; - expected[1].is_pinned = FALSE; + expected[1].is_protected = false; + expected[1].is_pinned = false; expected[1].flush_dep_nchd = 0; expected[1].flush_dep_ndirty_chd = 0; @@ -27595,8 +27596,8 @@ check_flush_deps(unsigned paged) expected[0].flush_dep_par_type[0] = entry_type; expected[0].flush_dep_par_idx[0] = 1; expected[0].flush_dep_npar = 1; - expected[1].is_protected = TRUE; - expected[1].is_pinned = TRUE; + expected[1].is_protected = true; + expected[1].is_pinned = true; expected[1].flush_dep_nchd = 1; expected[1].flush_dep_ndirty_chd = 1; @@ -27638,8 +27639,8 @@ check_flush_deps(unsigned paged) * after destroy flush dependency */ expected[0].flush_dep_npar = 0; - expected[1].is_protected = FALSE; - expected[1].is_pinned = FALSE; + expected[1].is_protected = false; + expected[1].is_pinned = false; expected[1].flush_dep_nchd = 0; expected[1].flush_dep_ndirty_chd = 0; @@ -27672,8 +27673,8 @@ check_flush_deps(unsigned paged) expected[0].flush_dep_par_type[0] = entry_type; expected[0].flush_dep_par_idx[0] = 1; expected[0].flush_dep_npar = 1; - expected[1].is_protected = TRUE; - expected[1].is_pinned = TRUE; + expected[1].is_protected = true; + expected[1].is_pinned = true; expected[1].flush_dep_nchd = 1; expected[1].flush_dep_ndirty_chd = 1; @@ -27699,8 +27700,8 @@ check_flush_deps(unsigned paged) expected[0].flush_dep_par_type[1] = entry_type; expected[0].flush_dep_par_idx[1] = 2; expected[0].flush_dep_npar = 2; - expected[2].is_protected = TRUE; - expected[2].is_pinned = TRUE; + expected[2].is_protected = true; + expected[2].is_pinned = true; expected[2].flush_dep_nchd = 1; expected[2].flush_dep_ndirty_chd = 1; @@ -27732,8 +27733,8 @@ check_flush_deps(unsigned paged) expected[0].flush_dep_par_type[0] = entry_type; expected[0].flush_dep_par_idx[0] = 2; expected[0].flush_dep_npar = 1; - expected[1].is_protected = FALSE; - expected[1].is_pinned = FALSE; + expected[1].is_protected = false; + expected[1].is_pinned = false; expected[1].flush_dep_nchd = 0; expected[1].flush_dep_ndirty_chd = 0; @@ -27760,8 +27761,8 @@ check_flush_deps(unsigned paged) * after destroying flush dependency */ expected[0].flush_dep_npar = 0; - expected[2].is_protected = FALSE; - expected[2].is_pinned = FALSE; + expected[2].is_protected = false; + expected[2].is_pinned = false; expected[2].flush_dep_nchd = 0; expected[2].flush_dep_ndirty_chd = 0; @@ -27776,7 +27777,7 @@ check_flush_deps(unsigned paged) done: if (file_ptr) - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); if (pass) PASSED(); @@ -27810,7 +27811,7 @@ check_flush_deps_err(unsigned paged) else TESTING("flush dependency errors"); - pass = TRUE; + pass = true; /* Loop over test cases, check for various errors in configuring flush * dependencies. Verify that all performs as expected. @@ -28031,7 +28032,7 @@ check_flush_deps_err(unsigned paged) CACHE_ERROR("Unknown test case!") } /* end switch */ - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); if (!pass) CACHE_ERROR("takedown_cache failed") file_ptr = NULL; @@ -28039,7 +28040,7 @@ check_flush_deps_err(unsigned paged) done: if (file_ptr) - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); if (pass) PASSED(); @@ -28075,11 +28076,11 @@ check_flush_deps_order(unsigned paged) { /* entry entry in at main flush dep flush dep child flush flush flush */ /* type: index: size: cache: addr: dirty: prot: pinned: dsrlzd: srlzd: dest: par type[]: par idx[]: dep npart: dep nchd: dep ndirty chd: order: corked: */ - { PICO_ENTRY_TYPE, 0, PICO_ENTRY_SIZE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 0, 0, 0, -1, FALSE}, - { PICO_ENTRY_TYPE, 1, PICO_ENTRY_SIZE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 0, 0, 0, -1, FALSE}, - { PICO_ENTRY_TYPE, 2, PICO_ENTRY_SIZE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 0, 0, 0, -1, FALSE}, - { PICO_ENTRY_TYPE, 3, PICO_ENTRY_SIZE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 0, 0, 0, -1, FALSE}, - { PICO_ENTRY_TYPE, 4, PICO_ENTRY_SIZE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 0, 0, 0, -1, FALSE} + { PICO_ENTRY_TYPE, 0, PICO_ENTRY_SIZE, false, true, false, false, false, false, false, false, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 0, 0, 0, -1, false}, + { PICO_ENTRY_TYPE, 1, PICO_ENTRY_SIZE, false, true, false, false, false, false, false, false, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 0, 0, 0, -1, false}, + { PICO_ENTRY_TYPE, 2, PICO_ENTRY_SIZE, false, true, false, false, false, false, false, false, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 0, 0, 0, -1, false}, + { PICO_ENTRY_TYPE, 3, PICO_ENTRY_SIZE, false, true, false, false, false, false, false, false, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 0, 0, 0, -1, false}, + { PICO_ENTRY_TYPE, 4, PICO_ENTRY_SIZE, false, true, false, false, false, false, false, false, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 0, 0, 0, -1, false} }; /* clang-format on */ @@ -28088,7 +28089,7 @@ check_flush_deps_order(unsigned paged) else TESTING("flush dependencies flush order"); - pass = TRUE; + pass = true; /* allocate a cache, build up flush dependency hierarchy and tear it down. * Verify that all performs as expected. @@ -28110,8 +28111,8 @@ check_flush_deps_order(unsigned paged) /* Change expected values, and verify the status of the entries * after each insertion */ - expected[u].in_cache = TRUE; - expected[u].is_dirty = TRUE; + expected[u].in_cache = true; + expected[u].is_dirty = true; /* Verify the status */ verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */ @@ -28140,8 +28141,8 @@ check_flush_deps_order(unsigned paged) expected[0].flush_dep_par_type[0] = entry_type; expected[0].flush_dep_par_idx[0] = 1; expected[0].flush_dep_npar = 1; - expected[1].is_protected = TRUE; - expected[1].is_pinned = TRUE; + expected[1].is_protected = true; + expected[1].is_pinned = true; expected[1].flush_dep_nchd = 1; expected[1].flush_dep_ndirty_chd = 1; @@ -28156,8 +28157,8 @@ check_flush_deps_order(unsigned paged) /* Flush the cache and verify that the entries were flushed in correct order */ { - add_flush_op(entry_type, 0, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 1, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); + add_flush_op(entry_type, 0, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 1, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); unprotect_entry(file_ptr, /* H5F_t * file_ptr */ entry_type, /* int32_t type */ @@ -28176,20 +28177,20 @@ check_flush_deps_order(unsigned paged) /* Change expected values, and verify the status of the entries * after destroy flush dependency */ - expected[0].is_dirty = FALSE; - expected[0].serialized = TRUE; + expected[0].is_dirty = false; + expected[0].serialized = true; expected[0].flush_order = 0; - expected[1].is_dirty = FALSE; - expected[1].serialized = TRUE; + expected[1].is_dirty = false; + expected[1].serialized = true; expected[1].flush_order = 1; - expected[1].is_protected = FALSE; + expected[1].is_protected = false; expected[1].flush_dep_ndirty_chd = 0; - expected[2].is_dirty = FALSE; - expected[2].serialized = TRUE; - expected[3].is_dirty = FALSE; - expected[3].serialized = TRUE; - expected[4].is_dirty = FALSE; - expected[4].serialized = TRUE; + expected[2].is_dirty = false; + expected[2].serialized = true; + expected[3].is_dirty = false; + expected[3].serialized = true; + expected[4].is_dirty = false; + expected[4].serialized = true; /* Verify the status */ verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */ @@ -28210,7 +28211,7 @@ check_flush_deps_order(unsigned paged) * after destroy flush dependency */ expected[0].flush_dep_npar = 0; - expected[1].is_pinned = FALSE; + expected[1].is_pinned = false; expected[1].flush_dep_nchd = 0; /* Verify the status */ @@ -28237,8 +28238,8 @@ check_flush_deps_order(unsigned paged) /* Change expected values, and verify the status of the entries * after creating flush dependency */ - expected[0].is_protected = TRUE; - expected[0].is_pinned = TRUE; + expected[0].is_protected = true; + expected[0].is_pinned = true; expected[0].flush_dep_nchd = 1; expected[1].flush_dep_par_type[0] = entry_type; expected[1].flush_dep_par_idx[0] = 0; @@ -28255,8 +28256,8 @@ check_flush_deps_order(unsigned paged) /* Flush the cache and verify that the entries were flushed in correct order */ { - add_flush_op(entry_type, 0, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 1, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); + add_flush_op(entry_type, 0, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 1, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); unprotect_entry(file_ptr, /* H5F_t * file_ptr */ entry_type, /* int32_t type */ @@ -28266,15 +28267,15 @@ check_flush_deps_order(unsigned paged) CACHE_ERROR("unprotect_entry failed") /* Mark entries 0 & 1 dirty, so they are flushed */ - dirty_entry(file_ptr, entry_type, 0, TRUE); - dirty_entry(file_ptr, entry_type, 1, FALSE); + dirty_entry(file_ptr, entry_type, 0, true); + dirty_entry(file_ptr, entry_type, 1, false); if (!pass) CACHE_ERROR("dirty_entry failed") /* Reset 'serialized' flag & 'flush_order' value in expected array */ - expected[0].serialized = FALSE; + expected[0].serialized = false; expected[0].flush_order = -1; - expected[1].serialized = FALSE; + expected[1].serialized = false; expected[1].flush_order = -1; /* Reset index for tracking flush order */ @@ -28287,12 +28288,12 @@ check_flush_deps_order(unsigned paged) /* Change expected values, and verify the status of the entries * after destroy flush dependency */ - expected[0].is_dirty = FALSE; - expected[0].serialized = TRUE; + expected[0].is_dirty = false; + expected[0].serialized = true; expected[0].flush_order = 1; - expected[0].is_protected = FALSE; - expected[1].is_dirty = FALSE; - expected[1].serialized = TRUE; + expected[0].is_protected = false; + expected[1].is_dirty = false; + expected[1].serialized = true; expected[1].flush_order = 0; /* Verify the status */ @@ -28313,7 +28314,7 @@ check_flush_deps_order(unsigned paged) /* Change expected values, and verify the status of the entries * after destroy flush dependency */ - expected[0].is_pinned = FALSE; + expected[0].is_pinned = false; expected[0].flush_dep_nchd = 0; expected[1].flush_dep_npar = 0; @@ -28353,8 +28354,8 @@ check_flush_deps_order(unsigned paged) expected[1].flush_dep_par_type[0] = entry_type; expected[1].flush_dep_par_idx[0] = 2; expected[1].flush_dep_npar = 1; - expected[2].is_protected = TRUE; - expected[2].is_pinned = TRUE; + expected[2].is_protected = true; + expected[2].is_pinned = true; expected[2].flush_dep_nchd = 2; /* Verify the status */ @@ -28368,9 +28369,9 @@ check_flush_deps_order(unsigned paged) /* Flush the cache and verify that the entries were flushed in correct order */ { - add_flush_op(entry_type, 0, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 1, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 2, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); + add_flush_op(entry_type, 0, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 1, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 2, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); unprotect_entry(file_ptr, /* H5F_t * file_ptr */ entry_type, /* int32_t type */ @@ -28380,18 +28381,18 @@ check_flush_deps_order(unsigned paged) CACHE_ERROR("unprotect_entry failed") /* Mark entries 0, 1 & 2 dirty, so they are flushed */ - dirty_entry(file_ptr, entry_type, 0, FALSE); - dirty_entry(file_ptr, entry_type, 1, FALSE); - dirty_entry(file_ptr, entry_type, 2, TRUE); + dirty_entry(file_ptr, entry_type, 0, false); + dirty_entry(file_ptr, entry_type, 1, false); + dirty_entry(file_ptr, entry_type, 2, true); if (!pass) CACHE_ERROR("dirty_entry failed") /* Reset 'serialized' flag & 'flush_order' value in expected array */ - expected[0].serialized = FALSE; + expected[0].serialized = false; expected[0].flush_order = -1; - expected[1].serialized = FALSE; + expected[1].serialized = false; expected[1].flush_order = -1; - expected[2].serialized = FALSE; + expected[2].serialized = false; expected[2].flush_order = -1; /* Reset index for tracking flush order */ @@ -28404,16 +28405,16 @@ check_flush_deps_order(unsigned paged) /* Change expected values, and verify the status of the entries * after destroy flush dependency */ - expected[0].is_dirty = FALSE; - expected[0].serialized = TRUE; + expected[0].is_dirty = false; + expected[0].serialized = true; expected[0].flush_order = 0; - expected[1].is_dirty = FALSE; - expected[1].serialized = TRUE; + expected[1].is_dirty = false; + expected[1].serialized = true; expected[1].flush_order = 1; - expected[2].is_dirty = FALSE; - expected[2].serialized = TRUE; + expected[2].is_dirty = false; + expected[2].serialized = true; expected[2].flush_order = 2; - expected[2].is_protected = FALSE; + expected[2].is_protected = false; /* Verify the status */ verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */ @@ -28439,7 +28440,7 @@ check_flush_deps_order(unsigned paged) */ expected[0].flush_dep_npar = 0; expected[1].flush_dep_npar = 0; - expected[2].is_pinned = FALSE; + expected[2].is_pinned = false; expected[2].flush_dep_nchd = 0; /* Verify the status */ @@ -28472,8 +28473,8 @@ check_flush_deps_order(unsigned paged) /* Change expected values, and verify the status of the entries * after creating flush dependency */ - expected[0].is_protected = TRUE; - expected[0].is_pinned = TRUE; + expected[0].is_protected = true; + expected[0].is_pinned = true; expected[0].flush_dep_nchd = 2; expected[1].flush_dep_par_type[0] = entry_type; expected[1].flush_dep_par_idx[0] = 0; @@ -28493,9 +28494,9 @@ check_flush_deps_order(unsigned paged) /* Flush the cache and verify that the entries were flushed in correct order */ { - add_flush_op(entry_type, 0, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 1, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 2, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); + add_flush_op(entry_type, 0, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 1, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 2, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); unprotect_entry(file_ptr, /* H5F_t * file_ptr */ entry_type, /* int32_t type */ @@ -28505,18 +28506,18 @@ check_flush_deps_order(unsigned paged) CACHE_ERROR("unprotect_entry failed") /* Mark entries 0, 1 & 2 dirty, so they are flushed */ - dirty_entry(file_ptr, entry_type, 0, TRUE); - dirty_entry(file_ptr, entry_type, 1, FALSE); - dirty_entry(file_ptr, entry_type, 2, FALSE); + dirty_entry(file_ptr, entry_type, 0, true); + dirty_entry(file_ptr, entry_type, 1, false); + dirty_entry(file_ptr, entry_type, 2, false); if (!pass) CACHE_ERROR("dirty_entry failed") /* Reset 'serialized' flag & 'flush_order' value in expected array */ - expected[0].serialized = FALSE; + expected[0].serialized = false; expected[0].flush_order = -1; - expected[1].serialized = FALSE; + expected[1].serialized = false; expected[1].flush_order = -1; - expected[2].serialized = FALSE; + expected[2].serialized = false; expected[2].flush_order = -1; /* Reset index for tracking flush order */ @@ -28529,15 +28530,15 @@ check_flush_deps_order(unsigned paged) /* Change expected values, and verify the status of the entries * after destroy flush dependency */ - expected[0].is_dirty = FALSE; - expected[0].serialized = TRUE; + expected[0].is_dirty = false; + expected[0].serialized = true; expected[0].flush_order = 2; - expected[0].is_protected = FALSE; - expected[1].is_dirty = FALSE; - expected[1].serialized = TRUE; + expected[0].is_protected = false; + expected[1].is_dirty = false; + expected[1].serialized = true; expected[1].flush_order = 0; - expected[2].is_dirty = FALSE; - expected[2].serialized = TRUE; + expected[2].is_dirty = false; + expected[2].serialized = true; expected[2].flush_order = 1; /* Verify the status */ @@ -28562,7 +28563,7 @@ check_flush_deps_order(unsigned paged) /* Change expected values, and verify the status of the entries * after destroy flush dependency */ - expected[0].is_pinned = FALSE; + expected[0].is_pinned = false; expected[0].flush_dep_nchd = 0; expected[1].flush_dep_npar = 0; expected[2].flush_dep_npar = 0; @@ -28596,8 +28597,8 @@ check_flush_deps_order(unsigned paged) expected[0].flush_dep_par_type[0] = entry_type; expected[0].flush_dep_par_idx[0] = 1; expected[0].flush_dep_npar = 1; - expected[1].is_protected = TRUE; - expected[1].is_pinned = TRUE; + expected[1].is_protected = true; + expected[1].is_pinned = true; expected[1].flush_dep_nchd = 1; /* Verify the status */ @@ -28622,8 +28623,8 @@ check_flush_deps_order(unsigned paged) expected[1].flush_dep_par_type[0] = entry_type; expected[1].flush_dep_par_idx[0] = 2; expected[1].flush_dep_npar = 1; - expected[2].is_protected = TRUE; - expected[2].is_pinned = TRUE; + expected[2].is_protected = true; + expected[2].is_pinned = true; expected[2].flush_dep_nchd = 1; /* Verify the status */ @@ -28648,8 +28649,8 @@ check_flush_deps_order(unsigned paged) expected[2].flush_dep_par_type[0] = entry_type; expected[2].flush_dep_par_idx[0] = 3; expected[2].flush_dep_npar = 1; - expected[3].is_protected = TRUE; - expected[3].is_pinned = TRUE; + expected[3].is_protected = true; + expected[3].is_pinned = true; expected[3].flush_dep_nchd = 1; /* Verify the status */ @@ -28663,10 +28664,10 @@ check_flush_deps_order(unsigned paged) /* Flush the cache and verify that the entries were flushed in correct order */ { - add_flush_op(entry_type, 0, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 1, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 2, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 3, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); + add_flush_op(entry_type, 0, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 1, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 2, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 3, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); unprotect_entry(file_ptr, /* H5F_t * file_ptr */ entry_type, /* int32_t type */ @@ -28690,21 +28691,21 @@ check_flush_deps_order(unsigned paged) CACHE_ERROR("unprotect_entry failed") /* Mark entries 0-3 dirty, so they are flushed */ - dirty_entry(file_ptr, entry_type, 0, FALSE); - dirty_entry(file_ptr, entry_type, 1, TRUE); - dirty_entry(file_ptr, entry_type, 2, TRUE); - dirty_entry(file_ptr, entry_type, 3, TRUE); + dirty_entry(file_ptr, entry_type, 0, false); + dirty_entry(file_ptr, entry_type, 1, true); + dirty_entry(file_ptr, entry_type, 2, true); + dirty_entry(file_ptr, entry_type, 3, true); if (!pass) CACHE_ERROR("dirty_entry failed") /* Reset 'serialized' flag & 'flush_order' value in expected array */ - expected[0].serialized = FALSE; + expected[0].serialized = false; expected[0].flush_order = -1; - expected[1].serialized = FALSE; + expected[1].serialized = false; expected[1].flush_order = -1; - expected[2].serialized = FALSE; + expected[2].serialized = false; expected[2].flush_order = -1; - expected[3].serialized = FALSE; + expected[3].serialized = false; expected[3].flush_order = -1; /* Reset index for tracking flush order */ @@ -28717,20 +28718,20 @@ check_flush_deps_order(unsigned paged) /* Change expected values, and verify the status of the entries * after destroy flush dependency */ - expected[0].is_dirty = FALSE; - expected[0].serialized = TRUE; + expected[0].is_dirty = false; + expected[0].serialized = true; expected[0].flush_order = 0; - expected[1].is_dirty = FALSE; - expected[1].serialized = TRUE; + expected[1].is_dirty = false; + expected[1].serialized = true; expected[1].flush_order = 1; - expected[1].is_protected = FALSE; - expected[2].is_dirty = FALSE; - expected[2].serialized = TRUE; + expected[1].is_protected = false; + expected[2].is_dirty = false; + expected[2].serialized = true; expected[2].flush_order = 2; - expected[2].is_protected = FALSE; - expected[3].serialized = TRUE; + expected[2].is_protected = false; + expected[3].serialized = true; expected[3].flush_order = 3; - expected[3].is_protected = FALSE; + expected[3].is_protected = false; /* Verify the status */ verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */ @@ -28751,7 +28752,7 @@ check_flush_deps_order(unsigned paged) * after destroying flush dependency */ expected[2].flush_dep_npar = 0; - expected[3].is_pinned = FALSE; + expected[3].is_pinned = false; expected[3].flush_dep_nchd = 0; /* Verify the status */ @@ -28770,7 +28771,7 @@ check_flush_deps_order(unsigned paged) * after destroying flush dependency */ expected[1].flush_dep_npar = 0; - expected[2].is_pinned = FALSE; + expected[2].is_pinned = false; expected[2].flush_dep_nchd = 0; /* Verify the status */ @@ -28789,7 +28790,7 @@ check_flush_deps_order(unsigned paged) * after destroying flush dependency */ expected[0].flush_dep_npar = 0; - expected[1].is_pinned = FALSE; + expected[1].is_pinned = false; expected[1].flush_dep_nchd = 0; /* Verify the status */ @@ -28818,8 +28819,8 @@ check_flush_deps_order(unsigned paged) /* Change expected values, and verify the status of the entries * after creating flush dependency */ - expected[0].is_protected = TRUE; - expected[0].is_pinned = TRUE; + expected[0].is_protected = true; + expected[0].is_pinned = true; expected[0].flush_dep_nchd = 1; expected[1].flush_dep_par_type[0] = entry_type; expected[1].flush_dep_par_idx[0] = 0; @@ -28844,8 +28845,8 @@ check_flush_deps_order(unsigned paged) /* Change expected values, and verify the status of the entries * after creating flush dependency */ - expected[1].is_protected = TRUE; - expected[1].is_pinned = TRUE; + expected[1].is_protected = true; + expected[1].is_pinned = true; expected[1].flush_dep_nchd = 1; expected[2].flush_dep_par_type[0] = entry_type; expected[2].flush_dep_par_idx[0] = 1; @@ -28870,8 +28871,8 @@ check_flush_deps_order(unsigned paged) /* Change expected values, and verify the status of the entries * after creating flush dependency */ - expected[2].is_protected = TRUE; - expected[2].is_pinned = TRUE; + expected[2].is_protected = true; + expected[2].is_pinned = true; expected[2].flush_dep_nchd = 1; expected[3].flush_dep_par_type[0] = entry_type; expected[3].flush_dep_par_idx[0] = 2; @@ -28888,10 +28889,10 @@ check_flush_deps_order(unsigned paged) /* Flush the cache and verify that the entries were flushed in correct order */ { - add_flush_op(entry_type, 0, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 1, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 2, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 3, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); + add_flush_op(entry_type, 0, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 1, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 2, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 3, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); unprotect_entry(file_ptr, /* H5F_t * file_ptr */ entry_type, /* int32_t type */ @@ -28915,21 +28916,21 @@ check_flush_deps_order(unsigned paged) CACHE_ERROR("unprotect_entry failed") /* Mark entries 0-3 dirty, so they are flushed */ - dirty_entry(file_ptr, entry_type, 0, TRUE); - dirty_entry(file_ptr, entry_type, 1, TRUE); - dirty_entry(file_ptr, entry_type, 2, TRUE); - dirty_entry(file_ptr, entry_type, 3, FALSE); + dirty_entry(file_ptr, entry_type, 0, true); + dirty_entry(file_ptr, entry_type, 1, true); + dirty_entry(file_ptr, entry_type, 2, true); + dirty_entry(file_ptr, entry_type, 3, false); if (!pass) CACHE_ERROR("dirty_entry failed") /* Reset 'serialized' flag & 'flush_order' value in expected array */ - expected[0].serialized = FALSE; + expected[0].serialized = false; expected[0].flush_order = -1; - expected[1].serialized = FALSE; + expected[1].serialized = false; expected[1].flush_order = -1; - expected[2].serialized = FALSE; + expected[2].serialized = false; expected[2].flush_order = -1; - expected[3].serialized = FALSE; + expected[3].serialized = false; expected[3].flush_order = -1; /* Reset index for tracking flush order */ @@ -28942,20 +28943,20 @@ check_flush_deps_order(unsigned paged) /* Change expected values, and verify the status of the entries * after destroy flush dependency */ - expected[0].is_dirty = FALSE; - expected[0].serialized = TRUE; + expected[0].is_dirty = false; + expected[0].serialized = true; expected[0].flush_order = 3; - expected[0].is_protected = FALSE; - expected[1].is_dirty = FALSE; - expected[1].serialized = TRUE; + expected[0].is_protected = false; + expected[1].is_dirty = false; + expected[1].serialized = true; expected[1].flush_order = 2; - expected[1].is_protected = FALSE; - expected[2].is_dirty = FALSE; - expected[2].serialized = TRUE; + expected[1].is_protected = false; + expected[2].is_dirty = false; + expected[2].serialized = true; expected[2].flush_order = 1; - expected[2].is_protected = FALSE; - expected[3].is_dirty = FALSE; - expected[3].serialized = TRUE; + expected[2].is_protected = false; + expected[3].is_dirty = false; + expected[3].serialized = true; expected[3].flush_order = 0; /* Verify the status */ @@ -28976,7 +28977,7 @@ check_flush_deps_order(unsigned paged) /* Change expected values, and verify the status of the entries * after destroying flush dependency */ - expected[2].is_pinned = FALSE; + expected[2].is_pinned = false; expected[2].flush_dep_nchd = 0; expected[3].flush_dep_npar = 0; @@ -28995,7 +28996,7 @@ check_flush_deps_order(unsigned paged) /* Change expected values, and verify the status of the entries * after destroying flush dependency */ - expected[1].is_pinned = FALSE; + expected[1].is_pinned = false; expected[1].flush_dep_nchd = 0; expected[2].flush_dep_npar = 0; @@ -29014,7 +29015,7 @@ check_flush_deps_order(unsigned paged) /* Change expected values, and verify the status of the entries * after destroying flush dependency */ - expected[0].is_pinned = FALSE; + expected[0].is_pinned = false; expected[0].flush_dep_nchd = 0; expected[1].flush_dep_npar = 0; @@ -29046,8 +29047,8 @@ check_flush_deps_order(unsigned paged) expected[u].flush_dep_par_type[0] = entry_type; expected[u].flush_dep_par_idx[0] = 4; expected[u].flush_dep_npar = 1; - expected[4].is_protected = TRUE; - expected[4].is_pinned = TRUE; + expected[4].is_protected = true; + expected[4].is_pinned = true; expected[4].flush_dep_nchd = u + 1; /* Verify the status */ @@ -29062,11 +29063,11 @@ check_flush_deps_order(unsigned paged) /* Flush the cache and verify that the entries were flushed in correct order */ { - add_flush_op(entry_type, 0, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 1, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 2, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 3, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 4, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); + add_flush_op(entry_type, 0, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 1, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 2, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 3, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 4, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); unprotect_entry(file_ptr, /* H5F_t * file_ptr */ entry_type, /* int32_t type */ @@ -29076,24 +29077,24 @@ check_flush_deps_order(unsigned paged) CACHE_ERROR("unprotect_entry failed") /* Mark entries 0-4 dirty, so they are flushed */ - dirty_entry(file_ptr, entry_type, 0, FALSE); - dirty_entry(file_ptr, entry_type, 1, FALSE); - dirty_entry(file_ptr, entry_type, 2, FALSE); - dirty_entry(file_ptr, entry_type, 3, FALSE); - dirty_entry(file_ptr, entry_type, 4, TRUE); + dirty_entry(file_ptr, entry_type, 0, false); + dirty_entry(file_ptr, entry_type, 1, false); + dirty_entry(file_ptr, entry_type, 2, false); + dirty_entry(file_ptr, entry_type, 3, false); + dirty_entry(file_ptr, entry_type, 4, true); if (!pass) CACHE_ERROR("dirty_entry failed") /* Reset 'serialized' flag & 'flush_order' value in expected array */ - expected[0].serialized = FALSE; + expected[0].serialized = false; expected[0].flush_order = -1; - expected[1].serialized = FALSE; + expected[1].serialized = false; expected[1].flush_order = -1; - expected[2].serialized = FALSE; + expected[2].serialized = false; expected[2].flush_order = -1; - expected[3].serialized = FALSE; + expected[3].serialized = false; expected[3].flush_order = -1; - expected[4].serialized = FALSE; + expected[4].serialized = false; expected[4].flush_order = -1; /* Reset index for tracking flush order */ @@ -29106,22 +29107,22 @@ check_flush_deps_order(unsigned paged) /* Change expected values, and verify the status of the entries * after destroy flush dependency */ - expected[0].is_dirty = FALSE; - expected[0].serialized = TRUE; + expected[0].is_dirty = false; + expected[0].serialized = true; expected[0].flush_order = 0; - expected[1].is_dirty = FALSE; - expected[1].serialized = TRUE; + expected[1].is_dirty = false; + expected[1].serialized = true; expected[1].flush_order = 1; - expected[2].is_dirty = FALSE; - expected[2].serialized = TRUE; + expected[2].is_dirty = false; + expected[2].serialized = true; expected[2].flush_order = 2; - expected[3].is_dirty = FALSE; - expected[3].serialized = TRUE; + expected[3].is_dirty = false; + expected[3].serialized = true; expected[3].flush_order = 3; - expected[4].is_dirty = FALSE; - expected[4].serialized = TRUE; + expected[4].is_dirty = false; + expected[4].serialized = true; expected[4].flush_order = 4; - expected[4].is_protected = FALSE; + expected[4].is_protected = false; /* Verify the status */ verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */ @@ -29150,7 +29151,7 @@ check_flush_deps_order(unsigned paged) /* Change expected values, and verify the status of the entries * after destroying flush dependency */ - expected[4].is_pinned = FALSE; + expected[4].is_pinned = false; } /* end if */ /* Verify the status */ @@ -29182,8 +29183,8 @@ check_flush_deps_order(unsigned paged) expected[u].flush_dep_par_type[0] = entry_type; expected[u].flush_dep_par_idx[0] = 0; expected[u].flush_dep_npar = 1; - expected[0].is_protected = TRUE; - expected[0].is_pinned = TRUE; + expected[0].is_protected = true; + expected[0].is_pinned = true; expected[0].flush_dep_nchd = u; /* Verify the status */ @@ -29198,11 +29199,11 @@ check_flush_deps_order(unsigned paged) /* Flush the cache and verify that the entries were flushed in correct order */ { - add_flush_op(entry_type, 0, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 1, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 2, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 3, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 4, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); + add_flush_op(entry_type, 0, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 1, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 2, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 3, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 4, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); unprotect_entry(file_ptr, /* H5F_t * file_ptr */ entry_type, /* int32_t type */ @@ -29212,24 +29213,24 @@ check_flush_deps_order(unsigned paged) CACHE_ERROR("unprotect_entry failed") /* Mark entries 0-4 dirty, so they are flushed */ - dirty_entry(file_ptr, entry_type, 0, TRUE); - dirty_entry(file_ptr, entry_type, 1, FALSE); - dirty_entry(file_ptr, entry_type, 2, FALSE); - dirty_entry(file_ptr, entry_type, 3, FALSE); - dirty_entry(file_ptr, entry_type, 4, FALSE); + dirty_entry(file_ptr, entry_type, 0, true); + dirty_entry(file_ptr, entry_type, 1, false); + dirty_entry(file_ptr, entry_type, 2, false); + dirty_entry(file_ptr, entry_type, 3, false); + dirty_entry(file_ptr, entry_type, 4, false); if (!pass) CACHE_ERROR("dirty_entry failed") /* Reset 'serialized' flag & 'flush_order' value in expected array */ - expected[0].serialized = FALSE; + expected[0].serialized = false; expected[0].flush_order = -1; - expected[1].serialized = FALSE; + expected[1].serialized = false; expected[1].flush_order = -1; - expected[2].serialized = FALSE; + expected[2].serialized = false; expected[2].flush_order = -1; - expected[3].serialized = FALSE; + expected[3].serialized = false; expected[3].flush_order = -1; - expected[4].serialized = FALSE; + expected[4].serialized = false; expected[4].flush_order = -1; /* Reset index for tracking flush order */ @@ -29242,21 +29243,21 @@ check_flush_deps_order(unsigned paged) /* Change expected values, and verify the status of the entries * after destroy flush dependency */ - expected[0].is_dirty = FALSE; - expected[0].serialized = TRUE; + expected[0].is_dirty = false; + expected[0].serialized = true; expected[0].flush_order = 4; - expected[0].is_protected = FALSE; - expected[1].is_dirty = FALSE; - expected[1].serialized = TRUE; + expected[0].is_protected = false; + expected[1].is_dirty = false; + expected[1].serialized = true; expected[1].flush_order = 0; - expected[2].is_dirty = FALSE; - expected[2].serialized = TRUE; + expected[2].is_dirty = false; + expected[2].serialized = true; expected[2].flush_order = 1; - expected[3].is_dirty = FALSE; - expected[3].serialized = TRUE; + expected[3].is_dirty = false; + expected[3].serialized = true; expected[3].flush_order = 2; - expected[4].is_dirty = FALSE; - expected[4].serialized = TRUE; + expected[4].is_dirty = false; + expected[4].serialized = true; expected[4].flush_order = 3; /* Verify the status */ @@ -29286,7 +29287,7 @@ check_flush_deps_order(unsigned paged) /* Change expected values, and verify the status of the entries * after destroying flush dependency */ - expected[0].is_pinned = FALSE; + expected[0].is_pinned = false; } /* end if */ /* Verify the status */ @@ -29321,8 +29322,8 @@ check_flush_deps_order(unsigned paged) expected[0].flush_dep_par_type[0] = entry_type; expected[0].flush_dep_par_idx[0] = 1; expected[0].flush_dep_npar = 1; - expected[1].is_protected = TRUE; - expected[1].is_pinned = TRUE; + expected[1].is_protected = true; + expected[1].is_pinned = true; expected[1].flush_dep_nchd = 1; /* Verify the status */ @@ -29347,8 +29348,8 @@ check_flush_deps_order(unsigned paged) expected[3].flush_dep_par_type[0] = entry_type; expected[3].flush_dep_par_idx[0] = 4; expected[3].flush_dep_npar = 1; - expected[4].is_protected = TRUE; - expected[4].is_pinned = TRUE; + expected[4].is_protected = true; + expected[4].is_pinned = true; expected[4].flush_dep_nchd = 1; /* Verify the status */ @@ -29373,8 +29374,8 @@ check_flush_deps_order(unsigned paged) expected[4].flush_dep_par_type[0] = entry_type; expected[4].flush_dep_par_idx[0] = 0; expected[4].flush_dep_npar = 1; - expected[0].is_protected = TRUE; - expected[0].is_pinned = TRUE; + expected[0].is_protected = true; + expected[0].is_pinned = true; expected[0].flush_dep_nchd = 1; /* Verify the status */ @@ -29388,11 +29389,11 @@ check_flush_deps_order(unsigned paged) /* Flush the cache and verify that the entries were flushed in correct order */ { - add_flush_op(entry_type, 0, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 1, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); + add_flush_op(entry_type, 0, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 1, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); - add_flush_op(entry_type, 3, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 4, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); + add_flush_op(entry_type, 3, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 4, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); unprotect_entry(file_ptr, /* H5F_t * file_ptr */ entry_type, /* int32_t type */ @@ -29416,23 +29417,23 @@ check_flush_deps_order(unsigned paged) CACHE_ERROR("unprotect_entry failed") /* Mark entries 0 & 1, 3 & 4 dirty, so they are flushed */ - dirty_entry(file_ptr, entry_type, 0, TRUE); - dirty_entry(file_ptr, entry_type, 1, TRUE); - dirty_entry(file_ptr, entry_type, 3, FALSE); - dirty_entry(file_ptr, entry_type, 4, TRUE); + dirty_entry(file_ptr, entry_type, 0, true); + dirty_entry(file_ptr, entry_type, 1, true); + dirty_entry(file_ptr, entry_type, 3, false); + dirty_entry(file_ptr, entry_type, 4, true); if (!pass) CACHE_ERROR("dirty_entry failed") /* Reset 'serialized' flag & 'flush_order' value in expected array */ - expected[0].serialized = FALSE; + expected[0].serialized = false; expected[0].flush_order = -1; - expected[1].serialized = FALSE; + expected[1].serialized = false; expected[1].flush_order = -1; - expected[2].serialized = FALSE; + expected[2].serialized = false; expected[2].flush_order = -1; - expected[3].serialized = FALSE; + expected[3].serialized = false; expected[3].flush_order = -1; - expected[4].serialized = FALSE; + expected[4].serialized = false; expected[4].flush_order = -1; /* Reset index for tracking flush order */ @@ -29445,23 +29446,23 @@ check_flush_deps_order(unsigned paged) /* Change expected values, and verify the status of the entries * after destroy flush dependency */ - expected[0].is_dirty = FALSE; - expected[0].serialized = TRUE; + expected[0].is_dirty = false; + expected[0].serialized = true; expected[0].flush_order = 2; - expected[0].is_protected = FALSE; - expected[1].is_dirty = FALSE; - expected[1].serialized = TRUE; + expected[0].is_protected = false; + expected[1].is_dirty = false; + expected[1].serialized = true; expected[1].flush_order = 3; - expected[1].is_protected = FALSE; - expected[2].is_dirty = FALSE; - expected[2].serialized = TRUE; - expected[3].is_dirty = FALSE; - expected[3].serialized = TRUE; + expected[1].is_protected = false; + expected[2].is_dirty = false; + expected[2].serialized = true; + expected[3].is_dirty = false; + expected[3].serialized = true; expected[3].flush_order = 0; - expected[4].is_dirty = FALSE; - expected[4].serialized = TRUE; + expected[4].is_dirty = false; + expected[4].serialized = true; expected[4].flush_order = 1; - expected[4].is_protected = FALSE; + expected[4].is_protected = false; /* Verify the status */ verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */ @@ -29482,7 +29483,7 @@ check_flush_deps_order(unsigned paged) * after destroying flush dependency */ expected[4].flush_dep_npar = 0; - expected[0].is_pinned = FALSE; + expected[0].is_pinned = false; expected[0].flush_dep_nchd = 0; /* Verify the status */ @@ -29501,7 +29502,7 @@ check_flush_deps_order(unsigned paged) * after destroying flush dependency */ expected[3].flush_dep_npar = 0; - expected[4].is_pinned = FALSE; + expected[4].is_pinned = false; expected[4].flush_dep_nchd = 0; /* Verify the status */ @@ -29520,7 +29521,7 @@ check_flush_deps_order(unsigned paged) * after destroying flush dependency */ expected[0].flush_dep_npar = 0; - expected[1].is_pinned = FALSE; + expected[1].is_pinned = false; expected[1].flush_dep_nchd = 0; /* Verify the status */ @@ -29554,8 +29555,8 @@ check_flush_deps_order(unsigned paged) expected[0].flush_dep_par_type[0] = entry_type; expected[0].flush_dep_par_idx[0] = 1; expected[0].flush_dep_npar = 1; - expected[1].is_protected = TRUE; - expected[1].is_pinned = TRUE; + expected[1].is_protected = true; + expected[1].is_pinned = true; expected[1].flush_dep_nchd = 1; /* Verify the status */ @@ -29580,8 +29581,8 @@ check_flush_deps_order(unsigned paged) expected[1].flush_dep_par_type[0] = entry_type; expected[1].flush_dep_par_idx[0] = 2; expected[1].flush_dep_npar = 1; - expected[2].is_protected = TRUE; - expected[2].is_pinned = TRUE; + expected[2].is_protected = true; + expected[2].is_pinned = true; expected[2].flush_dep_nchd = 1; /* Verify the status */ @@ -29606,8 +29607,8 @@ check_flush_deps_order(unsigned paged) expected[3].flush_dep_par_type[0] = entry_type; expected[3].flush_dep_par_idx[0] = 4; expected[3].flush_dep_npar = 1; - expected[4].is_protected = TRUE; - expected[4].is_pinned = TRUE; + expected[4].is_protected = true; + expected[4].is_pinned = true; expected[4].flush_dep_nchd = 1; /* Verify the status */ @@ -29641,11 +29642,11 @@ check_flush_deps_order(unsigned paged) /* Flush the cache and verify that the entries were flushed in correct order */ { - add_flush_op(entry_type, 0, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 1, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 2, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 3, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 4, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); + add_flush_op(entry_type, 0, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 1, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 2, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 3, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 4, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); unprotect_entry(file_ptr, /* H5F_t * file_ptr */ entry_type, /* int32_t type */ @@ -29669,24 +29670,24 @@ check_flush_deps_order(unsigned paged) CACHE_ERROR("unprotect_entry failed") /* Mark entries 0-4 dirty, so they are flushed */ - dirty_entry(file_ptr, entry_type, 0, FALSE); - dirty_entry(file_ptr, entry_type, 1, TRUE); - dirty_entry(file_ptr, entry_type, 2, TRUE); - dirty_entry(file_ptr, entry_type, 3, FALSE); - dirty_entry(file_ptr, entry_type, 4, TRUE); + dirty_entry(file_ptr, entry_type, 0, false); + dirty_entry(file_ptr, entry_type, 1, true); + dirty_entry(file_ptr, entry_type, 2, true); + dirty_entry(file_ptr, entry_type, 3, false); + dirty_entry(file_ptr, entry_type, 4, true); if (!pass) CACHE_ERROR("dirty_entry failed") /* Reset 'serialized' flag & 'flush_order' value in expected array */ - expected[0].serialized = FALSE; + expected[0].serialized = false; expected[0].flush_order = -1; - expected[1].serialized = FALSE; + expected[1].serialized = false; expected[1].flush_order = -1; - expected[2].serialized = FALSE; + expected[2].serialized = false; expected[2].flush_order = -1; - expected[3].serialized = FALSE; + expected[3].serialized = false; expected[3].flush_order = -1; - expected[4].serialized = FALSE; + expected[4].serialized = false; expected[4].flush_order = -1; /* Reset index for tracking flush order */ @@ -29699,25 +29700,25 @@ check_flush_deps_order(unsigned paged) /* Change expected values, and verify the status of the entries * after destroy flush dependency */ - expected[0].is_dirty = FALSE; - expected[0].serialized = TRUE; + expected[0].is_dirty = false; + expected[0].serialized = true; expected[0].flush_order = 0; - expected[0].is_protected = FALSE; - expected[1].is_dirty = FALSE; - expected[1].serialized = TRUE; + expected[0].is_protected = false; + expected[1].is_dirty = false; + expected[1].serialized = true; expected[1].flush_order = 3; - expected[1].is_protected = FALSE; - expected[2].is_dirty = FALSE; - expected[2].serialized = TRUE; + expected[1].is_protected = false; + expected[2].is_dirty = false; + expected[2].serialized = true; expected[2].flush_order = 4; - expected[2].is_protected = FALSE; - expected[3].is_dirty = FALSE; - expected[3].serialized = TRUE; + expected[2].is_protected = false; + expected[3].is_dirty = false; + expected[3].serialized = true; expected[3].flush_order = 1; - expected[4].is_dirty = FALSE; - expected[4].serialized = TRUE; + expected[4].is_dirty = false; + expected[4].serialized = true; expected[4].flush_order = 2; - expected[4].is_protected = FALSE; + expected[4].is_protected = false; /* Verify the status */ verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */ @@ -29756,7 +29757,7 @@ check_flush_deps_order(unsigned paged) * after destroying flush dependency */ expected[3].flush_dep_npar = 0; - expected[4].is_pinned = FALSE; + expected[4].is_pinned = false; expected[4].flush_dep_nchd = 0; /* Verify the status */ @@ -29775,7 +29776,7 @@ check_flush_deps_order(unsigned paged) * after destroying flush dependency */ expected[1].flush_dep_npar = 0; - expected[2].is_pinned = FALSE; + expected[2].is_pinned = false; expected[2].flush_dep_nchd = 0; /* Verify the status */ @@ -29794,7 +29795,7 @@ check_flush_deps_order(unsigned paged) * after destroying flush dependency */ expected[0].flush_dep_npar = 0; - expected[1].is_pinned = FALSE; + expected[1].is_pinned = false; expected[1].flush_dep_nchd = 0; /* Verify the status */ @@ -29828,8 +29829,8 @@ check_flush_deps_order(unsigned paged) expected[0].flush_dep_par_type[0] = entry_type; expected[0].flush_dep_par_idx[0] = 1; expected[0].flush_dep_npar = 1; - expected[1].is_protected = TRUE; - expected[1].is_pinned = TRUE; + expected[1].is_protected = true; + expected[1].is_pinned = true; expected[1].flush_dep_nchd = 1; /* Verify the status */ @@ -29854,8 +29855,8 @@ check_flush_deps_order(unsigned paged) expected[1].flush_dep_par_type[0] = entry_type; expected[1].flush_dep_par_idx[0] = 2; expected[1].flush_dep_npar = 1; - expected[2].is_protected = TRUE; - expected[2].is_pinned = TRUE; + expected[2].is_protected = true; + expected[2].is_pinned = true; expected[2].flush_dep_nchd = 1; /* Verify the status */ @@ -29880,8 +29881,8 @@ check_flush_deps_order(unsigned paged) expected[3].flush_dep_par_type[0] = entry_type; expected[3].flush_dep_par_idx[0] = 4; expected[3].flush_dep_npar = 1; - expected[4].is_protected = TRUE; - expected[4].is_pinned = TRUE; + expected[4].is_protected = true; + expected[4].is_pinned = true; expected[4].flush_dep_nchd = 1; /* Verify the status */ @@ -29915,11 +29916,11 @@ check_flush_deps_order(unsigned paged) /* Flush the cache and verify that the entries were flushed in correct order */ { - add_flush_op(entry_type, 0, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 1, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 2, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 3, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 4, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); + add_flush_op(entry_type, 0, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 1, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 2, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 3, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 4, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); unprotect_entry(file_ptr, /* H5F_t * file_ptr */ entry_type, /* int32_t type */ @@ -29943,24 +29944,24 @@ check_flush_deps_order(unsigned paged) CACHE_ERROR("unprotect_entry failed") /* Mark entries 0-4 dirty, so they are flushed */ - dirty_entry(file_ptr, entry_type, 0, FALSE); - dirty_entry(file_ptr, entry_type, 1, TRUE); - dirty_entry(file_ptr, entry_type, 2, TRUE); - dirty_entry(file_ptr, entry_type, 3, FALSE); - dirty_entry(file_ptr, entry_type, 4, TRUE); + dirty_entry(file_ptr, entry_type, 0, false); + dirty_entry(file_ptr, entry_type, 1, true); + dirty_entry(file_ptr, entry_type, 2, true); + dirty_entry(file_ptr, entry_type, 3, false); + dirty_entry(file_ptr, entry_type, 4, true); if (!pass) CACHE_ERROR("dirty_entry failed") /* Reset 'serialized' flag & 'flush_order' value in expected array */ - expected[0].serialized = FALSE; + expected[0].serialized = false; expected[0].flush_order = -1; - expected[1].serialized = FALSE; + expected[1].serialized = false; expected[1].flush_order = -1; - expected[2].serialized = FALSE; + expected[2].serialized = false; expected[2].flush_order = -1; - expected[3].serialized = FALSE; + expected[3].serialized = false; expected[3].flush_order = -1; - expected[4].serialized = FALSE; + expected[4].serialized = false; expected[4].flush_order = -1; /* Reset index for tracking flush order */ @@ -29973,25 +29974,25 @@ check_flush_deps_order(unsigned paged) /* Change expected values, and verify the status of the entries * after destroy flush dependency */ - expected[0].is_dirty = FALSE; - expected[0].serialized = TRUE; + expected[0].is_dirty = false; + expected[0].serialized = true; expected[0].flush_order = 0; - expected[0].is_protected = FALSE; - expected[1].is_dirty = FALSE; - expected[1].serialized = TRUE; + expected[0].is_protected = false; + expected[1].is_dirty = false; + expected[1].serialized = true; expected[1].flush_order = 1; - expected[1].is_protected = FALSE; - expected[2].is_dirty = FALSE; - expected[2].serialized = TRUE; + expected[1].is_protected = false; + expected[2].is_dirty = false; + expected[2].serialized = true; expected[2].flush_order = 4; - expected[2].is_protected = FALSE; - expected[3].is_dirty = FALSE; - expected[3].serialized = TRUE; + expected[2].is_protected = false; + expected[3].is_dirty = false; + expected[3].serialized = true; expected[3].flush_order = 2; - expected[4].is_dirty = FALSE; - expected[4].serialized = TRUE; + expected[4].is_dirty = false; + expected[4].serialized = true; expected[4].flush_order = 3; - expected[4].is_protected = FALSE; + expected[4].is_protected = false; /* Verify the status */ verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */ @@ -30030,7 +30031,7 @@ check_flush_deps_order(unsigned paged) * after destroying flush dependency */ expected[3].flush_dep_npar = 0; - expected[4].is_pinned = FALSE; + expected[4].is_pinned = false; expected[4].flush_dep_nchd = 0; /* Verify the status */ @@ -30049,7 +30050,7 @@ check_flush_deps_order(unsigned paged) * after destroying flush dependency */ expected[1].flush_dep_npar = 0; - expected[2].is_pinned = FALSE; + expected[2].is_pinned = false; expected[2].flush_dep_nchd = 0; /* Verify the status */ @@ -30068,7 +30069,7 @@ check_flush_deps_order(unsigned paged) * after destroying flush dependency */ expected[0].flush_dep_npar = 0; - expected[1].is_pinned = FALSE; + expected[1].is_pinned = false; expected[1].flush_dep_nchd = 0; /* Verify the status */ @@ -30101,8 +30102,8 @@ check_flush_deps_order(unsigned paged) expected[0].flush_dep_par_type[0] = entry_type; expected[0].flush_dep_par_idx[0] = 1; expected[0].flush_dep_npar = 1; - expected[1].is_protected = TRUE; - expected[1].is_pinned = TRUE; + expected[1].is_protected = true; + expected[1].is_pinned = true; expected[1].flush_dep_nchd = 1; /* Verify the status */ @@ -30127,8 +30128,8 @@ check_flush_deps_order(unsigned paged) expected[0].flush_dep_par_type[1] = entry_type; expected[0].flush_dep_par_idx[1] = 2; expected[0].flush_dep_npar = 2; - expected[2].is_protected = TRUE; - expected[2].is_pinned = TRUE; + expected[2].is_protected = true; + expected[2].is_pinned = true; expected[2].flush_dep_nchd = 1; /* Verify the status */ @@ -30173,8 +30174,8 @@ check_flush_deps_order(unsigned paged) expected[0].flush_dep_par_type[2] = entry_type; expected[0].flush_dep_par_idx[2] = 3; expected[0].flush_dep_npar = 3; - expected[3].is_protected = TRUE; - expected[3].is_pinned = TRUE; + expected[3].is_protected = true; + expected[3].is_pinned = true; expected[3].flush_dep_nchd = 1; /* Verify the status */ @@ -30228,10 +30229,10 @@ check_flush_deps_order(unsigned paged) /* Flush the cache and verify that the entries were flushed in correct order */ { - add_flush_op(entry_type, 0, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 1, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 2, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 3, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); + add_flush_op(entry_type, 0, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 1, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 2, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 3, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); unprotect_entry(file_ptr, /* H5F_t * file_ptr */ entry_type, /* int32_t type */ @@ -30255,21 +30256,21 @@ check_flush_deps_order(unsigned paged) CACHE_ERROR("unprotect_entry failed") /* Mark entries 0-3 dirty, so they are flushed */ - dirty_entry(file_ptr, entry_type, 0, FALSE); - dirty_entry(file_ptr, entry_type, 1, TRUE); - dirty_entry(file_ptr, entry_type, 2, TRUE); - dirty_entry(file_ptr, entry_type, 3, FALSE); + dirty_entry(file_ptr, entry_type, 0, false); + dirty_entry(file_ptr, entry_type, 1, true); + dirty_entry(file_ptr, entry_type, 2, true); + dirty_entry(file_ptr, entry_type, 3, false); if (!pass) CACHE_ERROR("dirty_entry failed") /* Reset 'flushed' flag & 'flush_order' value in expected array */ - expected[0].serialized = FALSE; + expected[0].serialized = false; expected[0].flush_order = -1; - expected[1].serialized = FALSE; + expected[1].serialized = false; expected[1].flush_order = -1; - expected[2].serialized = FALSE; + expected[2].serialized = false; expected[2].flush_order = -1; - expected[3].serialized = FALSE; + expected[3].serialized = false; expected[3].flush_order = -1; /* Reset index for tracking flush order */ @@ -30282,22 +30283,22 @@ check_flush_deps_order(unsigned paged) /* Change expected values, and verify the status of the entries * after destroy flush dependency */ - expected[0].is_dirty = FALSE; - expected[0].serialized = TRUE; + expected[0].is_dirty = false; + expected[0].serialized = true; expected[0].flush_order = 0; - expected[0].is_protected = FALSE; - expected[1].is_dirty = FALSE; - expected[1].serialized = TRUE; + expected[0].is_protected = false; + expected[1].is_dirty = false; + expected[1].serialized = true; expected[1].flush_order = 1; - expected[1].is_protected = FALSE; - expected[2].is_dirty = FALSE; - expected[2].serialized = TRUE; + expected[1].is_protected = false; + expected[2].is_dirty = false; + expected[2].serialized = true; expected[2].flush_order = 2; - expected[2].is_protected = FALSE; - expected[3].is_dirty = FALSE; - expected[3].serialized = TRUE; + expected[2].is_protected = false; + expected[3].is_dirty = false; + expected[3].serialized = true; expected[3].flush_order = 3; - expected[3].is_protected = FALSE; + expected[3].is_protected = false; /* Verify the status */ verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */ @@ -30354,7 +30355,7 @@ check_flush_deps_order(unsigned paged) * after destroying flush dependency */ expected[0].flush_dep_npar = 2; - expected[3].is_pinned = FALSE; + expected[3].is_pinned = false; expected[3].flush_dep_nchd = 0; /* Verify the status */ @@ -30391,7 +30392,7 @@ check_flush_deps_order(unsigned paged) * after destroying flush dependency */ expected[0].flush_dep_npar = 1; - expected[2].is_pinned = FALSE; + expected[2].is_pinned = false; expected[2].flush_dep_nchd = 0; /* Verify the status */ @@ -30410,7 +30411,7 @@ check_flush_deps_order(unsigned paged) * after destroying flush dependency */ expected[0].flush_dep_npar = 0; - expected[1].is_pinned = FALSE; + expected[1].is_pinned = false; expected[1].flush_dep_nchd = 0; /* Verify the status */ @@ -30443,8 +30444,8 @@ check_flush_deps_order(unsigned paged) expected[3].flush_dep_par_type[0] = entry_type; expected[3].flush_dep_par_idx[0] = 2; expected[3].flush_dep_npar = 1; - expected[2].is_protected = TRUE; - expected[2].is_pinned = TRUE; + expected[2].is_protected = true; + expected[2].is_pinned = true; expected[2].flush_dep_nchd = 1; /* Verify the status */ @@ -30469,8 +30470,8 @@ check_flush_deps_order(unsigned paged) expected[3].flush_dep_par_type[1] = entry_type; expected[3].flush_dep_par_idx[1] = 1; expected[3].flush_dep_npar = 2; - expected[1].is_protected = TRUE; - expected[1].is_pinned = TRUE; + expected[1].is_protected = true; + expected[1].is_pinned = true; expected[1].flush_dep_nchd = 1; /* Verify the status */ @@ -30515,8 +30516,8 @@ check_flush_deps_order(unsigned paged) expected[3].flush_dep_par_type[2] = entry_type; expected[3].flush_dep_par_idx[2] = 0; expected[3].flush_dep_npar = 3; - expected[0].is_protected = TRUE; - expected[0].is_pinned = TRUE; + expected[0].is_protected = true; + expected[0].is_pinned = true; expected[0].flush_dep_nchd = 1; /* Verify the status */ @@ -30570,10 +30571,10 @@ check_flush_deps_order(unsigned paged) /* Flush the cache and verify that the entries were flushed in correct order */ { - add_flush_op(entry_type, 0, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 1, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 2, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); - add_flush_op(entry_type, 3, FLUSH_OP__ORDER, entry_type, 0, FALSE, (size_t)0, &flush_order); + add_flush_op(entry_type, 0, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 1, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 2, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); + add_flush_op(entry_type, 3, FLUSH_OP__ORDER, entry_type, 0, false, (size_t)0, &flush_order); unprotect_entry(file_ptr, /* H5F_t * file_ptr */ entry_type, /* int32_t type */ @@ -30597,21 +30598,21 @@ check_flush_deps_order(unsigned paged) CACHE_ERROR("unprotect_entry failed") /* Mark entries 0-3 dirty, so they are flushed */ - dirty_entry(file_ptr, entry_type, 0, FALSE); - dirty_entry(file_ptr, entry_type, 1, TRUE); - dirty_entry(file_ptr, entry_type, 2, TRUE); - dirty_entry(file_ptr, entry_type, 3, FALSE); + dirty_entry(file_ptr, entry_type, 0, false); + dirty_entry(file_ptr, entry_type, 1, true); + dirty_entry(file_ptr, entry_type, 2, true); + dirty_entry(file_ptr, entry_type, 3, false); if (!pass) CACHE_ERROR("dirty_entry failed") /* Reset 'flushed' flag & 'flush_order' value in expected array */ - expected[0].serialized = FALSE; + expected[0].serialized = false; expected[0].flush_order = -1; - expected[1].serialized = FALSE; + expected[1].serialized = false; expected[1].flush_order = -1; - expected[2].serialized = FALSE; + expected[2].serialized = false; expected[2].flush_order = -1; - expected[3].serialized = FALSE; + expected[3].serialized = false; expected[3].flush_order = -1; /* Reset index for tracking flush order */ @@ -30624,22 +30625,22 @@ check_flush_deps_order(unsigned paged) /* Change expected values, and verify the status of the entries * after destroy flush dependency */ - expected[0].is_dirty = FALSE; - expected[0].serialized = TRUE; + expected[0].is_dirty = false; + expected[0].serialized = true; expected[0].flush_order = 3; - expected[0].is_protected = FALSE; - expected[1].is_dirty = FALSE; - expected[1].serialized = TRUE; + expected[0].is_protected = false; + expected[1].is_dirty = false; + expected[1].serialized = true; expected[1].flush_order = 2; - expected[1].is_protected = FALSE; - expected[2].is_dirty = FALSE; - expected[2].serialized = TRUE; + expected[1].is_protected = false; + expected[2].is_dirty = false; + expected[2].serialized = true; expected[2].flush_order = 1; - expected[2].is_protected = FALSE; - expected[3].is_dirty = FALSE; - expected[3].serialized = TRUE; + expected[2].is_protected = false; + expected[3].is_dirty = false; + expected[3].serialized = true; expected[3].flush_order = 0; - expected[3].is_protected = FALSE; + expected[3].is_protected = false; /* Verify the status */ verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */ @@ -30696,7 +30697,7 @@ check_flush_deps_order(unsigned paged) * after destroying flush dependency */ expected[3].flush_dep_npar = 2; - expected[0].is_pinned = FALSE; + expected[0].is_pinned = false; expected[0].flush_dep_nchd = 0; /* Verify the status */ @@ -30733,7 +30734,7 @@ check_flush_deps_order(unsigned paged) * after destroying flush dependency */ expected[3].flush_dep_npar = 1; - expected[1].is_pinned = FALSE; + expected[1].is_pinned = false; expected[1].flush_dep_nchd = 0; /* Verify the status */ @@ -30752,7 +30753,7 @@ check_flush_deps_order(unsigned paged) * after destroying flush dependency */ expected[3].flush_dep_npar = 0; - expected[2].is_pinned = FALSE; + expected[2].is_pinned = false; expected[2].flush_dep_nchd = 0; /* Verify the status */ @@ -30766,7 +30767,7 @@ check_flush_deps_order(unsigned paged) done: if (file_ptr) - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); if (pass) PASSED(); @@ -30802,11 +30803,11 @@ check_notify_cb(unsigned paged) { /* entry entry in at main flush dep flush dep child flush flush flush */ /* type: index: size: cache: addr: dirty: prot: pinned: dsrlzd: srlzd: dest: par type[]: par idx[]: dep npart: dep nchd: dep ndirty chd: order: corked: */ - { NOTIFY_ENTRY_TYPE, 0, NOTIFY_ENTRY_SIZE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 0, 0, 0, -1, FALSE}, - { NOTIFY_ENTRY_TYPE, 1, NOTIFY_ENTRY_SIZE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 0, 0, 0, -1, FALSE}, - { NOTIFY_ENTRY_TYPE, 2, NOTIFY_ENTRY_SIZE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 0, 0, 0, -1, FALSE}, - { NOTIFY_ENTRY_TYPE, 3, NOTIFY_ENTRY_SIZE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 0, 0, 0, -1, FALSE}, - { NOTIFY_ENTRY_TYPE, 4, NOTIFY_ENTRY_SIZE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 0, 0, 0, -1, FALSE} + { NOTIFY_ENTRY_TYPE, 0, NOTIFY_ENTRY_SIZE, false, true, false, false, false, false, false, false, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 0, 0, 0, -1, false}, + { NOTIFY_ENTRY_TYPE, 1, NOTIFY_ENTRY_SIZE, false, true, false, false, false, false, false, false, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 0, 0, 0, -1, false}, + { NOTIFY_ENTRY_TYPE, 2, NOTIFY_ENTRY_SIZE, false, true, false, false, false, false, false, false, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 0, 0, 0, -1, false}, + { NOTIFY_ENTRY_TYPE, 3, NOTIFY_ENTRY_SIZE, false, true, false, false, false, false, false, false, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 0, 0, 0, -1, false}, + { NOTIFY_ENTRY_TYPE, 4, NOTIFY_ENTRY_SIZE, false, true, false, false, false, false, false, false, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 0, 0, 0, -1, false} }; /* clang-format on */ @@ -30815,7 +30816,7 @@ check_notify_cb(unsigned paged) else TESTING("'notify' callback"); - pass = TRUE; + pass = true; /* Allocate a cache, insert & remove entries, triggering 'notify' callback. * Verify that all performs as expected. @@ -30840,8 +30841,8 @@ check_notify_cb(unsigned paged) /* Change expected values, and verify the status of the entries * after each insertion */ - expected[u].in_cache = TRUE; - expected[u].is_dirty = TRUE; + expected[u].in_cache = true; + expected[u].is_dirty = true; /* Verify the status */ verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */ @@ -30868,10 +30869,10 @@ check_notify_cb(unsigned paged) /* Change expected values, and verify the status of the entries * after each expunge */ - expected[u].in_cache = FALSE; - expected[u].is_dirty = TRUE; - expected[u].serialized = FALSE; - expected[u].destroyed = TRUE; + expected[u].in_cache = false; + expected[u].is_dirty = true; + expected[u].serialized = false; + expected[u].destroyed = true; /* Verify the status */ verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */ @@ -30898,10 +30899,10 @@ check_notify_cb(unsigned paged) /* Change expected values, and verify the status of the entries * after each insertion */ - expected[u].in_cache = TRUE; - expected[u].is_dirty = FALSE; - expected[u].is_protected = TRUE; - expected[u].deserialized = TRUE; + expected[u].in_cache = true; + expected[u].is_dirty = false; + expected[u].is_protected = true; + expected[u].deserialized = true; /* Verify the status */ verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */ @@ -30928,9 +30929,9 @@ check_notify_cb(unsigned paged) /* Change expected values, and verify the status of the entries * after each insertion */ - expected[u].in_cache = TRUE; - expected[u].is_dirty = TRUE; - expected[u].is_protected = FALSE; + expected[u].in_cache = true; + expected[u].is_dirty = true; + expected[u].is_protected = false; /* Verify the status */ verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */ @@ -30957,10 +30958,10 @@ check_notify_cb(unsigned paged) /* Change expected values, and verify the status of the entries * after each expunge */ - expected[u].in_cache = FALSE; - expected[u].is_dirty = TRUE; - expected[u].serialized = FALSE; - expected[u].destroyed = TRUE; + expected[u].in_cache = false; + expected[u].is_dirty = true; + expected[u].serialized = false; + expected[u].destroyed = true; /* Verify the status */ verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */ @@ -30979,7 +30980,7 @@ check_notify_cb(unsigned paged) } /* end for */ done: - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); if (pass) PASSED(); @@ -31004,7 +31005,7 @@ done: *------------------------------------------------------------------------- */ static unsigned -check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) +check_metadata_cork(bool fill_via_insertion, unsigned paged) { struct expected_entry_status *expected = NULL; const char *fcn_name = "check_metadata_cork"; @@ -31012,7 +31013,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) size_t entry_size = HUGE_ENTRY_SIZE; /* 16 KB */ H5F_t *file_ptr = NULL; H5C_t *cache_ptr = NULL; - hbool_t show_progress = FALSE; + bool show_progress = false; int32_t checkpoint = 0; int32_t entry_idx = 0; int32_t i; @@ -31020,12 +31021,12 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) /* Expected deserialized status of entries depends on how they get into * the cache. Insertions = not deserialized, protect/unprotect = deserialized. */ - hbool_t deserialized = (hbool_t) !(fill_via_insertion); + bool deserialized = (bool)!(fill_via_insertion); expected = malloc(150 * sizeof(struct expected_entry_status)); if (expected == NULL) { - pass = FALSE; + pass = false; failure_mssg = "couldn't allocate expected entry status array\n"; } @@ -31037,14 +31038,14 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) expected[i].entry_type = HUGE_ENTRY_TYPE; expected[i].entry_index = (int)i; expected[i].size = HUGE_ENTRY_SIZE; - expected[i].in_cache = FALSE; - expected[i].at_main_addr = TRUE; - expected[i].is_dirty = FALSE; - expected[i].is_protected = FALSE; - expected[i].is_pinned = FALSE; - expected[i].deserialized = FALSE; - expected[i].serialized = FALSE; - expected[i].destroyed = FALSE; + expected[i].in_cache = false; + expected[i].at_main_addr = true; + expected[i].is_dirty = false; + expected[i].is_protected = false; + expected[i].is_pinned = false; + expected[i].deserialized = false; + expected[i].serialized = false; + expected[i].destroyed = false; memset(expected[i].flush_dep_par_type, 0, sizeof(expected[i].flush_dep_par_type)); memset(expected[i].flush_dep_par_idx, 0, sizeof(expected[i].flush_dep_par_idx)); @@ -31053,10 +31054,10 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) expected[i].flush_dep_nchd = 0; expected[i].flush_dep_ndirty_chd = 0; expected[i].flush_order = -1; - expected[i].is_corked = FALSE; + expected[i].is_corked = false; } - pass = TRUE; + pass = true; } reset_entries(); @@ -31080,7 +31081,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) if (file_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "bad return from cache initialization.\n"; } else @@ -31131,10 +31132,10 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) /* Change expected values, and verify the status of the entries * after each insertion */ - expected[entry_idx].in_cache = TRUE; - expected[entry_idx].is_dirty = TRUE; + expected[entry_idx].in_cache = true; + expected[entry_idx].is_dirty = true; expected[entry_idx].deserialized = (unsigned char)deserialized; - expected[entry_idx].is_corked = TRUE; + expected[entry_idx].is_corked = true; verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */ entry_idx, /* int tag */ @@ -31187,10 +31188,10 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) */ /* entry w/ index 26 is now in the cache and dirty. */ - expected[26].in_cache = TRUE; - expected[26].is_dirty = TRUE; + expected[26].in_cache = true; + expected[26].is_dirty = true; expected[26].deserialized = (unsigned char)deserialized; - expected[26].is_corked = TRUE; + expected[26].is_corked = true; /* verify the status */ verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */ @@ -31228,10 +31229,10 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) * all entries are dirty corked entries. * */ - expected[27].in_cache = TRUE; - expected[27].is_dirty = TRUE; + expected[27].in_cache = true; + expected[27].is_dirty = true; expected[27].deserialized = (unsigned char)deserialized; - expected[27].is_corked = TRUE; + expected[27].is_corked = true; /* verify the status */ verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */ @@ -31269,10 +31270,10 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) /* * Expected status: all entries are dirty corked entries. */ - expected[entry_idx].in_cache = TRUE; - expected[entry_idx].is_dirty = TRUE; + expected[entry_idx].in_cache = true; + expected[entry_idx].is_dirty = true; expected[entry_idx].deserialized = (unsigned char)deserialized; - expected[entry_idx].is_corked = TRUE; + expected[entry_idx].is_corked = true; /* Verify the status */ verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */ @@ -31282,9 +31283,9 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) } /* Verify that the cache is now full */ - if (cache_ptr->cache_full != TRUE) { + if (cache_ptr->cache_full != true) { - pass = FALSE; + pass = false; failure_mssg = "cache not completely filled.\n"; } } @@ -31328,10 +31329,10 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) } /* This past inserted entry is now in the cache: dirty and corked */ - expected[entry_idx].in_cache = TRUE; - expected[entry_idx].is_dirty = TRUE; + expected[entry_idx].in_cache = true; + expected[entry_idx].is_dirty = true; expected[entry_idx].deserialized = (unsigned char)deserialized; - expected[entry_idx].is_corked = TRUE; + expected[entry_idx].is_corked = true; /* Verify this expected status */ verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */ @@ -31365,9 +31366,9 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) */ flush_cache(file_ptr, /* H5F_t * file_ptr */ - FALSE, /* hbool_t destory_entries */ - FALSE, /* hbool_t dump_stats */ - FALSE); /* hbool_t dump_detailed_stats */ + false, /* bool destory_entries */ + false, /* bool dump_stats */ + false); /* bool dump_detailed_stats */ /* Verify that the cache is clean */ verify_clean(); @@ -31375,9 +31376,9 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) /* Verify the status of the entries. */ /* All entries are flushed, clean but still corked */ for (i = 0; i < 100; i++) { - expected[i].serialized = TRUE; - expected[i].is_dirty = FALSE; - expected[i].is_corked = TRUE; + expected[i].serialized = true; + expected[i].is_dirty = false; + expected[i].is_corked = true; } verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */ 0, /* int tag */ @@ -31392,9 +31393,9 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) /* Will evict 50 clean "corked" entries all at once when inserting the 100th entry */ for (i = 0; i < 51; i++) { - expected[i].in_cache = FALSE; - expected[i].destroyed = TRUE; - expected[i].is_corked = TRUE; + expected[i].in_cache = false; + expected[i].destroyed = true; + expected[i].is_corked = true; } /* Insert the 100th entry */ @@ -31416,10 +31417,10 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) } /* The 100th inserted entry is now in the cache and dirty */ - expected[100].in_cache = TRUE; - expected[100].is_dirty = TRUE; + expected[100].in_cache = true; + expected[100].is_dirty = true; expected[100].deserialized = (unsigned char)deserialized; - expected[100].is_corked = TRUE; + expected[100].is_corked = true; /* verify the status */ verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */ @@ -31455,14 +31456,14 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) } /* The inserted entry is now in the cache and dirty */ - expected[entry_idx].in_cache = TRUE; - expected[entry_idx].is_dirty = TRUE; + expected[entry_idx].in_cache = true; + expected[entry_idx].is_dirty = true; expected[entry_idx].deserialized = (unsigned char)deserialized; - expected[entry_idx].is_corked = TRUE; + expected[entry_idx].is_corked = true; - expected[entry_idx - 50].in_cache = FALSE; - expected[entry_idx - 50].destroyed = TRUE; - expected[entry_idx - 50].is_corked = TRUE; + expected[entry_idx - 50].in_cache = false; + expected[entry_idx - 50].destroyed = true; + expected[entry_idx - 50].is_corked = true; /* verify the status */ verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */ @@ -31496,14 +31497,14 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) } /* Verify the status of the entries. */ - expected[126].in_cache = TRUE; - expected[126].is_dirty = TRUE; + expected[126].in_cache = true; + expected[126].is_dirty = true; expected[126].deserialized = (unsigned char)deserialized; - expected[126].is_corked = TRUE; + expected[126].is_corked = true; - expected[126 - 50].in_cache = FALSE; - expected[126 - 50].destroyed = TRUE; - expected[126 - 50].is_corked = TRUE; + expected[126 - 50].in_cache = false; + expected[126 - 50].destroyed = true; + expected[126 - 50].is_corked = true; /* verify the status */ verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */ @@ -31538,15 +31539,15 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) } /* This past inserted entry is now in the cache, dirty and corked */ - expected[entry_idx].in_cache = TRUE; - expected[entry_idx].is_dirty = TRUE; + expected[entry_idx].in_cache = true; + expected[entry_idx].is_dirty = true; expected[entry_idx].deserialized = (unsigned char)deserialized; - expected[entry_idx].is_corked = TRUE; + expected[entry_idx].is_corked = true; /* Entry that is 50 entries away will be evicted since it is clean even though corked */ - expected[entry_idx - 50].in_cache = FALSE; - expected[entry_idx - 50].destroyed = TRUE; - expected[entry_idx - 50].is_corked = TRUE; + expected[entry_idx - 50].in_cache = false; + expected[entry_idx - 50].destroyed = true; + expected[entry_idx - 50].is_corked = true; /* verify the status */ verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */ @@ -31560,7 +31561,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) fprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass); /* We're done with testing. We can take down the cache. */ - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); reset_entries(); if (show_progress) /* 13 */ @@ -31596,7 +31597,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) * This function contains tests for correct handling on this * situation. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -31612,7 +31613,7 @@ check_entry_deletions_during_scans(unsigned paged) else TESTING("entry deletion during list scan detection and adaption"); - pass = TRUE; + pass = true; /* allocate a cache, and flush it under various circumstances. * To the extent possible, verify that the desired actions took @@ -31652,7 +31653,7 @@ check_entry_deletions_during_scans(unsigned paged) cedds__H5C_flush_invalidate_cache__bucket_scan(file_ptr); } - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); if (pass) { PASSED(); @@ -31686,7 +31687,7 @@ check_entry_deletions_during_scans(unsigned paged) * * H5C_flush_cache() should handle this deletion gracefully. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -31703,7 +31704,7 @@ cedds__expunge_dirty_entry_in_flush_test(H5F_t *file_ptr) expected = malloc(36 * sizeof(struct expected_entry_status)); if (expected == NULL) { - pass = FALSE; + pass = false; failure_mssg = "couldn't allocate expected entry status array\n"; } @@ -31717,14 +31718,14 @@ cedds__expunge_dirty_entry_in_flush_test(H5F_t *file_ptr) expected[i].entry_type = HUGE_ENTRY_TYPE; expected[i].entry_index = (int)i; expected[i].size = HUGE_ENTRY_SIZE; - expected[i].in_cache = TRUE; - expected[i].at_main_addr = TRUE; - expected[i].is_dirty = TRUE; - expected[i].is_protected = FALSE; - expected[i].is_pinned = FALSE; - expected[i].deserialized = TRUE; - expected[i].serialized = FALSE; - expected[i].destroyed = FALSE; + expected[i].in_cache = true; + expected[i].at_main_addr = true; + expected[i].is_dirty = true; + expected[i].is_protected = false; + expected[i].is_pinned = false; + expected[i].deserialized = true; + expected[i].serialized = false; + expected[i].destroyed = false; for (size_t j = 0; j < MAX_FLUSH_DEP_PARS; j++) { expected[i].flush_dep_par_type[j] = -1; @@ -31735,28 +31736,28 @@ cedds__expunge_dirty_entry_in_flush_test(H5F_t *file_ptr) expected[i].flush_dep_nchd = 0; expected[i].flush_dep_ndirty_chd = 0; expected[i].flush_order = -1; - expected[i].is_corked = FALSE; + expected[i].is_corked = false; } - pass = TRUE; + pass = true; } if (pass) { if (cache_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "cache_ptr NULL on entry to cedds expunge dirty entry in flush test."; } else if ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0)) { - pass = FALSE; + pass = false; failure_mssg = "cache not empty on entry to cedds expunge dirty entry in flush test."; } else if ((cache_ptr->max_cache_size != (2 * 1024 * 1024)) || (cache_ptr->min_clean_size != (1 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "unexpected cache config at start of cedds expunge dirty entry in flush test."; } else { @@ -31800,7 +31801,7 @@ cedds__expunge_dirty_entry_in_flush_test(H5F_t *file_ptr) if ((cache_ptr->index_len != 4) || (cache_ptr->index_size != (4 * HUGE_ENTRY_SIZE))) { - pass = FALSE; + pass = false; failure_mssg = "unexpected size/len in cedds expunge dirty entry in flush test (1)"; } @@ -31813,7 +31814,7 @@ cedds__expunge_dirty_entry_in_flush_test(H5F_t *file_ptr) * (HET, 0) expunges (HET, 1) * */ - add_flush_op(HUGE_ENTRY_TYPE, 0, FLUSH_OP__EXPUNGE, HUGE_ENTRY_TYPE, 1, FALSE, (size_t)0, NULL); + add_flush_op(HUGE_ENTRY_TYPE, 0, FLUSH_OP__EXPUNGE, HUGE_ENTRY_TYPE, 1, false, (size_t)0, NULL); } if (pass) { @@ -31850,7 +31851,7 @@ cedds__expunge_dirty_entry_in_flush_test(H5F_t *file_ptr) if ((pass) && ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache len/size after cedds expunge dirty entry in flush test"; } } @@ -31875,14 +31876,14 @@ cedds__expunge_dirty_entry_in_flush_test(H5F_t *file_ptr) (cache_ptr->entry_flush_size_changes[HUGE_ENTRY_TYPE] != 0) || (cache_ptr->cache_flush_size_changes[HUGE_ENTRY_TYPE] != 0)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected huge size entry stats in cedds__expunge_dirty_entry_in_flush_test()."; } /* end if */ if (pass) if ((cache_ptr->slist_scan_restarts != 1) || (cache_ptr->LRU_scan_restarts != 0) || (cache_ptr->index_scan_restarts != 0)) { - pass = FALSE; + pass = false; failure_mssg = "unexpected scan restart stats in cedds__expunge_dirty_entry_in_flush_test()."; } /* end if */ #endif /* H5C_COLLECT_CACHE_STATS */ @@ -31915,7 +31916,7 @@ cedds__expunge_dirty_entry_in_flush_test(H5F_t *file_ptr) * restart its scan of the LRU from the tail, instead of * examining the now deleted next item up on the LRU. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -31934,7 +31935,7 @@ cedds__H5C_make_space_in_cache(H5F_t *file_ptr) expected = malloc(36 * sizeof(struct expected_entry_status)); if (expected == NULL) { - pass = FALSE; + pass = false; failure_mssg = "couldn't allocate expected entry status array\n"; } @@ -31956,14 +31957,14 @@ cedds__H5C_make_space_in_cache(H5F_t *file_ptr) expected[i].size = MONSTER_ENTRY_SIZE; } - expected[i].in_cache = TRUE; - expected[i].at_main_addr = TRUE; - expected[i].is_dirty = TRUE; - expected[i].is_protected = FALSE; - expected[i].is_pinned = FALSE; - expected[i].deserialized = TRUE; - expected[i].serialized = FALSE; - expected[i].destroyed = FALSE; + expected[i].in_cache = true; + expected[i].at_main_addr = true; + expected[i].is_dirty = true; + expected[i].is_protected = false; + expected[i].is_pinned = false; + expected[i].deserialized = true; + expected[i].serialized = false; + expected[i].destroyed = false; for (size_t j = 0; j < MAX_FLUSH_DEP_PARS; j++) { expected[i].flush_dep_par_type[j] = -1; @@ -31974,28 +31975,28 @@ cedds__H5C_make_space_in_cache(H5F_t *file_ptr) expected[i].flush_dep_nchd = 0; expected[i].flush_dep_ndirty_chd = 0; expected[i].flush_order = -1; - expected[i].is_corked = FALSE; + expected[i].is_corked = false; } - pass = TRUE; + pass = true; } if (pass) { if (cache_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "cache_ptr NULL on entry to cedds for H5C__make_space_in_cache() test."; } else if ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0)) { - pass = FALSE; + pass = false; failure_mssg = "cache not empty at start of flush ops eviction test."; } else if ((cache_ptr->max_cache_size != (2 * 1024 * 1024)) || (cache_ptr->min_clean_size != (1 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "unexpected cache config at start of cedds H5C__make_space_in_cache() test."; } else { @@ -32043,7 +32044,7 @@ cedds__H5C_make_space_in_cache(H5F_t *file_ptr) if ((cache_ptr->index_len != 4) || (cache_ptr->index_size != (4 * HUGE_ENTRY_SIZE))) { - pass = FALSE; + pass = false; failure_mssg = "unexpected size/len in H5C__make_space_in_cache() test (1)"; } @@ -32056,7 +32057,7 @@ cedds__H5C_make_space_in_cache(H5F_t *file_ptr) * (HET, 0) expunges (HET, 1) * */ - add_flush_op(HUGE_ENTRY_TYPE, 0, FLUSH_OP__EXPUNGE, HUGE_ENTRY_TYPE, 1, FALSE, (size_t)0, NULL); + add_flush_op(HUGE_ENTRY_TYPE, 0, FLUSH_OP__EXPUNGE, HUGE_ENTRY_TYPE, 1, false, (size_t)0, NULL); } if (pass) { @@ -32092,7 +32093,7 @@ cedds__H5C_make_space_in_cache(H5F_t *file_ptr) if ((cache_ptr->index_len != 35) || (cache_ptr->index_size != 2 * 1024 * 1024) || (cache_ptr->index_size != ((4 * HUGE_ENTRY_SIZE) + (31 * MONSTER_ENTRY_SIZE)))) { - pass = FALSE; + pass = false; failure_mssg = "unexpected size/len in H5C__make_space_in_cache() test (2)"; } else { @@ -32136,7 +32137,7 @@ cedds__H5C_make_space_in_cache(H5F_t *file_ptr) if ((cache_ptr->index_len != 32) || (cache_ptr->index_size != 2 * 1024 * 1024) || (cache_ptr->index_size != (32 * MONSTER_ENTRY_SIZE))) { - pass = FALSE; + pass = false; failure_mssg = "unexpected size/len in H5C__make_space_in_cache() test (3)"; } else { @@ -32145,19 +32146,19 @@ cedds__H5C_make_space_in_cache(H5F_t *file_ptr) * then call verify_entry_status(). */ for (i = 0; i < num_huge_entries; i++) { - expected[i].in_cache = FALSE; - expected[i].is_dirty = FALSE; - expected[i].serialized = TRUE; - expected[i].destroyed = TRUE; + expected[i].in_cache = false; + expected[i].is_dirty = false; + expected[i].serialized = true; + expected[i].destroyed = true; } /* (HET, 1) was expunged, so touch its entry up accordingly */ - expected[1].is_dirty = TRUE; - expected[1].serialized = FALSE; + expected[1].is_dirty = true; + expected[1].serialized = false; for (i = num_huge_entries; i < num_huge_entries + num_monster_entries - 1; i++) { - expected[i].is_dirty = FALSE; - expected[i].serialized = TRUE; + expected[i].is_dirty = false; + expected[i].serialized = true; } /* verify the expected status of all entries: */ @@ -32174,7 +32175,7 @@ cedds__H5C_make_space_in_cache(H5F_t *file_ptr) if ((pass) && ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache len/size after cleanup of flush op eviction test"; } } @@ -32201,7 +32202,7 @@ cedds__H5C_make_space_in_cache(H5F_t *file_ptr) (cache_ptr->entry_flush_size_changes[HUGE_ENTRY_TYPE] != 0) || (cache_ptr->cache_flush_size_changes[HUGE_ENTRY_TYPE] != 0)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected large entry stats in cedds__H5C_make_space_in_cache()."; } } @@ -32224,7 +32225,7 @@ cedds__H5C_make_space_in_cache(H5F_t *file_ptr) (cache_ptr->entry_flush_size_changes[MONSTER_ENTRY_TYPE] != 0) || (cache_ptr->cache_flush_size_changes[MONSTER_ENTRY_TYPE] != 0)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected monster entry stats in cedds__H5C_make_space_in_cache()."; } /* end if */ @@ -32232,7 +32233,7 @@ cedds__H5C_make_space_in_cache(H5F_t *file_ptr) if ((cache_ptr->slist_scan_restarts != 0) || (cache_ptr->LRU_scan_restarts != 1) || (cache_ptr->index_scan_restarts != 0)) { - pass = FALSE; + pass = false; failure_mssg = "unexpected scan restart stats in cedds__H5C_make_space_in_cache()."; } /* end if */ @@ -32266,7 +32267,7 @@ cedds__H5C_make_space_in_cache(H5F_t *file_ptr) * restart its scan of the LRU from the tail, instead of * examining the now deleted next item up on the LRU. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -32285,7 +32286,7 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *file_ptr) /* int32_t version = */ H5C__CURR_AUTO_SIZE_CTL_VER, /* H5C_auto_resize_report_fcn rpt_fcn = */ test_rpt_fcn, - /* hbool_t set_initial_size = */ TRUE, + /* bool set_initial_size = */ true, /* size_t initial_size = */ (2 * 1024 * 1024), /* double min_clean_fraction = */ 0.5, @@ -32301,7 +32302,7 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *file_ptr) /* double increment = */ 2.0, - /* hbool_t apply_max_increment = */ TRUE, + /* bool apply_max_increment = */ true, /* size_t max_increment = */ (4 * 1024 * 1024), /* enum H5C_cache_flash_incr_mode */ @@ -32315,18 +32316,18 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *file_ptr) /* double decrement = */ 0.5, - /* hbool_t apply_max_decrement = */ FALSE, + /* bool apply_max_decrement = */ false, /* size_t max_decrement = */ (1 * 1024 * 1024), /* int32_t epochs_before_eviction = */ 1, - /* hbool_t apply_empty_reserve = */ TRUE, + /* bool apply_empty_reserve = */ true, /* double empty_reserve = */ 0.05}; expected = malloc(36 * sizeof(struct expected_entry_status)); if (expected == NULL) { - pass = FALSE; + pass = false; failure_mssg = "couldn't allocate expected entry status array\n"; } @@ -32340,17 +32341,17 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *file_ptr) expected[i].entry_type = MONSTER_ENTRY_TYPE; expected[i].entry_index = (int)i; expected[i].size = MONSTER_ENTRY_SIZE; - expected[i].in_cache = TRUE; - expected[i].at_main_addr = TRUE; + expected[i].in_cache = true; + expected[i].at_main_addr = true; /* NOTE: special case for first entry */ expected[i].is_dirty = (i == 0); - expected[i].is_protected = FALSE; - expected[i].is_pinned = FALSE; - expected[i].deserialized = TRUE; - expected[i].serialized = FALSE; - expected[i].destroyed = FALSE; + expected[i].is_protected = false; + expected[i].is_pinned = false; + expected[i].deserialized = true; + expected[i].serialized = false; + expected[i].destroyed = false; for (size_t j = 0; j < MAX_FLUSH_DEP_PARS; j++) { expected[i].flush_dep_par_type[j] = -1; @@ -32361,30 +32362,30 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *file_ptr) expected[i].flush_dep_nchd = 0; expected[i].flush_dep_ndirty_chd = 0; expected[i].flush_order = -1; - expected[i].is_corked = FALSE; + expected[i].is_corked = false; } - pass = TRUE; + pass = true; } if (pass) { if (cache_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "cache_ptr NULL on entry to cedds for " "H5C__autoadjust__ageout__evict_aged_out_entries() test."; } else if ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0)) { - pass = FALSE; + pass = false; failure_mssg = "cache not empty at start cedds for H5C__autoadjust__ageout__evict_aged_out_entries() test."; } else if ((cache_ptr->max_cache_size != (2 * 1024 * 1024)) || (cache_ptr->min_clean_size != (1 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "unexpected cache config at start of cedds " "H5C__autoadjust__ageout__evict_aged_out_entries() test."; } @@ -32407,7 +32408,7 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *file_ptr) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_get_cache_auto_resize_config failed."; } } @@ -32419,7 +32420,7 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *file_ptr) if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 1.\n"; } } @@ -32467,7 +32468,7 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *file_ptr) * (MET, 0) expunges (MET, 1) * */ - add_flush_op(MONSTER_ENTRY_TYPE, 0, FLUSH_OP__EXPUNGE, MONSTER_ENTRY_TYPE, 1, FALSE, (size_t)0, NULL); + add_flush_op(MONSTER_ENTRY_TYPE, 0, FLUSH_OP__EXPUNGE, MONSTER_ENTRY_TYPE, 1, false, (size_t)0, NULL); } if (pass) { @@ -32491,7 +32492,7 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *file_ptr) if ((cache_ptr->index_len != 32) || (cache_ptr->index_size != 2 * 1024 * 1024) || (cache_ptr->index_size != (32 * MONSTER_ENTRY_SIZE))) { - pass = FALSE; + pass = false; failure_mssg = "unexpected size/len in H5C__autoadjust__ageout__evict_aged_out_entries() test (1)"; } @@ -32535,7 +32536,7 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *file_ptr) if ((cache_ptr->index_len != 2) || (cache_ptr->index_size != 2 * MONSTER_ENTRY_SIZE)) { - pass = FALSE; + pass = false; failure_mssg = "unexpected size/len in H5C__autoadjust__ageout__evict_aged_out_entries() test (2)"; } @@ -32545,13 +32546,13 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *file_ptr) * this point, and then verify. */ - expected[0].is_dirty = FALSE; - expected[0].serialized = TRUE; + expected[0].is_dirty = false; + expected[0].serialized = true; for (i = 1; i < 31; i++) { - expected[i].in_cache = FALSE; - expected[i].is_dirty = FALSE; - expected[i].destroyed = TRUE; + expected[i].in_cache = false; + expected[i].is_dirty = false; + expected[i].destroyed = true; } verify_entry_status(cache_ptr, 0, 32, expected); @@ -32561,14 +32562,14 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *file_ptr) /* restore the initial resize configuration */ if (pass) { - saved_auto_size_ctl.set_initial_size = TRUE; + saved_auto_size_ctl.set_initial_size = true; saved_auto_size_ctl.initial_size = 2 * 1024 * 1024; result = H5C_set_cache_auto_resize_config(cache_ptr, &saved_auto_size_ctl); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5C_set_cache_auto_resize_config failed 2.\n"; } } @@ -32582,7 +32583,7 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *file_ptr) if ((pass) && ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache len/size after cleanup of flush op eviction test"; } } @@ -32610,7 +32611,7 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *file_ptr) (cache_ptr->entry_flush_size_changes[MONSTER_ENTRY_TYPE] != 0) || (cache_ptr->cache_flush_size_changes[MONSTER_ENTRY_TYPE] != 0)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected monster entry stats in cedds__H5C__autoadjust__ageout__evict_aged_out_entries()."; } /* end if */ @@ -32619,7 +32620,7 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *file_ptr) if ((cache_ptr->slist_scan_restarts != 0) || (cache_ptr->LRU_scan_restarts != 1) || (cache_ptr->index_scan_restarts != 0)) { - pass = FALSE; + pass = false; failure_mssg = "unexpected scan restart stats in cedds__H5C__autoadjust__ageout__evict_aged_out_entries()."; } /* end if */ @@ -32715,7 +32716,7 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *file_ptr) * it will attempt to continue its scan of the bucket with * an entry that has been deleted from the cache. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -32742,11 +32743,11 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t *file_ptr) */ /* entry entry in at main flush dep flush dep child flush flush flush */ /* type: index: size: cache: addr: dirty: prot: pinned: dsrlzd: srlzd: dest: par type[]: par idx[]: dep npart: dep nchd: dep ndirty chd: order: corked: */ - { MONSTER_ENTRY_TYPE, 0, MONSTER_ENTRY_SIZE, TRUE, TRUE, TRUE, FALSE, TRUE, TRUE, FALSE, FALSE, {-1,0,0,0,0,0,0,0}, {-1,0,0,0,0,0,0,0}, 0, 1, 1, -1, FALSE}, - { MONSTER_ENTRY_TYPE, 8, MONSTER_ENTRY_SIZE, TRUE, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE, {-1,0,0,0,0,0,0,0}, {-1,0,0,0,0,0,0,0}, 0, 0, 0, -1, FALSE}, - { MONSTER_ENTRY_TYPE, 16, MONSTER_ENTRY_SIZE, TRUE, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE, {-1,0,0,0,0,0,0,0}, {-1,0,0,0,0,0,0,0}, 0, 0, 0, -1, FALSE}, - { MONSTER_ENTRY_TYPE, 24, MONSTER_ENTRY_SIZE, TRUE, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE, {-1,0,0,0,0,0,0,0}, {-1,0,0,0,0,0,0,0}, 0, 0, 0, -1, FALSE}, - { MONSTER_ENTRY_TYPE, 31, MONSTER_ENTRY_SIZE, TRUE, TRUE, TRUE, FALSE, FALSE, TRUE, FALSE, FALSE, {MONSTER_ENTRY_TYPE,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 1, 0, 0, -1, FALSE}, + { MONSTER_ENTRY_TYPE, 0, MONSTER_ENTRY_SIZE, true, true, true, false, true, true, false, false, {-1,0,0,0,0,0,0,0}, {-1,0,0,0,0,0,0,0}, 0, 1, 1, -1, false}, + { MONSTER_ENTRY_TYPE, 8, MONSTER_ENTRY_SIZE, true, true, false, false, false, true, false, false, {-1,0,0,0,0,0,0,0}, {-1,0,0,0,0,0,0,0}, 0, 0, 0, -1, false}, + { MONSTER_ENTRY_TYPE, 16, MONSTER_ENTRY_SIZE, true, true, false, false, false, true, false, false, {-1,0,0,0,0,0,0,0}, {-1,0,0,0,0,0,0,0}, 0, 0, 0, -1, false}, + { MONSTER_ENTRY_TYPE, 24, MONSTER_ENTRY_SIZE, true, true, false, false, false, true, false, false, {-1,0,0,0,0,0,0,0}, {-1,0,0,0,0,0,0,0}, 0, 0, 0, -1, false}, + { MONSTER_ENTRY_TYPE, 31, MONSTER_ENTRY_SIZE, true, true, true, false, false, true, false, false, {MONSTER_ENTRY_TYPE,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, 1, 0, 0, -1, false}, }; /* clang-format on */ @@ -32754,20 +32755,20 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t *file_ptr) if (cache_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "cache_ptr NULL on entry to cedds for cedds__H5C_flush_invalidate_cache__bucket_scan() test."; } else if ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0)) { - pass = FALSE; + pass = false; failure_mssg = "cache not empty at start cedds for cedds__H5C_flush_invalidate_cache__bucket_scan() test."; } else if ((cache_ptr->max_cache_size != (2 * 1024 * 1024)) || (cache_ptr->min_clean_size != (1 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "unexpected cache config at start of cedds " "cedds__H5C_flush_invalidate_cache__bucket_scan() test."; } @@ -32820,7 +32821,7 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t *file_ptr) if (expected_hash_bucket != H5C__HASH_FCN(entry_addr)) { - pass = FALSE; + pass = false; failure_mssg = "Test entries don't map to same bucket -- hash table size or hash fcn change?"; } } @@ -32833,7 +32834,7 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t *file_ptr) * (MET, 0) expunges (MET, 8) * */ - add_flush_op(MONSTER_ENTRY_TYPE, 0, FLUSH_OP__EXPUNGE, MONSTER_ENTRY_TYPE, 8, FALSE, (size_t)0, NULL); + add_flush_op(MONSTER_ENTRY_TYPE, 0, FLUSH_OP__EXPUNGE, MONSTER_ENTRY_TYPE, 8, false, (size_t)0, NULL); } if (pass) { @@ -32858,7 +32859,7 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t *file_ptr) if (expected_hash_bucket == H5C__HASH_FCN(entry_addr)) { - pass = FALSE; + pass = false; failure_mssg = "Dirty entry maps to same hash bucket as clean entries?!?!"; } } @@ -32882,7 +32883,7 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t *file_ptr) * (MET, 31) destroys flush dependency with (MET, 8) * */ - add_flush_op(MONSTER_ENTRY_TYPE, 31, FLUSH_OP__DEST_FLUSH_DEP, MONSTER_ENTRY_TYPE, 0, FALSE, + add_flush_op(MONSTER_ENTRY_TYPE, 31, FLUSH_OP__DEST_FLUSH_DEP, MONSTER_ENTRY_TYPE, 0, false, (size_t)0, NULL); } @@ -32920,12 +32921,12 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t *file_ptr) if (scan_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "premature end of hash bucket list?!?!"; } else if ((scan_ptr == NULL) || (scan_ptr != &(entry_ptr->header))) { - pass = FALSE; + pass = false; failure_mssg = "bad test hash bucket setup?!?!"; } @@ -32946,7 +32947,7 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t *file_ptr) if ((pass) && ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache len/size after cleanup of flush op eviction test"; } } @@ -32974,7 +32975,7 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t *file_ptr) (cache_ptr->entry_flush_size_changes[MONSTER_ENTRY_TYPE] != 0) || (cache_ptr->cache_flush_size_changes[MONSTER_ENTRY_TYPE] != 0)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected monster entry stats in cedds__H5C_flush_invalidate_cache__bucket_scan()."; } /* end if */ @@ -32986,7 +32987,7 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t *file_ptr) */ if ((cache_ptr->slist_scan_restarts != 0) || (cache_ptr->LRU_scan_restarts != 0) || (cache_ptr->index_scan_restarts != 1)) { - pass = FALSE; + pass = false; failure_mssg = "unexpected scan restart stats in cedds__H5C_flush_invalidate_cache__bucket_scan()."; } @@ -33035,7 +33036,7 @@ check_stats(unsigned paged) #if H5C_COLLECT_CACHE_STATS - pass = TRUE; + pass = true; reset_entries(); @@ -33048,7 +33049,7 @@ check_stats(unsigned paged) if (pass) { - takedown_cache(file_ptr, FALSE, FALSE); + takedown_cache(file_ptr, false, false); } if (pass) { @@ -33088,7 +33089,7 @@ check_stats(unsigned paged) * check that will serve as a place holder until more complete * tests are implemented. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -33104,18 +33105,18 @@ check_stats__smoke_check_1(H5F_t *file_ptr) if (pass) { if (cache_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "cache_ptr NULL on entry to check_stats__smoke_check_1()."; } /* end if */ else if ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0)) { - pass = FALSE; + pass = false; failure_mssg = "cache not empty on entry to check_stats__smoke_check_1()."; } /* end else-if */ else if ((cache_ptr->max_cache_size != (2 * 1024 * 1024)) || (cache_ptr->min_clean_size != (1 * 1024 * 1024))) { - pass = FALSE; + pass = false; failure_mssg = "unexpected cache config at start of check_stats__smoke_check_1()."; } /* end else-if */ @@ -33155,7 +33156,7 @@ check_stats__smoke_check_1(H5F_t *file_ptr) (cache_ptr->entry_flush_size_changes[MONSTER_ENTRY_TYPE] != 0) || (cache_ptr->cache_flush_size_changes[MONSTER_ENTRY_TYPE] != 0)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected monster size entry stats in check_stats__smoke_check_1(1)."; } /* end if */ @@ -33176,7 +33177,7 @@ check_stats__smoke_check_1(H5F_t *file_ptr) (cache_ptr->entries_scanned_to_make_space != 0) || (cache_ptr->slist_scan_restarts != 0) || (cache_ptr->LRU_scan_restarts != 0) || (cache_ptr->index_scan_restarts != 0)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache stats in check_stats__smoke_check_1(1)."; } /* end if */ } @@ -33191,7 +33192,7 @@ check_stats__smoke_check_1(H5F_t *file_ptr) (cache_ptr->max_size[MONSTER_ENTRY_TYPE] != 64 * 1024) || (cache_ptr->max_pins[MONSTER_ENTRY_TYPE] != 0)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected monster entry level stats in check_stats__smoke_check_1(1)."; } /* end if */ #endif /* H5C_COLLECT_CACHE_ENTRY_STATS */ @@ -33228,7 +33229,7 @@ check_stats__smoke_check_1(H5F_t *file_ptr) (cache_ptr->entry_flush_size_changes[MONSTER_ENTRY_TYPE] != 0) || (cache_ptr->cache_flush_size_changes[MONSTER_ENTRY_TYPE] != 0)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected monster size entry stats in check_stats__smoke_check_1(2)."; } /* end if */ @@ -33250,7 +33251,7 @@ check_stats__smoke_check_1(H5F_t *file_ptr) (cache_ptr->entries_scanned_to_make_space != 0) || (cache_ptr->slist_scan_restarts != 0) || (cache_ptr->LRU_scan_restarts != 0) || (cache_ptr->index_scan_restarts != 0)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache stats in check_stats__smoke_check_1(2)."; } /* end if */ } @@ -33265,7 +33266,7 @@ check_stats__smoke_check_1(H5F_t *file_ptr) (cache_ptr->max_size[MONSTER_ENTRY_TYPE] != 64 * 1024) || (cache_ptr->max_pins[MONSTER_ENTRY_TYPE] != 0)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected monster entry level stats in check_stats__smoke_check_1(2)."; } /* end if */ #endif /* H5C_COLLECT_CACHE_ENTRY_STATS */ @@ -33302,7 +33303,7 @@ check_stats__smoke_check_1(H5F_t *file_ptr) (cache_ptr->entry_flush_size_changes[MONSTER_ENTRY_TYPE] != 0) || (cache_ptr->cache_flush_size_changes[MONSTER_ENTRY_TYPE] != 0)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected monster size entry stats in check_stats__smoke_check_1(3)."; } /* end if */ @@ -33325,7 +33326,7 @@ check_stats__smoke_check_1(H5F_t *file_ptr) (cache_ptr->entries_scanned_to_make_space != 33) || (cache_ptr->slist_scan_restarts != 0) || (cache_ptr->LRU_scan_restarts != 0) || (cache_ptr->index_scan_restarts != 0)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache stats in check_stats__smoke_check_1(3)."; } /* end if */ } @@ -33340,7 +33341,7 @@ check_stats__smoke_check_1(H5F_t *file_ptr) (cache_ptr->max_size[MONSTER_ENTRY_TYPE] != 64 * 1024) || (cache_ptr->max_pins[MONSTER_ENTRY_TYPE] != 0)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected monster entry level stats in check_stats__smoke_check_1(3)."; } /* end if */ @@ -33363,7 +33364,7 @@ check_stats__smoke_check_1(H5F_t *file_ptr) if ((pass) && ((cache_ptr->index_len != 0) || (cache_ptr->index_size != 0))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache len/size after check_stats__smoke_check_1()"; } /* end else-if */ @@ -33391,7 +33392,7 @@ check_stats__smoke_check_1(H5F_t *file_ptr) (cache_ptr->entry_flush_size_changes[MONSTER_ENTRY_TYPE] != 0) || (cache_ptr->cache_flush_size_changes[MONSTER_ENTRY_TYPE] != 0)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected monster size entry stats in check_stats__smoke_check_1(4)."; } /* end if */ @@ -33414,7 +33415,7 @@ check_stats__smoke_check_1(H5F_t *file_ptr) (cache_ptr->entries_scanned_to_make_space != 33) || (cache_ptr->slist_scan_restarts != 0) || (cache_ptr->LRU_scan_restarts != 0) || (cache_ptr->index_scan_restarts != 0)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected cache stats in check_stats__smoke_check_1(4)."; } /* end if */ } @@ -33429,7 +33430,7 @@ check_stats__smoke_check_1(H5F_t *file_ptr) (cache_ptr->max_size[MONSTER_ENTRY_TYPE] != 64 * 1024) || (cache_ptr->max_pins[MONSTER_ENTRY_TYPE] != 0)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected monster entry level stats in check_stats__smoke_check_1(4)."; } /* end if */ @@ -33466,7 +33467,7 @@ check_stats__smoke_check_1(H5F_t *file_ptr) *------------------------------------------------------------------------- */ static herr_t -check_write_permitted(const H5F_t H5_ATTR_UNUSED *f, hbool_t *write_permitted_ptr) +check_write_permitted(const H5F_t H5_ATTR_UNUSED *f, bool *write_permitted_ptr) { assert(write_permitted_ptr); @@ -33509,8 +33510,8 @@ H5F_t * setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged) { char filename[512]; - hbool_t show_progress = FALSE; - hbool_t verbose = TRUE; + bool show_progress = false; + bool verbose = true; int mile_stone = 1; hid_t fid = -1; H5F_t *file_ptr = NULL; @@ -33527,7 +33528,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged) if (pass) { if ((fcpl_id = H5Pcreate(H5P_FILE_CREATE)) == FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5Pcreate(H5P_FILE_CREATE) failed.\n"; } } @@ -33535,7 +33536,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged) if (pass && paged) { /* Set up paged aggregation strategy */ if (H5Pset_file_space_strategy(fcpl_id, H5F_FSPACE_STRATEGY_PAGE, 1, (hsize_t)1) == FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_file_space_strategy() failed.\n"; H5Pclose(fcpl_id); fcpl_id = H5P_DEFAULT; @@ -33545,7 +33546,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged) if (pass && paged) { /* Set up file space page size to BASE_ADDR */ if (H5Pset_file_space_page_size(fcpl_id, (hsize_t)BASE_ADDR) == FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_file_space_page_size() failed.\n"; H5Pclose(fcpl_id); fcpl_id = H5P_DEFAULT; @@ -33558,7 +33559,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged) /* setup the file name */ if (pass) { if (NULL == h5_fixname(FILENAME[0], H5P_DEFAULT, filename, sizeof(filename))) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname() failed.\n"; } } @@ -33568,17 +33569,17 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged) if (pass && try_core_file_driver) { if ((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) == FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5Pcreate(H5P_FILE_ACCESS) failed.\n"; } - else if (H5Pset_fapl_core(fapl_id, MAX_ADDR, FALSE) < 0) { + else if (H5Pset_fapl_core(fapl_id, MAX_ADDR, false) < 0) { H5Pclose(fapl_id); fapl_id = H5P_DEFAULT; - pass = FALSE; + pass = false; failure_mssg = "H5P_set_fapl_core() failed.\n"; } else if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl_id, fapl_id)) < 0) { - core_file_driver_failed = TRUE; + core_file_driver_failed = true; if (verbose) fprintf(stdout, "%s: H5Fcreate() with CFD failed.\n", __func__); @@ -33600,7 +33601,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged) saved_fid = fid; if (fid < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fcreate() failed."; if (verbose) @@ -33618,7 +33619,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged) assert(fid >= 0); saved_fid = fid; if (H5Fflush(fid, H5F_SCOPE_GLOBAL) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fflush() failed."; if (verbose) @@ -33627,7 +33628,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged) else { file_ptr = (H5F_t *)H5VL_object_verify(fid, H5I_FILE); if (file_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "Can't get file_ptr."; if (verbose) @@ -33674,7 +33675,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged) file_ptr->shared->cache = NULL; cache_ptr = H5C_create(max_cache_size, min_clean_size, (NUMBER_OF_ENTRY_TYPES - 1), types, - check_write_permitted, TRUE, NULL, NULL); + check_write_permitted, true, NULL, NULL); file_ptr->shared->cache = cache_ptr; } @@ -33684,7 +33685,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged) if (pass) { if (cache_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "H5C_create() failed."; if (verbose) @@ -33699,7 +33700,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged) actual_base_addr = H5MF_alloc(file_ptr, H5FD_MEM_DEFAULT, (hsize_t)(ADDR_SPACE_SIZE + BASE_ADDR)); if (actual_base_addr == HADDR_UNDEF) { - pass = FALSE; + pass = false; failure_mssg = "H5MF_alloc() failed."; if (verbose) @@ -33710,7 +33711,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged) * actual_base_addr is <= BASE_ADDR. This should only happen * if the size of the superblock is increase. */ - pass = FALSE; + pass = false; failure_mssg = "actual_base_addr > BASE_ADDR"; if (verbose) @@ -33725,7 +33726,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged) if (pass) { /* Need to set this else all cache tests will fail */ - cache_ptr->ignore_tags = TRUE; + cache_ptr->ignore_tags = true; H5C_stats__reset(cache_ptr); ret_val = file_ptr; @@ -33744,7 +33745,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged) * dump stats first. Then close and delete the associate * file. * - * If pass is FALSE, do nothing. + * If pass is false, do nothing. * * Return: void * @@ -33752,7 +33753,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged) */ void -takedown_cache(H5F_t *file_ptr, hbool_t dump_stats, hbool_t dump_detailed_stats) +takedown_cache(H5F_t *file_ptr, bool dump_stats, bool dump_detailed_stats) { char filename[512]; @@ -33766,11 +33767,11 @@ takedown_cache(H5F_t *file_ptr, hbool_t dump_stats, hbool_t dump_detailed_stats) if (H5C_prep_for_file_close(file_ptr) < 0) { - pass = FALSE; + pass = false; failure_mssg = "unexpected failure of prep for file close.\n"; } - flush_cache(file_ptr, TRUE, FALSE, FALSE); + flush_cache(file_ptr, true, false, false); H5C_dest(file_ptr); @@ -33808,7 +33809,7 @@ takedown_cache(H5F_t *file_ptr, hbool_t dump_stats, hbool_t dump_detailed_stats) if (H5Fclose(saved_fid) < 0) { - pass = FALSE; + pass = false; failure_mssg = "couldn't close test file."; } else { @@ -33817,19 +33818,19 @@ takedown_cache(H5F_t *file_ptr, hbool_t dump_stats, hbool_t dump_detailed_stats) } /* Pop API context */ - H5CX_pop(FALSE); + H5CX_pop(false); if ((!try_core_file_driver) || (core_file_driver_failed)) { if (h5_fixname(FILENAME[0], H5P_DEFAULT, filename, sizeof(filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname() failed.\n"; } if (HDremove(filename) < 0) { - pass = FALSE; + pass = false; failure_mssg = "couldn't delete test file."; } } @@ -33874,7 +33875,7 @@ main(void) /* Test with paged aggregation enabled or not */ /* Each test will call setup_cache() which set up the file space strategy according to "paged" */ - for (paged = FALSE; paged <= TRUE; paged++) { + for (paged = false; paged <= true; paged++) { if (paged) { @@ -33923,20 +33924,20 @@ main(void) nerrs += check_protect_ro_rw_err(paged); nerrs += check_protect_retries(paged); nerrs += check_check_evictions_enabled_err(paged); - nerrs += check_auto_cache_resize(FALSE, paged); - nerrs += check_auto_cache_resize(TRUE, paged); + nerrs += check_auto_cache_resize(false, paged); + nerrs += check_auto_cache_resize(true, paged); nerrs += check_auto_cache_resize_disable(paged); nerrs += check_auto_cache_resize_epoch_markers(paged); nerrs += check_auto_cache_resize_input_errs(paged); nerrs += check_auto_cache_resize_aux_fcns(paged); - nerrs += check_metadata_blizzard_absence(TRUE, paged); - nerrs += check_metadata_blizzard_absence(FALSE, paged); + nerrs += check_metadata_blizzard_absence(true, paged); + nerrs += check_metadata_blizzard_absence(false, paged); nerrs += check_flush_deps(paged); nerrs += check_flush_deps_err(paged); nerrs += check_flush_deps_order(paged); nerrs += check_notify_cb(paged); - nerrs += check_metadata_cork(TRUE, paged); - nerrs += check_metadata_cork(FALSE, paged); + nerrs += check_metadata_cork(true, paged); + nerrs += check_metadata_cork(false, paged); nerrs += check_entry_deletions_during_scans(paged); nerrs += check_stats(paged); } /* end for */ diff --git a/test/cache_api.c b/test/cache_api.c index 1752a43..e5a4af9 100644 --- a/test/cache_api.c +++ b/test/cache_api.c @@ -27,12 +27,12 @@ static const char *FILENAME[] = {"cache_api_test", NULL}; /* private function declarations: */ -static hbool_t check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id); -static hbool_t check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id); -static hbool_t mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id); +static bool check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id); +static bool check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id); +static bool mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id); static H5AC_cache_config_t *init_invalid_configs(void); -static hbool_t check_fapl_mdc_api_errs(void); -static hbool_t check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id); +static bool check_fapl_mdc_api_errs(void); +static bool check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id); /**************************************************************************/ /**************************************************************************/ @@ -51,11 +51,11 @@ static hbool_t check_file_mdc_api_errs(unsigned paged, hid_t fcpl_i * be sufficient to verify that the desired configuration * data is getting to the cache. * - * Return: Test pass status (TRUE/FALSE) + * Return: Test pass status (true/false) * *------------------------------------------------------------------------- */ -static hbool_t +static bool check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) { char filename[512]; @@ -68,12 +68,12 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) H5AC_cache_config_t default_config = H5AC__DEFAULT_CACHE_CONFIG; H5AC_cache_config_t mod_config = { /* int version = */ H5AC__CURR_CACHE_CONFIG_VERSION, - /* hbool_t rpt_fcn_enabled = */ FALSE, - /* hbool_t open_trace_file = */ FALSE, - /* hbool_t close_trace_file = */ FALSE, + /* bool rpt_fcn_enabled = */ false, + /* bool open_trace_file = */ false, + /* bool close_trace_file = */ false, /* char trace_file_name[] = */ "", - /* hbool_t evictions_enabled = */ TRUE, - /* hbool_t set_initial_size = */ TRUE, + /* bool evictions_enabled = */ true, + /* bool set_initial_size = */ true, /* size_t initial_size = */ (1 * 1024 * 1024 + 1), /* double min_clean_fraction = */ 0.2, /* size_t max_size = */ (16 * 1024 * 1024 + 1), @@ -82,7 +82,7 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__threshold, /* double lower_hr_threshold = */ 0.91, /* double increment = */ 2.1, - /* hbool_t apply_max_increment = */ TRUE, + /* bool apply_max_increment = */ true, /* size_t max_increment = */ (4 * 1024 * 1024 + 1), /* enum H5C_cache_flash_incr_mode */ /* flash_incr_mode = */ H5C_flash_incr__off, @@ -91,10 +91,10 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out, /* double upper_hr_threshold = */ 0.998, /* double decrement = */ 0.91, - /* hbool_t apply_max_decrement = */ TRUE, + /* bool apply_max_decrement = */ true, /* size_t max_decrement = */ (1 * 1024 * 1024 - 1), /* int epochs_before_eviction = */ 4, - /* hbool_t apply_empty_reserve = */ TRUE, + /* bool apply_empty_reserve = */ true, /* double empty_reserve = */ 0.05, /* int dirty_bytes_threshold = */ (256 * 1024), /* int metadata_write_strategy = */ @@ -108,7 +108,7 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) else TESTING("MDC/FAPL related API calls"); - pass = TRUE; + pass = true; XLATE_EXT_TO_INT_MDC_CONFIG(default_auto_size_ctl, default_config) XLATE_EXT_TO_INT_MDC_CONFIG(mod_auto_size_ctl, mod_config) @@ -123,7 +123,7 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) if (fapl_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pcreate(H5P_FILE_ACCESS) failed.\n"; } } @@ -136,12 +136,12 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pget_mdc_config() failed.\n"; } - else if (!CACHE_CONFIGS_EQUAL(default_config, scratch, TRUE, TRUE)) { + else if (!CACHE_CONFIGS_EQUAL(default_config, scratch, true, true)) { - pass = FALSE; + pass = false; failure_mssg = "retrieved config doesn't match default."; } } @@ -156,7 +156,7 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_mdc_config() failed.\n"; } } @@ -169,12 +169,12 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pget_mdc_config() failed.\n"; } - else if (!CACHE_CONFIGS_EQUAL(mod_config, scratch, TRUE, TRUE)) { + else if (!CACHE_CONFIGS_EQUAL(mod_config, scratch, true, true)) { - pass = FALSE; + pass = false; failure_mssg = "retrieved config doesn't match mod config."; } } @@ -183,7 +183,7 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) if (H5Pclose(fapl_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pclose() failed.\n"; } } @@ -200,7 +200,7 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) if (h5_fixname(FILENAME[0], H5P_DEFAULT, filename, sizeof(filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname() failed.\n"; } } @@ -212,7 +212,7 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) if (file_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fcreate() failed.\n"; } } @@ -224,7 +224,7 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) if (file_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "Can't get file_ptr.\n"; } else { @@ -238,7 +238,7 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) if (cache_ptr == NULL || cache_ptr->resize_ctl.version != H5C__CURR_AUTO_SIZE_CTL_VER) { - pass = FALSE; + pass = false; failure_mssg = "Can't access cache resize_ctl.\n"; } } @@ -246,9 +246,9 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) /* conpare the cache's internal configuration with the expected value */ if (pass) { - if (!resize_configs_are_equal(&default_auto_size_ctl, &cache_ptr->resize_ctl, TRUE)) { + if (!resize_configs_are_equal(&default_auto_size_ctl, &cache_ptr->resize_ctl, true)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected value(s) in cache resize_ctl 1.\n"; } } @@ -260,7 +260,7 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) if (fapl_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fget_access_plist() failed.\n"; } } @@ -276,17 +276,17 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pget_mdc_config() failed.\n"; } - else if (!CACHE_CONFIGS_EQUAL(default_config, scratch, TRUE, TRUE)) { + else if (!CACHE_CONFIGS_EQUAL(default_config, scratch, true, true)) { - pass = FALSE; + pass = false; failure_mssg = "config retrieved from file doesn't match default."; } else if (H5Pclose(fapl_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pclose() failed.\n"; } } @@ -296,12 +296,12 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } else if (H5Fdelete(filename, H5P_DEFAULT) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fdelete() failed.\n"; } } @@ -320,7 +320,7 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) if (fapl_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pcreate(H5P_FILE_ACCESS) failed.\n"; } } @@ -333,7 +333,7 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_mdc_config() failed.\n"; } } @@ -343,7 +343,7 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) if (h5_fixname(FILENAME[0], H5P_DEFAULT, filename, sizeof(filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname() failed.\n"; } } @@ -355,7 +355,7 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) if (file_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fcreate() failed.\n"; } } @@ -367,7 +367,7 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) if (file_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "Can't get file_ptr.\n"; } else { @@ -381,7 +381,7 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) if (cache_ptr == NULL || cache_ptr->resize_ctl.version != H5C__CURR_AUTO_SIZE_CTL_VER) { - pass = FALSE; + pass = false; failure_mssg = "Can't access cache resize_ctl.\n"; } } @@ -389,9 +389,9 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) /* conpare the cache's internal configuration with the expected value */ if (pass) { - if (!resize_configs_are_equal(&mod_auto_size_ctl, &cache_ptr->resize_ctl, TRUE)) { + if (!resize_configs_are_equal(&mod_auto_size_ctl, &cache_ptr->resize_ctl, true)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected value(s) in cache resize_ctl 2.\n"; } } @@ -403,7 +403,7 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) if (test_fapl_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fget_access_plist() failed.\n"; } } @@ -419,17 +419,17 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pget_mdc_config() failed.\n"; } - else if (!CACHE_CONFIGS_EQUAL(mod_config, scratch, TRUE, TRUE)) { + else if (!CACHE_CONFIGS_EQUAL(mod_config, scratch, true, true)) { - pass = FALSE; + pass = false; failure_mssg = "config retrieved from file doesn't match."; } else if (H5Pclose(test_fapl_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pclose() failed.\n"; } } @@ -439,12 +439,12 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } else if (H5Fdelete(filename, fapl_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fdelete() failed.\n"; } } @@ -454,7 +454,7 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) if (H5Pclose(fapl_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pclose() failed.\n"; } } @@ -491,11 +491,11 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) * We shouldn't need to verify data correctness beyond that * point. * - * Return: Test pass status (TRUE/FALSE) + * Return: Test pass status (true/false) * *------------------------------------------------------------------------- */ -static hbool_t +static bool check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id) { char filename[512]; @@ -508,12 +508,12 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id) H5AC_cache_config_t default_config = H5AC__DEFAULT_CACHE_CONFIG; H5AC_cache_config_t mod_config_1 = { /* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER, - /* hbool_t rpt_fcn_enabled = */ FALSE, - /* hbool_t open_trace_file = */ FALSE, - /* hbool_t close_trace_file = */ FALSE, + /* bool rpt_fcn_enabled = */ false, + /* bool open_trace_file = */ false, + /* bool close_trace_file = */ false, /* char trace_file_name[] = */ "", - /* hbool_t evictions_enabled = */ TRUE, - /* hbool_t set_initial_size = */ TRUE, + /* bool evictions_enabled = */ true, + /* bool set_initial_size = */ true, /* size_t initial_size = */ (1 * 1024 * 1024 + 1), /* double min_clean_fraction = */ 0.2, /* size_t max_size = */ (16 * 1024 * 1024 + 1), @@ -522,7 +522,7 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id) /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__threshold, /* double lower_hr_threshold = */ 0.91, /* double increment = */ 2.1, - /* hbool_t apply_max_increment = */ TRUE, + /* bool apply_max_increment = */ true, /* size_t max_increment = */ (4 * 1024 * 1024 + 1), /* enum H5C_cache_flash_incr_mode */ /* flash_incr_mode = */ H5C_flash_incr__off, @@ -531,22 +531,22 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id) /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out, /* double upper_hr_threshold = */ 0.998, /* double decrement = */ 0.91, - /* hbool_t apply_max_decrement = */ TRUE, + /* bool apply_max_decrement = */ true, /* size_t max_decrement = */ (1 * 1024 * 1024 - 1), /* int epochs_before_eviction = */ 4, - /* hbool_t apply_empty_reserve = */ TRUE, + /* bool apply_empty_reserve = */ true, /* double empty_reserve = */ 0.05, /* int dirty_bytes_threshold = */ (256 * 1024), /* int metadata_write_strategy = */ H5AC__DEFAULT_METADATA_WRITE_STRATEGY}; H5AC_cache_config_t mod_config_2 = { /* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER, - /* hbool_t rpt_fcn_enabled = */ TRUE, - /* hbool_t open_trace_file = */ FALSE, - /* hbool_t close_trace_file = */ FALSE, + /* bool rpt_fcn_enabled = */ true, + /* bool open_trace_file = */ false, + /* bool close_trace_file = */ false, /* char trace_file_name[] = */ "", - /* hbool_t evictions_enabled = */ TRUE, - /* hbool_t set_initial_size = */ TRUE, + /* bool evictions_enabled = */ true, + /* bool set_initial_size = */ true, /* size_t initial_size = */ (512 * 1024), /* double min_clean_fraction = */ 0.1, /* size_t max_size = */ (8 * 1024 * 1024), @@ -555,7 +555,7 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id) /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__threshold, /* double lower_hr_threshold = */ 0.9, /* double increment = */ 2.0, - /* hbool_t apply_max_increment = */ TRUE, + /* bool apply_max_increment = */ true, /* size_t max_increment = */ (2 * 1024 * 1024), /* enum H5C_cache_flash_incr_mode */ /* flash_incr_mode = */ H5C_flash_incr__off, @@ -564,22 +564,22 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id) /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__threshold, /* double upper_hr_threshold = */ 0.9995, /* double decrement = */ 0.95, - /* hbool_t apply_max_decrement = */ TRUE, + /* bool apply_max_decrement = */ true, /* size_t max_decrement = */ (512 * 1024), /* int epochs_before_eviction = */ 4, - /* hbool_t apply_empty_reserve = */ TRUE, + /* bool apply_empty_reserve = */ true, /* double empty_reserve = */ 0.05, /* int dirty_bytes_threshold = */ (256 * 1024), /* int metadata_write_strategy = */ H5AC__DEFAULT_METADATA_WRITE_STRATEGY}; H5AC_cache_config_t mod_config_3 = { /* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER, - /* hbool_t rpt_fcn_enabled = */ FALSE, - /* hbool_t open_trace_file = */ FALSE, - /* hbool_t close_trace_file = */ FALSE, + /* bool rpt_fcn_enabled = */ false, + /* bool open_trace_file = */ false, + /* bool close_trace_file = */ false, /* char trace_file_name[] = */ "", - /* hbool_t evictions_enabled = */ TRUE, - /* hbool_t set_initial_size = */ TRUE, + /* bool evictions_enabled = */ true, + /* bool set_initial_size = */ true, /* size_t initial_size = */ (1 * 1024 * 1024), /* double min_clean_fraction = */ 0.2, /* size_t max_size = */ (16 * 1024 * 1024), @@ -588,7 +588,7 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id) /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__off, /* double lower_hr_threshold = */ 0.90, /* double increment = */ 2.0, - /* hbool_t apply_max_increment = */ TRUE, + /* bool apply_max_increment = */ true, /* size_t max_increment = */ (4 * 1024 * 1024), /* enum H5C_cache_flash_incr_mode */ /* flash_incr_mode = */ H5C_flash_incr__off, @@ -597,22 +597,22 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id) /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__off, /* double upper_hr_threshold = */ 0.999, /* double decrement = */ 0.9, - /* hbool_t apply_max_decrement = */ FALSE, + /* bool apply_max_decrement = */ false, /* size_t max_decrement = */ (1 * 1024 * 1024 - 1), /* int epochs_before_eviction = */ 3, - /* hbool_t apply_empty_reserve = */ FALSE, + /* bool apply_empty_reserve = */ false, /* double empty_reserve = */ 0.05, /* int dirty_bytes_threshold = */ (256 * 1024), /* int metadata_write_strategy = */ H5AC__DEFAULT_METADATA_WRITE_STRATEGY}; H5AC_cache_config_t mod_config_4 = { /* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER, - /* hbool_t rpt_fcn_enabled = */ FALSE, - /* hbool_t open_trace_file = */ FALSE, - /* hbool_t close_trace_file = */ FALSE, + /* bool rpt_fcn_enabled = */ false, + /* bool open_trace_file = */ false, + /* bool close_trace_file = */ false, /* char trace_file_name[] = */ "", - /* hbool_t evictions_enabled = */ TRUE, - /* hbool_t set_initial_size = */ TRUE, + /* bool evictions_enabled = */ true, + /* bool set_initial_size = */ true, /* size_t initial_size = */ (1 * 1024 * 1024), /* double min_clean_fraction = */ 0.15, /* size_t max_size = */ (20 * 1024 * 1024), @@ -621,7 +621,7 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id) /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__threshold, /* double lower_hr_threshold = */ 0.9, /* double increment = */ 2.0, - /* hbool_t apply_max_increment = */ TRUE, + /* bool apply_max_increment = */ true, /* size_t max_increment = */ (2 * 1024 * 1024), /* enum H5C_cache_flash_incr_mode */ /* flash_incr_mode = */ H5C_flash_incr__off, @@ -631,10 +631,10 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id) H5C_decr__age_out_with_threshold, /* double upper_hr_threshold = */ 0.999, /* double decrement = */ 0.9, - /* hbool_t apply_max_decrement = */ TRUE, + /* bool apply_max_decrement = */ true, /* size_t max_decrement = */ (1 * 1024 * 1024), /* int epochs_before_eviction = */ 3, - /* hbool_t apply_empty_reserve = */ TRUE, + /* bool apply_empty_reserve = */ true, /* double empty_reserve = */ 0.1, /* int dirty_bytes_threshold = */ (256 * 1024), /* int metadata_write_strategy = */ @@ -645,7 +645,7 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id) else TESTING("MDC/FILE related API calls"); - pass = TRUE; + pass = true; /* Open a file with the default FAPL. Verify that the cache is * configured as per the default both by looking at its internal @@ -660,7 +660,7 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id) if (h5_fixname(FILENAME[0], H5P_DEFAULT, filename, sizeof(filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname() failed.\n"; } } @@ -672,65 +672,65 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id) if (file_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fcreate() failed.\n"; } } /* verify that the cache is set to the default config */ - validate_mdc_config(file_id, &default_config, TRUE, 1); + validate_mdc_config(file_id, &default_config, true, 1); /* set alternate config 1 */ if (pass) { if (H5Fset_mdc_config(file_id, &mod_config_1) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fset_mdc_config() failed 1.\n"; } } /* verify that the cache is now set to the alternate config */ - validate_mdc_config(file_id, &mod_config_1, TRUE, 2); + validate_mdc_config(file_id, &mod_config_1, true, 2); /* set alternate config 2 */ if (pass) { if (H5Fset_mdc_config(file_id, &mod_config_2) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fset_mdc_config() failed 2.\n"; } } /* verify that the cache is now set to the alternate config */ - validate_mdc_config(file_id, &mod_config_2, TRUE, 3); + validate_mdc_config(file_id, &mod_config_2, true, 3); /* set alternate config 3 */ if (pass) { if (H5Fset_mdc_config(file_id, &mod_config_3) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fset_mdc_config() failed 3.\n"; } } /* verify that the cache is now set to the alternate config */ - validate_mdc_config(file_id, &mod_config_3, TRUE, 4); + validate_mdc_config(file_id, &mod_config_3, true, 4); /* set alternate config 4 */ if (pass) { if (H5Fset_mdc_config(file_id, &mod_config_4) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fset_mdc_config() failed 4.\n"; } } /* verify that the cache is now set to the alternate config */ - validate_mdc_config(file_id, &mod_config_4, TRUE, 5); + validate_mdc_config(file_id, &mod_config_4, true, 5); /* Run some quick smoke checks on the cache status monitoring * calls -- no interesting data as the cache hasn't had a @@ -741,12 +741,12 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id) if (H5Fget_mdc_hit_rate(file_id, &hit_rate) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fget_mdc_hit_rate() failed 1.\n"; } else if (!H5_DBL_ABS_EQUAL(hit_rate, 0.0)) { - pass = FALSE; + pass = false; failure_mssg = "H5Fget_mdc_hit_rate() returned unexpected hit rate.\n"; } } @@ -755,13 +755,13 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id) if (H5Fget_mdc_size(file_id, &max_size, &min_clean_size, &cur_size, &cur_num_entries) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fget_mdc_size() failed 1.\n"; } else if ((mod_config_4.initial_size != max_size) || (min_clean_size != (size_t)((double)max_size * mod_config_4.min_clean_fraction))) { - pass = FALSE; + pass = false; failure_mssg = "H5Fget_mdc_size() returned unexpected value(s).\n"; } } @@ -771,12 +771,12 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } else if (H5Fdelete(filename, H5P_DEFAULT) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fdelete() failed.\n"; } } @@ -808,7 +808,7 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id) * NOTE: This test takes some time to run and checks the * testing express level value. * - * Return: Test pass status (TRUE/FALSE) + * Return: Test pass status (true/false) * *------------------------------------------------------------------------- */ @@ -818,15 +818,15 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id) #define NUM_DSETS 6 #define NUM_RANDOM_ACCESSES 200000 -static hbool_t +static bool mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) { char filename[512]; - hbool_t valid_chunk; - hbool_t dump_hit_rate = FALSE; + bool valid_chunk; + bool dump_hit_rate = false; int64_t min_accesses = 1000; double min_hit_rate = 0.90; - hbool_t dump_cache_size = FALSE; + bool dump_cache_size = false; hid_t file_id = -1; hid_t dataspace_id = -1; hid_t filespace_ids[NUM_DSETS]; @@ -844,12 +844,12 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) H5AC_cache_config_t default_config = H5AC__DEFAULT_CACHE_CONFIG; H5AC_cache_config_t mod_config_1 = { /* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER, - /* hbool_t rpt_fcn_enabled = */ FALSE, - /* hbool_t open_trace_file = */ FALSE, - /* hbool_t close_trace_file = */ FALSE, + /* bool rpt_fcn_enabled = */ false, + /* bool open_trace_file = */ false, + /* bool close_trace_file = */ false, /* char trace_file_name[] = */ "", - /* hbool_t evictions_enabled = */ TRUE, - /* hbool_t set_initial_size = */ TRUE, + /* bool evictions_enabled = */ true, + /* bool set_initial_size = */ true, /* size_t initial_size = */ 500000, /* double min_clean_fraction = */ 0.1, /* size_t max_size = */ 16000000, @@ -858,7 +858,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__off, /* double lower_hr_threshold = */ 0.95, /* double increment = */ 2.0, - /* hbool_t apply_max_increment = */ FALSE, + /* bool apply_max_increment = */ false, /* size_t max_increment = */ 4000000, /* enum H5C_cache_flash_incr_mode */ /* flash_incr_mode = */ H5C_flash_incr__off, @@ -867,22 +867,22 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__off, /* double upper_hr_threshold = */ 0.999, /* double decrement = */ 0.9, - /* hbool_t apply_max_decrement = */ FALSE, + /* bool apply_max_decrement = */ false, /* size_t max_decrement = */ 1000000, /* int epochs_before_eviction = */ 2, - /* hbool_t apply_empty_reserve = */ TRUE, + /* bool apply_empty_reserve = */ true, /* double empty_reserve = */ 0.05, /* int dirty_bytes_threshold = */ (256 * 1024), /* int metadata_write_strategy = */ H5AC__DEFAULT_METADATA_WRITE_STRATEGY}; H5AC_cache_config_t mod_config_2 = { /* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER, - /* hbool_t rpt_fcn_enabled = */ FALSE, - /* hbool_t open_trace_file = */ FALSE, - /* hbool_t close_trace_file = */ FALSE, + /* bool rpt_fcn_enabled = */ false, + /* bool open_trace_file = */ false, + /* bool close_trace_file = */ false, /* char trace_file_name[] = */ "", - /* hbool_t evictions_enabled = */ TRUE, - /* hbool_t set_initial_size = */ TRUE, + /* bool evictions_enabled = */ true, + /* bool set_initial_size = */ true, /* size_t initial_size = */ 12000000, /* double min_clean_fraction = */ 0.1, /* size_t max_size = */ 16000000, @@ -891,7 +891,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__off, /* double lower_hr_threshold = */ 0.95, /* double increment = */ 2.0, - /* hbool_t apply_max_increment = */ FALSE, + /* bool apply_max_increment = */ false, /* size_t max_increment = */ 4000000, /* enum H5C_cache_flash_incr_mode */ /* flash_incr_mode = */ H5C_flash_incr__off, @@ -900,22 +900,22 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__off, /* double upper_hr_threshold = */ 0.999, /* double decrement = */ 0.9, - /* hbool_t apply_max_decrement = */ FALSE, + /* bool apply_max_decrement = */ false, /* size_t max_decrement = */ 1000000, /* int epochs_before_eviction = */ 2, - /* hbool_t apply_empty_reserve = */ TRUE, + /* bool apply_empty_reserve = */ true, /* double empty_reserve = */ 0.05, /* int dirty_bytes_threshold = */ (256 * 1024), /* int metadata_write_strategy = */ H5AC__DEFAULT_METADATA_WRITE_STRATEGY}; H5AC_cache_config_t mod_config_3 = { /* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER, - /* hbool_t rpt_fcn_enabled = */ FALSE, - /* hbool_t open_trace_file = */ FALSE, - /* hbool_t close_trace_file = */ FALSE, + /* bool rpt_fcn_enabled = */ false, + /* bool open_trace_file = */ false, + /* bool close_trace_file = */ false, /* char trace_file_name[] = */ "", - /* hbool_t evictions_enabled = */ TRUE, - /* hbool_t set_initial_size = */ TRUE, + /* bool evictions_enabled = */ true, + /* bool set_initial_size = */ true, /* size_t initial_size = */ 2000000, /* double min_clean_fraction = */ 0.1, /* size_t max_size = */ 16000000, @@ -924,7 +924,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__off, /* double lower_hr_threshold = */ 0.95, /* double increment = */ 2.0, - /* hbool_t apply_max_increment = */ FALSE, + /* bool apply_max_increment = */ false, /* size_t max_increment = */ 4000000, /* enum H5C_cache_flash_incr_mode */ /* flash_incr_mode = */ H5C_flash_incr__off, @@ -933,10 +933,10 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__off, /* double upper_hr_threshold = */ 0.999, /* double decrement = */ 0.9, - /* hbool_t apply_max_decrement = */ FALSE, + /* bool apply_max_decrement = */ false, /* size_t max_decrement = */ 1000000, /* int epochs_before_eviction = */ 2, - /* hbool_t apply_empty_reserve = */ TRUE, + /* bool apply_empty_reserve = */ true, /* double empty_reserve = */ 0.05, /* int dirty_bytes_threshold = */ (256 * 1024), /* int metadata_write_strategy = */ @@ -947,7 +947,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) else TESTING("MDC API smoke check"); - pass = TRUE; + pass = true; if (express_test > 0) { @@ -971,7 +971,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) if (h5_fixname(FILENAME[0], H5P_DEFAULT, filename, sizeof(filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname() failed.\n"; } } @@ -983,26 +983,26 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) if (file_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fcreate() failed.\n"; } } /* verify that the cache is set to the default config */ - validate_mdc_config(file_id, &default_config, TRUE, 1); + validate_mdc_config(file_id, &default_config, true, 1); /* set alternate config 1 */ if (pass) { if (H5Fset_mdc_config(file_id, &mod_config_1) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fset_mdc_config() failed 1.\n"; } } /* verify that the cache is now set to the alternate config */ - validate_mdc_config(file_id, &mod_config_1, TRUE, 2); + validate_mdc_config(file_id, &mod_config_1, true, 2); /* create the datasets */ if (pass) { @@ -1017,7 +1017,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) if (dataspace_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Screate_simple() failed."; } @@ -1033,7 +1033,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) if (properties < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pcreate() failed."; } } @@ -1042,7 +1042,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) if (H5Pset_chunk(properties, 2, chunk_size) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_chunk() failed."; } } @@ -1056,7 +1056,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) if (dataset_ids[i] < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dcreate2() failed."; } } @@ -1068,7 +1068,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) if (filespace_ids[i] < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dget_space() failed."; } } @@ -1086,7 +1086,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) if (memspace_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Screate_simple() failed."; } } @@ -1102,7 +1102,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Sselect_hyperslab() failed."; } } @@ -1131,7 +1131,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "disk H5Sselect_hyperslab() failed."; } @@ -1141,7 +1141,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dwrite() failed."; } m++; @@ -1173,13 +1173,13 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) if (H5Fset_mdc_config(file_id, &mod_config_2) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fset_mdc_config() failed 2.\n"; } } /* verify that the cache is now set to the alternate config */ - validate_mdc_config(file_id, &mod_config_2, TRUE, 3); + validate_mdc_config(file_id, &mod_config_2, true, 3); /* do random reads on all datasets */ n = 0; @@ -1197,7 +1197,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "disk hyperslab create failed."; } @@ -1209,7 +1209,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "disk hyperslab create failed."; } } @@ -1217,18 +1217,18 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) /* validate the slab */ if (pass) { - valid_chunk = TRUE; + valid_chunk = true; for (k = 0; k < CHUNK_SIZE; k++) { for (l = 0; l < CHUNK_SIZE; l++) { if (data_chunk[k][l] != ((DSET_SIZE * DSET_SIZE * m) + (DSET_SIZE * (i + k)) + j + l)) { - valid_chunk = FALSE; + valid_chunk = false; } } } if (!valid_chunk) { - pass = FALSE; + pass = false; failure_mssg = "slab validation failed."; } } @@ -1248,7 +1248,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) while ((pass) && (i < NUM_DSETS)) { if (H5Sclose(filespace_ids[i]) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Sclose() failed."; } i++; @@ -1259,7 +1259,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) while ((pass) && (i < NUM_DSETS)) { if (H5Dclose(dataset_ids[i]) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dclose() failed."; } i++; @@ -1270,13 +1270,13 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) if (H5Fset_mdc_config(file_id, &mod_config_3) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fset_mdc_config() failed 3.\n"; } } /* verify that the cache is now set to the alternate config */ - validate_mdc_config(file_id, &mod_config_3, TRUE, 4); + validate_mdc_config(file_id, &mod_config_3, true, 4); /* do random reads on data set 0 only */ m = 0; @@ -1294,7 +1294,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "disk hyperslab create failed."; } @@ -1306,7 +1306,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "disk hyperslab create failed."; } } @@ -1314,19 +1314,19 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) /* validate the slab */ if (pass) { - valid_chunk = TRUE; + valid_chunk = true; for (k = 0; k < CHUNK_SIZE; k++) { for (l = 0; l < CHUNK_SIZE; l++) { if (data_chunk[k][l] != ((DSET_SIZE * DSET_SIZE * m) + (DSET_SIZE * (i + k)) + j + l)) { - valid_chunk = FALSE; + valid_chunk = false; } } } if (!valid_chunk) { - pass = FALSE; + pass = false; failure_mssg = "slab validation failed."; } } @@ -1346,7 +1346,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) if (H5Sclose(filespace_ids[0]) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Sclose(filespace_ids[0]) failed."; } } @@ -1356,7 +1356,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) if (H5Sclose(dataspace_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Sclose(dataspace) failed."; } } @@ -1366,7 +1366,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) if (H5Sclose(memspace_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Sclose(memspace_id) failed."; } } @@ -1376,7 +1376,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) if (H5Dclose(dataset_ids[0]) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dclose(dataset_ids[0]) failed."; } } @@ -1386,12 +1386,12 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } else if (H5Fdelete(filename, H5P_DEFAULT) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fdelete() failed.\n"; } } @@ -1422,7 +1422,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) * related API calls. * * Note: It is assumed that boolean parameters are only set - * to TRUE/FALSE. + * to true/false. * * Return: Success: Pointer to an array of cache configurations. * Failure: NULL @@ -1450,12 +1450,12 @@ init_invalid_configs(void) for (i = 0; i < NUM_INVALID_CONFIGS; i++) { configs[i].version = H5C__CURR_AUTO_SIZE_CTL_VER; - configs[i].rpt_fcn_enabled = FALSE; - configs[i].open_trace_file = FALSE; - configs[i].close_trace_file = FALSE; + configs[i].rpt_fcn_enabled = false; + configs[i].open_trace_file = false; + configs[i].close_trace_file = false; /* trace file name set to all ASCII NUL by calloc() */ - configs[i].evictions_enabled = TRUE; - configs[i].set_initial_size = TRUE; + configs[i].evictions_enabled = true; + configs[i].set_initial_size = true; configs[i].initial_size = (1 * 1024 * 1024); configs[i].min_clean_fraction = 0.25; configs[i].max_size = (16 * 1024 * 1024); @@ -1464,7 +1464,7 @@ init_invalid_configs(void) configs[i].incr_mode = H5C_incr__threshold; configs[i].lower_hr_threshold = 0.9; configs[i].increment = 2.0; - configs[i].apply_max_increment = TRUE; + configs[i].apply_max_increment = true; configs[i].max_increment = (4 * 1024 * 1024); configs[i].flash_incr_mode = H5C_flash_incr__off; configs[i].flash_multiple = 2.0; @@ -1472,10 +1472,10 @@ init_invalid_configs(void) configs[i].decr_mode = H5C_decr__age_out_with_threshold; configs[i].upper_hr_threshold = 0.999; configs[i].decrement = 0.9; - configs[i].apply_max_decrement = TRUE; + configs[i].apply_max_decrement = true; configs[i].max_decrement = (1 * 1024 * 1024); configs[i].epochs_before_eviction = 3; - configs[i].apply_empty_reserve = TRUE; + configs[i].apply_empty_reserve = true; configs[i].empty_reserve = 0.1; configs[i].dirty_bytes_threshold = (256 * 1024); configs[i].metadata_write_strategy = H5AC__DEFAULT_METADATA_WRITE_STRATEGY; @@ -1486,8 +1486,8 @@ init_invalid_configs(void) /* 0 -- bad version */ configs[0].version = -1; - /* 1 -- open_trace_file == TRUE and empty trace_file_name */ - configs[1].open_trace_file = TRUE; + /* 1 -- open_trace_file == true and empty trace_file_name */ + configs[1].open_trace_file = true; /* trace file name set to all ASCII NUL by calloc() */ /* 2 -- max_size too big */ @@ -1592,11 +1592,11 @@ init_invalid_configs(void) configs[32].dirty_bytes_threshold = (H5C__MAX_MAX_CACHE_SIZE / 4) + 1; /* 33 -- attempt to disable evictions when auto incr enabled */ - configs[33].evictions_enabled = FALSE; + configs[33].evictions_enabled = false; configs[33].decr_mode = H5C_decr__off; /* 34 -- attempt to disable evictions when auto decr enabled */ - configs[34].evictions_enabled = FALSE; + configs[34].evictions_enabled = false; configs[34].decr_mode = H5C_decr__age_out; /* 35 -- unknown metadata write strategy */ @@ -1612,11 +1612,11 @@ init_invalid_configs(void) * Purpose: Verify that the FAPL related MDC API calls reject input * errors gracefully. * - * Return: Test pass status (TRUE/FALSE) + * Return: Test pass status (true/false) * *------------------------------------------------------------------------- */ -static hbool_t +static bool check_fapl_mdc_api_errs(void) { static char msg[128]; @@ -1628,7 +1628,7 @@ check_fapl_mdc_api_errs(void) TESTING("MDC/FAPL related API input errors"); - pass = TRUE; + pass = true; /* first test H5Pget_mdc_config(). */ @@ -1644,7 +1644,7 @@ check_fapl_mdc_api_errs(void) if (result >= 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pget_mdc_config() accepted invalid plist_id."; } } @@ -1659,16 +1659,16 @@ check_fapl_mdc_api_errs(void) if (fapl_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pcreate(H5P_FILE_ACCESS) failed.\n"; } } scratch.version = H5C__CURR_AUTO_SIZE_CTL_VER; if ((pass) && ((H5Pget_mdc_config(fapl_id, &scratch) < 0) || - (!CACHE_CONFIGS_EQUAL(default_config, scratch, TRUE, TRUE)))) { + (!CACHE_CONFIGS_EQUAL(default_config, scratch, true, true)))) { - pass = FALSE; + pass = false; failure_mssg = "New FAPL has unexpected metadata cache config?!?!?.\n"; } @@ -1682,7 +1682,7 @@ check_fapl_mdc_api_errs(void) if (result >= 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pget_mdc_config() accepted NULL config_ptr."; } } @@ -1700,7 +1700,7 @@ check_fapl_mdc_api_errs(void) if (result >= 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pget_mdc_config() accepted bad config version."; } } @@ -1719,7 +1719,7 @@ check_fapl_mdc_api_errs(void) if (result >= 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_mdc_config() accepted bad invalid plist_id."; } } @@ -1734,7 +1734,7 @@ check_fapl_mdc_api_errs(void) if (result >= 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_mdc_config() accepted NULL config_ptr."; } } @@ -1749,7 +1749,7 @@ check_fapl_mdc_api_errs(void) if (result >= 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5Pset_mdc_config() accepted invalid_configs[%d].", i); failure_mssg = msg; } @@ -1761,9 +1761,9 @@ check_fapl_mdc_api_errs(void) */ scratch.version = H5C__CURR_AUTO_SIZE_CTL_VER; if ((pass) && ((H5Pget_mdc_config(fapl_id, &scratch) < 0) || - (!CACHE_CONFIGS_EQUAL(default_config, scratch, TRUE, TRUE)))) { + (!CACHE_CONFIGS_EQUAL(default_config, scratch, true, true)))) { - pass = FALSE; + pass = false; failure_mssg = "FAPL metadata cache config changed???.\n"; } @@ -1791,16 +1791,16 @@ check_fapl_mdc_api_errs(void) * Purpose: Verify that the file related MDC API calls reject input * errors gracefully. * - * Return: Test pass status (TRUE/FALSE) + * Return: Test pass status (true/false) * *------------------------------------------------------------------------- */ -static hbool_t +static bool check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) { char filename[512]; static char msg[128]; - hbool_t show_progress = FALSE; + bool show_progress = false; int i; herr_t result; hid_t file_id = -1; @@ -1817,7 +1817,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) else TESTING("MDC/FILE related API input errors"); - pass = TRUE; + pass = true; /* Create a file for test purposes, and verify that its metadata cache * set to the default MDC configuration. @@ -1833,7 +1833,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) if (h5_fixname(FILENAME[0], H5P_DEFAULT, filename, sizeof(filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname() failed.\n"; } } @@ -1849,12 +1849,12 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) if (file_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fcreate() failed.\n"; } } - validate_mdc_config(file_id, &default_config, TRUE, 1); + validate_mdc_config(file_id, &default_config, true, 1); /* test H5Fget_mdc_config(). */ @@ -1874,7 +1874,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) if (result >= 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fget_mdc_config() accepted invalid file_id."; } } @@ -1894,7 +1894,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) if (result >= 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fget_mdc_config() accepted NULL config_ptr."; } } @@ -1915,7 +1915,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) if (result >= 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fget_mdc_config() accepted bad config version."; } } @@ -1938,7 +1938,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) if (result >= 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fset_mdc_config() accepted bad invalid file_id."; } } @@ -1958,7 +1958,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) if (result >= 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fset_mdc_config() accepted NULL config_ptr."; } } @@ -1978,7 +1978,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) if (result >= 0) { - pass = FALSE; + pass = false; HDsnprintf(msg, (size_t)128, "H5Fset_mdc_config() accepted invalid_configs[%d].", i); failure_mssg = msg; } @@ -1988,7 +1988,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) /* verify that none of the above calls to H5Fset_mdc_config() changed * the configuration in the FAPL. */ - validate_mdc_config(file_id, &default_config, TRUE, 2); + validate_mdc_config(file_id, &default_config, true, 2); /* test H5Fget_mdc_hit_rate() */ if (pass) { @@ -2006,7 +2006,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) if (result >= 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fget_mdc_hit_rate() accepted bad file_id."; } } @@ -2026,7 +2026,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) if (result >= 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fget_mdc_hit_rate() accepted NULL hit_rate_ptr."; } } @@ -2047,7 +2047,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) if (result >= 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Freset_mdc_hit_rate_stats() accepted bad file_id."; } } @@ -2068,7 +2068,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) if (result >= 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fget_mdc_size() accepted bad file_id."; } } @@ -2086,7 +2086,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) (H5Fget_mdc_size(file_id, NULL, NULL, NULL, &cur_num_entries) < 0) || (H5Fget_mdc_size(file_id, NULL, NULL, NULL, NULL) < 0)) { - pass = FALSE; + pass = false; failure_mssg = "H5Fget_mdc_size() failed to handle NULL params."; } } @@ -2101,12 +2101,12 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } else if (H5Fdelete(filename, H5P_DEFAULT) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fdelete() failed.\n"; } } @@ -2186,7 +2186,7 @@ main(void) /* Test with paged aggregation enabled or not */ /* The "my_fcpl" passed to each test has the paged or non-paged strategy set up accordingly */ - for (paged = FALSE; paged <= TRUE; paged++) { + for (paged = false; paged <= true; paged++) { hid_t my_fcpl = fcpl_id; if (paged) { diff --git a/test/cache_common.c b/test/cache_common.c index b406ff4..23fca65 100644 --- a/test/cache_common.c +++ b/test/cache_common.c @@ -20,7 +20,7 @@ #include "cache_common.h" -hbool_t pass = TRUE; /* set to false on error */ +bool pass = true; /* set to false on error */ const char *failure_mssg = NULL; static char tmp_msg_buf[256]; @@ -36,7 +36,7 @@ static test_entry_t *monster_entries = NULL, *orig_monster_entries = NULL; static test_entry_t *variable_entries = NULL, *orig_variable_entries = NULL; static test_entry_t *notify_entries = NULL, *orig_notify_entries = NULL; -hbool_t orig_entry_arrays_init = FALSE; +bool orig_entry_arrays_init = false; static herr_t pico_get_initial_load_size(void *udata_ptr, size_t *image_len_ptr); static herr_t nano_get_initial_load_size(void *udata_ptr, size_t *image_len_ptr); @@ -55,17 +55,17 @@ static herr_t variable_get_final_load_size(const void *image, size_t image_len, static htri_t variable_verify_chksum(const void *image_ptr, size_t len, void *udata_ptr); -static void *pico_deserialize(const void *image_ptr, size_t len, void *udata_ptr, hbool_t *dirty_ptr); -static void *nano_deserialize(const void *image_ptr, size_t len, void *udata_ptr, hbool_t *dirty_ptr); -static void *micro_deserialize(const void *image_ptr, size_t len, void *udata_ptr, hbool_t *dirty_ptr); -static void *tiny_deserialize(const void *image_ptr, size_t len, void *udata_ptr, hbool_t *dirty_ptr); -static void *small_deserialize(const void *image_ptr, size_t len, void *udata_ptr, hbool_t *dirty_ptr); -static void *medium_deserialize(const void *image_ptr, size_t len, void *udata_ptr, hbool_t *dirty_ptr); -static void *large_deserialize(const void *image_ptr, size_t len, void *udata_ptr, hbool_t *dirty_ptr); -static void *huge_deserialize(const void *image_ptr, size_t len, void *udata_ptr, hbool_t *dirty_ptr); -static void *monster_deserialize(const void *image_ptr, size_t len, void *udata_ptr, hbool_t *dirty_ptr); -static void *variable_deserialize(const void *image_ptr, size_t len, void *udata_ptr, hbool_t *dirty_ptr); -static void *notify_deserialize(const void *image_ptr, size_t len, void *udata_ptr, hbool_t *dirty_ptr); +static void *pico_deserialize(const void *image_ptr, size_t len, void *udata_ptr, bool *dirty_ptr); +static void *nano_deserialize(const void *image_ptr, size_t len, void *udata_ptr, bool *dirty_ptr); +static void *micro_deserialize(const void *image_ptr, size_t len, void *udata_ptr, bool *dirty_ptr); +static void *tiny_deserialize(const void *image_ptr, size_t len, void *udata_ptr, bool *dirty_ptr); +static void *small_deserialize(const void *image_ptr, size_t len, void *udata_ptr, bool *dirty_ptr); +static void *medium_deserialize(const void *image_ptr, size_t len, void *udata_ptr, bool *dirty_ptr); +static void *large_deserialize(const void *image_ptr, size_t len, void *udata_ptr, bool *dirty_ptr); +static void *huge_deserialize(const void *image_ptr, size_t len, void *udata_ptr, bool *dirty_ptr); +static void *monster_deserialize(const void *image_ptr, size_t len, void *udata_ptr, bool *dirty_ptr); +static void *variable_deserialize(const void *image_ptr, size_t len, void *udata_ptr, bool *dirty_ptr); +static void *notify_deserialize(const void *image_ptr, size_t len, void *udata_ptr, bool *dirty_ptr); static herr_t pico_image_len(const void *thing, size_t *image_len_ptr); static herr_t nano_image_len(const void *thing, size_t *image_len_ptr); @@ -135,7 +135,7 @@ static void mark_flush_dep_clean(test_entry_t *entry_ptr); static herr_t get_initial_load_size(void *udata_ptr, size_t *image_len_ptr, int32_t entry_type); static herr_t get_final_load_size(const void *image, size_t image_len, void *udata, size_t *actual_len, int32_t entry_type); -static void *deserialize(const void *image_ptr, size_t len, void *udata_ptr, hbool_t *dirty_ptr, +static void *deserialize(const void *image_ptr, size_t len, void *udata_ptr, bool *dirty_ptr, int32_t entry_type); static herr_t image_len(const void *thing, size_t *image_len_ptr, int32_t entry_type); static herr_t pre_serialize(H5F_t *f, void *thing, haddr_t addr, size_t len, haddr_t *new_addr_ptr, @@ -599,8 +599,8 @@ variable_get_final_load_size(const void *image, size_t image_len, void *udata, s * --check is ok only after 'max_verify_ct' is reached * --otherwise check is not ok * - * Return: TRUE: checksum is ok - * FALSE: checksum is not ok + * Return: true: checksum is ok + * false: checksum is not ok * *------------------------------------------------------------------------- */ @@ -632,9 +632,9 @@ verify_chksum(const void H5_ATTR_UNUSED *image, size_t H5_ATTR_UNUSED len, void assert(entry->addr == addr); if (++entry->verify_ct >= entry->max_verify_ct) - return (TRUE); + return (true); else - return (FALSE); + return (false); } /* verify_chksum() */ @@ -656,7 +656,7 @@ variable_verify_chksum(const void *image, size_t len, void *udata) *------------------------------------------------------------------------- */ static void * -deserialize(const void *image, size_t H5_ATTR_NDEBUG_UNUSED len, void *udata, hbool_t *dirty, +deserialize(const void *image, size_t H5_ATTR_NDEBUG_UNUSED len, void *udata, bool *dirty, int32_t H5_ATTR_NDEBUG_UNUSED entry_type) { test_entry_t *entry; @@ -685,8 +685,8 @@ deserialize(const void *image, size_t H5_ATTR_NDEBUG_UNUSED len, void *udata, hb assert(entry->flush_dep_npar == 0); assert(entry->flush_dep_nchd == 0); - /* for now *dirty will always be FALSE */ - *dirty = FALSE; + /* for now *dirty will always be false */ + *dirty = false; /* verify that the image contains the expected data. */ assert(image != NULL); @@ -715,76 +715,76 @@ deserialize(const void *image, size_t H5_ATTR_NDEBUG_UNUSED len, void *udata, hb } /* end else */ } /* end if */ - entry->deserialized = TRUE; - entry->header.is_dirty = FALSE; - entry->is_dirty = FALSE; + entry->deserialized = true; + entry->header.is_dirty = false; + entry->is_dirty = false; (entry->deserializes)++; return ((void *)entry); } /* deserialize() */ void * -pico_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty) +pico_deserialize(const void *image, size_t len, void *udata, bool *dirty) { return deserialize(image, len, udata, dirty, PICO_ENTRY_TYPE); } void * -nano_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty) +nano_deserialize(const void *image, size_t len, void *udata, bool *dirty) { return deserialize(image, len, udata, dirty, NANO_ENTRY_TYPE); } void * -micro_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty) +micro_deserialize(const void *image, size_t len, void *udata, bool *dirty) { return deserialize(image, len, udata, dirty, MICRO_ENTRY_TYPE); } void * -tiny_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty) +tiny_deserialize(const void *image, size_t len, void *udata, bool *dirty) { return deserialize(image, len, udata, dirty, TINY_ENTRY_TYPE); } void * -small_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty) +small_deserialize(const void *image, size_t len, void *udata, bool *dirty) { return deserialize(image, len, udata, dirty, SMALL_ENTRY_TYPE); } void * -medium_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty) +medium_deserialize(const void *image, size_t len, void *udata, bool *dirty) { return deserialize(image, len, udata, dirty, MEDIUM_ENTRY_TYPE); } void * -large_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty) +large_deserialize(const void *image, size_t len, void *udata, bool *dirty) { return deserialize(image, len, udata, dirty, LARGE_ENTRY_TYPE); } void * -huge_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty) +huge_deserialize(const void *image, size_t len, void *udata, bool *dirty) { return deserialize(image, len, udata, dirty, HUGE_ENTRY_TYPE); } void * -monster_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty) +monster_deserialize(const void *image, size_t len, void *udata, bool *dirty) { return deserialize(image, len, udata, dirty, MONSTER_ENTRY_TYPE); } void * -variable_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty) +variable_deserialize(const void *image, size_t len, void *udata, bool *dirty) { return deserialize(image, len, udata, dirty, VARIABLE_ENTRY_TYPE); } void * -notify_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty) +notify_deserialize(const void *image, size_t len, void *udata, bool *dirty) { return deserialize(image, len, udata, dirty, NOTIFY_ENTRY_TYPE); } @@ -953,7 +953,7 @@ pre_serialize(H5F_t H5_ATTR_NDEBUG_UNUSED *f, void *thing, haddr_t H5_ATTR_NDEBU execute_flush_op(entry->file_ptr, entry, &((entry->flush_ops)[i]), flags_ptr); } /* end for */ entry->num_flush_ops = 0; - entry->flush_op_self_resize_in_progress = FALSE; + entry->flush_op_self_resize_in_progress = false; /* This looks wrong, but it isn't -- *flags_ptr will be modified * by execute_flush_op() only if the target is this entry -- @@ -1122,7 +1122,7 @@ serialize(const H5F_t H5_ATTR_UNUSED *f, void *image_ptr, size_t len, void *thin * as close to that callback as we will get. Hence mark the entry * clean here. If all goes well, it will be flushed shortly. */ - entry->is_dirty = FALSE; + entry->is_dirty = false; if (entry->flush_dep_npar > 0) { assert(entry->flush_dep_ndirty_chd == 0); @@ -1133,13 +1133,13 @@ serialize(const H5F_t H5_ATTR_UNUSED *f, void *image_ptr, size_t len, void *thin * as initialized. */ if (entry->at_main_addr) - entry->written_to_main_addr = TRUE; + entry->written_to_main_addr = true; else - entry->written_to_alt_addr = TRUE; + entry->written_to_alt_addr = true; /* do book keeping */ (entry->serializes)++; - entry->serialized = TRUE; + entry->serialized = true; return (SUCCEED); } /* serialize() */ @@ -1345,7 +1345,7 @@ free_icr(test_entry_t *entry, int32_t H5_ATTR_NDEBUG_UNUSED entry_type) entry->num_pins = 0; } /* end if */ - entry->destroyed = TRUE; + entry->destroyed = true; entry->cache_ptr = NULL; return (SUCCEED); @@ -1426,7 +1426,7 @@ notify_free_icr(void *thing) /*------------------------------------------------------------------------- * Function: add_flush_op * - * Purpose: Do nothing if pass is FALSE on entry. + * Purpose: Do nothing if pass is false on entry. * * Otherwise, add the specified flush operation to the * target instance of test_entry_t. @@ -1437,7 +1437,7 @@ notify_free_icr(void *thing) */ void -add_flush_op(int target_type, int target_idx, int op_code, int type, int idx, hbool_t flag, size_t new_size, +add_flush_op(int target_type, int target_idx, int op_code, int type, int idx, bool flag, size_t new_size, unsigned *order_ptr) { int i; @@ -1476,7 +1476,7 @@ add_flush_op(int target_type, int target_idx, int op_code, int type, int idx, hb /*------------------------------------------------------------------------- * Function: create_pinned_entry_dependency * - * Purpose: Do nothing if pass is FALSE on entry. + * Purpose: Do nothing if pass is false on entry. * * Otherwise, set up a pinned entry dependency so we can * test the pinned entry modifications to the flush routine. @@ -1558,7 +1558,7 @@ create_pinned_entry_dependency(H5F_t *file_ptr, int pinning_type, int pinning_id */ void -dirty_entry(H5F_t *file_ptr, int32_t type, int32_t idx, hbool_t dirty_pin) +dirty_entry(H5F_t *file_ptr, int32_t type, int32_t idx, bool dirty_pin) { test_entry_t *base_addr; test_entry_t *entry_ptr; @@ -1576,7 +1576,7 @@ dirty_entry(H5F_t *file_ptr, int32_t type, int32_t idx, hbool_t dirty_pin) if (!entry_in_cache(cache_ptr, type, idx)) { - pass = FALSE; + pass = false; failure_mssg = "entry to be dirty pinned is not in cache."; } else { @@ -1590,7 +1590,7 @@ dirty_entry(H5F_t *file_ptr, int32_t type, int32_t idx, hbool_t dirty_pin) if (!((entry_ptr->header).is_pinned)) { - pass = FALSE; + pass = false; failure_mssg = "entry to be dirty pinned is not pinned."; } else { @@ -1667,7 +1667,7 @@ execute_flush_op(H5F_t *file_ptr, struct test_entry_t *entry_ptr, struct flush_o (*flags_ptr) |= H5C__SERIALIZE_RESIZED_FLAG; - entry_ptr->flush_op_self_resize_in_progress = TRUE; + entry_ptr->flush_op_self_resize_in_progress = true; } else { @@ -1690,12 +1690,12 @@ execute_flush_op(H5F_t *file_ptr, struct test_entry_t *entry_ptr, struct flush_o if (op_ptr->flag) { assert(entry_ptr->addr == entry_ptr->alt_addr); entry_ptr->addr = entry_ptr->main_addr; - entry_ptr->at_main_addr = TRUE; + entry_ptr->at_main_addr = true; } /* end if */ else { assert(entry_ptr->addr == entry_ptr->main_addr); entry_ptr->addr = entry_ptr->alt_addr; - entry_ptr->at_main_addr = FALSE; + entry_ptr->at_main_addr = false; } /* end else */ } /* end if */ else @@ -1733,7 +1733,7 @@ execute_flush_op(H5F_t *file_ptr, struct test_entry_t *entry_ptr, struct flush_o break; default: - pass = FALSE; + pass = false; failure_mssg = "Undefined flush op code."; break; } @@ -1747,15 +1747,15 @@ execute_flush_op(H5F_t *file_ptr, struct test_entry_t *entry_ptr, struct flush_o * Purpose: Given a pointer to a cache, an entry type, and an index, * determine if the entry is currently in the cache. * - * Return: TRUE if the entry is in the cache, and FALSE otherwise. + * Return: true if the entry is in the cache, and false otherwise. * *------------------------------------------------------------------------- */ -hbool_t +bool entry_in_cache(H5C_t *cache_ptr, int32_t type, int32_t idx) { - hbool_t in_cache = FALSE; /* will set to TRUE if necessary */ + bool in_cache = false; /* will set to true if necessary */ test_entry_t *base_addr; test_entry_t *entry_ptr; H5C_cache_entry_t *test_ptr = NULL; @@ -1775,7 +1775,7 @@ entry_in_cache(H5C_t *cache_ptr, int32_t type, int32_t idx) if (test_ptr != NULL) { - in_cache = TRUE; + in_cache = true; assert(test_ptr == (H5C_cache_entry_t *)entry_ptr); assert(entry_ptr->addr == entry_ptr->header.addr); } @@ -2003,10 +2003,10 @@ reset_entries(void) base_addr[j].header.addr = (haddr_t)0; base_addr[j].header.size = (size_t)0; base_addr[j].header.type = NULL; - base_addr[j].header.is_dirty = FALSE; - base_addr[j].header.is_protected = FALSE; - base_addr[j].header.is_read_only = FALSE; - base_addr[j].header.ro_ref_count = FALSE; + base_addr[j].header.is_dirty = false; + base_addr[j].header.is_protected = false; + base_addr[j].header.is_read_only = false; + base_addr[j].header.ro_ref_count = false; base_addr[j].header.next = NULL; base_addr[j].header.prev = NULL; #if H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS @@ -2016,10 +2016,10 @@ reset_entries(void) base_addr[j].self = &(base_addr[j]); base_addr[j].cache_ptr = NULL; - base_addr[j].written_to_main_addr = FALSE; - base_addr[j].written_to_alt_addr = FALSE; + base_addr[j].written_to_main_addr = false; + base_addr[j].written_to_alt_addr = false; base_addr[j].addr = addr; - base_addr[j].at_main_addr = TRUE; + base_addr[j].at_main_addr = true; base_addr[j].main_addr = addr; base_addr[j].alt_addr = alt_addr; base_addr[j].size = entry_size; @@ -2027,14 +2027,14 @@ reset_entries(void) base_addr[j].index = j; base_addr[j].serializes = 0; base_addr[j].deserializes = 0; - base_addr[j].is_dirty = FALSE; - base_addr[j].is_protected = FALSE; - base_addr[j].is_read_only = FALSE; - base_addr[j].ro_ref_count = FALSE; + base_addr[j].is_dirty = false; + base_addr[j].is_protected = false; + base_addr[j].is_read_only = false; + base_addr[j].ro_ref_count = false; - base_addr[j].is_corked = FALSE; + base_addr[j].is_corked = false; - base_addr[j].is_pinned = FALSE; + base_addr[j].is_pinned = false; base_addr[j].pinning_ref_count = 0; base_addr[j].num_pins = 0; for (k = 0; k < MAX_PINS; k++) { @@ -2047,21 +2047,21 @@ reset_entries(void) base_addr[j].flush_ops[k].op_code = FLUSH_OP__NO_OP; base_addr[j].flush_ops[k].type = -1; base_addr[j].flush_ops[k].idx = -1; - base_addr[j].flush_ops[k].flag = FALSE; + base_addr[j].flush_ops[k].flag = false; base_addr[j].flush_ops[k].size = 0; } - base_addr[j].flush_op_self_resize_in_progress = FALSE; + base_addr[j].flush_op_self_resize_in_progress = false; - base_addr[j].deserialized = FALSE; - base_addr[j].serialized = FALSE; - base_addr[j].destroyed = FALSE; - base_addr[j].expunged = FALSE; + base_addr[j].deserialized = false; + base_addr[j].serialized = false; + base_addr[j].destroyed = false; + base_addr[j].expunged = false; base_addr[j].flush_dep_npar = 0; base_addr[j].flush_dep_nchd = 0; base_addr[j].flush_dep_ndirty_chd = 0; - base_addr[j].pinned_from_client = FALSE; - base_addr[j].pinned_from_cache = FALSE; + base_addr[j].pinned_from_client = false; + base_addr[j].pinned_from_cache = false; base_addr[j].flush_order = 0; @@ -2081,7 +2081,7 @@ reset_entries(void) } /* end for */ /* Indicate that we've made a copy for later */ - orig_entry_arrays_init = TRUE; + orig_entry_arrays_init = true; } /* end if */ else { for (i = 0; i < NUMBER_OF_ENTRY_TYPES; i++) { @@ -2113,7 +2113,7 @@ reset_entries(void) */ void -resize_entry(H5F_t *file_ptr, int32_t type, int32_t idx, size_t new_size, hbool_t in_cache) +resize_entry(H5F_t *file_ptr, int32_t type, int32_t idx, size_t new_size, bool in_cache) { test_entry_t *base_addr; test_entry_t *entry_ptr; @@ -2133,7 +2133,7 @@ resize_entry(H5F_t *file_ptr, int32_t type, int32_t idx, size_t new_size, hbool_ if (!entry_in_cache(cache_ptr, type, idx)) { - pass = FALSE; + pass = false; failure_mssg = "entry to be resized pinned is not in cache."; } else { @@ -2148,23 +2148,23 @@ resize_entry(H5F_t *file_ptr, int32_t type, int32_t idx, size_t new_size, hbool_ if (!(entry_ptr->header.is_pinned || entry_ptr->header.is_protected)) { - pass = FALSE; + pass = false; failure_mssg = "entry to be resized is not pinned or protected."; } else { - hbool_t was_dirty = entry_ptr->is_dirty; + bool was_dirty = entry_ptr->is_dirty; entry_ptr->size = new_size; result = H5C_resize_entry((void *)entry_ptr, new_size); - entry_ptr->is_dirty = TRUE; + entry_ptr->is_dirty = true; if (entry_ptr->flush_dep_npar > 0 && !was_dirty) mark_flush_dep_dirty(entry_ptr); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "error(s) in H5C_resize_entry()."; } else { @@ -2177,7 +2177,7 @@ resize_entry(H5F_t *file_ptr, int32_t type, int32_t idx, size_t new_size, hbool_ else { protect_entry(file_ptr, type, idx); - resize_entry(file_ptr, type, idx, new_size, TRUE); + resize_entry(file_ptr, type, idx, new_size, true); unprotect_entry(file_ptr, type, idx, H5C__DIRTIED_FLAG); } } @@ -2188,9 +2188,9 @@ resize_entry(H5F_t *file_ptr, int32_t type, int32_t idx, size_t new_size, hbool_ * Function: verify_clean * * Purpose: Verify that all cache entries are marked as clean. If any - * are not, set pass to FALSE. + * are not, set pass to false. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -2225,7 +2225,7 @@ verify_clean(void) if (dirty_count > 0) { - pass = FALSE; + pass = false; failure_mssg = "verify_clean() found dirty entry(s)."; } } @@ -2237,9 +2237,9 @@ verify_clean(void) * * Purpose: Verify that a list of entries have the expected status. * If any discrepancies are found, set the failure message - * and set pass to FALSE. + * and set pass to false. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -2255,19 +2255,19 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ while ((pass) && (i < num_entries)) { test_entry_t *base_addr = entries[expected[i].entry_type]; test_entry_t *entry_ptr = &(base_addr[expected[i].entry_index]); - hbool_t in_cache = FALSE; /* will set to TRUE if necessary */ + bool in_cache = false; /* will set to true if necessary */ unsigned u; /* Local index variable */ if ((!expected[i].in_cache) && ((expected[i].is_protected) || (expected[i].is_pinned))) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d: Contradictory data in expected[%d].\n", tag, i); failure_mssg = tmp_msg_buf; } if ((!expected[i].in_cache) && (expected[i].is_dirty) && (!entry_ptr->expunged)) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d: expected[%d] specs non-expunged, dirty, non-resident.\n", tag, i); failure_mssg = tmp_msg_buf; @@ -2279,7 +2279,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (in_cache != expected[i].in_cache) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) in cache actual/expected = %d/%d.\n", tag, (int)expected[i].entry_type, (int)expected[i].entry_index, (int)in_cache, @@ -2292,7 +2292,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (entry_ptr->size != expected[i].size) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) size actual/expected = %ld/%ld.\n", tag, (int)expected[i].entry_type, (int)expected[i].entry_index, (long)(entry_ptr->size), @@ -2305,7 +2305,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (entry_ptr->header.size != expected[i].size) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) header size actual/expected = %ld/%ld.\n", tag, (int)expected[i].entry_type, (int)expected[i].entry_index, @@ -2318,7 +2318,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (entry_ptr->at_main_addr != expected[i].at_main_addr) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) at main addr actual/expected = %d/%d.\n", tag, (int)expected[i].entry_type, (int)expected[i].entry_index, @@ -2331,7 +2331,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (entry_ptr->is_dirty != expected[i].is_dirty) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) is_dirty actual/expected = %d/%d.\n", tag, (int)expected[i].entry_type, (int)expected[i].entry_index, @@ -2344,7 +2344,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (entry_ptr->header.is_dirty != expected[i].is_dirty) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) header is_dirty actual/expected = %d/%d.\n", tag, (int)expected[i].entry_type, (int)expected[i].entry_index, @@ -2357,7 +2357,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (entry_ptr->is_protected != expected[i].is_protected) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) is_protected actual/expected = %d/%d.\n", tag, (int)expected[i].entry_type, (int)expected[i].entry_index, @@ -2370,7 +2370,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (entry_ptr->header.is_protected != expected[i].is_protected) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) header is_protected actual/expected = %d/%d.\n", tag, (int)expected[i].entry_type, (int)expected[i].entry_index, @@ -2383,7 +2383,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (entry_ptr->is_pinned != expected[i].is_pinned) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) is_pinned actual/expected = %d/%d.\n", tag, (int)expected[i].entry_type, (int)expected[i].entry_index, @@ -2396,7 +2396,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (entry_ptr->is_corked != expected[i].is_corked) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) is_corked actual/expected = %d/%d.\n", tag, (int)expected[i].entry_type, (int)expected[i].entry_index, @@ -2409,7 +2409,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (entry_ptr->header.is_pinned != expected[i].is_pinned) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) header is_pinned actual/expected = %d/%d.\n", tag, (int)expected[i].entry_type, (int)expected[i].entry_index, @@ -2424,7 +2424,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ (entry_ptr->serialized != expected[i].serialized) || (entry_ptr->destroyed != expected[i].destroyed)) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d,%d) deserialized = %d(%d), serialized = %d(%d), dest = %d(%d)\n", tag, (int)expected[i].entry_type, (int)expected[i].entry_index, @@ -2440,7 +2440,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ /* # of flush dependency parents */ if (pass) { if (entry_ptr->flush_dep_npar != expected[i].flush_dep_npar) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) flush_dep_npar actual/expected = %u/%u.\n", tag, expected[i].entry_type, expected[i].entry_index, entry_ptr->flush_dep_npar, @@ -2450,7 +2450,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ } /* end if */ if ((pass) && (in_cache)) { if (entry_ptr->header.flush_dep_nparents != expected[i].flush_dep_npar) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) header flush_dep_nparents actual/expected = %u/%u.\n", tag, expected[i].entry_type, expected[i].entry_index, @@ -2464,7 +2464,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (pass) { for (u = 0; u < entry_ptr->flush_dep_npar; u++) { if (entry_ptr->flush_dep_par_type[u] != expected[i].flush_dep_par_type[u]) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) flush_dep_par_type[%u] actual/expected = %d/%d.\n", tag, expected[i].entry_type, expected[i].entry_index, u, @@ -2476,7 +2476,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (pass) { for (u = 0; u < entry_ptr->flush_dep_npar; u++) { if (entry_ptr->flush_dep_par_idx[u] != expected[i].flush_dep_par_idx[u]) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) flush_dep_par_idx[%u] actual/expected = %d/%d.\n", tag, expected[i].entry_type, expected[i].entry_index, u, @@ -2489,7 +2489,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ /* # of flush dependency children and dirty children */ if (pass) { if (entry_ptr->flush_dep_nchd != expected[i].flush_dep_nchd) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) flush_dep_nchd actual/expected = %u/%u.\n", tag, expected[i].entry_type, expected[i].entry_index, entry_ptr->flush_dep_nchd, @@ -2499,7 +2499,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ } /* end if */ if ((pass) && (in_cache)) { if (entry_ptr->header.flush_dep_nchildren != expected[i].flush_dep_nchd) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) header flush_dep_nchildren actual/expected = %u/%u.\n", tag, expected[i].entry_type, expected[i].entry_index, @@ -2509,7 +2509,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ } /* end if */ if (pass) { if (entry_ptr->flush_dep_ndirty_chd != expected[i].flush_dep_ndirty_chd) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) flush_dep_ndirty_chd actual/expected = %u/%u.\n", tag, expected[i].entry_type, expected[i].entry_index, entry_ptr->flush_dep_ndirty_chd, @@ -2519,7 +2519,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ } /* end if */ if ((pass) && (in_cache)) { if (entry_ptr->header.flush_dep_ndirty_children != expected[i].flush_dep_ndirty_chd) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) header flush_dep_ndirty_children actual/expected = %u/%u.\n", tag, expected[i].entry_type, expected[i].entry_index, @@ -2531,7 +2531,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ /* Flush dependency flush order */ if (pass) { if (expected[i].flush_order >= 0 && entry_ptr->flush_order != (unsigned)expected[i].flush_order) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) flush_order actual/expected = %u/%d.\n", tag, expected[i].entry_type, expected[i].entry_index, entry_ptr->flush_order, @@ -2549,9 +2549,9 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ * Function: verify_unprotected * * Purpose: Verify that no cache entries are marked as protected. If - * any are, set pass to FALSE. + * any are, set pass to false. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -2588,7 +2588,7 @@ verify_unprotected(void) if (protected_count > 0) { - pass = FALSE; + pass = false; failure_mssg = "verify_unprotected() found protected entry(s)."; } } @@ -2639,12 +2639,12 @@ expunge_entry(H5F_t *file_ptr, int32_t type, int32_t idx) if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "error in H5C_expunge_entry()."; } else { - entry_ptr->expunged = TRUE; + entry_ptr->expunged = true; } } @@ -2662,9 +2662,9 @@ expunge_entry(H5F_t *file_ptr, int32_t type, int32_t idx) */ void -flush_cache(H5F_t *file_ptr, hbool_t destroy_entries, hbool_t dump_stats, hbool_t dump_detailed_stats) +flush_cache(H5F_t *file_ptr, bool destroy_entries, bool dump_stats, bool dump_detailed_stats) { - hbool_t verbose = FALSE; + bool verbose = false; verify_unprotected(); @@ -2699,7 +2699,7 @@ flush_cache(H5F_t *file_ptr, hbool_t destroy_entries, hbool_t dump_stats, hbool_ (long long)(cache_ptr->index_len), (long long)(cache_ptr->index_size), (long long)(cache_ptr->clean_index_size), (long long)(cache_ptr->dirty_index_size)); } - pass = FALSE; + pass = false; failure_mssg = "non zero index len/sizes after H5C_flush_cache() with invalidate."; } } @@ -2731,7 +2731,7 @@ cork_entry_type(H5F_t *file_ptr, int32_t type) baddrs = base_addrs[type]; if (H5C_cork(cache_ptr, baddrs, H5C__SET_CORK, NULL) < 0) { - pass = FALSE; + pass = false; failure_mssg = "error in H5C_cork()."; } /* end if */ } /* end if */ @@ -2763,7 +2763,7 @@ uncork_entry_type(H5F_t *file_ptr, int32_t type) baddrs = base_addrs[type]; if (H5C_cork(cache_ptr, baddrs, H5C__UNCORK, NULL) < 0) { - pass = FALSE; + pass = false; failure_mssg = "error in H5C_cork()."; } /* end if */ } /* end if */ @@ -2787,7 +2787,7 @@ insert_entry(H5F_t *file_ptr, int32_t type, int32_t idx, unsigned int flags) { H5C_t *cache_ptr; herr_t result; - hbool_t insert_pinned; + bool insert_pinned; test_entry_t *base_addr; test_entry_t *entry_ptr; haddr_t baddrs; @@ -2811,9 +2811,9 @@ insert_entry(H5F_t *file_ptr, int32_t type, int32_t idx, unsigned int flags) assert(entry_ptr->flush_dep_npar == 0); assert(entry_ptr->flush_dep_nchd == 0); - insert_pinned = (hbool_t)((flags & H5C__PIN_ENTRY_FLAG) != 0); + insert_pinned = (bool)((flags & H5C__PIN_ENTRY_FLAG) != 0); - entry_ptr->is_dirty = TRUE; + entry_ptr->is_dirty = true; /* Set the base address of the entry type into the property list as tag */ /* Use to cork entries for the object */ @@ -2824,7 +2824,7 @@ insert_entry(H5F_t *file_ptr, int32_t type, int32_t idx, unsigned int flags) if ((result < 0) || (entry_ptr->header.is_protected) || (entry_ptr->header.type != types[type]) || (entry_ptr->size != entry_ptr->header.size) || (entry_ptr->addr != entry_ptr->header.addr)) { - pass = FALSE; + pass = false; failure_mssg = "error in H5C_insert()."; #if 0 /* This is useful debugging code. Lets keep it around. */ @@ -2856,7 +2856,7 @@ insert_entry(H5F_t *file_ptr, int32_t type, int32_t idx, unsigned int flags) entry_ptr->pinned_from_client = insert_pinned; if (entry_ptr->header.tag_info && entry_ptr->header.tag_info->corked) - entry_ptr->is_corked = TRUE; + entry_ptr->is_corked = true; assert(entry_ptr->header.is_dirty); assert(((entry_ptr->header).type)->id == type); @@ -2869,7 +2869,7 @@ insert_entry(H5F_t *file_ptr, int32_t type, int32_t idx, unsigned int flags) * * Purpose: Mark the specified entry as dirty. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -2882,7 +2882,7 @@ mark_entry_dirty(int32_t type, int32_t idx) herr_t result; test_entry_t *base_addr; test_entry_t *entry_ptr; - hbool_t was_dirty; + bool was_dirty; if (pass) { @@ -2898,7 +2898,7 @@ mark_entry_dirty(int32_t type, int32_t idx) assert(entry_ptr->header.is_protected || entry_ptr->header.is_pinned); was_dirty = entry_ptr->is_dirty; - entry_ptr->is_dirty = TRUE; + entry_ptr->is_dirty = true; if (entry_ptr->flush_dep_npar > 0 && !was_dirty) mark_flush_dep_dirty(entry_ptr); @@ -2911,7 +2911,7 @@ mark_entry_dirty(int32_t type, int32_t idx) (entry_ptr->header.type != types[type]) || (entry_ptr->size != entry_ptr->header.size) || (entry_ptr->addr != entry_ptr->header.addr)) { - pass = FALSE; + pass = false; failure_mssg = "error in H5C_mark_entry_dirty()."; } @@ -2933,10 +2933,10 @@ mark_entry_dirty(int32_t type, int32_t idx) */ void -move_entry(H5C_t *cache_ptr, int32_t type, int32_t idx, hbool_t main_addr) +move_entry(H5C_t *cache_ptr, int32_t type, int32_t idx, bool main_addr) { herr_t result = 0; - hbool_t done = TRUE; /* will set to FALSE if we have work to do */ + bool done = true; /* will set to false if we have work to do */ haddr_t old_addr = HADDR_UNDEF; haddr_t new_addr = HADDR_UNDEF; test_entry_t *base_addr; @@ -2964,7 +2964,7 @@ move_entry(H5C_t *cache_ptr, int32_t type, int32_t idx, hbool_t main_addr) assert(entry_ptr->addr == entry_ptr->main_addr); - done = FALSE; + done = false; old_addr = entry_ptr->addr; new_addr = entry_ptr->alt_addr; } @@ -2974,15 +2974,15 @@ move_entry(H5C_t *cache_ptr, int32_t type, int32_t idx, hbool_t main_addr) assert(entry_ptr->addr == entry_ptr->alt_addr); - done = FALSE; + done = false; old_addr = entry_ptr->addr; new_addr = entry_ptr->main_addr; } if (!done) { - hbool_t was_dirty = entry_ptr->is_dirty; + bool was_dirty = entry_ptr->is_dirty; - entry_ptr->is_dirty = TRUE; + entry_ptr->is_dirty = true; if (entry_ptr->flush_dep_npar > 0 && !was_dirty) mark_flush_dep_dirty(entry_ptr); @@ -2997,7 +2997,7 @@ move_entry(H5C_t *cache_ptr, int32_t type, int32_t idx, hbool_t main_addr) if ((result < 0) || ((!(entry_ptr->header.destroy_in_progress)) && (entry_ptr->header.addr != new_addr))) { - pass = FALSE; + pass = false; failure_mssg = "error in H5C_move_entry()."; } else { @@ -3020,7 +3020,7 @@ move_entry(H5C_t *cache_ptr, int32_t type, int32_t idx, hbool_t main_addr) * * Purpose: Protect the entry indicated by the type and index. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -3088,7 +3088,7 @@ protect_entry(H5F_t *file_ptr, int32_t type, int32_t idx) entry_ptr->verify_ct, entry_ptr->max_verify_ct); H5Eprint2(H5E_DEFAULT, stdout); #endif - pass = FALSE; + pass = false; failure_mssg = "error in H5C_protect()."; } /* end if */ @@ -3098,12 +3098,12 @@ protect_entry(H5F_t *file_ptr, int32_t type, int32_t idx) entry_ptr->cache_ptr = cache_ptr; entry_ptr->file_ptr = file_ptr; - entry_ptr->is_protected = TRUE; + entry_ptr->is_protected = true; } /* end else */ if (entry_ptr->header.tag_info && entry_ptr->header.tag_info->corked) - entry_ptr->is_corked = TRUE; + entry_ptr->is_corked = true; assert(((entry_ptr->header).type)->id == type); } /* end if */ @@ -3116,7 +3116,7 @@ protect_entry(H5F_t *file_ptr, int32_t type, int32_t idx) * Purpose: Do a read only protect the entry indicated by the type * and index. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -3155,7 +3155,7 @@ protect_entry_ro(H5F_t *file_ptr, int32_t type, int32_t idx) (entry_ptr->header.type != types[type]) || (entry_ptr->size != entry_ptr->header.size) || (entry_ptr->addr != entry_ptr->header.addr)) { - pass = FALSE; + pass = false; failure_mssg = "error in read only H5C_protect()."; } else { @@ -3164,8 +3164,8 @@ protect_entry_ro(H5F_t *file_ptr, int32_t type, int32_t idx) entry_ptr->cache_ptr = cache_ptr; entry_ptr->file_ptr = file_ptr; - entry_ptr->is_protected = TRUE; - entry_ptr->is_read_only = TRUE; + entry_ptr->is_protected = true; + entry_ptr->is_read_only = true; entry_ptr->ro_ref_count++; } @@ -3179,7 +3179,7 @@ protect_entry_ro(H5F_t *file_ptr, int32_t type, int32_t idx) * * Purpose: Pin the entry indicated by the type and index. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -3210,18 +3210,18 @@ pin_entry(int32_t type, int32_t idx) if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5C_pin_protected_entry() reports failure."; } else if (!(entry_ptr->header.is_pinned)) { - pass = FALSE; + pass = false; failure_mssg = "entry not pinned when it should be."; } else { - entry_ptr->pinned_from_client = TRUE; - entry_ptr->is_pinned = TRUE; + entry_ptr->pinned_from_client = true; + entry_ptr->is_pinned = true; } } /* end if */ @@ -3232,7 +3232,7 @@ pin_entry(int32_t type, int32_t idx) * * Purpose: Unpin the entry indicated by the type and index. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -3268,11 +3268,11 @@ unpin_entry(int32_t type, int32_t idx) (entry_ptr->header.type != types[type]) || (entry_ptr->size != entry_ptr->header.size) || (entry_ptr->addr != entry_ptr->header.addr)) { - pass = FALSE; + pass = false; failure_mssg = "error in H5C_unpin()."; } - entry_ptr->pinned_from_client = FALSE; + entry_ptr->pinned_from_client = false; entry_ptr->is_pinned = entry_ptr->pinned_from_cache; @@ -3286,7 +3286,7 @@ unpin_entry(int32_t type, int32_t idx) * * Purpose: Unprotect the entry indicated by the type and index. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -3297,8 +3297,8 @@ void unprotect_entry(H5F_t *file_ptr, int32_t type, int32_t idx, unsigned int flags) { herr_t result; - hbool_t pin_flag_set; - hbool_t unpin_flag_set; + bool pin_flag_set; + bool unpin_flag_set; test_entry_t *base_addr; test_entry_t *entry_ptr; @@ -3315,17 +3315,17 @@ unprotect_entry(H5F_t *file_ptr, int32_t type, int32_t idx, unsigned int flags) assert(entry_ptr->header.is_protected); assert(entry_ptr->is_protected); - pin_flag_set = (hbool_t)((flags & H5C__PIN_ENTRY_FLAG) != 0); - unpin_flag_set = (hbool_t)((flags & H5C__UNPIN_ENTRY_FLAG) != 0); + pin_flag_set = (bool)((flags & H5C__PIN_ENTRY_FLAG) != 0); + unpin_flag_set = (bool)((flags & H5C__UNPIN_ENTRY_FLAG) != 0); assert(!(pin_flag_set && unpin_flag_set)); assert((!pin_flag_set) || (!(entry_ptr->is_pinned))); assert((!unpin_flag_set) || (entry_ptr->is_pinned)); if (flags & H5C__DIRTIED_FLAG) { - hbool_t was_dirty = entry_ptr->is_dirty; + bool was_dirty = entry_ptr->is_dirty; - entry_ptr->is_dirty = TRUE; + entry_ptr->is_dirty = true; if (entry_ptr->flush_dep_npar > 0 && !was_dirty) mark_flush_dep_dirty(entry_ptr); @@ -3339,7 +3339,7 @@ unprotect_entry(H5F_t *file_ptr, int32_t type, int32_t idx, unsigned int flags) (entry_ptr->header.type != types[type]) || (entry_ptr->size != entry_ptr->header.size) || (entry_ptr->addr != entry_ptr->header.addr)) { - pass = FALSE; + pass = false; failure_mssg = "error in H5C_unprotect()."; } else { @@ -3349,25 +3349,25 @@ unprotect_entry(H5F_t *file_ptr, int32_t type, int32_t idx, unsigned int flags) } else if (entry_ptr->ro_ref_count == 1) { - entry_ptr->is_protected = FALSE; - entry_ptr->is_read_only = FALSE; + entry_ptr->is_protected = false; + entry_ptr->is_read_only = false; entry_ptr->ro_ref_count = 0; } else { - entry_ptr->is_protected = FALSE; + entry_ptr->is_protected = false; } if (pin_flag_set) { assert(entry_ptr->header.is_pinned); - entry_ptr->pinned_from_client = TRUE; - entry_ptr->is_pinned = TRUE; + entry_ptr->pinned_from_client = true; + entry_ptr->is_pinned = true; } else if (unpin_flag_set) { assert(entry_ptr->header.is_pinned == entry_ptr->header.pinned_from_cache); - entry_ptr->pinned_from_client = FALSE; + entry_ptr->pinned_from_client = false; entry_ptr->is_pinned = entry_ptr->pinned_from_cache; } } @@ -3399,10 +3399,10 @@ unprotect_entry(H5F_t *file_ptr, int32_t type, int32_t idx, unsigned int flags) *------------------------------------------------------------------------- */ void -row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t verbose, hbool_t reset_stats, - hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts, - hbool_t do_moves, hbool_t move_to_main_addr, hbool_t do_destroys, - hbool_t do_mult_ro_protects, int dirty_destroys, int dirty_unprotects) +row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, bool verbose, bool reset_stats, + bool display_stats, bool display_detailed_stats, bool do_inserts, bool do_moves, + bool move_to_main_addr, bool do_destroys, bool do_mult_ro_protects, int dirty_destroys, + int dirty_unprotects) { H5C_t *cache_ptr = NULL; int32_t type = 0; @@ -3719,8 +3719,8 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t */ void -hl_row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, hbool_t reset_stats, - hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts) +hl_row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, bool verbose, bool reset_stats, + bool display_stats, bool display_detailed_stats, bool do_inserts) { H5C_t *cache_ptr = NULL; int32_t type = 0; @@ -3808,10 +3808,10 @@ hl_row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, h */ void -row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t verbose, hbool_t reset_stats, - hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts, - hbool_t do_moves, hbool_t move_to_main_addr, hbool_t do_destroys, - hbool_t do_mult_ro_protects, int dirty_destroys, int dirty_unprotects) +row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, bool verbose, bool reset_stats, + bool display_stats, bool display_detailed_stats, bool do_inserts, bool do_moves, + bool move_to_main_addr, bool do_destroys, bool do_mult_ro_protects, + int dirty_destroys, int dirty_unprotects) { H5C_t *cache_ptr = NULL; int32_t type = NUMBER_OF_ENTRY_TYPES - 1; @@ -4065,8 +4065,8 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t */ void -hl_row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, hbool_t reset_stats, - hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts) +hl_row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, bool verbose, bool reset_stats, + bool display_stats, bool display_detailed_stats, bool do_inserts) { H5C_t *cache_ptr = NULL; int32_t type = NUMBER_OF_ENTRY_TYPES - 1; @@ -4154,9 +4154,8 @@ hl_row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, */ void -col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t verbose, hbool_t reset_stats, - hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts, - int dirty_unprotects) +col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, bool verbose, bool reset_stats, + bool display_stats, bool display_detailed_stats, bool do_inserts, int dirty_unprotects) { H5C_t *cache_ptr = NULL; int32_t type = 0; @@ -4243,8 +4242,8 @@ col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t */ void -hl_col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, hbool_t reset_stats, - hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts, +hl_col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, bool verbose, bool reset_stats, + bool display_stats, bool display_detailed_stats, bool do_inserts, int dirty_unprotects) { H5C_t *cache_ptr = NULL; @@ -4343,8 +4342,8 @@ hl_col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, h */ void -col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t verbose, hbool_t reset_stats, - hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts, +col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, bool verbose, bool reset_stats, + bool display_stats, bool display_detailed_stats, bool do_inserts, int dirty_unprotects) { H5C_t *cache_ptr = NULL; @@ -4444,8 +4443,8 @@ col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t */ void -hl_col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, hbool_t reset_stats, - hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts, +hl_col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, bool verbose, bool reset_stats, + bool display_stats, bool display_detailed_stats, bool do_inserts, int dirty_unprotects) { H5C_t *cache_ptr = NULL; @@ -4556,7 +4555,7 @@ create_flush_dependency(int32_t par_type, int32_t par_idx, int32_t chd_type, int test_entry_t *par_entry_ptr; /* Parent entry */ test_entry_t *chd_base_addr; /* Base entry of child's entry array */ test_entry_t *chd_entry_ptr; /* Child entry */ - hbool_t par_is_pinned; /* Whether parent is already pinned */ + bool par_is_pinned; /* Whether parent is already pinned */ herr_t result; /* API routine status */ /* Get parent entry */ @@ -4584,7 +4583,7 @@ create_flush_dependency(int32_t par_type, int32_t par_idx, int32_t chd_type, int if ((result < 0) || (!par_entry_ptr->header.is_pinned) || (!(par_entry_ptr->header.flush_dep_nchildren > 0))) { - pass = FALSE; + pass = false; failure_mssg = "error in H5C_create_flush_dependency()."; } /* end if */ @@ -4598,9 +4597,9 @@ create_flush_dependency(int32_t par_type, int32_t par_idx, int32_t chd_type, int assert(par_entry_ptr->flush_dep_ndirty_chd < par_entry_ptr->flush_dep_nchd); par_entry_ptr->flush_dep_ndirty_chd++; } /* end if */ - par_entry_ptr->pinned_from_cache = TRUE; + par_entry_ptr->pinned_from_cache = true; if (!par_is_pinned) - par_entry_ptr->is_pinned = TRUE; + par_entry_ptr->is_pinned = true; } /* end if */ } /* create_flush_dependency() */ @@ -4652,7 +4651,7 @@ destroy_flush_dependency(int32_t par_type, int32_t par_idx, int32_t chd_type, in assert(chd_entry_ptr == chd_entry_ptr->self); if (H5C_destroy_flush_dependency(par_entry_ptr, chd_entry_ptr) < 0) { - pass = FALSE; + pass = false; failure_mssg = "error in H5C_destroy_flush_dependency()."; } /* end if */ @@ -4671,7 +4670,7 @@ destroy_flush_dependency(int32_t par_type, int32_t par_idx, int32_t chd_type, in chd_entry_ptr->flush_dep_npar--; par_entry_ptr->flush_dep_nchd--; if (par_entry_ptr->flush_dep_nchd == 0) { - par_entry_ptr->pinned_from_cache = FALSE; + par_entry_ptr->pinned_from_cache = false; par_entry_ptr->is_pinned = par_entry_ptr->pinned_from_client; } /* end if */ if (chd_entry_ptr->is_dirty || chd_entry_ptr->flush_dep_ndirty_chd > 0) { @@ -4771,13 +4770,13 @@ mark_flush_dep_clean(test_entry_t *entry_ptr) * * If the number of cache accesses exceeds the value provided * in the min_accesses parameter, and the hit rate is less than - * min_hit_rate, set pass to FALSE, and set failure_mssg to + * min_hit_rate, set pass to false, and set failure_mssg to * a string indicating that hit rate was unexpectedly low. * * Return hit rate in *hit_rate_ptr, and print the data to * stdout if requested. * - * If an error is detected, set pass to FALSE, and set + * If an error is detected, set pass to false, and set * failure_mssg to an appropriate value. * * Return: void @@ -4786,8 +4785,8 @@ mark_flush_dep_clean(test_entry_t *entry_ptr) */ void -check_and_validate_cache_hit_rate(hid_t file_id, double *hit_rate_ptr, hbool_t dump_data, - int64_t min_accesses, double min_hit_rate) +check_and_validate_cache_hit_rate(hid_t file_id, double *hit_rate_ptr, bool dump_data, int64_t min_accesses, + double min_hit_rate) { herr_t result; int64_t cache_hits = 0; @@ -4804,14 +4803,14 @@ check_and_validate_cache_hit_rate(hid_t file_id, double *hit_rate_ptr, hbool_t d if (file_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "Can't get file_ptr."; } else { cache_ptr = file_ptr->shared->cache; if (NULL == cache_ptr) { - pass = FALSE; + pass = false; failure_mssg = "NULL cache pointer"; } } @@ -4836,12 +4835,12 @@ check_and_validate_cache_hit_rate(hid_t file_id, double *hit_rate_ptr, hbool_t d if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fget_mdc_hit_rate() failed."; } else if (!H5_DBL_ABS_EQUAL(hit_rate, expected_hit_rate)) { - pass = FALSE; + pass = false; failure_mssg = "unexpected hit rate."; } } @@ -4852,7 +4851,7 @@ check_and_validate_cache_hit_rate(hid_t file_id, double *hit_rate_ptr, hbool_t d if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Freset_mdc_hit_rate_stats() failed."; } } @@ -4872,7 +4871,7 @@ check_and_validate_cache_hit_rate(hid_t file_id, double *hit_rate_ptr, hbool_t d if ((pass) && (cache_accesses > min_accesses) && (hit_rate < min_hit_rate)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpectedly low hit rate."; } @@ -4889,7 +4888,7 @@ check_and_validate_cache_hit_rate(hid_t file_id, double *hit_rate_ptr, hbool_t d * parameters if these parameters are not NULL. Print the * data to stdout if requested. * - * If an error is detected, set pass to FALSE, and set + * If an error is detected, set pass to false, and set * failure_mssg to an appropriate value. * * Return: void @@ -4899,7 +4898,7 @@ check_and_validate_cache_hit_rate(hid_t file_id, double *hit_rate_ptr, hbool_t d void check_and_validate_cache_size(hid_t file_id, size_t *max_size_ptr, size_t *min_clean_size_ptr, - size_t *cur_size_ptr, int32_t *cur_num_entries_ptr, hbool_t dump_data) + size_t *cur_size_ptr, int32_t *cur_num_entries_ptr, bool dump_data) { herr_t result; size_t expected_max_size; @@ -4920,14 +4919,14 @@ check_and_validate_cache_size(hid_t file_id, size_t *max_size_ptr, size_t *min_c if (file_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "Can't get file_ptr."; } else { cache_ptr = file_ptr->shared->cache; if (NULL == cache_ptr) { - pass = FALSE; + pass = false; failure_mssg = "NULL cache pointer"; } } @@ -4945,13 +4944,13 @@ check_and_validate_cache_size(hid_t file_id, size_t *max_size_ptr, size_t *min_c if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fget_mdc_size() failed."; } else if ((max_size != expected_max_size) || (min_clean_size != expected_min_clean_size) || (cur_size != expected_cur_size) || (cur_num_entries != (int)expected_cur_num_entries)) { - pass = FALSE; + pass = false; failure_mssg = "H5Fget_mdc_size() returned unexpected value(s)."; } } @@ -4986,58 +4985,58 @@ check_and_validate_cache_size(hid_t file_id, size_t *max_size_ptr, size_t *min_c } /* check_and_validate_cache_size() */ -H5_ATTR_PURE hbool_t -resize_configs_are_equal(const H5C_auto_size_ctl_t *a, const H5C_auto_size_ctl_t *b, hbool_t compare_init) +H5_ATTR_PURE bool +resize_configs_are_equal(const H5C_auto_size_ctl_t *a, const H5C_auto_size_ctl_t *b, bool compare_init) { if (a->version != b->version) - return (FALSE); + return (false); else if (a->rpt_fcn != b->rpt_fcn) - return (FALSE); + return (false); else if (compare_init && (a->set_initial_size != b->set_initial_size)) - return (FALSE); + return (false); else if (compare_init && (a->initial_size != b->initial_size)) - return (FALSE); + return (false); else if (!H5_DBL_ABS_EQUAL(a->min_clean_fraction, b->min_clean_fraction)) - return (FALSE); + return (false); else if (a->max_size != b->max_size) - return (FALSE); + return (false); else if (a->min_size != b->min_size) - return (FALSE); + return (false); else if (a->epoch_length != b->epoch_length) - return (FALSE); + return (false); else if (a->incr_mode != b->incr_mode) - return (FALSE); + return (false); else if (!H5_DBL_ABS_EQUAL(a->lower_hr_threshold, b->lower_hr_threshold)) - return (FALSE); + return (false); else if (!H5_DBL_ABS_EQUAL(a->increment, b->increment)) - return (FALSE); + return (false); else if (a->apply_max_increment != b->apply_max_increment) - return (FALSE); + return (false); else if (a->max_increment != b->max_increment) - return (FALSE); + return (false); else if (a->flash_incr_mode != b->flash_incr_mode) - return (FALSE); + return (false); else if (!H5_DBL_ABS_EQUAL(a->flash_multiple, b->flash_multiple)) - return (FALSE); + return (false); else if (!H5_DBL_ABS_EQUAL(a->flash_threshold, b->flash_threshold)) - return (FALSE); + return (false); else if (a->decr_mode != b->decr_mode) - return (FALSE); + return (false); else if (!H5_DBL_ABS_EQUAL(a->upper_hr_threshold, b->upper_hr_threshold)) - return (FALSE); + return (false); else if (!H5_DBL_ABS_EQUAL(a->decrement, b->decrement)) - return (FALSE); + return (false); else if (a->apply_max_decrement != b->apply_max_decrement) - return (FALSE); + return (false); else if (a->max_decrement != b->max_decrement) - return (FALSE); + return (false); else if (a->epochs_before_eviction != b->epochs_before_eviction) - return (FALSE); + return (false); else if (a->apply_empty_reserve != b->apply_empty_reserve) - return (FALSE); + return (false); else if (!H5_DBL_ABS_EQUAL(a->empty_reserve, b->empty_reserve)) - return (FALSE); - return (TRUE); + return (false); + return (true); } /*------------------------------------------------------------------------- @@ -5047,7 +5046,7 @@ resize_configs_are_equal(const H5C_auto_size_ctl_t *a, const H5C_auto_size_ctl_t * has both internal and external configuration matching * *config_ptr. * - * Do nothing on success. On failure, set pass to FALSE, and + * Do nothing on success. On failure, set pass to false, and * load an error message into failue_mssg. Note that * failure_msg is assumed to be at least 128 bytes in length. * @@ -5057,7 +5056,7 @@ resize_configs_are_equal(const H5C_auto_size_ctl_t *a, const H5C_auto_size_ctl_t */ void -validate_mdc_config(hid_t file_id, H5AC_cache_config_t *ext_config_ptr, hbool_t compare_init, int test_num) +validate_mdc_config(hid_t file_id, H5AC_cache_config_t *ext_config_ptr, bool compare_init, int test_num) { H5F_t *file_ptr = NULL; H5C_t *cache_ptr = NULL; @@ -5073,7 +5072,7 @@ validate_mdc_config(hid_t file_id, H5AC_cache_config_t *ext_config_ptr, hbool_t if (file_ptr == NULL) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "Can't get file_ptr #%d.", test_num); failure_mssg = tmp_msg_buf; } @@ -5088,7 +5087,7 @@ validate_mdc_config(hid_t file_id, H5AC_cache_config_t *ext_config_ptr, hbool_t if (cache_ptr == NULL || cache_ptr->resize_ctl.version != H5C__CURR_AUTO_SIZE_CTL_VER) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "Can't access cache resize_ctl #%d.", test_num); failure_mssg = tmp_msg_buf; } @@ -5099,7 +5098,7 @@ validate_mdc_config(hid_t file_id, H5AC_cache_config_t *ext_config_ptr, hbool_t if (!resize_configs_are_equal(&int_config, &cache_ptr->resize_ctl, compare_init)) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "Unexpected internal config #%d.", test_num); failure_mssg = tmp_msg_buf; } @@ -5112,7 +5111,7 @@ validate_mdc_config(hid_t file_id, H5AC_cache_config_t *ext_config_ptr, hbool_t if (H5Fget_mdc_config(file_id, &scratch) < 0) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "H5Fget_mdc_config() failed #%d.", test_num); failure_mssg = tmp_msg_buf; } @@ -5122,7 +5121,7 @@ validate_mdc_config(hid_t file_id, H5AC_cache_config_t *ext_config_ptr, hbool_t /* Recall that in any configuration supplied by the cache * at run time, the set_initial_size field will always - * be FALSE, regardless of the value passed in. Thus we + * be false, regardless of the value passed in. Thus we * always presume that this field need not match that of * the supplied external configuration. * @@ -5131,9 +5130,9 @@ validate_mdc_config(hid_t file_id, H5AC_cache_config_t *ext_config_ptr, hbool_t * Depending on circumstances, this may or may not match * the original. Hence the compare_init parameter. */ - if (!CACHE_CONFIGS_EQUAL((*ext_config_ptr), scratch, FALSE, compare_init)) { + if (!CACHE_CONFIGS_EQUAL((*ext_config_ptr), scratch, false, compare_init)) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "Unexpected external config #%d.", test_num); failure_mssg = tmp_msg_buf; } diff --git a/test/cache_common.h b/test/cache_common.h index 8c54b5c..a9a8dbb 100644 --- a/test/cache_common.h +++ b/test/cache_common.h @@ -35,7 +35,7 @@ #define CACHE_ERROR(s) \ { \ failure_mssg = "Line #" H5_TOSTRING(__LINE__) ": " s; \ - pass = FALSE; \ + pass = false; \ goto done; \ } @@ -131,7 +131,7 @@ * H5C__FLUSH_MARKED_ENTRIES_FLAG). Compute clear_slist * and pass it into H5C_set_slist_enabled as appropriate. * - * On error, set pass to FALSE, and set failure_mssg + * On error, set pass to false, and set failure_mssg * to the supplied error message. * * Return: N/A @@ -140,12 +140,12 @@ #define H5C_FLUSH_CACHE(file, flags, fail_mssg) \ { \ - hbool_t clear_slist; \ - herr_t rslt; \ + bool clear_slist; \ + herr_t rslt; \ \ clear_slist = ((flags & H5C__FLUSH_MARKED_ENTRIES_FLAG) != 0); \ \ - rslt = H5C_set_slist_enabled((file)->shared->cache, TRUE, FALSE); \ + rslt = H5C_set_slist_enabled((file)->shared->cache, true, false); \ \ if (rslt >= 0) { \ \ @@ -154,12 +154,12 @@ \ if (rslt >= 0) { \ \ - rslt = H5C_set_slist_enabled((file)->shared->cache, FALSE, clear_slist); \ + rslt = H5C_set_slist_enabled((file)->shared->cache, false, clear_slist); \ } \ \ if (rslt < 0) { \ \ - pass = FALSE; \ + pass = false; \ failure_mssg = (fail_mssg); \ } \ } /* H5C_FLUSH_CACHE */ @@ -211,25 +211,25 @@ typedef struct flush_op { * function implementing the flush * operation. */ - hbool_t flag; /* boolean flag passed into the + bool flag; /* boolean flag passed into the * function implementing the flush * operation. The meaning of the * flag is dependent upon the flush * operation: * - * FLUSH_OP__DIRTY: TRUE iff the + * FLUSH_OP__DIRTY: true iff the * target is pinned, and is to * be dirtied via the * H5C_mark_entry_dirty() * call. * - * FLUSH_OP__RESIZE: TRUE iff the + * FLUSH_OP__RESIZE: true iff the * target is pinned, and is to * be resized via the * H5C_resize_entry() * call. * - * FLUSH_OP__MOVE: TRUE iff the + * FLUSH_OP__MOVE: true iff the * target is to be moved to * its main address. */ @@ -264,7 +264,7 @@ typedef struct test_entry_t { * the entry resides, or NULL if the * entry is not in cache. */ - hbool_t written_to_main_addr; + bool written_to_main_addr; /* Flag indicating whether an image * of the entry has been written to * its main address. Since we no @@ -273,7 +273,7 @@ typedef struct test_entry_t { * entry is serialized while at its * main address. */ - hbool_t written_to_alt_addr; + bool written_to_alt_addr; /* Flag indicating whether an image * of the entry has been written to * its alternate address. Since we no @@ -285,7 +285,7 @@ typedef struct test_entry_t { haddr_t addr; /* where the cache thinks this entry * is located */ - hbool_t at_main_addr; /* boolean flag indicating whether + bool at_main_addr; /* boolean flag indicating whether * the entry is supposed to be at * either its main or alternate * address. @@ -309,23 +309,23 @@ typedef struct test_entry_t { int32_t deserializes; /* number of times this entry has * been deserialized */ - hbool_t is_dirty; /* entry has been modified since + bool is_dirty; /* entry has been modified since * last write */ - hbool_t is_protected; /* entry should currently be on + bool is_protected; /* entry should currently be on * the cache's protected list. */ - hbool_t is_read_only; /* TRUE iff the entry should be + bool is_read_only; /* true iff the entry should be * protected read only. */ int ro_ref_count; /* Number of outstanding read only * protects on the entry. */ - hbool_t is_pinned; /* entry is currently pinned in + bool is_pinned; /* entry is currently pinned in * the cache. */ haddr_t tag; /* the base_addr as tag for corking entries */ - hbool_t is_corked; /* entry is currently corked or not */ + bool is_corked; /* entry is currently corked or not */ int pinning_ref_count; /* Number of entries that * pin this entry in the cache. * When this count drops to zero, @@ -358,8 +358,8 @@ typedef struct test_entry_t { * num_flush_ops contains the number * of valid entries in this array. */ - hbool_t flush_op_self_resize_in_progress; /* Boolean flag - * that is set to TRUE iff this + bool flush_op_self_resize_in_progress; /* Boolean flag + * that is set to true iff this * entry is being flushed, it has * been resized by a resize flush * op, and the flush function has @@ -368,16 +368,16 @@ typedef struct test_entry_t { * checking code that would otherwise * cause a false test failure. */ - hbool_t deserialized; /* entry has been deserialized since + bool deserialized; /* entry has been deserialized since * the last time it was reset. */ - hbool_t serialized; /* entry has been serialized since the + bool serialized; /* entry has been serialized since the * last time it was reset. */ - hbool_t destroyed; /* entry has been destroyed since the + bool destroyed; /* entry has been destroyed since the * last time it was reset. */ - hbool_t expunged; /* entry has been expunged since the + bool expunged; /* entry has been expunged since the * last time it was reset. */ int flush_dep_par_type[MAX_FLUSH_DEP_PARS]; /* Entry types of flush dependency parents */ @@ -385,10 +385,10 @@ typedef struct test_entry_t { unsigned flush_dep_npar; /* Number of flush dependency parents */ unsigned flush_dep_nchd; /* Number of flush dependency children */ unsigned - flush_dep_ndirty_chd; /* Number of dirty flush dependency children (including grandchildren, etc.) */ - hbool_t pinned_from_client; /* entry was pinned by client call */ - hbool_t pinned_from_cache; /* entry was pinned by cache internally */ - unsigned flush_order; /* Order that entry was flushed in */ + flush_dep_ndirty_chd; /* Number of dirty flush dependency children (including grandchildren, etc.) */ + bool pinned_from_client; /* entry was pinned by client call */ + bool pinned_from_cache; /* entry was pinned by cache internally */ + unsigned flush_order; /* Order that entry was flushed in */ unsigned notify_after_insert_count; /* Count of times that entry was inserted in cache */ unsigned notify_before_evict_count; /* Count of times that entry was removed in cache */ @@ -443,7 +443,7 @@ typedef struct test_entry_t { #define CACHE_CONFIGS_EQUAL(a, b, cmp_set_init, cmp_init_size) \ (((a).version == (b).version) && ((a).rpt_fcn_enabled == (b).rpt_fcn_enabled) && \ ((a).open_trace_file == (b).open_trace_file) && ((a).close_trace_file == (b).close_trace_file) && \ - (((a).open_trace_file == FALSE) || (strcmp((a).trace_file_name, (b).trace_file_name) == 0)) && \ + (((a).open_trace_file == false) || (strcmp((a).trace_file_name, (b).trace_file_name) == 0)) && \ ((a).evictions_enabled == (b).evictions_enabled) && \ ((!cmp_set_init) || ((a).set_initial_size == (b).set_initial_size)) && \ ((!cmp_init_size) || ((a).initial_size == (b).initial_size)) && \ @@ -502,14 +502,14 @@ struct expected_entry_status { int entry_type; int entry_index; size_t size; - hbool_t in_cache; - hbool_t at_main_addr; - hbool_t is_dirty; - hbool_t is_protected; - hbool_t is_pinned; - hbool_t deserialized; - hbool_t serialized; - hbool_t destroyed; + bool in_cache; + bool at_main_addr; + bool is_dirty; + bool is_protected; + bool is_pinned; + bool deserialized; + bool serialized; + bool destroyed; int flush_dep_par_type[MAX_FLUSH_DEP_PARS]; /* Entry types of flush dependency parents */ int flush_dep_par_idx[MAX_FLUSH_DEP_PARS]; /* Indices of flush dependency parents */ unsigned flush_dep_npar; /* Number of flush dependency parents */ @@ -520,7 +520,7 @@ struct expected_entry_status { }; /* global variable externs: */ -H5TEST_DLLVAR hbool_t pass; /* set to false on error */ +H5TEST_DLLVAR bool pass; /* set to false on error */ H5TEST_DLLVAR const char *failure_mssg; H5TEST_DLLVAR test_entry_t *entries[NUMBER_OF_ENTRY_TYPES]; @@ -539,12 +539,12 @@ extern "C" { /* function declarations: */ -H5TEST_DLL void add_flush_op(int target_type, int target_idx, int op_code, int type, int idx, hbool_t flag, +H5TEST_DLL void add_flush_op(int target_type, int target_idx, int op_code, int type, int idx, bool flag, size_t size, unsigned *order); H5TEST_DLL void addr_to_type_and_index(haddr_t addr, int32_t *type_ptr, int32_t *index_ptr); -H5TEST_DLL void dirty_entry(H5F_t *file_ptr, int32_t type, int32_t idx, hbool_t dirty_pin); +H5TEST_DLL void dirty_entry(H5F_t *file_ptr, int32_t type, int32_t idx, bool dirty_pin); H5TEST_DLL void expunge_entry(H5F_t *file_ptr, int32_t type, int32_t idx); @@ -552,7 +552,7 @@ H5TEST_DLL void insert_entry(H5F_t *file_ptr, int32_t type, int32_t idx, unsigne H5TEST_DLL void mark_entry_dirty(int32_t type, int32_t idx); -H5TEST_DLL void move_entry(H5C_t *cache_ptr, int32_t type, int32_t idx, hbool_t main_addr); +H5TEST_DLL void move_entry(H5C_t *cache_ptr, int32_t type, int32_t idx, bool main_addr); H5TEST_DLL void protect_entry(H5F_t *file_ptr, int32_t type, int32_t idx); @@ -560,7 +560,7 @@ H5TEST_DLL void protect_entry_ro(H5F_t *file_ptr, int32_t type, int32_t idx); H5TEST_DLL void pin_entry(int32_t type, int32_t idx); -H5TEST_DLL hbool_t entry_in_cache(H5C_t *cache_ptr, int32_t type, int32_t idx); +H5TEST_DLL bool entry_in_cache(H5C_t *cache_ptr, int32_t type, int32_t idx); H5TEST_DLL void create_pinned_entry_dependency(H5F_t *file_ptr, int pinning_type, int pinning_idx, int pinned_type, int pinned_idx); @@ -575,51 +575,43 @@ H5TEST_DLL void cork_entry_type(H5F_t *file_ptr, int32_t type); H5TEST_DLL void uncork_entry_type(H5F_t *file_ptr, int32_t type); -H5TEST_DLL void resize_entry(H5F_t *file_ptr, int32_t type, int32_t idx, size_t new_size, hbool_t in_cache); +H5TEST_DLL void resize_entry(H5F_t *file_ptr, int32_t type, int32_t idx, size_t new_size, bool in_cache); -H5TEST_DLL void row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t verbose, - hbool_t reset_stats, hbool_t display_stats, - hbool_t display_detailed_stats, hbool_t do_inserts, hbool_t do_moves, - hbool_t move_to_main_addr, hbool_t do_destroys, - hbool_t do_mult_ro_protects, int dirty_destroys, int dirty_unprotects); +H5TEST_DLL void row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, bool verbose, + bool reset_stats, bool display_stats, bool display_detailed_stats, + bool do_inserts, bool do_moves, bool move_to_main_addr, + bool do_destroys, bool do_mult_ro_protects, int dirty_destroys, + int dirty_unprotects); -H5TEST_DLL void hl_row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, - hbool_t reset_stats, hbool_t display_stats, - hbool_t display_detailed_stats, hbool_t do_inserts); +H5TEST_DLL void hl_row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, bool verbose, bool reset_stats, + bool display_stats, bool display_detailed_stats, bool do_inserts); -H5TEST_DLL void row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t verbose, - hbool_t reset_stats, hbool_t display_stats, - hbool_t display_detailed_stats, hbool_t do_inserts, hbool_t do_moves, - hbool_t move_to_main_addr, hbool_t do_destroys, - hbool_t do_mult_ro_protects, int dirty_destroys, +H5TEST_DLL void row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, bool verbose, + bool reset_stats, bool display_stats, bool display_detailed_stats, + bool do_inserts, bool do_moves, bool move_to_main_addr, + bool do_destroys, bool do_mult_ro_protects, int dirty_destroys, int dirty_unprotects); -H5TEST_DLL void hl_row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, - hbool_t reset_stats, hbool_t display_stats, - hbool_t display_detailed_stats, hbool_t do_inserts); +H5TEST_DLL void hl_row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, bool verbose, bool reset_stats, + bool display_stats, bool display_detailed_stats, bool do_inserts); -H5TEST_DLL void col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t verbose, - hbool_t reset_stats, hbool_t display_stats, - hbool_t display_detailed_stats, hbool_t do_inserts, - int dirty_unprotects); +H5TEST_DLL void col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, bool verbose, + bool reset_stats, bool display_stats, bool display_detailed_stats, + bool do_inserts, int dirty_unprotects); -H5TEST_DLL void hl_col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, - hbool_t reset_stats, hbool_t display_stats, - hbool_t display_detailed_stats, hbool_t do_inserts, +H5TEST_DLL void hl_col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, bool verbose, bool reset_stats, + bool display_stats, bool display_detailed_stats, bool do_inserts, int dirty_unprotects); -H5TEST_DLL void col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t verbose, - hbool_t reset_stats, hbool_t display_stats, - hbool_t display_detailed_stats, hbool_t do_inserts, - int dirty_unprotects); +H5TEST_DLL void col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, bool verbose, + bool reset_stats, bool display_stats, bool display_detailed_stats, + bool do_inserts, int dirty_unprotects); -H5TEST_DLL void hl_col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, - hbool_t reset_stats, hbool_t display_stats, - hbool_t display_detailed_stats, hbool_t do_inserts, +H5TEST_DLL void hl_col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, bool verbose, bool reset_stats, + bool display_stats, bool display_detailed_stats, bool do_inserts, int dirty_unprotects); -H5TEST_DLL void flush_cache(H5F_t *file_ptr, hbool_t destroy_entries, hbool_t dump_stats, - hbool_t dump_detailed_stats); +H5TEST_DLL void flush_cache(H5F_t *file_ptr, bool destroy_entries, bool dump_stats, bool dump_detailed_stats); H5TEST_DLL void unpin_entry(int32_t type, int32_t idx); @@ -640,17 +632,17 @@ H5TEST_DLL void destroy_flush_dependency(int32_t parent_type, int32_t parent_idx /*** H5AC level utility functions ***/ -H5TEST_DLL hbool_t resize_configs_are_equal(const H5C_auto_size_ctl_t *a, const H5C_auto_size_ctl_t *b, - hbool_t compare_init); +H5TEST_DLL bool resize_configs_are_equal(const H5C_auto_size_ctl_t *a, const H5C_auto_size_ctl_t *b, + bool compare_init); -H5TEST_DLL void check_and_validate_cache_hit_rate(hid_t file_id, double *hit_rate_ptr, hbool_t dump_data, +H5TEST_DLL void check_and_validate_cache_hit_rate(hid_t file_id, double *hit_rate_ptr, bool dump_data, int64_t min_accesses, double min_hit_rate); H5TEST_DLL void check_and_validate_cache_size(hid_t file_id, size_t *max_size_ptr, size_t *min_clean_size_ptr, size_t *cur_size_ptr, int32_t *cur_num_entries_ptr, - hbool_t dump_data); + bool dump_data); -H5TEST_DLL void validate_mdc_config(hid_t file_id, H5AC_cache_config_t *ext_config_ptr, hbool_t compare_init, +H5TEST_DLL void validate_mdc_config(hid_t file_id, H5AC_cache_config_t *ext_config_ptr, bool compare_init, int test_num); /** Debugging functions -- normally commented out ***/ diff --git a/test/cache_image.c b/test/cache_image.c index 2e95a97..57a0834 100644 --- a/test/cache_image.c +++ b/test/cache_image.c @@ -24,36 +24,35 @@ static const char *FILENAMES[] = {"cache_image_test", NULL}; /* local utility function declarations */ static void create_datasets(hid_t file_id, int min_dset, int max_dset); static void delete_datasets(hid_t file_id, int min_dset, int max_dset); -static void open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_only, - hbool_t set_mdci_fapl, hbool_t config_fsm, hbool_t set_eoc, - const char *hdf_file_name, unsigned cache_image_flags, hid_t *file_id_ptr, - H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr); -static void attempt_swmr_open_hdf5_file(hbool_t create_file, hbool_t set_mdci_fapl, - const char *hdf_file_name); +static void open_hdf5_file(bool create_file, bool mdci_sbem_expected, bool read_only, bool set_mdci_fapl, + bool config_fsm, bool set_eoc, const char *hdf_file_name, + unsigned cache_image_flags, hid_t *file_id_ptr, H5F_t **file_ptr_ptr, + H5C_t **cache_ptr_ptr); +static void attempt_swmr_open_hdf5_file(bool create_file, bool set_mdci_fapl, const char *hdf_file_name); static void verify_datasets(hid_t file_id, int min_dset, int max_dset); /* local test function declarations */ -static unsigned check_cache_image_ctl_flow_1(hbool_t single_file_vfd); -static unsigned check_cache_image_ctl_flow_2(hbool_t single_file_vfd); -static unsigned check_cache_image_ctl_flow_3(hbool_t single_file_vfd); -static unsigned check_cache_image_ctl_flow_4(hbool_t single_file_vfd); -static unsigned check_cache_image_ctl_flow_5(hbool_t single_file_vfd); -static unsigned check_cache_image_ctl_flow_6(hbool_t single_file_vfd); - -static unsigned cache_image_smoke_check_1(hbool_t single_file_vfd); -static unsigned cache_image_smoke_check_2(hbool_t single_file_vfd); -static unsigned cache_image_smoke_check_3(hbool_t single_file_vfd); -static unsigned cache_image_smoke_check_4(hbool_t single_file_vfd); -static unsigned cache_image_smoke_check_5(hbool_t single_file_vfd); -static unsigned cache_image_smoke_check_6(hbool_t single_file_vfd); - -static unsigned cache_image_api_error_check_1(hbool_t single_file_vfd); -static unsigned cache_image_api_error_check_2(hbool_t single_file_vfd); -static unsigned cache_image_api_error_check_3(hbool_t single_file_vfd); -static unsigned cache_image_api_error_check_4(hbool_t single_file_vfd); - -static unsigned get_free_sections_test(hbool_t single_file_vfd); -static unsigned evict_on_close_test(hbool_t single_file_vfd); +static unsigned check_cache_image_ctl_flow_1(bool single_file_vfd); +static unsigned check_cache_image_ctl_flow_2(bool single_file_vfd); +static unsigned check_cache_image_ctl_flow_3(bool single_file_vfd); +static unsigned check_cache_image_ctl_flow_4(bool single_file_vfd); +static unsigned check_cache_image_ctl_flow_5(bool single_file_vfd); +static unsigned check_cache_image_ctl_flow_6(bool single_file_vfd); + +static unsigned cache_image_smoke_check_1(bool single_file_vfd); +static unsigned cache_image_smoke_check_2(bool single_file_vfd); +static unsigned cache_image_smoke_check_3(bool single_file_vfd); +static unsigned cache_image_smoke_check_4(bool single_file_vfd); +static unsigned cache_image_smoke_check_5(bool single_file_vfd); +static unsigned cache_image_smoke_check_6(bool single_file_vfd); + +static unsigned cache_image_api_error_check_1(bool single_file_vfd); +static unsigned cache_image_api_error_check_2(bool single_file_vfd); +static unsigned cache_image_api_error_check_3(bool single_file_vfd); +static unsigned cache_image_api_error_check_4(bool single_file_vfd); + +static unsigned get_free_sections_test(bool single_file_vfd); +static unsigned evict_on_close_test(bool single_file_vfd); /****************************************************************************/ /***************************** Utility Functions ****************************/ @@ -62,16 +61,16 @@ static unsigned evict_on_close_test(hbool_t single_file_vfd); /*------------------------------------------------------------------------- * Function: create_datasets() * - * Purpose: If pass is TRUE on entry, create the specified datasets + * Purpose: If pass is true on entry, create the specified datasets * in the indicated file. * * Datasets and their contents must be well known, as we * will verify that they contain the expected data later. * - * On failure, set pass to FALSE, and set failure_mssg + * On failure, set pass to false, and set failure_mssg * to point to an appropriate failure message. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -87,9 +86,9 @@ create_datasets(hid_t file_id, int min_dset, int max_dset) { const char *fcn_name = "create_datasets()"; char dset_name[64]; - hbool_t show_progress = FALSE; - hbool_t valid_chunk; - hbool_t verbose = FALSE; + bool show_progress = false; + bool valid_chunk; + bool verbose = false; int cp = 0; int i, j, k, l, m; int data_chunk[CHUNK_SIZE][CHUNK_SIZE]; @@ -125,7 +124,7 @@ create_datasets(hid_t file_id, int min_dset, int max_dset) if (dataspace_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Screate_simple() failed."; } @@ -141,7 +140,7 @@ create_datasets(hid_t file_id, int min_dset, int max_dset) if (properties < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pcreate() failed."; } } @@ -150,7 +149,7 @@ create_datasets(hid_t file_id, int min_dset, int max_dset) if (H5Pset_chunk(properties, 2, chunk_size) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_chunk() failed."; } } @@ -164,7 +163,7 @@ create_datasets(hid_t file_id, int min_dset, int max_dset) if (dataset_ids[i] < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dcreate() failed."; } } @@ -176,7 +175,7 @@ create_datasets(hid_t file_id, int min_dset, int max_dset) if (filespace_ids[i] < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dget_space() failed."; } } @@ -197,7 +196,7 @@ create_datasets(hid_t file_id, int min_dset, int max_dset) if (memspace_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Screate_simple() failed."; } } @@ -216,7 +215,7 @@ create_datasets(hid_t file_id, int min_dset, int max_dset) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Sselect_hyperslab() failed."; } } @@ -247,7 +246,7 @@ create_datasets(hid_t file_id, int min_dset, int max_dset) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "disk H5Sselect_hyperslab() failed."; } @@ -257,7 +256,7 @@ create_datasets(hid_t file_id, int min_dset, int max_dset) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dwrite() failed."; } m++; @@ -288,7 +287,7 @@ create_datasets(hid_t file_id, int min_dset, int max_dset) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "disk hyperslab create failed."; } @@ -300,7 +299,7 @@ create_datasets(hid_t file_id, int min_dset, int max_dset) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "disk hyperslab create failed."; } } @@ -308,13 +307,13 @@ create_datasets(hid_t file_id, int min_dset, int max_dset) /* validate the slab */ if (pass) { - valid_chunk = TRUE; + valid_chunk = true; for (k = 0; k < CHUNK_SIZE; k++) { for (l = 0; l < CHUNK_SIZE; l++) { if (data_chunk[k][l] != ((DSET_SIZE * DSET_SIZE * m) + (DSET_SIZE * (i + k)) + j + l)) { - valid_chunk = FALSE; + valid_chunk = false; if (verbose) { @@ -330,7 +329,7 @@ create_datasets(hid_t file_id, int min_dset, int max_dset) if (!valid_chunk) { - pass = FALSE; + pass = false; failure_mssg = "slab validation failed."; if (verbose) { @@ -354,7 +353,7 @@ create_datasets(hid_t file_id, int min_dset, int max_dset) while ((pass) && (i <= max_dset)) { if (H5Sclose(filespace_ids[i]) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Sclose() failed."; } i++; @@ -365,7 +364,7 @@ create_datasets(hid_t file_id, int min_dset, int max_dset) while ((pass) && (i <= max_dset)) { if (H5Dclose(dataset_ids[i]) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dclose() failed."; } i++; @@ -376,7 +375,7 @@ create_datasets(hid_t file_id, int min_dset, int max_dset) if (H5Sclose(memspace_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Sclose(memspace_id) failed."; } } @@ -386,17 +385,17 @@ create_datasets(hid_t file_id, int min_dset, int max_dset) /*------------------------------------------------------------------------- * Function: delete_datasets() * - * Purpose: If pass is TRUE on entry, verify and then delete the + * Purpose: If pass is true on entry, verify and then delete the * dataset(s) indicated by min_dset and max_dset in the * indicated file. * * Datasets and their contents must be well know, as we * will verify that they contain the expected data later. * - * On failure, set pass to FALSE, and set failure_mssg + * On failure, set pass to false, and set failure_mssg * to point to an appropriate failure message. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -408,7 +407,7 @@ delete_datasets(hid_t file_id, int min_dset, int max_dset) { const char *fcn_name = "delete_datasets()"; char dset_name[64]; - hbool_t show_progress = FALSE; + bool show_progress = false; int cp = 0; int i; @@ -438,7 +437,7 @@ delete_datasets(hid_t file_id, int min_dset, int max_dset) if (H5Ldelete(file_id, dset_name, H5P_DEFAULT) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Ldelete() failed."; } @@ -458,32 +457,32 @@ delete_datasets(hid_t file_id, int min_dset, int max_dset) * and test to see if it has a metadata cache image superblock * extension message. * - * Set pass to FALSE and issue a suitable failure + * Set pass to false and issue a suitable failure * message if either the file contains a metadata cache image - * superblock extension and mdci_sbem_expected is TRUE, or + * superblock extension and mdci_sbem_expected is true, or * vice versa. * - * If mdci_sbem_expected is TRUE, also verify that the metadata + * If mdci_sbem_expected is true, also verify that the metadata * cache has been advised of this. * - * If read_only is TRUE, open the file read only. Otherwise + * If read_only is true, open the file read only. Otherwise * open the file read/write. * - * If set_mdci_fapl is TRUE, set the metadata cache image + * If set_mdci_fapl is true, set the metadata cache image * FAPL entry when opening the file, and verify that the * metadata cache is notified. * - * If config_fsm is TRUE, setup the persistent free space + * If config_fsm is true, setup the persistent free space * manager. Note that this flag may only be set if - * create_file is also TRUE. + * create_file is also true. * * Return pointers to the cache data structure and file data * structures. * - * On failure, set pass to FALSE, and set failure_mssg + * On failure, set pass to false, and set failure_mssg * to point to an appropriate failure message. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -491,13 +490,13 @@ delete_datasets(hid_t file_id, int min_dset, int max_dset) */ static void -open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_only, hbool_t set_mdci_fapl, - hbool_t config_fsm, hbool_t set_eoc, const char *hdf_file_name, unsigned cache_image_flags, - hid_t *file_id_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr) +open_hdf5_file(bool create_file, bool mdci_sbem_expected, bool read_only, bool set_mdci_fapl, bool config_fsm, + bool set_eoc, const char *hdf_file_name, unsigned cache_image_flags, hid_t *file_id_ptr, + H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr) { const char *fcn_name = "open_hdf5_file()"; - hbool_t show_progress = FALSE; - hbool_t verbose = FALSE; + bool show_progress = false; + bool verbose = false; int cp = 0; hid_t fapl_id = -1; hid_t fcpl_id = -1; @@ -506,7 +505,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl H5F_t *file_ptr = NULL; H5C_t *cache_ptr = NULL; H5C_cache_image_ctl_t image_ctl; - H5AC_cache_image_config_t cache_image_config = {H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION, TRUE, FALSE, + H5AC_cache_image_config_t cache_image_config = {H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION, true, false, H5AC__CACHE_IMAGE__ENTRY_AGEOUT__NONE}; if (pass) { @@ -521,7 +520,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl (file_ptr_ptr == NULL) || (cache_ptr_ptr == NULL)) { failure_mssg = "Bad param(s) on entry to open_hdf5_file().\n"; - pass = FALSE; + pass = false; } else if (verbose) { @@ -539,7 +538,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl if (fapl_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "h5_fileaccess() failed.\n"; } } @@ -552,7 +551,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl if (H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_libver_bounds() failed.\n"; } } @@ -567,16 +566,16 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pget_mdc_image_config() failed.\n"; } if ((cache_image_config.version != H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION) || - (cache_image_config.generate_image != FALSE) || - (cache_image_config.save_resize_status != FALSE) || + (cache_image_config.generate_image != false) || + (cache_image_config.save_resize_status != false) || (cache_image_config.entry_ageout != H5AC__CACHE_IMAGE__ENTRY_AGEOUT__NONE)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected default cache image config.\n"; } } @@ -588,15 +587,15 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl if ((pass) && (set_mdci_fapl)) { /* set cache image config fields to taste */ - cache_image_config.generate_image = TRUE; - cache_image_config.save_resize_status = FALSE; + cache_image_config.generate_image = true; + cache_image_config.save_resize_status = false; cache_image_config.entry_ageout = H5AC__CACHE_IMAGE__ENTRY_AGEOUT__NONE; result = H5Pset_mdc_image_config(fapl_id, &cache_image_config); if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_mdc_image_config() failed.\n"; } } @@ -611,14 +610,14 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl if (fcpl_id <= 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pcreate(H5P_FILE_CREATE) failed."; } } if ((pass) && (config_fsm)) { - if (H5Pset_file_space_strategy(fcpl_id, H5F_FSPACE_STRATEGY_PAGE, TRUE, (hsize_t)1) < 0) { - pass = FALSE; + if (H5Pset_file_space_strategy(fcpl_id, H5F_FSPACE_STRATEGY_PAGE, true, (hsize_t)1) < 0) { + pass = false; failure_mssg = "H5Pset_file_space_strategy() failed."; } } @@ -629,9 +628,9 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl /* set evict on close if indicated */ if ((pass) && (set_eoc)) { - if (H5Pset_evict_on_close(fapl_id, TRUE) < 0) { + if (H5Pset_evict_on_close(fapl_id, true) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_evict_on_close() failed."; } } @@ -667,7 +666,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl if (file_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fcreate() or H5Fopen() failed.\n"; } else { @@ -676,7 +675,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl if (file_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "Can't get file_ptr."; if (verbose) { @@ -696,7 +695,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl if (file_ptr->shared->cache == NULL) { - pass = FALSE; + pass = false; failure_mssg = "can't get cache pointer(1).\n"; } else { @@ -719,7 +718,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl if (H5C__get_cache_image_config(cache_ptr, &image_ctl) < 0) { - pass = FALSE; + pass = false; failure_mssg = "error returned by H5C__get_cache_image_config()."; } } @@ -734,22 +733,22 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl if (read_only) { if ((image_ctl.version != H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION) || - (image_ctl.generate_image != FALSE) || (image_ctl.save_resize_status != FALSE) || + (image_ctl.generate_image != false) || (image_ctl.save_resize_status != false) || (image_ctl.entry_ageout != H5AC__CACHE_IMAGE__ENTRY_AGEOUT__NONE) || (image_ctl.flags != H5C_CI__ALL_FLAGS)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected image_ctl values(1).\n"; } } else { if ((image_ctl.version != H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION) || - (image_ctl.generate_image != TRUE) || (image_ctl.save_resize_status != FALSE) || + (image_ctl.generate_image != true) || (image_ctl.save_resize_status != false) || (image_ctl.entry_ageout != H5AC__CACHE_IMAGE__ENTRY_AGEOUT__NONE) || (image_ctl.flags != H5C_CI__ALL_FLAGS)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected image_ctl values(2).\n"; } } @@ -757,11 +756,11 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl else { if ((image_ctl.version != H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION) || - (image_ctl.generate_image != FALSE) || (image_ctl.save_resize_status != FALSE) || + (image_ctl.generate_image != false) || (image_ctl.save_resize_status != false) || (image_ctl.entry_ageout != H5AC__CACHE_IMAGE__ENTRY_AGEOUT__NONE) || (image_ctl.flags != H5C_CI__ALL_FLAGS)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected image_ctl values(3).\n"; } } @@ -776,7 +775,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl if (H5C_set_cache_image_config(file_ptr, cache_ptr, &image_ctl) < 0) { - pass = FALSE; + pass = false; failure_mssg = "error returned by H5C_set_cache_image_config()."; } } @@ -786,9 +785,9 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl if (pass) { - if (cache_ptr->close_warning_received == TRUE) { + if (cache_ptr->close_warning_received == true) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected value of close_warning_received.\n"; } @@ -796,26 +795,26 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl if (read_only) { - if ((cache_ptr->load_image != TRUE) || (cache_ptr->delete_image != FALSE)) { + if ((cache_ptr->load_image != true) || (cache_ptr->delete_image != false)) { - pass = FALSE; + pass = false; failure_mssg = "mdci sb extension message not present?\n"; } } else { - if ((cache_ptr->load_image != TRUE) || (cache_ptr->delete_image != TRUE)) { + if ((cache_ptr->load_image != true) || (cache_ptr->delete_image != true)) { - pass = FALSE; + pass = false; failure_mssg = "mdci sb extension message not present?\n"; } } } else { - if ((cache_ptr->load_image == TRUE) || (cache_ptr->delete_image == TRUE)) { + if ((cache_ptr->load_image == true) || (cache_ptr->delete_image == true)) { - pass = FALSE; + pass = false; failure_mssg = "mdci sb extension message present?\n"; } } @@ -845,7 +844,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl * * In all cases, the attempted open or create should fail. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -853,15 +852,15 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl */ static void -attempt_swmr_open_hdf5_file(const hbool_t create_file, const hbool_t set_mdci_fapl, const char *hdf_file_name) +attempt_swmr_open_hdf5_file(const bool create_file, const bool set_mdci_fapl, const char *hdf_file_name) { const char *fcn_name = "attempt_swmr_open_hdf5_file()"; - hbool_t show_progress = FALSE; + bool show_progress = false; int cp = 0; hid_t fapl_id = -1; hid_t file_id = -1; herr_t result; - H5AC_cache_image_config_t cache_image_config = {H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION, TRUE, FALSE, + H5AC_cache_image_config_t cache_image_config = {H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION, true, false, H5AC__CACHE_IMAGE__ENTRY_AGEOUT__NONE}; /* create a file access property list. */ @@ -871,7 +870,7 @@ attempt_swmr_open_hdf5_file(const hbool_t create_file, const hbool_t set_mdci_fa if (fapl_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "h5_fileaccess() failed.\n"; } } @@ -884,7 +883,7 @@ attempt_swmr_open_hdf5_file(const hbool_t create_file, const hbool_t set_mdci_fa if (H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_libver_bounds() failed.\n"; } } @@ -896,15 +895,15 @@ attempt_swmr_open_hdf5_file(const hbool_t create_file, const hbool_t set_mdci_fa if ((pass) && (set_mdci_fapl)) { /* set cache image config fields to taste */ - cache_image_config.generate_image = TRUE; - cache_image_config.save_resize_status = FALSE; + cache_image_config.generate_image = true; + cache_image_config.save_resize_status = false; cache_image_config.entry_ageout = H5AC__CACHE_IMAGE__ENTRY_AGEOUT__NONE; result = H5Pset_mdc_image_config(fapl_id, &cache_image_config); if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_mdc_image_config() failed.\n"; } } @@ -934,7 +933,7 @@ attempt_swmr_open_hdf5_file(const hbool_t create_file, const hbool_t set_mdci_fa if (file_id >= 0) { - pass = FALSE; + pass = false; failure_mssg = "SWMR H5Fcreate() or H5Fopen() succeeded.\n"; } } @@ -947,7 +946,7 @@ attempt_swmr_open_hdf5_file(const hbool_t create_file, const hbool_t set_mdci_fa /*------------------------------------------------------------------------- * Function: verify_datasets() * - * Purpose: If pass is TRUE on entry, verify that the datasets in the + * Purpose: If pass is true on entry, verify that the datasets in the * file exist and contain the expected data. * * Note that these datasets were created by @@ -955,10 +954,10 @@ attempt_swmr_open_hdf5_file(const hbool_t create_file, const hbool_t set_mdci_fa * function must be reflected in this function, and * vise-versa. * - * On failure, set pass to FALSE, and set failure_mssg + * On failure, set pass to false, and set failure_mssg * to point to an appropriate failure message. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -970,9 +969,9 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset) { const char *fcn_name = "verify_datasets()"; char dset_name[64]; - hbool_t show_progress = FALSE; - hbool_t valid_chunk; - hbool_t verbose = FALSE; + bool show_progress = false; + bool valid_chunk; + bool verbose = false; int cp = 0; int i, j, k, l, m; int data_chunk[CHUNK_SIZE][CHUNK_SIZE]; @@ -1006,7 +1005,7 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset) if (dataset_ids[i] < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dopen2() failed."; } } @@ -1018,7 +1017,7 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset) if (filespace_ids[i] < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dget_space() failed."; } } @@ -1039,7 +1038,7 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset) if (memspace_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Screate_simple() failed."; } } @@ -1058,7 +1057,7 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Sselect_hyperslab() failed."; } } @@ -1083,7 +1082,7 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "disk hyperslab create failed."; } @@ -1095,7 +1094,7 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "disk hyperslab create failed."; } } @@ -1103,13 +1102,13 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset) /* validate the slab */ if (pass) { - valid_chunk = TRUE; + valid_chunk = true; for (k = 0; k < CHUNK_SIZE; k++) { for (l = 0; l < CHUNK_SIZE; l++) { if (data_chunk[k][l] != ((DSET_SIZE * DSET_SIZE * m) + (DSET_SIZE * (i + k)) + j + l)) { - valid_chunk = FALSE; + valid_chunk = false; if (verbose) { @@ -1125,7 +1124,7 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset) if (!valid_chunk) { - pass = FALSE; + pass = false; failure_mssg = "slab validation failed."; if (verbose) { @@ -1149,7 +1148,7 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset) while ((pass) && (i <= max_dset)) { if (H5Sclose(filespace_ids[i]) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Sclose() failed."; } i++; @@ -1160,7 +1159,7 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset) while ((pass) && (i <= max_dset)) { if (H5Dclose(dataset_ids[i]) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dclose() failed."; } i++; @@ -1171,7 +1170,7 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset) if (H5Sclose(memspace_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Sclose(memspace_id) failed."; } } @@ -1247,11 +1246,11 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset) */ static unsigned -check_cache_image_ctl_flow_1(hbool_t single_file_vfd) +check_cache_image_ctl_flow_1(bool single_file_vfd) { const char *fcn_name = "check_cache_image_ctl_flow_1()"; char filename[512]; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t file_id = -1; H5F_t *file_ptr = NULL; H5C_t *cache_ptr = NULL; @@ -1266,7 +1265,7 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd) return 0; } - pass = TRUE; + pass = true; if (show_progress) fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); @@ -1276,7 +1275,7 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd) if (h5_fixname(FILENAMES[0], H5P_DEFAULT, filename, sizeof(filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname() failed.\n"; } } @@ -1294,12 +1293,12 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ TRUE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ TRUE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ true, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ true, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__GEN_MDCI_SBE_MESG, /* file_id_ptr */ &file_id, @@ -1326,7 +1325,7 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -1344,12 +1343,12 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -1387,7 +1386,7 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -1403,12 +1402,12 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -1425,7 +1424,7 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -1439,7 +1438,7 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd) if (HDremove(filename) < 0) { - pass = FALSE; + pass = false; failure_mssg = "HDremove() failed.\n"; } } @@ -1521,11 +1520,11 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd) */ static unsigned -check_cache_image_ctl_flow_2(hbool_t single_file_vfd) +check_cache_image_ctl_flow_2(bool single_file_vfd) { const char *fcn_name = "check_cache_image_ctl_flow_2()"; char filename[512]; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t file_id = -1; H5F_t *file_ptr = NULL; H5C_t *cache_ptr = NULL; @@ -1540,7 +1539,7 @@ check_cache_image_ctl_flow_2(hbool_t single_file_vfd) return 0; } - pass = TRUE; + pass = true; if (show_progress) fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); @@ -1550,7 +1549,7 @@ check_cache_image_ctl_flow_2(hbool_t single_file_vfd) if (h5_fixname(FILENAMES[0], H5P_DEFAULT, filename, sizeof(filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname() failed.\n"; } } @@ -1568,12 +1567,12 @@ check_cache_image_ctl_flow_2(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ TRUE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ TRUE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ true, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ true, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__GEN_MDCI_SBE_MESG, /* file_id_ptr */ &file_id, @@ -1590,7 +1589,7 @@ check_cache_image_ctl_flow_2(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -1608,12 +1607,12 @@ check_cache_image_ctl_flow_2(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -1630,7 +1629,7 @@ check_cache_image_ctl_flow_2(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -1646,12 +1645,12 @@ check_cache_image_ctl_flow_2(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -1668,7 +1667,7 @@ check_cache_image_ctl_flow_2(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -1682,7 +1681,7 @@ check_cache_image_ctl_flow_2(hbool_t single_file_vfd) if (HDremove(filename) < 0) { - pass = FALSE; + pass = false; failure_mssg = "HDremove() failed.\n"; } } @@ -1782,11 +1781,11 @@ check_cache_image_ctl_flow_2(hbool_t single_file_vfd) */ static unsigned -check_cache_image_ctl_flow_3(hbool_t single_file_vfd) +check_cache_image_ctl_flow_3(bool single_file_vfd) { const char *fcn_name = "check_cache_image_ctl_flow_3()"; char filename[512]; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t file_id = -1; H5F_t *file_ptr = NULL; H5C_t *cache_ptr = NULL; @@ -1801,7 +1800,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd) return 0; } - pass = TRUE; + pass = true; if (show_progress) /* 0 */ fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); @@ -1811,7 +1810,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd) if (h5_fixname(FILENAMES[0], H5P_DEFAULT, filename, sizeof(filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname() failed.\n"; } } @@ -1827,12 +1826,12 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ TRUE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ true, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -1849,7 +1848,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -1867,12 +1866,12 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ TRUE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ true, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__GEN_MDCI_SBE_MESG, /* file_id_ptr */ &file_id, @@ -1899,7 +1898,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -1918,12 +1917,12 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ TRUE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ true, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -1950,7 +1949,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -1969,12 +1968,12 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -2001,7 +2000,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -2017,12 +2016,12 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -2039,7 +2038,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -2053,7 +2052,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd) if (HDremove(filename) < 0) { - pass = FALSE; + pass = false; failure_mssg = "HDremove() failed.\n"; } } @@ -2145,11 +2144,11 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd) */ static unsigned -check_cache_image_ctl_flow_4(hbool_t single_file_vfd) +check_cache_image_ctl_flow_4(bool single_file_vfd) { const char *fcn_name = "check_cache_image_ctl_flow_4()"; char filename[512]; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t file_id = -1; H5F_t *file_ptr = NULL; H5C_t *cache_ptr = NULL; @@ -2164,7 +2163,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd) return 0; } - pass = TRUE; + pass = true; if (show_progress) /* 0 */ fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); @@ -2174,7 +2173,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd) if (h5_fixname(FILENAMES[0], H5P_DEFAULT, filename, sizeof(filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname() failed.\n"; } } @@ -2190,12 +2189,12 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ TRUE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ true, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -2212,7 +2211,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -2230,12 +2229,12 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ TRUE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ true, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__GEN_MDCI_SBE_MESG, /* file_id_ptr */ &file_id, @@ -2252,7 +2251,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -2271,12 +2270,12 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ TRUE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ true, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -2293,7 +2292,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -2312,12 +2311,12 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -2334,7 +2333,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -2350,12 +2349,12 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -2372,7 +2371,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -2386,7 +2385,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd) if (HDremove(filename) < 0) { - pass = FALSE; + pass = false; failure_mssg = "HDremove() failed.\n"; } } @@ -2471,11 +2470,11 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd) */ static unsigned -check_cache_image_ctl_flow_5(hbool_t single_file_vfd) +check_cache_image_ctl_flow_5(bool single_file_vfd) { const char *fcn_name = "check_cache_image_ctl_flow_5()"; char filename[512]; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t file_id = -1; H5F_t *file_ptr = NULL; H5C_t *cache_ptr = NULL; @@ -2490,7 +2489,7 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd) return 0; } - pass = TRUE; + pass = true; if (show_progress) /* 0 */ fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); @@ -2500,7 +2499,7 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd) if (h5_fixname(FILENAMES[0], H5P_DEFAULT, filename, sizeof(filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname() failed.\n"; } } @@ -2518,12 +2517,12 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ TRUE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ TRUE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ true, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ true, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__GEN_MDCI_SBE_MESG, /* file_id_ptr */ &file_id, @@ -2550,7 +2549,7 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -2575,12 +2574,12 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ FALSE, - /* set_mdci_fapl */ TRUE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ false, + /* set_mdci_fapl */ true, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__GEN_MDCI_SBE_MESG, /* file_id_ptr */ &file_id, @@ -2607,7 +2606,7 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -2626,12 +2625,12 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -2658,7 +2657,7 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -2672,7 +2671,7 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd) if (HDremove(filename) < 0) { - pass = FALSE; + pass = false; failure_mssg = "HDremove() failed.\n"; } } @@ -2749,11 +2748,11 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd) */ static unsigned -check_cache_image_ctl_flow_6(hbool_t single_file_vfd) +check_cache_image_ctl_flow_6(bool single_file_vfd) { const char *fcn_name = "check_cache_image_ctl_flow_6()"; char filename[512]; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t file_id = -1; H5F_t *file_ptr = NULL; H5C_t *cache_ptr = NULL; @@ -2768,7 +2767,7 @@ check_cache_image_ctl_flow_6(hbool_t single_file_vfd) return 0; } - pass = TRUE; + pass = true; if (show_progress) /* 0 */ fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); @@ -2778,7 +2777,7 @@ check_cache_image_ctl_flow_6(hbool_t single_file_vfd) if (h5_fixname(FILENAMES[0], H5P_DEFAULT, filename, sizeof(filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname() failed.\n"; } } @@ -2796,12 +2795,12 @@ check_cache_image_ctl_flow_6(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ TRUE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ TRUE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ true, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ true, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__GEN_MDCI_SBE_MESG, /* file_id_ptr */ &file_id, @@ -2818,7 +2817,7 @@ check_cache_image_ctl_flow_6(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -2843,12 +2842,12 @@ check_cache_image_ctl_flow_6(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ FALSE, - /* set_mdci_fapl */ TRUE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ false, + /* set_mdci_fapl */ true, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__GEN_MDCI_SBE_MESG, /* file_id_ptr */ &file_id, @@ -2865,7 +2864,7 @@ check_cache_image_ctl_flow_6(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -2884,12 +2883,12 @@ check_cache_image_ctl_flow_6(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -2906,7 +2905,7 @@ check_cache_image_ctl_flow_6(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -2920,7 +2919,7 @@ check_cache_image_ctl_flow_6(hbool_t single_file_vfd) if (HDremove(filename) < 0) { - pass = FALSE; + pass = false; failure_mssg = "HDremove() failed.\n"; } } @@ -3032,11 +3031,11 @@ check_cache_image_ctl_flow_6(hbool_t single_file_vfd) */ static unsigned -cache_image_smoke_check_1(hbool_t single_file_vfd) +cache_image_smoke_check_1(bool single_file_vfd) { const char *fcn_name = "cache_image_smoke_check_1()"; char filename[512]; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t file_id = -1; H5F_t *file_ptr = NULL; H5C_t *cache_ptr = NULL; @@ -3051,7 +3050,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) return 0; } - pass = TRUE; + pass = true; if (show_progress) fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); @@ -3061,7 +3060,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) if (h5_fixname(FILENAMES[0], H5P_DEFAULT, filename, sizeof(filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname() failed.\n"; } } @@ -3078,12 +3077,12 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ TRUE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ TRUE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ true, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ true, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -3106,7 +3105,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) if (cache_ptr->images_loaded != 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block loaded(1)."; } } @@ -3121,7 +3120,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -3139,12 +3138,12 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -3171,7 +3170,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) if (cache_ptr->images_loaded != 1) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block not loaded(1)."; } } @@ -3186,7 +3185,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -3202,12 +3201,12 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -3234,7 +3233,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) if (cache_ptr->images_loaded != 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block loaded(2)."; } } @@ -3249,7 +3248,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -3265,12 +3264,12 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ TRUE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ true, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -3290,7 +3289,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -3306,12 +3305,12 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -3337,7 +3336,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) if (cache_ptr->images_loaded != 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block loaded(3)."; } } @@ -3352,7 +3351,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -3366,7 +3365,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) if (HDremove(filename) < 0) { - pass = FALSE; + pass = false; failure_mssg = "HDremove() failed.\n"; } } @@ -3440,11 +3439,11 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) */ static unsigned -cache_image_smoke_check_2(hbool_t single_file_vfd) +cache_image_smoke_check_2(bool single_file_vfd) { const char *fcn_name = "cache_image_smoke_check_2()"; char filename[512]; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t file_id = -1; H5F_t *file_ptr = NULL; H5C_t *cache_ptr = NULL; @@ -3459,7 +3458,7 @@ cache_image_smoke_check_2(hbool_t single_file_vfd) return 0; } - pass = TRUE; + pass = true; if (show_progress) fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); @@ -3469,7 +3468,7 @@ cache_image_smoke_check_2(hbool_t single_file_vfd) if (h5_fixname(FILENAMES[0], H5P_DEFAULT, filename, sizeof(filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname() failed.\n"; } } @@ -3486,12 +3485,12 @@ cache_image_smoke_check_2(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ TRUE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ TRUE, - /* config_fsm */ TRUE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ true, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ true, + /* config_fsm */ true, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -3514,7 +3513,7 @@ cache_image_smoke_check_2(hbool_t single_file_vfd) if (cache_ptr->images_loaded != 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block loaded(1)."; } } @@ -3529,7 +3528,7 @@ cache_image_smoke_check_2(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -3545,12 +3544,12 @@ cache_image_smoke_check_2(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -3573,7 +3572,7 @@ cache_image_smoke_check_2(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -3589,12 +3588,12 @@ cache_image_smoke_check_2(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -3625,7 +3624,7 @@ cache_image_smoke_check_2(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -3639,7 +3638,7 @@ cache_image_smoke_check_2(hbool_t single_file_vfd) if (HDremove(filename) < 0) { - pass = FALSE; + pass = false; failure_mssg = "HDremove() failed.\n"; } } @@ -3735,11 +3734,11 @@ cache_image_smoke_check_2(hbool_t single_file_vfd) */ static unsigned -cache_image_smoke_check_3(hbool_t single_file_vfd) +cache_image_smoke_check_3(bool single_file_vfd) { const char *fcn_name = "cache_image_smoke_check_3()"; char filename[512]; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t file_id = -1; H5F_t *file_ptr = NULL; H5C_t *cache_ptr = NULL; @@ -3754,7 +3753,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd) return 0; } - pass = TRUE; + pass = true; if (show_progress) fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); @@ -3764,7 +3763,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd) if (h5_fixname(FILENAMES[0], H5P_DEFAULT, filename, sizeof(filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname() failed.\n"; } } @@ -3781,12 +3780,12 @@ cache_image_smoke_check_3(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ TRUE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ TRUE, - /* config_fsm */ TRUE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ true, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ true, + /* config_fsm */ true, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -3809,7 +3808,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd) if (cache_ptr->images_loaded != 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block loaded(1)."; } } @@ -3824,7 +3823,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -3840,12 +3839,12 @@ cache_image_smoke_check_3(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ TRUE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ true, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -3872,7 +3871,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd) if (cache_ptr->images_loaded == 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block not loaded(1)."; } } @@ -3887,7 +3886,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -3903,12 +3902,12 @@ cache_image_smoke_check_3(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -3935,7 +3934,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd) if (cache_ptr->images_loaded == 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block not loaded(2)."; } } @@ -3950,7 +3949,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -3963,12 +3962,12 @@ cache_image_smoke_check_3(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -3995,7 +3994,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd) if (cache_ptr->images_loaded != 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block loaded(2)."; } } @@ -4010,7 +4009,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -4024,7 +4023,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd) if (HDremove(filename) < 0) { - pass = FALSE; + pass = false; failure_mssg = "HDremove() failed.\n"; } } @@ -4109,11 +4108,11 @@ cache_image_smoke_check_3(hbool_t single_file_vfd) */ static unsigned -cache_image_smoke_check_4(hbool_t single_file_vfd) +cache_image_smoke_check_4(bool single_file_vfd) { const char *fcn_name = "cache_image_smoke_check_4()"; char filename[512]; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t file_id = -1; H5F_t *file_ptr = NULL; H5C_t *cache_ptr = NULL; @@ -4130,7 +4129,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) return 0; } - pass = TRUE; + pass = true; if (show_progress) fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); @@ -4140,7 +4139,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) if (h5_fixname(FILENAMES[0], H5P_DEFAULT, filename, sizeof(filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname() failed.\n"; } } @@ -4157,12 +4156,12 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ TRUE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ TRUE, - /* config_fsm */ TRUE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ true, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ true, + /* config_fsm */ true, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -4185,7 +4184,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) if (cache_ptr->images_loaded != 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block loaded(1)."; } } @@ -4200,7 +4199,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -4218,12 +4217,12 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ FALSE, - /* set_mdci_fapl */ TRUE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ false, + /* set_mdci_fapl */ true, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -4246,7 +4245,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) if (cache_ptr->images_loaded == 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block not loaded(1)."; } } @@ -4261,7 +4260,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -4279,12 +4278,12 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -4311,7 +4310,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) if (cache_ptr->images_loaded == 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block not loaded(2)."; } } @@ -4326,7 +4325,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -4339,12 +4338,12 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -4371,7 +4370,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) if (cache_ptr->images_loaded != 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block loaded(2)."; } } @@ -4386,7 +4385,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -4400,7 +4399,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) if (HDremove(filename) < 0) { - pass = FALSE; + pass = false; failure_mssg = "HDremove() failed.\n"; } } @@ -4499,12 +4498,12 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) #define MAX_NUM_GROUPS 64 static unsigned -cache_image_smoke_check_5(hbool_t single_file_vfd) +cache_image_smoke_check_5(bool single_file_vfd) { const char *fcn_name = "cache_image_smoke_check_5()"; char filename[512]; char process_group_name[512]; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t file_id = -1; hid_t proc_gid = -1; H5F_t *file_ptr = NULL; @@ -4523,7 +4522,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) return 0; } - pass = TRUE; + pass = true; if (show_progress) fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); @@ -4535,7 +4534,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) if (h5_fixname(FILENAMES[0], fapl_id, filename, sizeof(filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname() failed.\n"; } @@ -4554,12 +4553,12 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ TRUE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ TRUE, - /* config_fsm */ TRUE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ true, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ true, + /* config_fsm */ true, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -4579,7 +4578,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) if (proc_gid < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Gcreate2() failed (1).\n"; } } @@ -4596,7 +4595,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) if (cache_ptr->images_loaded != 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block loaded(1)."; } } @@ -4611,7 +4610,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) if (H5Gclose(proc_gid) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Gclose(proc_gid) failed. (1)"; } } @@ -4620,7 +4619,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -4638,12 +4637,12 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ FALSE, - /* set_mdci_fapl */ TRUE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ false, + /* set_mdci_fapl */ true, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -4663,7 +4662,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) if (cache_ptr->images_loaded == 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block not loaded(1)."; } } @@ -4682,7 +4681,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) if (proc_gid < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Gcreate2() failed (2).\n"; } } @@ -4703,7 +4702,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) if (H5Gclose(proc_gid) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Gclose(process_gid) failed. (2)"; } } @@ -4712,7 +4711,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -4728,12 +4727,12 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) * superblock extension message. */ if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ TRUE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ true, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -4754,7 +4753,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) #if H5C_COLLECT_CACHE_STATS if (pass) { if (cache_ptr->images_loaded == 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block not loaded(2)."; } } @@ -4766,7 +4765,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) /* 12) Close the file. */ if (pass) { if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -4779,12 +4778,12 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -4808,7 +4807,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) if (cache_ptr->images_loaded == 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block not loaded(2)."; } } @@ -4823,7 +4822,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -4836,12 +4835,12 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -4868,7 +4867,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) if (cache_ptr->images_loaded != 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block loaded(2)."; } } @@ -4883,7 +4882,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -4897,7 +4896,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) if (HDremove(filename) < 0) { - pass = FALSE; + pass = false; failure_mssg = "HDremove() failed.\n"; } } @@ -4994,11 +4993,11 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) */ static unsigned -cache_image_smoke_check_6(hbool_t single_file_vfd) +cache_image_smoke_check_6(bool single_file_vfd) { const char *fcn_name = "cache_image_smoke_check_6()"; char filename[512]; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t file_id = -1; H5F_t *file_ptr = NULL; H5C_t *cache_ptr = NULL; @@ -5016,7 +5015,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) return 0; } - pass = TRUE; + pass = true; if (show_progress) fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); @@ -5026,7 +5025,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) if (h5_fixname(FILENAMES[0], H5P_DEFAULT, filename, sizeof(filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname() failed.\n"; } } @@ -5043,12 +5042,12 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ TRUE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ TRUE, - /* config_fsm */ TRUE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ true, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ true, + /* config_fsm */ true, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -5071,7 +5070,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) if (cache_ptr->images_loaded != 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block loaded(1)."; } } @@ -5086,7 +5085,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -5104,12 +5103,12 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ FALSE, - /* set_mdci_fapl */ TRUE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ false, + /* set_mdci_fapl */ true, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -5132,7 +5131,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) if (cache_ptr->images_loaded == 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block not loaded(1)."; } } @@ -5156,7 +5155,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -5174,12 +5173,12 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -5202,7 +5201,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) if (cache_ptr->images_loaded == 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block not loaded(2)."; } } @@ -5217,7 +5216,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -5230,12 +5229,12 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -5261,7 +5260,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) if (cache_ptr->images_loaded != 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block loaded(2)."; } } @@ -5273,7 +5272,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -5294,11 +5293,11 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) */ if (pass) { if ((file_size = h5_get_file_size(filename, H5P_DEFAULT)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "h5_get_file_size() failed.\n"; } else if (file_size > 20 * 1024) { - pass = FALSE; + pass = false; failure_mssg = "unexpectedly large file size.\n"; } } @@ -5311,7 +5310,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) if (HDremove(filename) < 0) { - pass = FALSE; + pass = false; failure_mssg = "HDremove() failed.\n"; } } @@ -5386,11 +5385,11 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) */ static unsigned -cache_image_api_error_check_1(hbool_t single_file_vfd) +cache_image_api_error_check_1(bool single_file_vfd) { const char *fcn_name = "cache_image_api_error_check_1()"; char filename[512]; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t file_id = -1; H5F_t *file_ptr = NULL; H5C_t *cache_ptr = NULL; @@ -5405,7 +5404,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) return 0; } - pass = TRUE; + pass = true; if (show_progress) fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); @@ -5415,7 +5414,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) if (h5_fixname(FILENAMES[0], H5P_DEFAULT, filename, sizeof(filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname() failed.\n"; } } @@ -5427,12 +5426,12 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ TRUE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ TRUE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ true, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ true, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -5455,7 +5454,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) if (cache_ptr->images_loaded != 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block loaded(1)."; } } @@ -5470,7 +5469,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -5482,12 +5481,12 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ TRUE, - /* set_mdci_fapl */ TRUE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ false, + /* read_only */ true, + /* set_mdci_fapl */ true, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -5515,7 +5514,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) if (cache_ptr->images_loaded != 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block loaded(2)."; } } @@ -5530,7 +5529,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -5542,12 +5541,12 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ TRUE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ false, + /* read_only */ true, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -5575,7 +5574,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) if (cache_ptr->images_loaded != 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block loaded(3)."; } } @@ -5590,7 +5589,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -5602,12 +5601,12 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -5635,7 +5634,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) if (cache_ptr->images_loaded != 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block loaded(4)."; } } @@ -5650,7 +5649,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -5664,7 +5663,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) if (HDremove(filename) < 0) { - pass = FALSE; + pass = false; failure_mssg = "HDremove() failed.\n"; } } @@ -5751,11 +5750,11 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) */ static unsigned -cache_image_api_error_check_2(hbool_t single_file_vfd) +cache_image_api_error_check_2(bool single_file_vfd) { const char *fcn_name = "cache_image_api_error_check_2()"; char filename[512]; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t file_id = -1; H5F_t *file_ptr = NULL; H5C_t *cache_ptr = NULL; @@ -5770,7 +5769,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) return 0; } - pass = TRUE; + pass = true; if (show_progress) fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); @@ -5780,7 +5779,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) if (h5_fixname(FILENAMES[0], H5P_DEFAULT, filename, sizeof(filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname() failed.\n"; } } @@ -5792,12 +5791,12 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ TRUE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ TRUE, - /* config_fsm */ TRUE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ true, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ true, + /* config_fsm */ true, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -5820,7 +5819,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) if (cache_ptr->images_loaded != 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block loaded(1)."; } } @@ -5835,7 +5834,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -5847,12 +5846,12 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ TRUE, - /* set_mdci_fapl */ TRUE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ true, + /* set_mdci_fapl */ true, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -5880,7 +5879,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) if (cache_ptr->images_loaded != 1) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block was not loaded(1)."; } } @@ -5895,7 +5894,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -5907,12 +5906,12 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ TRUE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ true, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ 0, /* file_id_ptr */ &file_id, @@ -5940,7 +5939,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) if (cache_ptr->images_loaded != 1) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block was not loaded(2)."; } } @@ -5955,7 +5954,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -5967,12 +5966,12 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -6000,7 +5999,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) if (cache_ptr->images_loaded != 1) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block was not loaded(3)."; } } @@ -6015,7 +6014,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -6027,12 +6026,12 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -6060,7 +6059,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) if (cache_ptr->images_loaded != 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block was loaded(2)."; } } @@ -6075,7 +6074,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -6089,7 +6088,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) if (HDremove(filename) < 0) { - pass = FALSE; + pass = false; failure_mssg = "HDremove() failed.\n"; } } @@ -6149,11 +6148,11 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) */ static unsigned -cache_image_api_error_check_3(hbool_t single_file_vfd) +cache_image_api_error_check_3(bool single_file_vfd) { const char *fcn_name = "cache_image_api_error_check_3()"; char filename[512]; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t file_id = -1; H5F_t *file_ptr = NULL; H5C_t *cache_ptr = NULL; @@ -6168,7 +6167,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd) return 0; } - pass = TRUE; + pass = true; if (show_progress) fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); @@ -6178,7 +6177,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd) if (h5_fixname(FILENAMES[0], H5P_DEFAULT, filename, sizeof(filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname() failed.\n"; } } @@ -6190,12 +6189,12 @@ cache_image_api_error_check_3(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ TRUE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ TRUE, - /* config_fsm */ TRUE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ true, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ true, + /* config_fsm */ true, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -6214,7 +6213,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd) { if (H5Fstart_swmr_write(file_id) == SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "SWMR start succeeded in file with cache image."; } } @@ -6230,13 +6229,13 @@ cache_image_api_error_check_3(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } if (HDremove(filename) < 0) { - pass = FALSE; + pass = false; failure_mssg = "HDremove() failed.\n"; } } @@ -6248,8 +6247,8 @@ cache_image_api_error_check_3(hbool_t single_file_vfd) * access and cache image requested -- should fail. */ - attempt_swmr_open_hdf5_file(/* create_file */ TRUE, - /* set_mdci_fapl */ TRUE, + attempt_swmr_open_hdf5_file(/* create_file */ true, + /* set_mdci_fapl */ true, /* hdf_file_name */ filename); if (show_progress) @@ -6272,12 +6271,12 @@ cache_image_api_error_check_3(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ TRUE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ TRUE, - /* config_fsm */ TRUE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ true, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ true, + /* config_fsm */ true, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -6300,7 +6299,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd) if (cache_ptr->images_loaded != 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block loaded(1)."; } } @@ -6315,7 +6314,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -6325,8 +6324,8 @@ cache_image_api_error_check_3(hbool_t single_file_vfd) /* 9) Attempt to open the file with SWMR write access -- should fail. */ - attempt_swmr_open_hdf5_file(/* create_file */ FALSE, - /* set_mdci_fapl */ TRUE, + attempt_swmr_open_hdf5_file(/* create_file */ false, + /* set_mdci_fapl */ true, /* hdf_file_name */ filename); if (show_progress) @@ -6338,7 +6337,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd) if (HDremove(filename) < 0) { - pass = FALSE; + pass = false; failure_mssg = "HDremove() failed.\n"; } } @@ -6427,11 +6426,11 @@ cache_image_api_error_check_3(hbool_t single_file_vfd) */ static unsigned -cache_image_api_error_check_4(hbool_t single_file_vfd) +cache_image_api_error_check_4(bool single_file_vfd) { const char *fcn_name = "cache_image_api_error_check_4()"; char filename[512]; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t fapl_id = -1; hid_t file_id = -1; H5F_t *file_ptr = NULL; @@ -6448,7 +6447,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) return 0; } - pass = TRUE; + pass = true; if (show_progress) fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); @@ -6458,7 +6457,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) if (h5_fixname(FILENAMES[0], H5P_DEFAULT, filename, sizeof(filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname() failed.\n"; } } @@ -6475,7 +6474,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) if (fapl_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "h5_fileaccess() failed.\n"; } } @@ -6487,13 +6486,13 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) /* set cache image config fields to taste */ cache_image_config.version = H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION; - cache_image_config.generate_image = TRUE; - cache_image_config.save_resize_status = FALSE; + cache_image_config.generate_image = true; + cache_image_config.save_resize_status = false; cache_image_config.entry_ageout = H5AC__CACHE_IMAGE__ENTRY_AGEOUT__NONE; if (H5Pset_mdc_image_config(fapl_id, &cache_image_config) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_mdc_image_config() failed.\n"; } } @@ -6509,7 +6508,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) if (file_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fcreate() failed.\n"; } else { @@ -6518,7 +6517,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) if (file_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "Can't get file_ptr."; } } @@ -6534,7 +6533,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) if (file_ptr->shared->cache == NULL) { - pass = FALSE; + pass = false; failure_mssg = "can't get cache pointer(1).\n"; } else { @@ -6560,7 +6559,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) if (cache_ptr->images_loaded != 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block loaded(1)."; } } @@ -6575,7 +6574,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -6587,12 +6586,12 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ TRUE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ false, + /* read_only */ true, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -6617,7 +6616,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) if (cache_ptr->images_loaded != 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block loaded(2)."; } } @@ -6632,7 +6631,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -6651,7 +6650,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) if (file_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fopen() failed.\n"; } else { @@ -6660,7 +6659,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) if (file_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "Can't get file_ptr."; } } @@ -6676,7 +6675,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) if (file_ptr->shared->cache == NULL) { - pass = FALSE; + pass = false; failure_mssg = "can't get cache pointer(1).\n"; } else { @@ -6690,9 +6689,9 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) if (pass) { - if ((cache_ptr->load_image == TRUE) || (cache_ptr->delete_image == TRUE)) { + if ((cache_ptr->load_image == true) || (cache_ptr->delete_image == true)) { - pass = FALSE; + pass = false; failure_mssg = "mdci sb extension message present?\n"; } } @@ -6706,7 +6705,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -6724,7 +6723,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) if (file_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fopen() failed.\n"; } else { @@ -6733,7 +6732,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) if (file_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "Can't get file_ptr."; } } @@ -6749,7 +6748,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) if (file_ptr->shared->cache == NULL) { - pass = FALSE; + pass = false; failure_mssg = "can't get cache pointer(1).\n"; } else { @@ -6763,9 +6762,9 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) if (pass) { - if ((cache_ptr->load_image == TRUE) || (cache_ptr->delete_image == TRUE)) { + if ((cache_ptr->load_image == true) || (cache_ptr->delete_image == true)) { - pass = FALSE; + pass = false; failure_mssg = "mdci sb extension message present?\n"; } } @@ -6788,7 +6787,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) if (cache_ptr->images_loaded != 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block loaded(2)."; } } @@ -6813,7 +6812,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -6828,12 +6827,12 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -6859,7 +6858,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) if (cache_ptr->images_loaded != 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block loaded(2)."; } } @@ -6874,7 +6873,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -6888,7 +6887,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) if (HDremove(filename) < 0) { - pass = FALSE; + pass = false; failure_mssg = "HDremove() failed.\n"; } } @@ -6996,11 +6995,11 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) *------------------------------------------------------------------------- */ static unsigned -get_free_sections_test(hbool_t single_file_vfd) +get_free_sections_test(bool single_file_vfd) { const char *fcn_name = "get_free_sections_test()"; char filename[512]; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t file_id = -1; H5F_t *file_ptr = NULL; H5C_t *cache_ptr = NULL; @@ -7016,7 +7015,7 @@ get_free_sections_test(hbool_t single_file_vfd) return 0; } - pass = TRUE; + pass = true; if (show_progress) fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); @@ -7026,7 +7025,7 @@ get_free_sections_test(hbool_t single_file_vfd) if (h5_fixname(FILENAMES[0], H5P_DEFAULT, filename, sizeof(filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname() failed.\n"; } } @@ -7040,12 +7039,12 @@ get_free_sections_test(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ TRUE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ TRUE, - /* config_fsm */ TRUE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ true, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ true, + /* config_fsm */ true, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -7090,7 +7089,7 @@ get_free_sections_test(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed (1).\n"; } } @@ -7102,12 +7101,12 @@ get_free_sections_test(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ TRUE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ true, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -7124,7 +7123,7 @@ get_free_sections_test(hbool_t single_file_vfd) if ((!file_ptr->shared->cache->load_image) || (file_ptr->shared->cache->image_loaded)) { - pass = FALSE; + pass = false; failure_mssg = "unexpected cache image status.\n"; } } @@ -7139,14 +7138,14 @@ get_free_sections_test(hbool_t single_file_vfd) if (pass) { - /* file_ptr->shared->first_alloc_dealloc is set to FALSE if the + /* file_ptr->shared->first_alloc_dealloc is set to false if the * file is opened R/O. */ if ((!H5_addr_defined(file_ptr->shared->eoa_fsm_fsalloc)) || (!H5_addr_defined(file_ptr->shared->cache->image_addr)) || (H5_addr_gt(file_ptr->shared->eoa_fsm_fsalloc, file_ptr->shared->cache->image_addr))) { - pass = FALSE; + pass = false; failure_mssg = "unexpected cache image status (1).\n"; } } @@ -7160,7 +7159,7 @@ get_free_sections_test(hbool_t single_file_vfd) if (H5Fget_free_sections(file_id, H5FD_MEM_DEFAULT, (size_t)0, NULL) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fget_free_sections() failed (1).\n"; } } @@ -7175,7 +7174,7 @@ get_free_sections_test(hbool_t single_file_vfd) if (!file_ptr->shared->cache->image_loaded) { - pass = FALSE; + pass = false; failure_mssg = "cache image not loaded (1).\n"; } } @@ -7199,7 +7198,7 @@ get_free_sections_test(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed (2).\n"; } } @@ -7211,12 +7210,12 @@ get_free_sections_test(hbool_t single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -7233,7 +7232,7 @@ get_free_sections_test(hbool_t single_file_vfd) if ((!file_ptr->shared->cache->load_image) || (file_ptr->shared->cache->image_loaded)) { - pass = FALSE; + pass = false; failure_mssg = "unexpected cache image status.\n"; } } @@ -7251,7 +7250,7 @@ get_free_sections_test(hbool_t single_file_vfd) (!H5_addr_defined(file_ptr->shared->cache->image_addr)) || (H5_addr_gt(file_ptr->shared->eoa_fsm_fsalloc, file_ptr->shared->cache->image_addr))) { - pass = FALSE; + pass = false; failure_mssg = "unexpected cache image status (2).\n"; } } @@ -7265,7 +7264,7 @@ get_free_sections_test(hbool_t single_file_vfd) if (H5Fget_free_sections(file_id, H5FD_MEM_DEFAULT, (size_t)0, NULL) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fget_free_sections() failed (2).\n"; } } @@ -7280,7 +7279,7 @@ get_free_sections_test(hbool_t single_file_vfd) if (!file_ptr->shared->cache->image_loaded) { - pass = FALSE; + pass = false; failure_mssg = "cache image not loaded (2).\n"; } } @@ -7314,7 +7313,7 @@ get_free_sections_test(hbool_t single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed (3).\n"; } } @@ -7328,12 +7327,12 @@ get_free_sections_test(hbool_t single_file_vfd) if ((file_size = h5_get_file_size(filename, H5P_DEFAULT)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "h5_get_file_size() failed.\n"; } else if (file_size > 20 * 1024) { - pass = FALSE; + pass = false; failure_mssg = "unexpectedly large file size.\n"; } } @@ -7347,7 +7346,7 @@ get_free_sections_test(hbool_t single_file_vfd) if (HDremove(filename) < 0) { - pass = FALSE; + pass = false; failure_mssg = "HDremove() failed.\n"; } } @@ -7434,13 +7433,13 @@ get_free_sections_test(hbool_t single_file_vfd) *------------------------------------------------------------------------- */ static unsigned -evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) +evict_on_close_test(bool H5_ATTR_PARALLEL_UNUSED single_file_vfd) { #ifndef H5_HAVE_PARALLEL const char *fcn_name = "evict_on_close_test()"; char filename[512]; - hbool_t show_progress = FALSE; - hbool_t verbose = FALSE; + bool show_progress = false; + bool verbose = false; hid_t file_id = -1; H5F_t *file_ptr = NULL; H5C_t *cache_ptr = NULL; @@ -7462,7 +7461,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) return 0; } - pass = TRUE; + pass = true; if (show_progress) fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); @@ -7472,7 +7471,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) if (h5_fixname(FILENAMES[0], H5P_DEFAULT, filename, sizeof(filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname() failed.\n"; } } @@ -7485,12 +7484,12 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) */ if (pass) { - open_hdf5_file(/* create_file */ TRUE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ TRUE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ true, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ true, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -7525,7 +7524,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed (1).\n"; } } @@ -7537,12 +7536,12 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ TRUE, - /* config_fsm */ FALSE, - /* set_eoc */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ true, + /* config_fsm */ false, + /* set_eoc */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -7598,7 +7597,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed (2).\n"; } } @@ -7610,12 +7609,12 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ TRUE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ TRUE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ true, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ true, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -7650,7 +7649,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed (3).\n"; } } @@ -7662,12 +7661,12 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* set_eoc */ TRUE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* set_eoc */ true, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -7702,7 +7701,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed (3).\n"; } } @@ -7716,7 +7715,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) if (HDremove(filename) < 0) { - pass = FALSE; + pass = false; failure_mssg = "HDremove() failed.\n"; } } @@ -7754,7 +7753,7 @@ int main(void) { const char *env_h5_drvr; /* File driver value from environment */ - hbool_t single_file_vfd; /* Whether VFD used stores data in a single file */ + bool single_file_vfd; /* Whether VFD used stores data in a single file */ unsigned nerrs = 0; int express_test; diff --git a/test/cache_logging.c b/test/cache_logging.c index 5001c49..e551e1f 100644 --- a/test/cache_logging.c +++ b/test/cache_logging.c @@ -32,20 +32,20 @@ static const char *FILENAME[] = {"cache_logging", NULL}; static herr_t test_logging_api(void) { - hid_t fapl = -1; - hbool_t is_enabled; - hbool_t is_enabled_out; - hbool_t start_on_access; - hbool_t start_on_access_out; - char *location = NULL; - size_t size; - - hid_t fid = -1; - hid_t gid = -1; - hbool_t is_currently_logging; - char group_name[12]; - char filename[1024]; - int i; + hid_t fapl = -1; + bool is_enabled; + bool is_enabled_out; + bool start_on_access; + bool start_on_access_out; + char *location = NULL; + size_t size; + + hid_t fid = -1; + hid_t gid = -1; + bool is_currently_logging; + char group_name[12]; + char filename[1024]; + int i; TESTING("metadata cache log api calls"); @@ -53,8 +53,8 @@ test_logging_api(void) h5_fixname(FILENAME[0], fapl, filename, sizeof filename); /* Set up metadata cache logging */ - is_enabled = TRUE; - start_on_access = FALSE; + is_enabled = true; + start_on_access = false; if (H5Pset_mdc_log_options(fapl, is_enabled, LOG_LOCATION, start_on_access) < 0) TEST_ERROR; @@ -67,8 +67,8 @@ test_logging_api(void) /* Check to make sure that the property list getter returns the correct * location string buffer size; */ - is_enabled_out = FALSE; - start_on_access_out = TRUE; + is_enabled_out = false; + start_on_access_out = true; location = NULL; size = 999; if (H5Pget_mdc_log_options(fapl, &is_enabled_out, location, &size, &start_on_access_out) < 0) @@ -92,19 +92,19 @@ test_logging_api(void) TEST_ERROR; /* Check to see if the logging flags were set correctly */ - is_enabled = FALSE; - is_currently_logging = TRUE; - if ((H5Fget_mdc_logging_status(fid, &is_enabled, &is_currently_logging) < 0) || (is_enabled != TRUE) || - (is_currently_logging != FALSE)) + is_enabled = false; + is_currently_logging = true; + if ((H5Fget_mdc_logging_status(fid, &is_enabled, &is_currently_logging) < 0) || (is_enabled != true) || + (is_currently_logging != false)) TEST_ERROR; /* Turn on logging and check flags */ if (H5Fstart_mdc_logging(fid) < 0) TEST_ERROR; - is_enabled = FALSE; - is_currently_logging = FALSE; - if ((H5Fget_mdc_logging_status(fid, &is_enabled, &is_currently_logging) < 0) || (is_enabled != TRUE) || - (is_currently_logging != TRUE)) + is_enabled = false; + is_currently_logging = false; + if ((H5Fget_mdc_logging_status(fid, &is_enabled, &is_currently_logging) < 0) || (is_enabled != true) || + (is_currently_logging != true)) TEST_ERROR; /* Perform some manipulations */ @@ -120,10 +120,10 @@ test_logging_api(void) /* Turn off logging and check flags */ if (H5Fstop_mdc_logging(fid) < 0) TEST_ERROR; - is_enabled = FALSE; - is_currently_logging = TRUE; - if ((H5Fget_mdc_logging_status(fid, &is_enabled, &is_currently_logging) < 0) || (is_enabled != TRUE) || - (is_currently_logging != FALSE)) + is_enabled = false; + is_currently_logging = true; + if ((H5Fget_mdc_logging_status(fid, &is_enabled, &is_currently_logging) < 0) || (is_enabled != true) || + (is_currently_logging != false)) TEST_ERROR; /* Clean up */ diff --git a/test/cache_tagging.c b/test/cache_tagging.c index 9af8bf2..6d4a6de 100644 --- a/test/cache_tagging.c +++ b/test/cache_tagging.c @@ -205,7 +205,7 @@ mark_all_entries_investigated(hid_t fid) entry_ptr = cache_ptr->index[i]; while (entry_ptr != NULL) { if (!entry_ptr->dirtied) - entry_ptr->dirtied = TRUE; + entry_ptr->dirtied = true; entry_ptr = entry_ptr->ht_next; } /* end if */ @@ -247,7 +247,7 @@ reset_all_entries_investigated(hid_t fid) entry_ptr = cache_ptr->index[i]; while (entry_ptr != NULL) { if (entry_ptr->dirtied) - entry_ptr->dirtied = FALSE; + entry_ptr->dirtied = false; entry_ptr = entry_ptr->ht_next; } /* end if */ @@ -295,7 +295,7 @@ verify_tag(hid_t fid, int id, haddr_t tag) TEST_ERROR; /* Mark the entry/tag pair as found */ - entry_ptr->dirtied = TRUE; + entry_ptr->dirtied = true; /* leave now that we've found the entry */ goto done; @@ -328,7 +328,7 @@ evict_entries(hid_t fid) mark_all_entries_investigated(fid); /* setup the skip list prior to calling H5C_flush_cache() */ - if (H5C_set_slist_enabled(f->shared->cache, TRUE, FALSE) < 0) + if (H5C_set_slist_enabled(f->shared->cache, true, false) < 0) TEST_ERROR; /* Evict all we can from the cache to examine full tag creation tree */ @@ -338,7 +338,7 @@ evict_entries(hid_t fid) H5C_flush_cache(f, H5C__FLUSH_INVALIDATE_FLAG); /* shutdown the slist -- allow it to be non-empty */ - if (H5C_set_slist_enabled(f->shared->cache, FALSE, TRUE) < 0) + if (H5C_set_slist_enabled(f->shared->cache, false, true) < 0) TEST_ERROR; return 0; @@ -418,7 +418,7 @@ check_file_creation_tags(hid_t fcpl_id, int type) /* Variable Declarations */ hid_t fid = -1; /* File Identifier */ #ifndef NDEBUG - int verbose = FALSE; /* verbose test output */ + int verbose = false; /* verbose test output */ #endif /* NDEBUG */ hid_t fapl = -1; /* File access prop list */ haddr_t root_tag = 0; @@ -519,7 +519,7 @@ check_file_open_tags(hid_t fcpl, int type) /* Variable Declarations */ hid_t fid = -1; /* File Identifier */ #ifndef NDEBUG - int verbose = FALSE; /* verbose file output */ + int verbose = false; /* verbose file output */ #endif /* NDEBUG */ hid_t fapl = -1; /* File access prop list */ haddr_t root_tag; /* Root Group Tag */ @@ -646,7 +646,7 @@ check_group_creation_tags(void) hid_t fid = -1; /* File Identifier */ hid_t gid = -1; /* Group Identifier */ #ifndef NDEBUG - int verbose = FALSE; /* verbose file output */ + int verbose = false; /* verbose file output */ #endif /* NDEBUG */ hid_t fapl = -1; /* File access prop list */ haddr_t root_tag = HADDR_UNDEF; /* Root Group Tag */ @@ -766,7 +766,7 @@ check_multi_group_creation_tags(void) hid_t fid = -1; /* File Identifier */ hid_t gid = -1; /* Group Identifier */ #ifndef NDEBUG - int verbose = FALSE; /* verbose file output */ + int verbose = false; /* verbose file output */ #endif /* NDEBUG */ char gname[16]; /* group name buffer */ int i = 0; /* iterator */ @@ -915,7 +915,7 @@ check_link_iteration_tags(void) hid_t sid = -1; /* Group Identifier */ hid_t did = -1; /* Group Identifier */ #ifndef NDEBUG - int verbose = FALSE; /* verbose file output */ + int verbose = false; /* verbose file output */ #endif /* NDEBUG */ int i = 0; /* iterator */ haddr_t root_tag = 0; /* Root Group Tag Value */ @@ -1054,7 +1054,7 @@ check_dense_attribute_tags(void) hid_t did = -1; /* Group Identifier */ hid_t dcpl = -1; /* Group Identifier */ #ifndef NDEBUG - int verbose = FALSE; /* verbose file output */ + int verbose = false; /* verbose file output */ #endif /* NDEBUG */ int i = 0; /* iterator */ hid_t fapl = -1; /* File access property list */ @@ -1281,7 +1281,7 @@ check_group_open_tags(void) hid_t fid = -1; /* File Identifier */ hid_t gid = -1; /* Group Identifier */ #ifndef NDEBUG - int verbose = FALSE; /* verbose file output */ + int verbose = false; /* verbose file output */ #endif /* NDEBUG */ hid_t fapl = -1; /* File access prop list */ haddr_t root_tag = HADDR_UNDEF; @@ -1409,7 +1409,7 @@ check_attribute_creation_tags(hid_t fcpl, int type) hid_t gid = -1; /* Group Identifier */ hid_t sid = -1; /* Dataspace Identifier */ #ifndef NDEBUG - int verbose = FALSE; /* verbose file output */ + int verbose = false; /* verbose file output */ #endif /* NDEBUG */ hid_t fapl = -1; /* File access prop list */ haddr_t root_tag = 0; /* Root group tag */ @@ -1571,7 +1571,7 @@ check_attribute_open_tags(hid_t fcpl, int type) hid_t gid = -1; /* Group Identifier */ hid_t sid = -1; /* Dataspace Identifier */ #ifndef NDEBUG - int verbose = FALSE; /* verbose file output */ + int verbose = false; /* verbose file output */ #endif /* NDEBUG */ hid_t fapl = -1; /* File access prop list */ haddr_t root_tag = 0; @@ -1735,7 +1735,7 @@ check_attribute_rename_tags(hid_t fcpl, int type) hid_t aid = -1; /* Attribute Identifier */ hid_t sid = -1; /* Dataset Identifier */ #ifndef NDEBUG - int verbose = FALSE; /* verbose file output */ + int verbose = false; /* verbose file output */ #endif /* NDEBUG */ int *data = NULL; /* data buffer */ int i, j, k = 0; /* iterators */ @@ -1744,7 +1744,7 @@ check_attribute_rename_tags(hid_t fcpl, int type) haddr_t g_tag = 0; hsize_t dims1[2] = {DIMS, DIMS}; /* dimensions */ hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dimensions */ - hbool_t persistent_fsms = FALSE; + bool persistent_fsms = false; /* Testing Macro */ TESTING("tag application during attribute renaming"); @@ -1945,7 +1945,7 @@ check_attribute_delete_tags(hid_t fcpl, int type) hid_t aid = -1; /* Attribute Identifier */ hid_t sid = -1; /* Dataset Identifier */ #ifndef NDEBUG - int verbose = FALSE; /* verbose file output */ + int verbose = false; /* verbose file output */ #endif /* NDEBUG */ int *data = NULL; /* data buffer */ int i, j, k = 0; /* iterators */ @@ -1954,7 +1954,7 @@ check_attribute_delete_tags(hid_t fcpl, int type) haddr_t g_tag = 0; hsize_t dims1[2] = {DIMS, DIMS}; /* dimensions */ hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dimensions */ - hbool_t persistent_fsms = FALSE; + bool persistent_fsms = false; /* Testing Macro */ TESTING("tag application during attribute delete"); @@ -2133,7 +2133,7 @@ check_dataset_creation_tags(hid_t fcpl, int type) hid_t did = -1; /* Dataset Identifier */ hid_t sid = -1; /* Dataspace Identifier */ #ifndef NDEBUG - int verbose = FALSE; /* verbose file output */ + int verbose = false; /* verbose file output */ #endif /* NDEBUG */ hid_t dcpl = -1; /* dataset creation pl */ hsize_t cdims[2] = {1, 1}; /* chunk dimensions */ @@ -2290,7 +2290,7 @@ check_dataset_creation_earlyalloc_tags(hid_t fcpl, int type) hid_t did = -1; /* Dataset Identifier */ hid_t sid = -1; /* Dataspace Identifier */ #ifndef NDEBUG - int verbose = FALSE; /* verbose file output */ + int verbose = false; /* verbose file output */ #endif /* NDEBUG */ hid_t dcpl = -1; /* dataset creation pl */ hsize_t cdims[2] = {1, 1}; /* chunk dimensions */ @@ -2453,7 +2453,7 @@ check_dataset_open_tags(void) hid_t did = -1; /* Dataset Identifier */ hid_t sid = -1; /* Dataspace Identifier */ #ifndef NDEBUG - int verbose = FALSE; /* verbose file output */ + int verbose = false; /* verbose file output */ #endif /* NDEBUG */ hid_t dcpl = -1; /* dataset creation pl */ hsize_t cdims[2] = {1, 1}; /* chunk dimensions */ @@ -2602,7 +2602,7 @@ check_dataset_write_tags(void) hid_t did = -1; /* Dataset Identifier */ hid_t sid = -1; /* Dataspace Identifier */ #ifndef NDEBUG - int verbose = FALSE; /* verbose file output */ + int verbose = false; /* verbose file output */ #endif /* NDEBUG */ hid_t dcpl = -1; /* dataset creation pl */ hsize_t cdims[2] = {1, 1}; /* chunk dimensions */ @@ -2766,7 +2766,7 @@ check_attribute_write_tags(hid_t fcpl, int type) hid_t aid = -1; /* Attribute Identifier */ hid_t sid = -1; /* Dataset Identifier */ #ifndef NDEBUG - int verbose = FALSE; /* verbose file output */ + int verbose = false; /* verbose file output */ #endif /* NDEBUG */ int *data = NULL; /* data buffer */ int i, j, k = 0; /* iterators */ @@ -2949,7 +2949,7 @@ check_dataset_read_tags(void) hid_t did = -1; /* Dataset Identifier */ hid_t sid = -1; /* Dataspace Identifier */ #ifndef NDEBUG - int verbose = FALSE; /* verbose file output */ + int verbose = false; /* verbose file output */ #endif /* NDEBUG */ hid_t dcpl = -1; /* dataset creation pl */ hsize_t cdims[2] = {1, 1}; /* chunk dimensions */ @@ -3108,7 +3108,7 @@ check_dataset_size_retrieval(void) hid_t did = -1; /* Dataset Identifier */ hid_t sid = -1; /* Dataspace Identifier */ #ifndef NDEBUG - int verbose = FALSE; /* verbose file output */ + int verbose = false; /* verbose file output */ #endif /* NDEBUG */ hid_t dcpl = -1; /* dataset creation pl */ hsize_t cdims[2] = {1, 1}; /* chunk dimensions */ @@ -3269,7 +3269,7 @@ check_dataset_extend_tags(void) hid_t did = -1; /* Dataset Identifier */ hid_t sid = -1; /* Dataspace Identifier */ #ifndef NDEBUG - int verbose = FALSE; /* verbose file output */ + int verbose = false; /* verbose file output */ #endif /* NDEBUG */ hid_t dcpl = -1; /* dataset creation pl */ hsize_t cdims[2] = {1, 1}; /* chunk dimensions */ @@ -3428,7 +3428,7 @@ check_object_info_tags(void) hid_t fid = -1; /* File Identifier */ hid_t gid = -1; /* Group Identifier */ #ifndef NDEBUG - int verbose = FALSE; /* verbose file output */ + int verbose = false; /* verbose file output */ #endif /* NDEBUG */ hid_t fapl = -1; /* File access prop list */ haddr_t root_tag = HADDR_UNDEF; @@ -3560,7 +3560,7 @@ check_object_copy_tags(void) hid_t fid = -1; /* File Identifier */ hid_t gid = -1; /* Group Identifier */ #ifndef NDEBUG - int verbose = FALSE; /* verbose file output */ + int verbose = false; /* verbose file output */ #endif /* NDEBUG */ hid_t fapl = -1; /* File access prop list */ haddr_t root_tag = HADDR_UNDEF; @@ -3707,7 +3707,7 @@ check_link_removal_tags(hid_t fcpl, int type) hid_t sid = -1; /* Dataspace Identifier */ hid_t gid = -1; /* Dataspace Identifier */ #ifndef NDEBUG - int verbose = FALSE; /* verbose file output */ + int verbose = false; /* verbose file output */ #endif /* NDEBUG */ hid_t dcpl = -1; /* dataset creation pl */ hsize_t cdims[2] = {1, 1}; /* chunk dimensions */ @@ -3893,7 +3893,7 @@ check_link_getname_tags(void) hid_t sid = -1; /* Dataspace Identifier */ hid_t gid = -1; /* Dataspace Identifier */ #ifndef NDEBUG - int verbose = FALSE; /* verbose file output */ + int verbose = false; /* verbose file output */ #endif /* NDEBUG */ hid_t dcpl = -1; /* dataset creation pl */ hsize_t cdims[2] = {1, 1}; /* chunk dimensions */ @@ -4067,7 +4067,7 @@ check_external_link_creation_tags(void) hid_t fid2 = -1; /* File Identifier */ hid_t gid = -1; /* Dataspace Identifier */ #ifndef NDEBUG - int verbose = FALSE; /* verbose file output */ + int verbose = false; /* verbose file output */ #endif /* NDEBUG */ hid_t fapl = -1; /* File access prop list */ haddr_t root_tag = 0; @@ -4191,7 +4191,7 @@ check_external_link_open_tags(void) hid_t gid = -1; /* Dataspace Identifier */ hid_t xid = -1; /* Dataspace Identifier */ #ifndef NDEBUG - int verbose = FALSE; /* verbose file output */ + int verbose = false; /* verbose file output */ #endif /* NDEBUG */ H5O_native_info_t ninfo; /* Native object info struct */ hid_t fapl = -1; /* File access prop list */ @@ -4361,7 +4361,7 @@ check_invalid_tag_application(void) haddr_t addr; H5HL_t *lheap = NULL; hid_t fapl = -1; /* File access prop list */ - hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ + bool api_ctx_pushed = false; /* Whether API context pushed */ #endif /* H5C_DO_TAGGING_SANITY_CHECKS */ /* Testing Macro */ @@ -4382,7 +4382,7 @@ check_invalid_tag_application(void) /* Push API context */ if (H5CX_push() < 0) TEST_ERROR; - api_ctx_pushed = TRUE; + api_ctx_pushed = true; /* Get internal file pointer*/ if (NULL == (f = (H5F_t *)H5VL_object(fid))) @@ -4420,9 +4420,9 @@ check_invalid_tag_application(void) TEST_ERROR; /* Pop API context */ - if (api_ctx_pushed && H5CX_pop(FALSE) < 0) + if (api_ctx_pushed && H5CX_pop(false) < 0) TEST_ERROR; - api_ctx_pushed = FALSE; + api_ctx_pushed = false; /* Close open objects and file */ if (H5Fclose(fid) < 0) @@ -4440,7 +4440,7 @@ check_invalid_tag_application(void) #ifdef H5C_DO_TAGGING_SANITY_CHECKS error: if (api_ctx_pushed) - H5CX_pop(FALSE); + H5CX_pop(false); return 1; #endif /* H5C_DO_TAGGING_SANITY_CHECKS */ @@ -4486,7 +4486,7 @@ main(void) fcpl_shmesg_all = H5Pcreate(H5P_FILE_CREATE); H5Pset_shared_mesg_nindexes(fcpl_shmesg_all, 1); H5Pset_shared_mesg_index(fcpl_shmesg_all, 0, H5O_SHMESG_ALL_FLAG, 20); - H5Pset_file_space_strategy(fcpl_shmesg_all, H5F_FSPACE_STRATEGY_FSM_AGGR, TRUE, (hsize_t)0); + H5Pset_file_space_strategy(fcpl_shmesg_all, H5F_FSPACE_STRATEGY_FSM_AGGR, true, (hsize_t)0); /* ========= */ /* Run Tests */ diff --git a/test/cmpd_dset.c b/test/cmpd_dset.c index 5e7a6e1..997393f 100644 --- a/test/cmpd_dset.c +++ b/test/cmpd_dset.c @@ -202,7 +202,7 @@ test_compound(char *filename, hid_t fapl) goto error; if ((ret_code = H5Pget_preserve(PRESERVE)) != 0) { printf("Preserve status of dataset transfer property list should be" - " 0 (FALSE), got %d\n", + " 0 (false), got %d\n", ret_code); goto error; } @@ -210,7 +210,7 @@ test_compound(char *filename, hid_t fapl) goto error; if ((ret_code = H5Pget_preserve(PRESERVE)) != 1) { printf("Preserve status of dataset transfer property list should be" - " 1 (TRUE), got %d\n", + " 1 (true), got %d\n", ret_code); goto error; } @@ -1159,7 +1159,7 @@ error: *------------------------------------------------------------------------- */ static int -compare_data(void *src_data, void *dst_data, hbool_t src_subset) +compare_data(void *src_data, void *dst_data, bool src_subset) { stype1 *s_ptr; stype2 *d_ptr; @@ -1324,7 +1324,7 @@ test_hdf5_src_subset(char *filename, hid_t fapl) if ((dxpl = H5Pcreate(H5P_DATASET_XFER)) < 0) FAIL_STACK_ERROR; - if (H5Pset_preserve(dxpl, TRUE) < 0) + if (H5Pset_preserve(dxpl, true) < 0) FAIL_STACK_ERROR; /* Rewrite contiguous data set */ @@ -1364,7 +1364,7 @@ test_hdf5_src_subset(char *filename, hid_t fapl) if (H5Dread(dataset, dst_tid, H5S_ALL, H5S_ALL, dxpl, rbuf) < 0) FAIL_STACK_ERROR; - if (compare_data(orig, rbuf, TRUE) < 0) + if (compare_data(orig, rbuf, true) < 0) TEST_ERROR; if (H5Dclose(dataset) < 0) @@ -1377,7 +1377,7 @@ test_hdf5_src_subset(char *filename, hid_t fapl) if (H5Dread(dataset, dst_tid, H5S_ALL, H5S_ALL, dxpl, rbuf) < 0) FAIL_STACK_ERROR; - if (compare_data(orig, rbuf, TRUE) < 0) + if (compare_data(orig, rbuf, true) < 0) TEST_ERROR; if (H5Dclose(dataset) < 0) @@ -1527,7 +1527,7 @@ test_hdf5_dst_subset(char *filename, hid_t fapl) if ((dxpl = H5Pcreate(H5P_DATASET_XFER)) < 0) goto error; - if (H5Pset_preserve(dxpl, TRUE) < 0) + if (H5Pset_preserve(dxpl, true) < 0) goto error; /* Rewrite contiguous data set */ @@ -1567,7 +1567,7 @@ test_hdf5_dst_subset(char *filename, hid_t fapl) if (H5Dread(dataset, dst_tid, H5S_ALL, H5S_ALL, dxpl, rbuf) < 0) goto error; - if (compare_data(orig, rbuf, FALSE) < 0) + if (compare_data(orig, rbuf, false) < 0) goto error; if (H5Dclose(dataset) < 0) @@ -1580,7 +1580,7 @@ test_hdf5_dst_subset(char *filename, hid_t fapl) if (H5Dread(dataset, dst_tid, H5S_ALL, H5S_ALL, dxpl, rbuf) < 0) goto error; - if (compare_data(orig, rbuf, FALSE) < 0) + if (compare_data(orig, rbuf, false) < 0) goto error; if (H5Dclose(dataset) < 0) diff --git a/test/cork.c b/test/cork.c index d67d18b..cec18f3 100644 --- a/test/cork.c +++ b/test/cork.c @@ -65,14 +65,14 @@ /* ===================== */ /* Tests */ -static unsigned test_objs_cork(hbool_t swmr, hbool_t new_format); -static unsigned test_dset_cork(hbool_t swmr, hbool_t new_format); +static unsigned test_objs_cork(bool swmr, bool new_format); +static unsigned test_dset_cork(bool swmr, bool new_format); static unsigned verify_old_dset_cork(void); -static unsigned verify_obj_dset_cork(hbool_t swmr); -static unsigned verify_dset_cork(hbool_t swmr, hbool_t new_format); -static unsigned verify_group_cork(hbool_t swmr); -static unsigned verify_named_cork(hbool_t swmr); -static unsigned verify_multiple_cork(hbool_t swmr); +static unsigned verify_obj_dset_cork(bool swmr); +static unsigned verify_dset_cork(bool swmr, bool new_format); +static unsigned verify_group_cork(bool swmr); +static unsigned verify_named_cork(bool swmr); +static unsigned verify_multiple_cork(bool swmr); /*------------------------------------------------------------------------- * Function: verify_old_dset_cork @@ -133,7 +133,7 @@ verify_old_dset_cork(void) TEST_ERROR; /* Verify cork status */ - if (H5C__verify_cork_tag_test(fid, oinfo.token, TRUE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo.token, true) < 0) TEST_ERROR; /* Set up data array */ @@ -154,7 +154,7 @@ verify_old_dset_cork(void) TEST_ERROR; /* Verify the cork status for DSET_BT1 */ - if (H5C__verify_cork_tag_test(fid, oinfo.token, TRUE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo.token, true) < 0) TEST_ERROR; /* Create compact dataset: DSET_COMPACT */ @@ -178,7 +178,7 @@ verify_old_dset_cork(void) TEST_ERROR; /* Verify cork status */ - if (H5C__verify_cork_tag_test(fid, oinfo2.token, TRUE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo2.token, true) < 0) TEST_ERROR; /* Closing */ @@ -226,11 +226,11 @@ verify_old_dset_cork(void) TEST_ERROR; /* Verify the cork status for DSET_CONTIG */ - if (H5C__verify_cork_tag_test(fid, oinfo3.token, TRUE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo3.token, true) < 0) TEST_ERROR; /* Verify the cork status for DSET_BT1 */ - if (H5C__verify_cork_tag_test(fid, oinfo.token, FALSE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo.token, false) < 0) TEST_ERROR; /* Un-cork the dataset: DSET_CONTIG */ @@ -238,7 +238,7 @@ verify_old_dset_cork(void) TEST_ERROR; /* Verify the cork status for DSET_CONTIG */ - if (H5C__verify_cork_tag_test(fid, oinfo3.token, FALSE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo3.token, false) < 0) TEST_ERROR; /* Closing */ @@ -291,7 +291,7 @@ error: *------------------------------------------------------------------------- */ static unsigned -verify_obj_dset_cork(hbool_t swmr) +verify_obj_dset_cork(bool swmr) { /* Variable Declarations */ hid_t fid = H5I_INVALID_HID; /* File ID */ @@ -342,7 +342,7 @@ verify_obj_dset_cork(hbool_t swmr) TEST_ERROR; /* Verify cork status of the dataset: DSET */ - if (H5C__verify_cork_tag_test(fid, oinfo.token, FALSE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo.token, false) < 0) TEST_ERROR; /* Cork the dataset: DSET */ @@ -354,7 +354,7 @@ verify_obj_dset_cork(hbool_t swmr) TEST_ERROR; /* Verify cork status of the dataset: DSET */ - if (H5C__verify_cork_tag_test(fid, oinfo.token, TRUE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo.token, true) < 0) TEST_ERROR; /* Close the attribute */ @@ -362,7 +362,7 @@ verify_obj_dset_cork(hbool_t swmr) TEST_ERROR; /* Verify cork status of the dataset: DSET */ - if (H5C__verify_cork_tag_test(fid, oinfo.token, TRUE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo.token, true) < 0) TEST_ERROR; /* Create dcpl */ @@ -400,7 +400,7 @@ verify_obj_dset_cork(hbool_t swmr) } /* end for */ /* Verify cork status of the dataset: DSET_NONE */ - if (H5C__verify_cork_tag_test(fid, oinfo2.token, TRUE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo2.token, true) < 0) TEST_ERROR; /* Closing */ @@ -429,7 +429,7 @@ verify_obj_dset_cork(hbool_t swmr) TEST_ERROR; /* Verify cork status of the dataset: DSET */ - if (H5C__verify_cork_tag_test(fid, oinfo2.token, FALSE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo2.token, false) < 0) TEST_ERROR; /* Open the attribute attached to the dataset object: DSET_NONE */ @@ -442,7 +442,7 @@ verify_obj_dset_cork(hbool_t swmr) TEST_ERROR; /* Verify cork status of the dataset: DSET_NONE */ - if (H5C__verify_cork_tag_test(fid, oinfo2.token, TRUE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo2.token, true) < 0) TEST_ERROR; /* Close the attribute */ @@ -450,7 +450,7 @@ verify_obj_dset_cork(hbool_t swmr) TEST_ERROR; /* Verify cork status of the dataset: DSET */ - if (H5C__verify_cork_tag_test(fid, oinfo.token, TRUE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo.token, true) < 0) TEST_ERROR; /* Closing */ @@ -494,7 +494,7 @@ error: *------------------------------------------------------------------------- */ static unsigned -verify_dset_cork(hbool_t swmr, hbool_t new_format) +verify_dset_cork(bool swmr, bool new_format) { /* Variable Declarations */ hid_t fid = H5I_INVALID_HID; /* File ID */ @@ -568,7 +568,7 @@ verify_dset_cork(hbool_t swmr, hbool_t new_format) TEST_ERROR; /* Verify cork status */ - if (H5C__verify_cork_tag_test(fid, oinfo.token, TRUE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo.token, true) < 0) TEST_ERROR; /* Create chunked dataset with fixed array indexing: DSET_FA */ @@ -590,11 +590,11 @@ verify_dset_cork(hbool_t swmr, hbool_t new_format) TEST_ERROR; /* Verify the cork status for DSET_FA */ - if (H5C__verify_cork_tag_test(fid, oinfo2.token, TRUE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo2.token, true) < 0) TEST_ERROR; /* Verify the cork status for DSET_EA */ - if (H5C__verify_cork_tag_test(fid, oinfo.token, FALSE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo.token, false) < 0) TEST_ERROR; /* Create chunked dataset with v2-Btree indexing */ @@ -613,7 +613,7 @@ verify_dset_cork(hbool_t swmr, hbool_t new_format) TEST_ERROR; /* Verify the cork status for DSET_BT2 */ - if (H5C__verify_cork_tag_test(fid, oinfo3.token, TRUE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo3.token, true) < 0) TEST_ERROR; /* Closing */ @@ -664,7 +664,7 @@ verify_dset_cork(hbool_t swmr, hbool_t new_format) TEST_ERROR; /* Verify the cork status for DSET_EA */ - if (H5C__verify_cork_tag_test(fid, oinfo.token, FALSE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo.token, false) < 0) TEST_ERROR; /* Open and write to the dataset: DSET_FA */ @@ -678,7 +678,7 @@ verify_dset_cork(hbool_t swmr, hbool_t new_format) TEST_ERROR; /* Verify the cork status for DSET_FA */ - if (H5C__verify_cork_tag_test(fid, oinfo2.token, TRUE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo2.token, true) < 0) TEST_ERROR; /* Open and write to the dataset: DSET_BT2 */ @@ -688,7 +688,7 @@ verify_dset_cork(hbool_t swmr, hbool_t new_format) TEST_ERROR; /* Verify the cork status for DSET_BT2 */ - if (H5C__verify_cork_tag_test(fid, oinfo3.token, FALSE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo3.token, false) < 0) TEST_ERROR; /* Cork the dataset: DSET_BT2 */ @@ -696,7 +696,7 @@ verify_dset_cork(hbool_t swmr, hbool_t new_format) TEST_ERROR; /* Verify the cork status for DSET_BT2 */ - if (H5C__verify_cork_tag_test(fid, oinfo3.token, TRUE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo3.token, true) < 0) TEST_ERROR; /* Closing */ @@ -750,7 +750,7 @@ error: *------------------------------------------------------------------------- */ static unsigned -verify_group_cork(hbool_t swmr) +verify_group_cork(bool swmr) { /* Variable Declarations */ hid_t fid = H5I_INVALID_HID; /* File ID */ @@ -806,11 +806,11 @@ verify_group_cork(hbool_t swmr) TEST_ERROR; /* Verify cork status of the groups */ - if (H5C__verify_cork_tag_test(fid, oinfo.token, FALSE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo.token, false) < 0) TEST_ERROR; - if (H5C__verify_cork_tag_test(fid, oinfo2.token, TRUE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo2.token, true) < 0) TEST_ERROR; - if (H5C__verify_cork_tag_test(fid, oinfo3.token, FALSE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo3.token, false) < 0) TEST_ERROR; /* Close the second group: GRP2 */ @@ -822,7 +822,7 @@ verify_group_cork(hbool_t swmr) FAIL_STACK_ERROR; /* Verify cork status of the second group: GRP2 */ - if (H5C__verify_cork_tag_test(fid, oinfo2.token, FALSE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo2.token, false) < 0) TEST_ERROR; /* Closing */ @@ -863,7 +863,7 @@ verify_group_cork(hbool_t swmr) if (i == 3) { if (H5Odisable_mdc_flushes(gid3) < 0) TEST_ERROR; - if (H5C__verify_cork_tag_test(fid, oinfo3.token, TRUE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo3.token, true) < 0) TEST_ERROR; } if (H5Aclose(aid) < 0) @@ -871,7 +871,7 @@ verify_group_cork(hbool_t swmr) } /* end for */ /* Verify cork status of the third group: GRP3 */ - if (H5C__verify_cork_tag_test(fid, oinfo3.token, TRUE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo3.token, true) < 0) TEST_ERROR; /* Closing */ @@ -917,7 +917,7 @@ error: *------------------------------------------------------------------------- */ static unsigned -verify_named_cork(hbool_t swmr) +verify_named_cork(bool swmr) { /* Variable Declarations */ hid_t fid = H5I_INVALID_HID; /* File ID */ @@ -995,11 +995,11 @@ verify_named_cork(hbool_t swmr) TEST_ERROR; /* Verify cork status of the named datatypes */ - if (H5C__verify_cork_tag_test(fid, oinfo.token, TRUE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo.token, true) < 0) TEST_ERROR; - if (H5C__verify_cork_tag_test(fid, oinfo2.token, FALSE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo2.token, false) < 0) TEST_ERROR; - if (H5C__verify_cork_tag_test(fid, oinfo3.token, TRUE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo3.token, true) < 0) TEST_ERROR; /* Close the datatypes */ @@ -1019,11 +1019,11 @@ verify_named_cork(hbool_t swmr) FAIL_STACK_ERROR; /* Verify cork status of the named datatypes */ - if (H5C__verify_cork_tag_test(fid, oinfo.token, FALSE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo.token, false) < 0) TEST_ERROR; - if (H5C__verify_cork_tag_test(fid, oinfo2.token, FALSE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo2.token, false) < 0) TEST_ERROR; - if (H5C__verify_cork_tag_test(fid, oinfo3.token, FALSE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo3.token, false) < 0) TEST_ERROR; /* Closing */ @@ -1078,7 +1078,7 @@ verify_named_cork(hbool_t swmr) if (i == 3) { if (H5Odisable_mdc_flushes(tid3) < 0) TEST_ERROR; - if (H5C__verify_cork_tag_test(fid, oinfo3.token, TRUE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo3.token, true) < 0) TEST_ERROR; } if (H5Aclose(aid) < 0) @@ -1098,20 +1098,20 @@ verify_named_cork(hbool_t swmr) TEST_ERROR; /* Verify cork status of the datatype: DT */ - if (H5C__verify_cork_tag_test(fid, oinfo.token, FALSE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo.token, false) < 0) TEST_ERROR; /* Verify cork status of the datatype: DT2 */ - if (H5C__verify_cork_tag_test(fid, oinfo2.token, TRUE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo2.token, true) < 0) TEST_ERROR; /* Verify cork status of the datatype: DT3 */ - if (H5C__verify_cork_tag_test(fid, oinfo3.token, TRUE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo3.token, true) < 0) TEST_ERROR; /* Un-cork the datatype: DT3 */ if (H5Oenable_mdc_flushes(tid3) < 0) TEST_ERROR; /* Verify cork status of the datatype: DT3 */ - if (H5C__verify_cork_tag_test(fid, oinfo3.token, FALSE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo3.token, false) < 0) TEST_ERROR; /* Cork the datatype: DT */ @@ -1119,14 +1119,14 @@ verify_named_cork(hbool_t swmr) TEST_ERROR; /* Verify cork status of the datatype: DT */ - if (H5C__verify_cork_tag_test(fid, oinfo.token, TRUE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo.token, true) < 0) TEST_ERROR; /* Verify cork status of the datatype: DT2 */ - if (H5C__verify_cork_tag_test(fid, oinfo2.token, TRUE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo2.token, true) < 0) TEST_ERROR; /* Verify cork status of the dataset: DSET */ - if (H5C__verify_cork_tag_test(fid, oinfo4.token, TRUE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo4.token, true) < 0) TEST_ERROR; /* Close the dataset */ @@ -1134,11 +1134,11 @@ verify_named_cork(hbool_t swmr) TEST_ERROR; /* Verify cork status of the datatype: DT */ - if (H5C__verify_cork_tag_test(fid, oinfo.token, TRUE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo.token, true) < 0) TEST_ERROR; /* Verify cork status of the dataset: DSET */ - if (H5C__verify_cork_tag_test(fid, oinfo4.token, FALSE) < 0) + if (H5C__verify_cork_tag_test(fid, oinfo4.token, false) < 0) TEST_ERROR; /* Closing */ @@ -1192,7 +1192,7 @@ error: *------------------------------------------------------------------------- */ static unsigned -verify_multiple_cork(hbool_t swmr) +verify_multiple_cork(bool swmr) { /* Variable Declarations */ hid_t fid1 = H5I_INVALID_HID, fid2 = H5I_INVALID_HID; /* File ID */ @@ -1207,7 +1207,7 @@ verify_multiple_cork(hbool_t swmr) H5O_info2_t oinfo1, oinfo2, oinfo3; /* Object metadata information */ hsize_t dim[1] = {5}; /* Dimension sizes */ unsigned flags; /* File access flags */ - hbool_t corked; /* Cork status */ + bool corked; /* Cork status */ herr_t ret; /* Return value */ /* Testing Macro */ @@ -1306,7 +1306,7 @@ verify_multiple_cork(hbool_t swmr) /* Verify cork status of the group: gid2 */ if (H5Oget_info3(gid2, &oinfo1, H5O_INFO_BASIC) < 0) TEST_ERROR; - if (H5C__verify_cork_tag_test(fid2, oinfo1.token, TRUE) < 0) + if (H5C__verify_cork_tag_test(fid2, oinfo1.token, true) < 0) TEST_ERROR; /* Check cork status of the group: gid1 */ @@ -1334,7 +1334,7 @@ verify_multiple_cork(hbool_t swmr) /* Verify cork status of the dataset: did1 */ if (H5Oget_info3(did1, &oinfo2, H5O_INFO_BASIC) < 0) TEST_ERROR; - if (H5C__verify_cork_tag_test(fid1, oinfo2.token, TRUE) < 0) + if (H5C__verify_cork_tag_test(fid1, oinfo2.token, true) < 0) TEST_ERROR; /* Check cork status of the dataset: did2 */ @@ -1362,7 +1362,7 @@ verify_multiple_cork(hbool_t swmr) /* Verify cork status of the datatype: tid2 */ if (H5Oget_info3(tid2, &oinfo3, H5O_INFO_BASIC) < 0) TEST_ERROR; - if (H5C__verify_cork_tag_test(fid2, oinfo3.token, TRUE) < 0) + if (H5C__verify_cork_tag_test(fid2, oinfo3.token, true) < 0) TEST_ERROR; /* Check cork status of the datatype: tid1 */ @@ -1378,7 +1378,7 @@ verify_multiple_cork(hbool_t swmr) /* Verify cork status of the group: gid1 */ if (H5Oget_info3(gid1, &oinfo1, H5O_INFO_BASIC) < 0) TEST_ERROR; - if (H5C__verify_cork_tag_test(fid1, oinfo1.token, FALSE) < 0) + if (H5C__verify_cork_tag_test(fid1, oinfo1.token, false) < 0) TEST_ERROR; /* Check cork status of the group: gid2 */ @@ -1398,7 +1398,7 @@ verify_multiple_cork(hbool_t swmr) TEST_ERROR; /* Verify cork status of the group: gid1 */ - if (H5C__verify_cork_tag_test(fid1, oinfo1.token, FALSE) < 0) + if (H5C__verify_cork_tag_test(fid1, oinfo1.token, false) < 0) TEST_ERROR; /* Close the group: gid1 */ @@ -1412,7 +1412,7 @@ verify_multiple_cork(hbool_t swmr) /* Verify cork status of the dataset: did2 */ if (H5Oget_info3(did2, &oinfo2, H5O_INFO_BASIC) < 0) TEST_ERROR; - if (H5C__verify_cork_tag_test(fid2, oinfo2.token, FALSE) < 0) + if (H5C__verify_cork_tag_test(fid2, oinfo2.token, false) < 0) TEST_ERROR; /* Check cork status of the dataset: did1 */ @@ -1432,7 +1432,7 @@ verify_multiple_cork(hbool_t swmr) TEST_ERROR; /* Verify cork status of the dataset: did1 */ - if (H5C__verify_cork_tag_test(fid1, oinfo2.token, FALSE) < 0) + if (H5C__verify_cork_tag_test(fid1, oinfo2.token, false) < 0) TEST_ERROR; /* Close the dataset: did1 */ @@ -1565,7 +1565,7 @@ error: *------------------------------------------------------------------------- */ static unsigned -test_objs_cork(hbool_t swmr, hbool_t new_format) +test_objs_cork(bool swmr, bool new_format) { hid_t fid = H5I_INVALID_HID; /* HDF5 File ID */ hid_t fapl = H5I_INVALID_HID; /* File access property list */ @@ -1575,7 +1575,7 @@ test_objs_cork(hbool_t swmr, hbool_t new_format) hid_t sid = H5I_INVALID_HID; /* Dataspace ID */ hid_t aid = H5I_INVALID_HID; /* Attribute ID */ hsize_t dims[RANK]; /* Dataset dimension sizes */ - hbool_t corked; /* Cork status of an object */ + bool corked; /* Cork status of an object */ unsigned flags; /* File access flags */ herr_t ret; /* Return value */ @@ -1865,7 +1865,7 @@ error: *------------------------------------------------------------------------- */ static unsigned -test_dset_cork(hbool_t swmr, hbool_t new_format) +test_dset_cork(bool swmr, bool new_format) { hid_t fid = H5I_INVALID_HID; /* File ID */ hid_t fapl; /* File access property list */ @@ -1882,7 +1882,7 @@ test_dset_cork(hbool_t swmr, hbool_t new_format) int **wbuf = NULL; /* Data buffer for writes (pointers to fake 2D array) */ int *wbuf_data = NULL; /* Data buffer for writes (real data) */ int *rbuf_data = NULL; /* Data buffer for reads (real data) */ - hbool_t corked; /* Cork status of an object */ + bool corked; /* Cork status of an object */ unsigned flags; /* File access flags */ /* Testing Macro */ @@ -2243,16 +2243,16 @@ main(void) /* Tests with new/old library format */ /* This is the test moved from th5o.c: test_h5o_cork() */ - nerrs += test_objs_cork(swmr, TRUE); - nerrs += test_objs_cork(swmr, FALSE); + nerrs += test_objs_cork(swmr, true); + nerrs += test_objs_cork(swmr, false); /* This is the test moved from th5o.c: test_h5o_cork_dataset() */ - nerrs += test_dset_cork(swmr, TRUE); - nerrs += test_dset_cork(swmr, FALSE); + nerrs += test_dset_cork(swmr, true); + nerrs += test_dset_cork(swmr, false); /* Tests with/without SWMR access */ nerrs += verify_obj_dset_cork(swmr); - nerrs += verify_dset_cork(swmr, TRUE); - nerrs += verify_dset_cork(swmr, FALSE); + nerrs += verify_dset_cork(swmr, true); + nerrs += verify_dset_cork(swmr, false); nerrs += verify_group_cork(swmr); nerrs += verify_named_cork(swmr); nerrs += verify_multiple_cork(swmr); diff --git a/test/cross_read.c b/test/cross_read.c index 8369a76..8bcf25d 100644 --- a/test/cross_read.c +++ b/test/cross_read.c @@ -338,9 +338,9 @@ error: int main(void) { - hbool_t driver_is_default_compatible; - char filename[1024]; - int nerrors = 0; + bool driver_is_default_compatible; + char filename[1024]; + int nerrors = 0; h5_reset(); diff --git a/test/direct_chunk.c b/test/direct_chunk.c index 078349c..b526d6e 100644 --- a/test/direct_chunk.c +++ b/test/direct_chunk.c @@ -1590,7 +1590,7 @@ error: #ifdef H5_HAVE_FILTER_DEFLATE static int -test_direct_chunk_read_cache(hid_t file, hbool_t flush) +test_direct_chunk_read_cache(hid_t file, bool flush) { hid_t dataspace = -1, dataset = -1; hid_t mem_space = -1; @@ -2249,15 +2249,15 @@ main(void) /* Test direct chunk read */ #ifdef H5_HAVE_FILTER_DEFLATE nerrors += test_direct_chunk_read_no_cache(file_id); - nerrors += test_direct_chunk_read_cache(file_id, TRUE); - nerrors += test_direct_chunk_read_cache(file_id, FALSE); + nerrors += test_direct_chunk_read_cache(file_id, true); + nerrors += test_direct_chunk_read_cache(file_id, false); #endif /* H5_HAVE_FILTER_DEFLATE */ nerrors += test_read_unfiltered_dset(file_id); nerrors += test_read_unallocated_chunk(file_id); /* Loop over test configurations */ for (config = 0; config < CONFIG_END; config++) { - hbool_t need_comma = FALSE; + bool need_comma = false; /* Check for invalid combinations */ if ((config & CONFIG_REOPEN_FILE) && !(config & CONFIG_REOPEN_DSET)) @@ -2271,31 +2271,31 @@ main(void) if (need_comma) printf(", "); printf("latest format"); - need_comma = TRUE; + need_comma = true; } /* end if */ if (config & CONFIG_REOPEN_FILE) { if (need_comma) printf(", "); printf("reopen file"); - need_comma = TRUE; + need_comma = true; } /* end if */ else if (config & CONFIG_REOPEN_DSET) { if (need_comma) printf(", "); printf("reopen dataset"); - need_comma = TRUE; + need_comma = true; } /* end if */ if (config & CONFIG_DIRECT_WRITE) { if (need_comma) printf(", "); printf("direct write"); - need_comma = TRUE; + need_comma = true; } /* end if */ if (config & CONFIG_DIRECT_READ) { if (need_comma) printf(", "); printf("direct read"); - need_comma = TRUE; + need_comma = true; } /* end if */ printf(":\n"); fflush(stdout); diff --git a/test/dsets.c b/test/dsets.c index 6d8c9dc..3c30717 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -691,7 +691,7 @@ error: *------------------------------------------------------------------------- */ static herr_t -test_userblock_offset(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) +test_userblock_offset(const char *env_h5_drvr, hid_t fapl, bool new_format) { char filename[FILENAME_BUF_SIZE]; hid_t file = -1, fcpl = -1, dataset = -1, space = -1; @@ -1935,7 +1935,7 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32, TESTING(" filters (setup)"); /* Check if all the filters are available */ - if (H5Pall_filters_avail(dcpl) != TRUE) { + if (H5Pall_filters_avail(dcpl) != true) { H5_FAILED(); printf(" Line %d: Incorrect filter availability\n", __LINE__); goto error; @@ -2845,14 +2845,14 @@ test_missing_filter(hid_t file) size_t i, j; /* Local index variables */ herr_t ret; /* Generic return value */ const char *testfile = H5_get_srcdir_filename(FILE_DEFLATE_NAME); /* Corrected test file name */ - hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ + bool api_ctx_pushed = false; /* Whether API context pushed */ TESTING("dataset access with missing filter"); /* Unregister the deflate filter */ #ifdef H5_HAVE_FILTER_DEFLATE /* Verify deflate filter is registered currently */ - if (H5Zfilter_avail(H5Z_FILTER_DEFLATE) != TRUE) { + if (H5Zfilter_avail(H5Z_FILTER_DEFLATE) != true) { H5_FAILED(); printf(" Line %d: Deflate filter not available\n", __LINE__); goto error; @@ -2861,7 +2861,7 @@ test_missing_filter(hid_t file) /* Push API context */ if (H5CX_push() < 0) FAIL_STACK_ERROR; - api_ctx_pushed = TRUE; + api_ctx_pushed = true; /* Unregister deflate filter */ /* (Use private routine, to avoid range checking on filter ID) */ @@ -2872,7 +2872,7 @@ test_missing_filter(hid_t file) } /* end if */ #endif /* H5_HAVE_FILTER_DEFLATE */ /* Verify deflate filter is not registered currently */ - if (H5Zfilter_avail(H5Z_FILTER_DEFLATE) != FALSE) { + if (H5Zfilter_avail(H5Z_FILTER_DEFLATE) != false) { H5_FAILED(); printf(" Line %d: Deflate filter available\n", __LINE__); goto error; @@ -2902,7 +2902,7 @@ test_missing_filter(hid_t file) printf(" Line %d: Can't check filter availability\n", __LINE__); goto error; } /* end if */ - if (ret != FALSE) { + if (ret != false) { H5_FAILED(); printf(" Line %d: Filter shouldn't be available\n", __LINE__); goto error; @@ -3040,7 +3040,7 @@ test_missing_filter(hid_t file) /* Re-register the deflate filter */ /* Verify deflate filter is not registered currently */ - if (H5Zfilter_avail(H5Z_FILTER_DEFLATE) != FALSE) { + if (H5Zfilter_avail(H5Z_FILTER_DEFLATE) != false) { H5_FAILED(); printf(" Line %d: Deflate filter available\n", __LINE__); goto error; @@ -3054,7 +3054,7 @@ test_missing_filter(hid_t file) } /* end if */ /* Verify deflate filter is registered currently */ - if (H5Zfilter_avail(H5Z_FILTER_DEFLATE) != TRUE) { + if (H5Zfilter_avail(H5Z_FILTER_DEFLATE) != true) { H5_FAILED(); printf(" Line %d: Deflate filter not available\n", __LINE__); goto error; @@ -3062,16 +3062,16 @@ test_missing_filter(hid_t file) #endif /* H5_HAVE_FILTER_DEFLATE */ /* Pop API context */ - if (api_ctx_pushed && H5CX_pop(FALSE) < 0) + if (api_ctx_pushed && H5CX_pop(false) < 0) FAIL_STACK_ERROR; - api_ctx_pushed = FALSE; + api_ctx_pushed = false; PASSED(); return SUCCEED; error: if (api_ctx_pushed) - H5CX_pop(FALSE); + H5CX_pop(false); return FAIL; } /* end test_missing_filter() */ @@ -7737,9 +7737,9 @@ error: static H5_ATTR_CONST long gcd(long l0, long r0) { - long magnitude, remainder; - hbool_t negative = ((l0 < 0) != (r0 < 0)); - long l = HDlabs(l0), r = HDlabs(r0); + long magnitude, remainder; + bool negative = ((l0 < 0) != (r0 < 0)); + long l = HDlabs(l0), r = HDlabs(r0); do { if (l < r) { @@ -7805,7 +7805,7 @@ make_random_offset_and_increment(long nelts, long *offsetp, long *incp) *------------------------------------------------------------------------- */ static herr_t -test_random_chunks_real(const char *testname, hbool_t early_alloc, hid_t fapl) +test_random_chunks_real(const char *testname, bool early_alloc, hid_t fapl) { char filename[FILENAME_BUF_SIZE]; hid_t s = -1, m = -1, d = -1, dcpl = -1, file = -1; @@ -8287,8 +8287,8 @@ test_random_chunks(hid_t fapl) int nerrors = 0; /* Errors in sub-tests */ nerrors += - test_random_chunks_real("Write/read on randomly selected chunks w/non-implicit index", FALSE, fapl); - nerrors += test_random_chunks_real("Write/read on randomly selected chunks w/implicit index", TRUE, fapl); + test_random_chunks_real("Write/read on randomly selected chunks w/non-implicit index", false, fapl); + nerrors += test_random_chunks_real("Write/read on randomly selected chunks w/implicit index", true, fapl); return nerrors; } /* end test_random_chunks() */ @@ -10099,7 +10099,7 @@ test_chunk_expand(hid_t fapl) FAIL_STACK_ERROR; /* Check that the filter was registered */ - if (TRUE != H5Zfilter_avail(H5Z_FILTER_EXPAND)) + if (true != H5Zfilter_avail(H5Z_FILTER_EXPAND)) FAIL_STACK_ERROR; /* Loop over storage allocation time */ @@ -10550,7 +10550,7 @@ test_chunk_expand(hid_t fapl) FAIL_STACK_ERROR; /* Check that the filter was unregistered */ - if (FALSE != H5Zfilter_avail(H5Z_FILTER_EXPAND)) + if (false != H5Zfilter_avail(H5Z_FILTER_EXPAND)) FAIL_STACK_ERROR; PASSED(); @@ -10719,7 +10719,7 @@ test_fixed_array(hid_t fapl) #ifdef H5_HAVE_FILTER_DEFLATE /* Loop over compressing chunks */ - for (compress = FALSE; compress <= TRUE; compress++) { + for (compress = false; compress <= true; compress++) { #endif /* H5_HAVE_FILTER_DEFLATE */ /* Loop over storage allocation time */ @@ -11205,7 +11205,7 @@ test_single_chunk(hid_t fapl) #ifdef H5_HAVE_FILTER_DEFLATE /* Loop over compressing chunks */ - for (compress = FALSE; compress <= TRUE; compress++) { + for (compress = false; compress <= true; compress++) { #endif /* H5_HAVE_FILTER_DEFLATE */ /* Loop over storage allocation time */ @@ -13402,9 +13402,9 @@ error: *------------------------------------------------------------------------- */ typedef struct gather_info_t { - int *expect_dst_buf; /* Expected destination data buffer */ - size_t max_nelmts; /* Maximum number of elements passed to callback */ - hbool_t last_call; /* Whether this should be the last time the callback is called */ + int *expect_dst_buf; /* Expected destination data buffer */ + size_t max_nelmts; /* Maximum number of elements passed to callback */ + bool last_call; /* Whether this should be the last time the callback is called */ } gather_info_t; static herr_t @@ -13433,7 +13433,7 @@ gather_cb(const void *dst_buf, size_t dst_buf_bytes_used, void *_gather_info) if (gather_info->last_call) TEST_ERROR; if (nelmts < gather_info->max_nelmts) - gather_info->last_call = TRUE; + gather_info->last_call = true; /* Compare data and expected data */ for (i = 0; i < (int)nelmts; i++) @@ -13501,7 +13501,7 @@ test_gather(void) /* Initialize gather_info */ gather_info.expect_dst_buf = expect_dst_buf; gather_info.max_nelmts = dst_buf_size; - gather_info.last_call = FALSE; + gather_info.last_call = false; /* Gather data */ if (H5Dgather(sid, src_buf, H5T_NATIVE_INT, dst_buf_size * sizeof(dst_buf[0]), dst_buf, gather_cb, @@ -13538,7 +13538,7 @@ test_gather(void) /* Initialize gather_info */ gather_info.expect_dst_buf = expect_dst_buf; gather_info.max_nelmts = dst_buf_size - 1; - gather_info.last_call = FALSE; + gather_info.last_call = false; /* Gather data */ if (H5Dgather(sid, src_buf, H5T_NATIVE_INT, dst_buf_size * sizeof(dst_buf[0]) - 1, dst_buf, gather_cb, @@ -13578,7 +13578,7 @@ test_gather(void) /* Initialize gather_info */ gather_info.expect_dst_buf = expect_dst_buf; gather_info.max_nelmts = dst_buf_size; - gather_info.last_call = FALSE; + gather_info.last_call = false; /* Gather data */ if (H5Dgather(sid, src_buf, H5T_NATIVE_INT, dst_buf_size * sizeof(dst_buf[0]), dst_buf, gather_cb, @@ -13634,7 +13634,7 @@ test_gather(void) /* Initialize gather_info */ gather_info.expect_dst_buf = expect_dst_buf; gather_info.max_nelmts = dst_buf_size; - gather_info.last_call = FALSE; + gather_info.last_call = false; /* Gather data */ if (H5Dgather(sid, src_buf, H5T_NATIVE_INT, dst_buf_size * sizeof(dst_buf[0]), dst_buf, gather_cb, @@ -13691,7 +13691,7 @@ test_gather(void) /* Initialize gather_info */ gather_info.expect_dst_buf = expect_dst_buf; gather_info.max_nelmts = dst_buf_size; - gather_info.last_call = FALSE; + gather_info.last_call = false; /* Gather data */ if (H5Dgather(sid, src_buf, H5T_NATIVE_INT, dst_buf_size * sizeof(dst_buf[0]), dst_buf, gather_cb, @@ -13725,7 +13725,7 @@ test_gather(void) /* Initialize gather_info */ gather_info.expect_dst_buf = expect_dst_buf; gather_info.max_nelmts = dst_buf_size; - gather_info.last_call = FALSE; + gather_info.last_call = false; /* Gather data */ if (H5Dgather(sid, src_buf, H5T_NATIVE_INT, dst_buf_size * sizeof(dst_buf[0]), dst_buf, gather_cb, @@ -14038,7 +14038,7 @@ test_gather_error(void) /* Verify that base configuration passes */ gather_info.expect_dst_buf = expect_dst_buf; gather_info.max_nelmts = 6; - gather_info.last_call = FALSE; + gather_info.last_call = false; if (H5Dgather(sid, src_buf, H5T_NATIVE_INT, 6 * sizeof(dst_buf[0]), dst_buf, gather_cb, &gather_info) < 0) TEST_ERROR; @@ -14046,7 +14046,7 @@ test_gather_error(void) * Test invalid parameters */ gather_info.expect_dst_buf = expect_dst_buf; - gather_info.last_call = FALSE; + gather_info.last_call = false; H5E_BEGIN_TRY { ret = H5Dgather(H5T_NATIVE_INT, src_buf, H5T_NATIVE_INT, 6 * sizeof(dst_buf[0]), dst_buf, gather_cb, @@ -14057,7 +14057,7 @@ test_gather_error(void) TEST_ERROR; gather_info.expect_dst_buf = expect_dst_buf; - gather_info.last_call = FALSE; + gather_info.last_call = false; H5E_BEGIN_TRY { ret = H5Dgather(sid, NULL, H5T_NATIVE_INT, 6 * sizeof(dst_buf[0]), dst_buf, gather_cb, &gather_info); @@ -14067,7 +14067,7 @@ test_gather_error(void) TEST_ERROR; gather_info.expect_dst_buf = expect_dst_buf; - gather_info.last_call = FALSE; + gather_info.last_call = false; H5E_BEGIN_TRY { ret = H5Dgather(sid, src_buf, sid, 6 * sizeof(dst_buf[0]), dst_buf, gather_cb, &gather_info); @@ -14077,7 +14077,7 @@ test_gather_error(void) TEST_ERROR; gather_info.expect_dst_buf = expect_dst_buf; - gather_info.last_call = FALSE; + gather_info.last_call = false; H5E_BEGIN_TRY { ret = H5Dgather(sid, src_buf, H5T_NATIVE_INT, 0, dst_buf, gather_cb, &gather_info); @@ -14087,7 +14087,7 @@ test_gather_error(void) TEST_ERROR; gather_info.expect_dst_buf = expect_dst_buf; - gather_info.last_call = FALSE; + gather_info.last_call = false; H5E_BEGIN_TRY { ret = H5Dgather(sid, src_buf, H5T_NATIVE_INT, 1, dst_buf, gather_cb, &gather_info); @@ -14097,7 +14097,7 @@ test_gather_error(void) TEST_ERROR; gather_info.expect_dst_buf = expect_dst_buf; - gather_info.last_call = FALSE; + gather_info.last_call = false; H5E_BEGIN_TRY { ret = H5Dgather(sid, src_buf, H5T_NATIVE_INT, 6 * sizeof(dst_buf[0]), NULL, gather_cb, &gather_info); @@ -14107,7 +14107,7 @@ test_gather_error(void) TEST_ERROR; gather_info.expect_dst_buf = expect_dst_buf; - gather_info.last_call = FALSE; + gather_info.last_call = false; H5E_BEGIN_TRY { ret = H5Dgather(sid, src_buf, H5T_NATIVE_INT, 5 * sizeof(dst_buf[0]), dst_buf, NULL, &gather_info); @@ -14120,7 +14120,7 @@ test_gather_error(void) * Test callback returns failure */ gather_info.expect_dst_buf = expect_dst_buf; - gather_info.last_call = FALSE; + gather_info.last_call = false; H5E_BEGIN_TRY { ret = H5Dgather(sid, src_buf, H5T_NATIVE_INT, 6 * sizeof(dst_buf[0]), dst_buf, gather_error_cb_fail, @@ -14461,7 +14461,7 @@ test_compact_open_close_dirty(hid_t fapl) int wbuf[10]; /* Data buffer */ char filename[FILENAME_BUF_SIZE]; /* Filename */ int i; /* Local index variable */ - hbool_t dirty; /* The dirty flag */ + bool dirty; /* The dirty flag */ TESTING("compact dataset repeated open/close and dirty flag"); @@ -14662,7 +14662,7 @@ test_versionbounds(void) if (vdset > 0) /* dataset created successfully */ { /* Virtual dataset is only available starting in V110 */ - VERIFY(high >= H5F_LIBVER_V110, TRUE, "virtual dataset"); + VERIFY(high >= H5F_LIBVER_V110, true, "virtual dataset"); if (H5Dclose(vdset) < 0) TEST_ERROR; @@ -14732,11 +14732,11 @@ error: static herr_t test_object_header_minimization_dcpl(void) { - hid_t dcpl_id = -1; - hid_t file_id = -1; - char filename[FILENAME_BUF_SIZE] = ""; - hbool_t minimize = FALSE; - herr_t ret; + hid_t dcpl_id = -1; + hid_t file_id = -1; + char filename[FILENAME_BUF_SIZE] = ""; + bool minimize = false; + herr_t ret; TESTING("dcpl flags to minimize dataset object header"); @@ -14762,23 +14762,23 @@ test_object_header_minimization_dcpl(void) /* Default value (not set explicitly) */ if (H5Pget_dset_no_attrs_hint(dcpl_id, &minimize) == FAIL) TEST_ERROR; - if (FALSE != minimize) + if (false != minimize) TEST_ERROR; - /* FALSE-set value */ - if (H5Pset_dset_no_attrs_hint(dcpl_id, FALSE) == FAIL) + /* false-set value */ + if (H5Pset_dset_no_attrs_hint(dcpl_id, false) == FAIL) TEST_ERROR; if (H5Pget_dset_no_attrs_hint(dcpl_id, &minimize) == FAIL) TEST_ERROR; - if (FALSE != minimize) + if (false != minimize) TEST_ERROR; - /* TRUE-set value */ - if (H5Pset_dset_no_attrs_hint(dcpl_id, TRUE) == FAIL) + /* true-set value */ + if (H5Pset_dset_no_attrs_hint(dcpl_id, true) == FAIL) TEST_ERROR; if (H5Pget_dset_no_attrs_hint(dcpl_id, &minimize) == FAIL) TEST_ERROR; - if (TRUE != minimize) + if (true != minimize) TEST_ERROR; /***************/ @@ -14797,7 +14797,7 @@ test_object_header_minimization_dcpl(void) /* Invalid DCPL ID should fail */ H5E_BEGIN_TRY { - ret = H5Pset_dset_no_attrs_hint(H5I_INVALID_HID, FALSE); + ret = H5Pset_dset_no_attrs_hint(H5I_INVALID_HID, false); } H5E_END_TRY if (ret == SUCCEED) @@ -14806,7 +14806,7 @@ test_object_header_minimization_dcpl(void) /* Invalid DCPL ID should fail */ H5E_BEGIN_TRY { - ret = H5Pset_dset_no_attrs_hint(H5I_INVALID_HID, TRUE); + ret = H5Pset_dset_no_attrs_hint(H5I_INVALID_HID, true); } H5E_END_TRY if (ret == SUCCEED) @@ -15243,7 +15243,7 @@ test_0sized_dset_metadata_alloc(hid_t fapl_id) /*************/ /* Iterate over file format versions */ - for (new_format = FALSE; new_format <= TRUE; new_format++) { + for (new_format = false; new_format <= true; new_format++) { H5D_layout_t layout; /* Dataset layout type */ H5D_alloc_time_t alloc_time; /* Storage allocation time */ @@ -15417,8 +15417,8 @@ main(void) double rdcc_w0; int nerrors = 0; const char *envval; - hbool_t contig_addr_vfd; /* Whether VFD used has a contiguous address space */ - hbool_t driver_is_default_compatible; + bool contig_addr_vfd; /* Whether VFD used has a contiguous address space */ + bool driver_is_default_compatible; int i; /* Don't run this test using certain file drivers */ @@ -15427,7 +15427,7 @@ main(void) envval = "nomatch"; /* Current VFD that does not support contiguous address space */ - contig_addr_vfd = (hbool_t)(HDstrcmp(envval, "split") != 0 && HDstrcmp(envval, "multi") != 0); + contig_addr_vfd = (bool)(HDstrcmp(envval, "split") != 0 && HDstrcmp(envval, "multi") != 0); /* Set the random # seed */ HDsrandom((unsigned)HDtime(NULL)); @@ -15494,23 +15494,23 @@ main(void) TEST_ERROR; /* Set file space strategy to paged aggregation and persisting free-space */ - if (H5Pset_file_space_strategy(fcpl2, H5F_FSPACE_STRATEGY_PAGE, TRUE, (hsize_t)1) < 0) + if (H5Pset_file_space_strategy(fcpl2, H5F_FSPACE_STRATEGY_PAGE, true, (hsize_t)1) < 0) TEST_ERROR; h5_fixname(FILENAME[0], fapl, filename, sizeof filename); /* Test with paged aggregation enabled or not */ - for (paged = FALSE; paged <= TRUE; paged++) { + for (paged = false; paged <= true; paged++) { /* Temporary: skip testing for multi/split drivers: fail file create when persisting free-space or using paged aggregation strategy */ if (!contig_addr_vfd && paged) continue; - for (minimized_ohdr = FALSE; minimized_ohdr <= TRUE; minimized_ohdr++) { + for (minimized_ohdr = false; minimized_ohdr <= true; minimized_ohdr++) { /* Test with old & new format groups */ - for (new_format = FALSE; new_format <= TRUE; new_format++) { + for (new_format = false; new_format <= true; new_format++) { hid_t my_fapl, my_fcpl; /* Set the FAPL for the type of format */ @@ -15541,8 +15541,8 @@ main(void) if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, my_fcpl, my_fapl)) < 0) goto error; - if (TRUE == minimized_ohdr) { - if (0 > H5Fset_dset_no_attrs_hint(file, TRUE)) + if (true == minimized_ohdr) { + if (0 > H5Fset_dset_no_attrs_hint(file, true)) goto error; HDputs("(minimized dataset object headers with file setting)"); } diff --git a/test/dt_arith.c b/test/dt_arith.c index ed80d5f..ce261ac 100644 --- a/test/dt_arith.c +++ b/test/dt_arith.c @@ -298,9 +298,9 @@ static int without_hardware_g = 0; *00000111,..., until 11111111.*/ \ memset(tmp1, 0, SRC_SIZE); \ memset(tmp2, 0, SRC_SIZE); \ - H5T__bit_set(tmp2, SRC_PREC - 1, (size_t)1, TRUE); /*the negative value*/ \ + H5T__bit_set(tmp2, SRC_PREC - 1, (size_t)1, true); /*the negative value*/ \ for (n = 0; n < SRC_MANT_DIG - 1; n++) { \ - H5T__bit_set(tmp1, n, (size_t)1, TRUE); /*turn on 1 bit each time*/ \ + H5T__bit_set(tmp1, n, (size_t)1, true); /*turn on 1 bit each time*/ \ CHANGE_ORDER(tmp1, SRC_ORDR, SRC_SIZE); /*change order for big endian*/ \ memcpy(buf_p, tmp1, SRC_SIZE); \ memcpy(saved_p, tmp1, SRC_SIZE); \ @@ -309,7 +309,7 @@ static int without_hardware_g = 0; saved_p += SRC_SIZE; \ \ /*negative values*/ \ - H5T__bit_set(tmp2, n, (size_t)1, TRUE); \ + H5T__bit_set(tmp2, n, (size_t)1, true); \ CHANGE_ORDER(tmp2, SRC_ORDR, SRC_SIZE); \ memcpy(buf_p, tmp2, SRC_SIZE); \ memcpy(saved_p, tmp2, SRC_SIZE); \ @@ -344,7 +344,7 @@ static int without_hardware_g = 0; buf_p = BUF; \ \ /* +0 */ \ - H5T__bit_set(value, (size_t)0, SRC_PREC, FALSE); \ + H5T__bit_set(value, (size_t)0, SRC_PREC, false); \ memcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ buf_p += SRC_SIZE; \ \ @@ -352,7 +352,7 @@ static int without_hardware_g = 0; if (n == 1) { \ memset(value, 0, SRC_SIZE * sizeof(unsigned char)); \ /* -0 */ \ - H5T__bit_set(value, (size_t)(SRC_PREC - 1), (size_t)1, TRUE); \ + H5T__bit_set(value, (size_t)(SRC_PREC - 1), (size_t)1, true); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change order for big endian*/ \ memcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change back the order for bit operation*/ \ @@ -360,21 +360,21 @@ static int without_hardware_g = 0; } \ \ /* +/-infinity */ \ - H5T__bit_set(value, (size_t)(SRC_MANT_DIG - 1), SRC_PREC - SRC_MANT_DIG, TRUE); \ + H5T__bit_set(value, (size_t)(SRC_MANT_DIG - 1), SRC_PREC - SRC_MANT_DIG, true); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change order for big endian*/ \ memcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change back the order for bit operation*/ \ buf_p += SRC_SIZE; \ \ /* +/-SNaN */ \ - H5T__bit_set(value, (size_t)0, (size_t)1, TRUE); \ + H5T__bit_set(value, (size_t)0, (size_t)1, true); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change order for big endian*/ \ memcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change back the order for bit operation*/ \ buf_p += SRC_SIZE; \ \ /* +/-QNaN */ \ - H5T__bit_set(value, (size_t)(SRC_MANT_DIG - 2), (size_t)1, TRUE); \ + H5T__bit_set(value, (size_t)(SRC_MANT_DIG - 2), (size_t)1, true); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change order for big endian*/ \ memcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change back the order for bit operation*/ \ @@ -385,8 +385,8 @@ static int without_hardware_g = 0; free(value); \ } while (0) -static hbool_t overflows(unsigned char *origin_bits, hid_t src_id, size_t dst_num_bits); -static int my_isnan(dtype_t type, void *val); +static bool overflows(unsigned char *origin_bits, hid_t src_id, size_t dst_num_bits); +static int my_isnan(dtype_t type, void *val); static int my_isinf(int endian, const unsigned char *val, size_t size, size_t mpos, size_t msize, size_t epos, size_t esize); @@ -505,7 +505,7 @@ test_hard_query(void) TESTING("query functions of compiler conversion"); /* Verify the conversion from int to float is a hard conversion. */ - if (H5Tcompiler_conv(H5T_NATIVE_INT, H5T_NATIVE_FLOAT) != TRUE) { + if (H5Tcompiler_conv(H5T_NATIVE_INT, H5T_NATIVE_FLOAT) != true) { H5_FAILED(); printf("Can't query conversion function\n"); goto error; @@ -515,7 +515,7 @@ test_hard_query(void) * is a soft conversion. */ H5Tunregister(H5T_PERS_HARD, NULL, H5T_NATIVE_INT, H5T_NATIVE_FLOAT, (H5T_conv_t)((void (*)(void))H5T__conv_int_float)); - if (H5Tcompiler_conv(H5T_NATIVE_INT, H5T_NATIVE_FLOAT) != FALSE) { + if (H5Tcompiler_conv(H5T_NATIVE_INT, H5T_NATIVE_FLOAT) != false) { H5_FAILED(); printf("Can't query conversion function\n"); goto error; @@ -525,7 +525,7 @@ test_hard_query(void) * is a hard conversion. */ H5Tregister(H5T_PERS_HARD, "int_flt", H5T_NATIVE_INT, H5T_NATIVE_FLOAT, (H5T_conv_t)((void (*)(void))H5T__conv_int_float)); - if (H5Tcompiler_conv(H5T_NATIVE_INT, H5T_NATIVE_FLOAT) != TRUE) { + if (H5Tcompiler_conv(H5T_NATIVE_INT, H5T_NATIVE_FLOAT) != true) { H5_FAILED(); printf("Can't query conversion function\n"); goto error; @@ -567,7 +567,7 @@ expt_handle(H5T_conv_except_t except_type, hid_t H5_ATTR_UNUSED src_id, hid_t H5 if (except_type == H5T_CONV_EXCEPT_RANGE_HI || except_type == H5T_CONV_EXCEPT_RANGE_LOW || except_type == H5T_CONV_EXCEPT_TRUNCATE) { - if (*(hbool_t *)user_data) + if (*(bool *)user_data) *(signed char *)dst_buf = fill_value1; else *(int *)dst_buf = fill_value2; @@ -601,7 +601,7 @@ static int test_particular_fp_integer(void) { hid_t dxpl_id; - hbool_t flag; + bool flag; double src_d = (double)SCHAR_MAX; signed char dst_c; unsigned char *buf1 = NULL, *buf2 = NULL; @@ -2627,7 +2627,7 @@ test_conv_int_2(void) * * Purpose: Determines whether VAL points to NaN. * - * Return: TRUE or FALSE + * Return: true or false * *------------------------------------------------------------------------- */ @@ -2698,7 +2698,7 @@ my_isnan(dtype_t type, void *val) * * Purpose: Determines whether VAL points to +/-infinity. * - * Return: TRUE or FALSE + * Return: true or false * *------------------------------------------------------------------------- */ @@ -3338,7 +3338,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) int fill_value = 9; /*fill value for conversion exception*/ H5T_conv_except_func_t op; /*returned callback function for conversion exception*/ void *user_data; /*returned pointer to user data passed in to the callback*/ - hbool_t except_set = FALSE; /*whether user's exception handling is set*/ + bool except_set = false; /*whether user's exception handling is set*/ size_t nelmts = 0; /*num values per test */ const size_t max_fails = 40; /*max number of failures*/ size_t fails_all_tests = 0; /*number of failures */ @@ -3580,7 +3580,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) if (H5Pset_type_conv_cb(dxpl_id, except_func, &fill_value) < 0) goto error; else - except_set = TRUE; + except_set = true; if (H5Pget_type_conv_cb(dxpl_id, &op, &user_data) < 0) goto error; @@ -4522,16 +4522,16 @@ error: * check if overflow occurs. * * - * Return: TRUE: overflow happens + * Return: true: overflow happens * - * FALSE: no overflow + * false: no overflow * *------------------------------------------------------------------------- */ -static hbool_t +static bool overflows(unsigned char *origin_bits, hid_t src_id, size_t dst_num_bits) { - hbool_t ret_value = FALSE; + bool ret_value = false; hsize_t expt; size_t mant_digits = 0, expt_digits = 0, bias = 0; size_t epos, mpos; @@ -4556,18 +4556,18 @@ overflows(unsigned char *origin_bits, hid_t src_id, size_t dst_num_bits) memcpy(bits, origin_bits, src_prec / 8 + 1); /*Check for special cases: +Inf, -Inf*/ - if (H5T__bit_find(bits, mpos, mant_digits, H5T_BIT_LSB, TRUE) < 0) { - if (H5T__bit_find(bits, epos, expt_digits, H5T_BIT_LSB, FALSE) < 0) { - ret_value = TRUE; + if (H5T__bit_find(bits, mpos, mant_digits, H5T_BIT_LSB, true) < 0) { + if (H5T__bit_find(bits, epos, expt_digits, H5T_BIT_LSB, false) < 0) { + ret_value = true; goto done; } } - else if (H5T_NORM_NONE == norm && H5T__bit_find(bits, mpos, mant_digits - 1, H5T_BIT_LSB, TRUE) < 0 && - H5T__bit_find(bits, epos, expt_digits, H5T_BIT_LSB, FALSE) < 0) { + else if (H5T_NORM_NONE == norm && H5T__bit_find(bits, mpos, mant_digits - 1, H5T_BIT_LSB, true) < 0 && + H5T__bit_find(bits, epos, expt_digits, H5T_BIT_LSB, false) < 0) { /*This is a special case for the source of no implied mantissa bit. *If the exponent bits are all 1s and only the 1st bit of mantissa *is set to 1. It's infinity. The Intel-Linux "long double" is this case.*/ - ret_value = TRUE; + ret_value = true; goto done; } @@ -4575,7 +4575,7 @@ overflows(unsigned char *origin_bits, hid_t src_id, size_t dst_num_bits) expt = H5T__bit_get_d(bits, mant_digits, expt_digits) - bias; if (expt >= (dst_num_bits - 1)) { - ret_value = TRUE; + ret_value = true; goto done; } @@ -4594,7 +4594,7 @@ overflows(unsigned char *origin_bits, hid_t src_id, size_t dst_num_bits) indx = H5T__bit_find(mant_bits, (size_t)0, (size_t)(32 * 8), H5T_BIT_MSB, 1); if ((size_t)indx >= dst_num_bits) - ret_value = TRUE; + ret_value = true; done: return ret_value; @@ -5140,7 +5140,7 @@ main(void) * Software tests *---------------------------------------------------------------------- */ - without_hardware_g = TRUE; + without_hardware_g = true; /* Restore the default error handler (set in h5_reset()) */ h5_restore_err(); diff --git a/test/dtypes.c b/test/dtypes.c index 21a79a1..143db76 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -364,15 +364,15 @@ test_detect(void) * Test class of some atomic types. *------------------------------------------------------------------------------*/ /* Native integers should be in the integer class */ - if (H5Tdetect_class(H5T_NATIVE_INT, H5T_INTEGER) != TRUE) + if (H5Tdetect_class(H5T_NATIVE_INT, H5T_INTEGER) != true) TEST_ERROR; /* Native integers should _not_ be in other classes */ - if (H5Tdetect_class(H5T_NATIVE_INT, H5T_FLOAT) != FALSE) + if (H5Tdetect_class(H5T_NATIVE_INT, H5T_FLOAT) != false) TEST_ERROR; - if (H5Tdetect_class(H5T_NATIVE_INT, H5T_ARRAY) != FALSE) + if (H5Tdetect_class(H5T_NATIVE_INT, H5T_ARRAY) != false) TEST_ERROR; - if (H5Tdetect_class(H5T_NATIVE_INT, H5T_ENUM) != FALSE) + if (H5Tdetect_class(H5T_NATIVE_INT, H5T_ENUM) != false) TEST_ERROR; /*-------------------------------------------------------------------------------- @@ -393,15 +393,15 @@ test_detect(void) TEST_ERROR; /* Make certain that the correct classes can be detected */ - if (H5Tdetect_class(atom_cmpd_id, H5T_COMPOUND) != TRUE) + if (H5Tdetect_class(atom_cmpd_id, H5T_COMPOUND) != true) TEST_ERROR; - if (H5Tdetect_class(atom_cmpd_id, H5T_INTEGER) != TRUE) + if (H5Tdetect_class(atom_cmpd_id, H5T_INTEGER) != true) TEST_ERROR; - if (H5Tdetect_class(atom_cmpd_id, H5T_FLOAT) != TRUE) + if (H5Tdetect_class(atom_cmpd_id, H5T_FLOAT) != true) TEST_ERROR; /* Make certain that an incorrect class is not detected */ - if (H5Tdetect_class(atom_cmpd_id, H5T_VLEN) != FALSE) + if (H5Tdetect_class(atom_cmpd_id, H5T_VLEN) != false) TEST_ERROR; /*-------------------------------------------------------------------------------- @@ -412,17 +412,17 @@ test_detect(void) TEST_ERROR; /* Make certain that the correct classes can be detected */ - if (H5Tdetect_class(atom_arr_id, H5T_ARRAY) != TRUE) + if (H5Tdetect_class(atom_arr_id, H5T_ARRAY) != true) TEST_ERROR; - if (H5Tdetect_class(atom_arr_id, H5T_REFERENCE) != TRUE) + if (H5Tdetect_class(atom_arr_id, H5T_REFERENCE) != true) TEST_ERROR; /* Make certain that an incorrect class is not detected */ - if (H5Tdetect_class(atom_arr_id, H5T_VLEN) != FALSE) + if (H5Tdetect_class(atom_arr_id, H5T_VLEN) != false) TEST_ERROR; - if (H5Tdetect_class(atom_arr_id, H5T_FLOAT) != FALSE) + if (H5Tdetect_class(atom_arr_id, H5T_FLOAT) != false) TEST_ERROR; - if (H5Tdetect_class(atom_arr_id, H5T_INTEGER) != FALSE) + if (H5Tdetect_class(atom_arr_id, H5T_INTEGER) != false) TEST_ERROR; /* Create a VL datatype with an atomic base type of float*/ @@ -430,15 +430,15 @@ test_detect(void) TEST_ERROR; /* Make certain that the correct classes can be detected */ - if (H5Tdetect_class(atom_vlf_id, H5T_VLEN) != TRUE) + if (H5Tdetect_class(atom_vlf_id, H5T_VLEN) != true) TEST_ERROR; - if (H5Tdetect_class(atom_vlf_id, H5T_FLOAT) != TRUE) + if (H5Tdetect_class(atom_vlf_id, H5T_FLOAT) != true) TEST_ERROR; /* Make certain that an incorrect class is not detected */ - if (H5Tdetect_class(atom_vlf_id, H5T_COMPOUND) != FALSE) + if (H5Tdetect_class(atom_vlf_id, H5T_COMPOUND) != false) TEST_ERROR; - if (H5Tdetect_class(atom_vlf_id, H5T_INTEGER) != FALSE) + if (H5Tdetect_class(atom_vlf_id, H5T_INTEGER) != false) TEST_ERROR; /* Create a VL datatype with an atomic base type of char. It should be a VL @@ -447,13 +447,13 @@ test_detect(void) TEST_ERROR; /* Make certain that the correct classes can be detected */ - if (H5Tdetect_class(atom_vlc_id, H5T_VLEN) != TRUE) + if (H5Tdetect_class(atom_vlc_id, H5T_VLEN) != true) TEST_ERROR; - if (H5Tdetect_class(atom_vlc_id, H5T_INTEGER) != TRUE) + if (H5Tdetect_class(atom_vlc_id, H5T_INTEGER) != true) TEST_ERROR; /* Make certain that an incorrect class is not detected */ - if (H5Tdetect_class(atom_vlc_id, H5T_STRING) != FALSE) + if (H5Tdetect_class(atom_vlc_id, H5T_STRING) != false) TEST_ERROR; /* Create a VL string. It should be a string, not a VL class. */ @@ -463,11 +463,11 @@ test_detect(void) TEST_ERROR; /* Make certain that the correct classes can be detected */ - if (H5Tdetect_class(atom_vls_id, H5T_STRING) != TRUE) + if (H5Tdetect_class(atom_vls_id, H5T_STRING) != true) TEST_ERROR; /* Make certain that an incorrect class is not detected */ - if (H5Tdetect_class(atom_vls_id, H5T_VLEN) != FALSE) + if (H5Tdetect_class(atom_vls_id, H5T_VLEN) != false) TEST_ERROR; /*-------------------------------------------------------------------------------- @@ -490,25 +490,25 @@ test_detect(void) TEST_ERROR; /* Make certain that the correct classes can be detected */ - if (H5Tdetect_class(cplx_cmpd_id, H5T_COMPOUND) != TRUE) + if (H5Tdetect_class(cplx_cmpd_id, H5T_COMPOUND) != true) TEST_ERROR; - if (H5Tdetect_class(cplx_cmpd_id, H5T_ARRAY) != TRUE) + if (H5Tdetect_class(cplx_cmpd_id, H5T_ARRAY) != true) TEST_ERROR; - if (H5Tdetect_class(cplx_cmpd_id, H5T_REFERENCE) != TRUE) + if (H5Tdetect_class(cplx_cmpd_id, H5T_REFERENCE) != true) TEST_ERROR; - if (H5Tdetect_class(cplx_cmpd_id, H5T_INTEGER) != TRUE) + if (H5Tdetect_class(cplx_cmpd_id, H5T_INTEGER) != true) TEST_ERROR; - if (H5Tdetect_class(cplx_cmpd_id, H5T_FLOAT) != TRUE) + if (H5Tdetect_class(cplx_cmpd_id, H5T_FLOAT) != true) TEST_ERROR; - if (H5Tdetect_class(cplx_cmpd_id, H5T_STRING) != TRUE) + if (H5Tdetect_class(cplx_cmpd_id, H5T_STRING) != true) TEST_ERROR; - if (H5Tdetect_class(cplx_cmpd_id, H5T_VLEN) != TRUE) + if (H5Tdetect_class(cplx_cmpd_id, H5T_VLEN) != true) TEST_ERROR; /* Make certain that an incorrect class is not detected */ - if (H5Tdetect_class(cplx_cmpd_id, H5T_TIME) != FALSE) + if (H5Tdetect_class(cplx_cmpd_id, H5T_TIME) != false) TEST_ERROR; - if (H5Tdetect_class(cplx_cmpd_id, H5T_ENUM) != FALSE) + if (H5Tdetect_class(cplx_cmpd_id, H5T_ENUM) != false) TEST_ERROR; /* Close complex compound datatype */ @@ -3697,7 +3697,7 @@ test_compound_18(void) hsize_t dim = 1; const char *testfile = H5_get_srcdir_filename(TESTFILE); /* Corrected test file name */ char filename[1024]; - hbool_t driver_is_default_compatible; + bool driver_is_default_compatible; herr_t ret; TESTING("accessing objects with compound datatypes that have no fields"); @@ -4550,7 +4550,7 @@ test_str_create(void) { hid_t fixed_str1, fixed_str2; hid_t vlen_str1, vlen_str2; - htri_t is_vl_str = FALSE; + htri_t is_vl_str = false; size_t query_size, str_size = 10; TESTING("string type creation using H5Tcreate"); @@ -7915,7 +7915,7 @@ test_deprec(hid_t fapl) int perm[2] = {0, 1}; /* Dimensions permutations for array datatype */ hsize_t rdims[2] = {0, 0}; /* Dimensions for querying array datatype */ int rperm[2] = {-2, -2}; /* Dimensions permutations for array datatype */ - hbool_t dim_mismatch; /* Whether any dimensions didn't match */ + bool dim_mismatch; /* Whether any dimensions didn't match */ char filename[1024]; unsigned u; /* Local index variable */ herr_t status; /* Generic routine value */ @@ -7928,9 +7928,9 @@ test_deprec(hid_t fapl) FAIL_STACK_ERROR; /* Make certain that the correct classes can be detected */ - if (H5Tdetect_class(type, H5T_ARRAY) != TRUE) + if (H5Tdetect_class(type, H5T_ARRAY) != true) FAIL_STACK_ERROR; - if (H5Tdetect_class(type, H5T_INTEGER) != TRUE) + if (H5Tdetect_class(type, H5T_INTEGER) != true) FAIL_STACK_ERROR; /* Get the array dimensions */ @@ -7939,24 +7939,24 @@ test_deprec(hid_t fapl) FAIL_STACK_ERROR; /* Check the array dimensions */ - dim_mismatch = FALSE; + dim_mismatch = false; for (u = 0; u < rank; u++) if (rdims[u] != dims[u]) { TestErrPrintf("Array dimension information doesn't match!, rdims1[%u]=%d, tdims1[%u]=%d\n", u, (int)rdims[u], u, (int)dims[u]); - dim_mismatch = TRUE; + dim_mismatch = true; } /* end if */ if (dim_mismatch) FAIL_PUTS_ERROR(" Dimensions didn't match!"); /* Check the array dimension permutations */ - dim_mismatch = FALSE; + dim_mismatch = false; for (u = 0; u < rank; u++) if (rperm[u] != -2) { TestErrPrintf( "Array dimension permutation information was modified!, rdims1[%u]=%d, tdims1[%u]=%d\n", u, rperm[u], u, perm[u]); - dim_mismatch = TRUE; + dim_mismatch = true; } /* end if */ if (dim_mismatch) FAIL_PUTS_ERROR(" Dimension permutations modified!"); @@ -8746,9 +8746,9 @@ error: int main(void) { - hbool_t driver_is_parallel; - long nerrors = 0; - hid_t fapl = H5I_INVALID_HID; + bool driver_is_parallel; + long nerrors = 0; + hid_t fapl = H5I_INVALID_HID; /* Set the random # seed */ HDsrandom((unsigned)HDtime(NULL)); diff --git a/test/earray.c b/test/earray.c index 8f5b2be..3fa0cb5 100644 --- a/test/earray.c +++ b/test/earray.c @@ -136,13 +136,13 @@ struct earray_test_param_t { /* Flush depend test context */ typedef struct earray_flush_depend_ctx_t { - hbool_t base_obj; /* Flag to indicate that base object has been flushed */ - hbool_t idx0_obj; /* Flag to indicate that index 0's object has been flushed */ - hbool_t idx0_elem; /* Flag to indicate that index 0's element has been flushed */ - hbool_t idx1_obj; /* Flag to indicate that index 1's object has been flushed */ - hbool_t idx1_elem; /* Flag to indicate that index 1's element has been flushed */ - hbool_t idx10000_obj; /* Flag to indicate that index 10000's object has been flushed */ - hbool_t idx10000_elem; /* Flag to indicate that index 10000's element has been flushed */ + bool base_obj; /* Flag to indicate that base object has been flushed */ + bool idx0_obj; /* Flag to indicate that index 0's object has been flushed */ + bool idx0_elem; /* Flag to indicate that index 0's element has been flushed */ + bool idx1_obj; /* Flag to indicate that index 1's object has been flushed */ + bool idx1_elem; /* Flag to indicate that index 1's element has been flushed */ + bool idx10000_obj; /* Flag to indicate that index 10000's object has been flushed */ + bool idx10000_elem; /* Flag to indicate that index 10000's element has been flushed */ } earray_flush_depend_ctx_t; /* Extensible array test cache object */ @@ -2299,7 +2299,7 @@ main(void) unsigned nerrors = 0; /* Cumulative error count */ time_t curr_time; /* Current time, for seeding random number generator */ int ExpressMode; /* Test express value */ - hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ + bool api_ctx_pushed = false; /* Whether API context pushed */ /* Reset library */ h5_reset(); @@ -2314,7 +2314,7 @@ main(void) /* Push API context */ if (H5CX_push() < 0) FAIL_STACK_ERROR; - api_ctx_pushed = TRUE; + api_ctx_pushed = true; /* Seed random #'s */ curr_time = HDtime(NULL); @@ -2475,9 +2475,9 @@ main(void) nerrors += (h5_verify_cached_stabs(FILENAME, fapl) < 0 ? 1 : 0); /* Pop API context */ - if (api_ctx_pushed && H5CX_pop(FALSE) < 0) + if (api_ctx_pushed && H5CX_pop(false) < 0) FAIL_STACK_ERROR; - api_ctx_pushed = FALSE; + api_ctx_pushed = false; if (nerrors) goto error; @@ -2498,7 +2498,7 @@ error: H5E_END_TRY if (api_ctx_pushed) - H5CX_pop(FALSE); + H5CX_pop(false); return 1; } /* end main() */ @@ -2638,7 +2638,7 @@ main(void) unsigned nerrors = 0; /* track errors */ H5P_genplist_t *plist; /* Property list pointer for FAPL */ H5VL_connector_prop_t connector_prop; /* Property for VOL connector ID & info */ - hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ + bool api_ctx_pushed = false; /* Whether API context pushed */ int i; /* iterator */ /* Test Setup */ @@ -2664,7 +2664,7 @@ main(void) /* Push API context */ if (H5CX_push() < 0) FAIL_STACK_ERROR; - api_ctx_pushed = TRUE; + api_ctx_pushed = true; /* Get the VOL info from the fapl */ plist = (H5P_genplist_t *)H5I_object(fapl_id); @@ -2688,9 +2688,9 @@ main(void) nerrors += (h5_verify_cached_stabs(FILENAME, fapl_id) < 0 ? 1 : 0); /* Pop API context */ - if (api_ctx_pushed && H5CX_pop(FALSE) < 0) + if (api_ctx_pushed && H5CX_pop(false) < 0) FAIL_STACK_ERROR; - api_ctx_pushed = FALSE; + api_ctx_pushed = false; if (nerrors) goto error; @@ -2715,7 +2715,7 @@ error: H5E_END_TRY if (api_ctx_pushed) - H5CX_pop(FALSE); + H5CX_pop(false); for (i = 0; i < N_FILENAMES; i++) { free(filename[i]); diff --git a/test/enc_dec_plist.c b/test/enc_dec_plist.c index cd97cb9..46956fc 100644 --- a/test/enc_dec_plist.c +++ b/test/enc_dec_plist.c @@ -140,12 +140,12 @@ main(void) H5F_libver_t low, high; /* Low and high bounds */ H5AC_cache_config_t my_cache_config = {H5AC__CURR_CACHE_CONFIG_VERSION, - TRUE, - FALSE, - FALSE, + true, + false, + false, "temp", - TRUE, - FALSE, + true, + false, (2 * 2048 * 1024), 0.3, (64 * 1024 * 1024), @@ -154,7 +154,7 @@ main(void) H5C_incr__threshold, 0.8, 3.0, - TRUE, + true, (8 * 1024 * 1024), H5C_flash_incr__add_space, 2.0, @@ -162,15 +162,15 @@ main(void) H5C_decr__age_out_with_threshold, 0.997, 0.8, - TRUE, + true, (3 * 1024 * 1024), 3, - FALSE, + false, 0.2, (256 * 2048), H5AC__DEFAULT_METADATA_WRITE_STRATEGY}; - H5AC_cache_image_config_t my_cache_image_config = {H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION, TRUE, FALSE, + H5AC_cache_image_config_t my_cache_image_config = {H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION, true, false, -1}; /* Loop through all the combinations of low/high version bounds */ @@ -216,7 +216,7 @@ main(void) if ((H5Pset_fill_value(dcpl, H5T_NATIVE_DOUBLE, &fill)) < 0) FAIL_STACK_ERROR; - if ((H5Pset_dset_no_attrs_hint(dcpl, FALSE)) < 0) + if ((H5Pset_dset_no_attrs_hint(dcpl, false)) < 0) FAIL_STACK_ERROR; max_size[0] = 100; @@ -370,7 +370,7 @@ main(void) if (H5Pset_selection_io(dxpl, H5D_SELECTION_IO_MODE_ON) < 0) FAIL_STACK_ERROR; - if (H5Pset_modify_write_buf(dxpl, TRUE) < 0) + if (H5Pset_modify_write_buf(dxpl, true) < 0) FAIL_STACK_ERROR; /* Test encoding & decoding property list */ @@ -435,7 +435,7 @@ main(void) TESTING("LCPL Encoding/Decoding"); - if ((H5Pset_create_intermediate_group(lcpl, TRUE)) < 0) + if ((H5Pset_create_intermediate_group(lcpl, true)) < 0) FAIL_STACK_ERROR; /* Test encoding & decoding property list */ diff --git a/test/error_test.c b/test/error_test.c index b4d366a..ce5e4d7 100644 --- a/test/error_test.c +++ b/test/error_test.c @@ -625,28 +625,28 @@ test_append(void) /* Try to append bad error stack IDs */ H5E_BEGIN_TRY { - ret = H5Eappend_stack(H5E_DEFAULT, H5E_DEFAULT, FALSE); + ret = H5Eappend_stack(H5E_DEFAULT, H5E_DEFAULT, false); } H5E_END_TRY if (ret >= 0) TEST_ERROR; H5E_BEGIN_TRY { - ret = H5Eappend_stack(estack_id1, H5E_DEFAULT, FALSE); + ret = H5Eappend_stack(estack_id1, H5E_DEFAULT, false); } H5E_END_TRY if (ret >= 0) TEST_ERROR; H5E_BEGIN_TRY { - ret = H5Eappend_stack(H5E_DEFAULT, estack_id2, FALSE); + ret = H5Eappend_stack(H5E_DEFAULT, estack_id2, false); } H5E_END_TRY if (ret >= 0) TEST_ERROR; /* Append error stack #2 to error stack #1, without closing stack #2 */ - if (H5Eappend_stack(estack_id1, estack_id2, FALSE) < 0) + if (H5Eappend_stack(estack_id1, estack_id2, false) < 0) TEST_ERROR; /* Check the number of errors on stack #1 */ @@ -660,7 +660,7 @@ test_append(void) TEST_ERROR; /* Append error stack #2 to error stack #1, and close stack #2 */ - if (H5Eappend_stack(estack_id1, estack_id2, TRUE) < 0) + if (H5Eappend_stack(estack_id1, estack_id2, true) < 0) TEST_ERROR; /* Try to close error stack #2. Should fail because H5Eappend_stack diff --git a/test/event_set.c b/test/event_set.c index 8102d4a..31bbab8 100644 --- a/test/event_set.c +++ b/test/event_set.c @@ -184,7 +184,7 @@ test_es_create(void) size_t count; /* # of events in set */ size_t num_errs; /* # of failed events in set */ uint64_t num_ops; /* # of events inserted into set */ - hbool_t err_occurred; /* Whether an error has occurred */ + bool err_occurred; /* Whether an error has occurred */ TESTING("event set creation"); @@ -200,7 +200,7 @@ test_es_create(void) FAIL_PUTS_ERROR("should be empty event set"); /* Check for errors */ - err_occurred = FALSE; + err_occurred = false; if (H5ESget_err_status(es_id, &err_occurred) < 0) TEST_ERROR; if (err_occurred) @@ -311,12 +311,12 @@ error: static int test_es_get_requests(void) { - hid_t es_id; /* Event set ID */ - hid_t connector_ids[2]; /* Connector IDs */ - void *requests[2]; /* Requests */ - int req_targets[2]; /* Dummy targets for void * requests */ - size_t count; /* # of events in set */ - hbool_t op_failed; /* Whether an operation failed (unused) */ + hid_t es_id; /* Event set ID */ + hid_t connector_ids[2]; /* Connector IDs */ + void *requests[2]; /* Requests */ + int req_targets[2]; /* Dummy targets for void * requests */ + size_t count; /* # of events in set */ + bool op_failed; /* Whether an operation failed (unused) */ TESTING("event set get requests"); diff --git a/test/evict_on_close.c b/test/evict_on_close.c index feebb08..a5e8389 100644 --- a/test/evict_on_close.c +++ b/test/evict_on_close.c @@ -69,11 +69,11 @@ const char *FILENAMES[] = {"evict-on-close", /* 0 */ #define SUBGROUP_NAME_SIZE 16 /* Prototypes */ -static hbool_t verify_tag_not_in_cache(const H5F_t *f, haddr_t tag); -static herr_t check_evict_on_close_api(void); -static hid_t generate_eoc_test_file(hid_t fapl_id); -static herr_t check_dset_scheme(hid_t fid, const char *dset_name); -static herr_t check_group_layout(hid_t fid, const char *group_name); +static bool verify_tag_not_in_cache(const H5F_t *f, haddr_t tag); +static herr_t check_evict_on_close_api(void); +static hid_t generate_eoc_test_file(hid_t fapl_id); +static herr_t check_dset_scheme(hid_t fid, const char *dset_name); +static herr_t check_group_layout(hid_t fid, const char *group_name); /*------------------------------------------------------------------------- * Function: verify_tag_not_in_cache() @@ -81,11 +81,11 @@ static herr_t check_group_layout(hid_t fid, const char *group_name); * Purpose: Ensure that metadata cache entries with a given tag are not * present in the cache. * - * Return: TRUE/FALSE + * Return: true/false * *------------------------------------------------------------------------- */ -static H5_ATTR_PURE hbool_t +static H5_ATTR_PURE bool verify_tag_not_in_cache(const H5F_t *f, haddr_t tag) { H5C_t *cache_ptr = NULL; /* cache pointer */ @@ -100,13 +100,13 @@ verify_tag_not_in_cache(const H5F_t *f, haddr_t tag) entry_ptr = cache_ptr->index[i]; while (entry_ptr != NULL) { if (tag == entry_ptr->tag_info->tag) - return TRUE; + return true; else entry_ptr = entry_ptr->ht_next; } } - return FALSE; + return false; } /* end verify_tag_not_in_cache() */ /*------------------------------------------------------------------------- @@ -633,7 +633,7 @@ check_group_layout(hid_t fid, const char *group_name) if (H5Gclose(gid2) < 0) TEST_ERROR; - if (TRUE == verify_tag_not_in_cache(file_ptr, tag2)) + if (true == verify_tag_not_in_cache(file_ptr, tag2)) TEST_ERROR; } /* end for */ @@ -663,7 +663,7 @@ check_group_layout(hid_t fid, const char *group_name) #endif /* Ensure that the cache does not contain entries with the tag */ - if (TRUE == verify_tag_not_in_cache(file_ptr, tag1)) + if (true == verify_tag_not_in_cache(file_ptr, tag1)) TEST_ERROR; /* Compare the number of cache entries */ if (before != after || before == during) @@ -764,7 +764,7 @@ check_dset_scheme(hid_t fid, const char *dset_name) #endif /* Ensure that the cache does not contain entries with the tag */ - if (TRUE == verify_tag_not_in_cache(file_ptr, tag)) + if (true == verify_tag_not_in_cache(file_ptr, tag)) TEST_ERROR; /* Compare the number of cache entries */ @@ -801,10 +801,10 @@ error: static herr_t check_evict_on_close_api(void) { - hid_t fapl_id = -1; - hid_t dapl_id = -1; - hbool_t evict_on_close; - herr_t status; + hid_t fapl_id = -1; + hid_t dapl_id = -1; + bool evict_on_close; + herr_t status; TESTING("evict on close API"); @@ -813,22 +813,22 @@ check_evict_on_close_api(void) TEST_ERROR; /* Check the default */ - evict_on_close = TRUE; + evict_on_close = true; if (H5Pget_evict_on_close(fapl_id, &evict_on_close) < 0) TEST_ERROR; - if (evict_on_close != FALSE) + if (evict_on_close != false) FAIL_PUTS_ERROR("Incorrect default evict on close value."); /* Set the evict on close property */ - evict_on_close = TRUE; + evict_on_close = true; if (H5Pset_evict_on_close(fapl_id, evict_on_close) < 0) TEST_ERROR; /* Make sure we can get it back out */ - evict_on_close = FALSE; + evict_on_close = false; if (H5Pget_evict_on_close(fapl_id, &evict_on_close) < 0) TEST_ERROR; - if (evict_on_close != TRUE) + if (evict_on_close != true) FAIL_PUTS_ERROR("Incorrect evict on close value."); /* close fapl */ @@ -902,7 +902,7 @@ main(void) } /* end if */ /* Set evict-on-close property */ - if (H5Pset_evict_on_close(fapl_id, TRUE) < 0) { + if (H5Pset_evict_on_close(fapl_id, true) < 0) { nerrors++; PUTS_ERROR("Unable to set evict-on-close property\n"); } /* end if */ @@ -990,9 +990,9 @@ error: static herr_t check_evict_on_close_parallel_fail(void) { - hid_t fapl_id = -1; - hbool_t evict_on_close; - herr_t status; + hid_t fapl_id = -1; + bool evict_on_close; + herr_t status; TESTING("evict on close fails in parallel"); @@ -1001,7 +1001,7 @@ check_evict_on_close_parallel_fail(void) TEST_ERROR; /* Set the evict on close property (should fail)*/ - evict_on_close = TRUE; + evict_on_close = true; H5E_BEGIN_TRY { status = H5Pset_evict_on_close(fapl_id, evict_on_close); diff --git a/test/external.c b/test/external.c index cc0d262..28d2e12 100644 --- a/test/external.c +++ b/test/external.c @@ -29,7 +29,7 @@ * *------------------------------------------------------------------------- */ -static hbool_t +static bool files_have_same_contents(const char *name1, const char *name2) { int fd1 = 0; @@ -38,7 +38,7 @@ files_have_same_contents(const char *name1, const char *name2) ssize_t n2 = 0; char buf1[1024]; char buf2[1024]; - hbool_t ret = FALSE; /* not equal until proven otherwise */ + bool ret = false; /* not equal until proven otherwise */ if ((fd1 = HDopen(name1, O_RDONLY)) < 0) goto out; @@ -61,7 +61,7 @@ files_have_same_contents(const char *name1, const char *name2) break; if (n1 == 0 && n2 == 0) { - ret = TRUE; + ret = true; break; } @@ -686,7 +686,7 @@ test_read_file_set(hid_t fapl) TEST_ERROR; /* Reset the raw data files */ - if (reset_raw_data_files(FALSE) < 0) + if (reset_raw_data_files(false) < 0) TEST_ERROR; /* Create the file and an initial group. This causes messages about @@ -830,7 +830,7 @@ test_write_file_set(hid_t fapl) } /* end for */ /* Reset the raw data files */ - if (reset_raw_data_files(FALSE) < 0) + if (reset_raw_data_files(false) < 0) TEST_ERROR; /* Create the dataset */ @@ -933,7 +933,7 @@ test_path_absolute(hid_t fapl) FAIL_STACK_ERROR; /* Reset the raw data files */ - if (reset_raw_data_files(FALSE) < 0) + if (reset_raw_data_files(false) < 0) TEST_ERROR; /* Create the dcpl */ @@ -1030,7 +1030,7 @@ test_path_relative(hid_t fapl) FAIL_STACK_ERROR; /* Reset the raw data files */ - if (reset_raw_data_files(FALSE) < 0) + if (reset_raw_data_files(false) < 0) TEST_ERROR; /* Create the dataset */ @@ -1124,7 +1124,7 @@ test_path_relative_cwd(hid_t fapl) FAIL_STACK_ERROR; /* Reset the raw data files */ - if (reset_raw_data_files(FALSE) < 0) + if (reset_raw_data_files(false) < 0) TEST_ERROR; /* Create the dataset */ @@ -1275,7 +1275,7 @@ test_h5d_get_access_plist(hid_t fapl_id) TEST_ERROR; /* Reset the raw data files */ - if (reset_raw_data_files(FALSE) < 0) + if (reset_raw_data_files(false) < 0) TEST_ERROR; /* Create the file */ @@ -1386,7 +1386,7 @@ main(void) HDputs(""); /* Test with old & new format groups */ - for (latest_format = FALSE; latest_format <= TRUE; latest_format++) { + for (latest_format = false; latest_format <= true; latest_format++) { hid_t current_fapl_id = -1; /* Set the fapl for different file formats */ diff --git a/test/external_common.c b/test/external_common.c index 0fd47f2..eb9c89a 100644 --- a/test/external_common.c +++ b/test/external_common.c @@ -27,7 +27,7 @@ *------------------------------------------------------------------------- */ herr_t -reset_raw_data_files(hbool_t is_env) +reset_raw_data_files(bool is_env) { int fd = 0; /* external file descriptor */ size_t i, j; /* iterators */ diff --git a/test/external_common.h b/test/external_common.h index 197be06..cf00fe2 100644 --- a/test/external_common.h +++ b/test/external_common.h @@ -31,7 +31,7 @@ extern "C" { #endif -H5TEST_DLL herr_t reset_raw_data_files(hbool_t is_env); +H5TEST_DLL herr_t reset_raw_data_files(bool is_env); #ifdef __cplusplus } diff --git a/test/external_env.c b/test/external_env.c index 1a91c2a..a7484a8 100644 --- a/test/external_env.c +++ b/test/external_env.c @@ -60,7 +60,7 @@ test_path_env(hid_t fapl) FAIL_STACK_ERROR; /* Reset the raw data files */ - if (reset_raw_data_files(TRUE) < 0) + if (reset_raw_data_files(true) < 0) TEST_ERROR; /* Create the dataset */ @@ -156,7 +156,7 @@ main(void) FAIL_STACK_ERROR; /* Test with old & new format groups */ - for (latest_format = FALSE; latest_format <= TRUE; latest_format++) { + for (latest_format = false; latest_format <= true; latest_format++) { hid_t current_fapl_id = -1; /* Set the fapl for different file formats */ diff --git a/test/farray.c b/test/farray.c index a7a4125..78bf16e 100644 --- a/test/farray.c +++ b/test/farray.c @@ -1494,7 +1494,7 @@ error: */ static unsigned test_skip_elmts(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam, hsize_t skip_elmts, - hbool_t check_rest, const char *test_str) + bool check_rest, const char *test_str) { hid_t file = -1; /* File ID */ H5F_t *f = NULL; /* Internal file object pointer */ @@ -1630,7 +1630,7 @@ main(void) unsigned nerrors = 0; /* Cumulative error count */ time_t curr_time; /* Current time, for seeding random number generator */ int ExpressMode; /* Test express value */ - hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ + bool api_ctx_pushed = false; /* Whether API context pushed */ /* Reset library */ h5_reset(); @@ -1645,7 +1645,7 @@ main(void) /* Push API context */ if (H5CX_push() < 0) FAIL_STACK_ERROR; - api_ctx_pushed = TRUE; + api_ctx_pushed = true; /* Seed random #'s */ curr_time = HDtime(NULL); @@ -1747,10 +1747,10 @@ main(void) } /* end for */ /* Check skipping elements */ - nerrors += test_skip_elmts(fapl, &cparam, &tparam, (hsize_t)1, TRUE, "skipping to first element"); + nerrors += test_skip_elmts(fapl, &cparam, &tparam, (hsize_t)1, true, "skipping to first element"); nerrors += test_skip_elmts(fapl, &cparam, &tparam, ((hsize_t)1 << cparam.max_dblk_page_nelmts_bits), - TRUE, "skipping to first element in data block page"); - nerrors += test_skip_elmts(fapl, &cparam, &tparam, (hsize_t)(tparam.nelmts - 1), TRUE, + true, "skipping to first element in data block page"); + nerrors += test_skip_elmts(fapl, &cparam, &tparam, (hsize_t)(tparam.nelmts - 1), true, "skipping to last element"); /* Create Fixed Array */ @@ -1768,7 +1768,7 @@ main(void) init_cparam(&cparam, &tparam); /* Set the last element in the Fixed Array */ - nerrors += test_skip_elmts(fapl, &cparam, &tparam, (hsize_t)(tparam.nelmts - 1), FALSE, + nerrors += test_skip_elmts(fapl, &cparam, &tparam, (hsize_t)(tparam.nelmts - 1), false, "skipping to last element"); } /* end for */ @@ -1776,9 +1776,9 @@ main(void) nerrors += (h5_verify_cached_stabs(FILENAME, fapl) < 0 ? 1 : 0); /* Pop API context */ - if (api_ctx_pushed && H5CX_pop(FALSE) < 0) + if (api_ctx_pushed && H5CX_pop(false) < 0) FAIL_STACK_ERROR; - api_ctx_pushed = FALSE; + api_ctx_pushed = false; if (nerrors) goto error; @@ -1799,7 +1799,7 @@ error: H5E_END_TRY if (api_ctx_pushed) - H5CX_pop(FALSE); + H5CX_pop(false); exit(EXIT_FAILURE); } /* end main() */ diff --git a/test/fheap.c b/test/fheap.c index b8c78da..345a71b 100644 --- a/test/fheap.c +++ b/test/fheap.c @@ -40,7 +40,7 @@ /* "Small" heap creation parameters */ #define SMALL_DBLOCK_OVERHEAD 21 /* Overhead for direct blocks */ -#define SMALL_CHECKSUM_DBLOCKS TRUE /* Whether to checksum direct blocks */ +#define SMALL_CHECKSUM_DBLOCKS true /* Whether to checksum direct blocks */ #define SMALL_MAN_WIDTH 4 /* Managed obj. table width */ #define SMALL_MAN_START_BLOCK_SIZE 512 /* Managed obj. starting block size */ #define SMALL_MAN_MAX_DIRECT_SIZE (64 * 1024) /* Managed obj. max. direct block size */ @@ -52,7 +52,7 @@ /* "Large" heap creation parameters */ #define LARGE_DBLOCK_OVERHEAD 21 /* Overhead for direct blocks */ /* (coincidentally the same size as for small direct blocks) */ -#define LARGE_CHECKSUM_DBLOCKS FALSE /* Whether to checksum direct blocks */ +#define LARGE_CHECKSUM_DBLOCKS false /* Whether to checksum direct blocks */ #define LARGE_MAN_WIDTH 32 /* Managed obj. table width */ #define LARGE_MAN_START_BLOCK_SIZE 4096 /* Managed obj. starting block size */ #define LARGE_MAN_MAX_DIRECT_SIZE (1024 * 1024) /* Managed obj. max. direct block size */ @@ -376,8 +376,8 @@ add_obj(H5HF_t *fh, size_t obj_off, size_t obj_size, fheap_heap_state_t *state, /* Check for tracking the heap's state */ if (state) { - size_t tiny_max_len; /* Max. length of tiny objects */ - hbool_t tiny_len_extended; /* Do tiny objects use two bytes for the length? */ + size_t tiny_max_len; /* Max. length of tiny objects */ + bool tiny_len_extended; /* Do tiny objects use two bytes for the length? */ /* Check information about tiny objects */ if (H5HF_get_tiny_info_test(fh, &tiny_max_len, &tiny_len_extended) < 0) @@ -1845,7 +1845,7 @@ test_reopen(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) h5_stat_size_t file_size; /* File size, after deleting heap */ size_t id_len; /* Size of fractal heap IDs */ fheap_heap_state_t state; /* State of fractal heap */ - hbool_t page = FALSE; /* Paged aggregation strategy or not */ + bool page = false; /* Paged aggregation strategy or not */ /* Set the filename to use for this test (dependent on fapl) */ h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); @@ -1871,7 +1871,7 @@ test_reopen(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) STACK_ERROR; if (f->shared->fs_strategy == H5F_FSPACE_STRATEGY_PAGE) - page = TRUE; + page = true; /* Ignore metadata tags in the file's cache */ if (H5AC_ignore_tags(f) < 0) @@ -1998,7 +1998,7 @@ test_open_twice(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) h5_stat_size_t file_size; /* File size, after deleting heap */ size_t id_len; /* Size of fractal heap IDs */ fheap_heap_state_t state; /* State of fractal heap */ - hbool_t page = FALSE; /* Paged aggregation strategy or not */ + bool page = false; /* Paged aggregation strategy or not */ /* Set the filename to use for this test (dependent on fapl) */ h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); @@ -2024,7 +2024,7 @@ test_open_twice(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) STACK_ERROR; if (f->shared->fs_strategy == H5F_FSPACE_STRATEGY_PAGE) - page = TRUE; + page = true; /* Ignore metadata tags in the file's cache */ if (H5AC_ignore_tags(f) < 0) @@ -2343,8 +2343,8 @@ test_id_limits(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl) unsigned deflate_level; /* Deflation level */ size_t id_len; /* Size of fractal heap IDs */ size_t tiny_max_len; /* Max. length of tiny objects */ - hbool_t tiny_len_extended; /* Do tiny objects use two bytes for the length? */ - hbool_t huge_ids_direct; /* Are 'huge' objects directly accessed? */ + bool tiny_len_extended; /* Do tiny objects use two bytes for the length? */ + bool huge_ids_direct; /* Are 'huge' objects directly accessed? */ /* Set the filename to use for this test (dependent on fapl) */ h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); @@ -2383,11 +2383,11 @@ test_id_limits(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl) FAIL_STACK_ERROR; if (tiny_max_len != (HEAP_ID_LEN - 1)) TEST_ERROR; - if (tiny_len_extended != FALSE) + if (tiny_len_extended != false) TEST_ERROR; if (H5HF_get_huge_info_test(fh, NULL, &huge_ids_direct) < 0) FAIL_STACK_ERROR; - if (huge_ids_direct != FALSE) + if (huge_ids_direct != false) TEST_ERROR; /* Close the fractal heap */ @@ -2412,11 +2412,11 @@ test_id_limits(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl) FAIL_STACK_ERROR; if (tiny_max_len != 16) TEST_ERROR; - if (tiny_len_extended != FALSE) + if (tiny_len_extended != false) TEST_ERROR; if (H5HF_get_huge_info_test(fh, NULL, &huge_ids_direct) < 0) FAIL_STACK_ERROR; - if (huge_ids_direct != TRUE) + if (huge_ids_direct != true) TEST_ERROR; /* Close the fractal heap */ @@ -2446,11 +2446,11 @@ test_id_limits(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl) FAIL_STACK_ERROR; if (tiny_max_len != 27) TEST_ERROR; - if (tiny_len_extended != TRUE) + if (tiny_len_extended != true) TEST_ERROR; if (H5HF_get_huge_info_test(fh, NULL, &huge_ids_direct) < 0) FAIL_STACK_ERROR; - if (huge_ids_direct != TRUE) + if (huge_ids_direct != true) TEST_ERROR; /* Close the fractal heap */ @@ -2491,11 +2491,11 @@ test_id_limits(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl) FAIL_STACK_ERROR; if (tiny_max_len != 7) TEST_ERROR; - if (tiny_len_extended != FALSE) + if (tiny_len_extended != false) TEST_ERROR; if (H5HF_get_huge_info_test(fh, NULL, &huge_ids_direct) < 0) FAIL_STACK_ERROR; - if (huge_ids_direct != FALSE) + if (huge_ids_direct != false) TEST_ERROR; /* Close the fractal heap */ @@ -2521,11 +2521,11 @@ test_id_limits(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl) FAIL_STACK_ERROR; if (tiny_max_len != 16) TEST_ERROR; - if (tiny_len_extended != FALSE) + if (tiny_len_extended != false) TEST_ERROR; if (H5HF_get_huge_info_test(fh, NULL, &huge_ids_direct) < 0) FAIL_STACK_ERROR; - if (huge_ids_direct != TRUE) + if (huge_ids_direct != true) TEST_ERROR; /* Close the fractal heap */ @@ -2551,11 +2551,11 @@ test_id_limits(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl) FAIL_STACK_ERROR; if (tiny_max_len != 16) TEST_ERROR; - if (tiny_len_extended != FALSE) + if (tiny_len_extended != false) TEST_ERROR; if (H5HF_get_huge_info_test(fh, NULL, &huge_ids_direct) < 0) FAIL_STACK_ERROR; - if (huge_ids_direct != TRUE) + if (huge_ids_direct != true) TEST_ERROR; /* Close the fractal heap */ @@ -2581,11 +2581,11 @@ test_id_limits(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl) FAIL_STACK_ERROR; if (tiny_max_len != 17) TEST_ERROR; - if (tiny_len_extended != TRUE) + if (tiny_len_extended != true) TEST_ERROR; if (H5HF_get_huge_info_test(fh, NULL, &huge_ids_direct) < 0) FAIL_STACK_ERROR; - if (huge_ids_direct != TRUE) + if (huge_ids_direct != true) TEST_ERROR; /* Close the fractal heap */ @@ -2611,11 +2611,11 @@ test_id_limits(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl) FAIL_STACK_ERROR; if (tiny_max_len != 43) TEST_ERROR; - if (tiny_len_extended != TRUE) + if (tiny_len_extended != true) TEST_ERROR; if (H5HF_get_huge_info_test(fh, NULL, &huge_ids_direct) < 0) FAIL_STACK_ERROR; - if (huge_ids_direct != TRUE) + if (huge_ids_direct != true) TEST_ERROR; /* Close the fractal heap */ @@ -13413,8 +13413,8 @@ test_filtered_huge(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam fheap_heap_state_t state; /* State of fractal heap */ unsigned deflate_level; /* Deflation level */ size_t old_actual_id_len = 0; /* Old actual ID length */ - hbool_t huge_ids_direct; /* Are 'huge' objects directly accessed? */ - hbool_t pline_init = FALSE; /* Whether the I/O pipeline has been initialized */ + bool huge_ids_direct; /* Are 'huge' objects directly accessed? */ + bool pline_init = false; /* Whether the I/O pipeline has been initialized */ /* Test description */ const char *base_desc = "insert 'huge' object into heap with I/O filters, then remove"; @@ -13425,7 +13425,7 @@ test_filtered_huge(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam deflate_level = 6; if (H5Z_append(&tmp_cparam.pline, H5Z_FILTER_DEFLATE, H5Z_FLAG_OPTIONAL, (size_t)1, &deflate_level) < 0) FAIL_STACK_ERROR; - pline_init = TRUE; + pline_init = true; /* Adjust actual ID length, if asking for IDs that can directly access 'huge' objects */ if (cparam->id_len == 1) { @@ -13454,15 +13454,15 @@ test_filtered_huge(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam if (H5HF_get_huge_info_test(fh, NULL, &huge_ids_direct) < 0) FAIL_STACK_ERROR; if (cparam->id_len == 1) { - if (huge_ids_direct != TRUE) + if (huge_ids_direct != true) TEST_ERROR; } /* end if */ else if (tparam->actual_id_len >= 29) { - if (huge_ids_direct != TRUE) + if (huge_ids_direct != true) TEST_ERROR; } /* end if */ else { - if (huge_ids_direct != FALSE) + if (huge_ids_direct != false) TEST_ERROR; } /* end else */ @@ -15488,13 +15488,13 @@ error: */ /* Custom filter used to verify that the filters are actually called and do not * just silently fail */ -static hbool_t test_write_filter_called; +static bool test_write_filter_called; static size_t test_write_filter(unsigned int H5_ATTR_UNUSED flags, size_t H5_ATTR_UNUSED cd_nelmts, const unsigned int H5_ATTR_UNUSED cd_values[], size_t nbytes, size_t H5_ATTR_UNUSED *buf_size, void H5_ATTR_UNUSED **buf) { - test_write_filter_called = TRUE; + test_write_filter_called = true; return nbytes; } /* end link_filter_filter */ @@ -15511,7 +15511,7 @@ test_write(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) size_t id_len; /* Size of fractal heap IDs */ unsigned char tiny_heap_id[HEAP_ID_LEN]; /* Heap ID for 'tiny' object */ unsigned char huge_heap_id[HEAP_ID_LEN]; /* Heap ID for 'huge' object */ - hbool_t id_changed = FALSE; /* Whether the heap ID changed */ + bool id_changed = false; /* Whether the heap ID changed */ unsigned char *rewrite_obj = NULL; /* Pointer to re-write buffer for objects */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -15549,8 +15549,8 @@ test_write(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) /* Register and append custom filter */ filter_class.version = H5Z_CLASS_T_VERS; filter_class.id = H5Z_FILTER_RESERVED + 43; - filter_class.encoder_present = TRUE; - filter_class.decoder_present = TRUE; + filter_class.encoder_present = true; + filter_class.decoder_present = true; filter_class.name = "custom_fheap_filter"; filter_class.can_apply = NULL; filter_class.set_local = NULL; @@ -15559,7 +15559,7 @@ test_write(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) TEST_ERROR; if (H5Z_append(&tmp_cparam.pline, H5Z_FILTER_RESERVED + 43, 0, (size_t)0, NULL) < 0) FAIL_STACK_ERROR; - test_write_filter_called = FALSE; + test_write_filter_called = false; } /* end if */ /* Perform common file & heap open operations */ @@ -15621,7 +15621,7 @@ test_write(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) if (tparam->comp == FHEAP_TEST_COMPRESS) { if (!test_write_filter_called) TEST_ERROR; - test_write_filter_called = FALSE; + test_write_filter_called = false; } /* end if */ /* Re-open the file */ @@ -15959,8 +15959,8 @@ main(void) unsigned num_pb_fs = 1; /* The number of settings to test for page buffering and file space handling */ int ExpressMode; /* Express testing level */ const char *envval; /* Environment variable */ - hbool_t contig_addr_vfd; /* Whether VFD used has a contiguous address space */ - hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ + bool contig_addr_vfd; /* Whether VFD used has a contiguous address space */ + bool api_ctx_pushed = false; /* Whether API context pushed */ /* Don't run this test using certain file drivers */ envval = HDgetenv(HDF5_DRIVER); @@ -15968,7 +15968,7 @@ main(void) envval = "nomatch"; /* Current VFD that does not support contiguous address space */ - contig_addr_vfd = (hbool_t)(HDstrcmp(envval, "split") != 0 && HDstrcmp(envval, "multi") != 0); + contig_addr_vfd = (bool)(HDstrcmp(envval, "split") != 0 && HDstrcmp(envval, "multi") != 0); /* Reset library */ h5_reset(); @@ -16003,7 +16003,7 @@ main(void) /* Push API context */ if (H5CX_push() < 0) FAIL_STACK_ERROR; - api_ctx_pushed = TRUE; + api_ctx_pushed = true; /* Allocate space for the shared objects */ shared_obj_size_g = large_cparam.max_man_size + 256; @@ -16037,12 +16037,12 @@ main(void) switch (v) { case 0: - if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, FALSE, (hsize_t)1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, false, (hsize_t)1) < 0) TEST_ERROR; fapl = def_fapl; break; case 1: - if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, TRUE, (hsize_t)1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, true, (hsize_t)1) < 0) TEST_ERROR; fapl = def_fapl; /* This is a fix for the daily test failure from the checkin for libver bounds. */ @@ -16074,22 +16074,22 @@ main(void) TEST_ERROR; break; case 2: - if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, FALSE, (hsize_t)1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, false, (hsize_t)1) < 0) TEST_ERROR; fapl = def_fapl; break; case 3: - if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, TRUE, (hsize_t)1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, true, (hsize_t)1) < 0) TEST_ERROR; fapl = def_fapl; break; case 4: - if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, FALSE, (hsize_t)1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, false, (hsize_t)1) < 0) TEST_ERROR; fapl = pb_fapl; break; case 5: - if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, TRUE, (hsize_t)1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, true, (hsize_t)1) < 0) TEST_ERROR; fapl = pb_fapl; break; @@ -16528,9 +16528,9 @@ main(void) TEST_ERROR; /* Pop API context */ - if (api_ctx_pushed && H5CX_pop(FALSE) < 0) + if (api_ctx_pushed && H5CX_pop(false) < 0) FAIL_STACK_ERROR; - api_ctx_pushed = FALSE; + api_ctx_pushed = false; /* Clean up file used */ h5_cleanup(FILENAME, def_fapl); @@ -16554,7 +16554,7 @@ error: H5E_END_TRY if (api_ctx_pushed) - H5CX_pop(FALSE); + H5CX_pop(false); return 1; } /* end main() */ diff --git a/test/file_image.c b/test/file_image.c index 2b4e481..669afa9 100644 --- a/test/file_image.c +++ b/test/file_image.c @@ -676,14 +676,14 @@ error: */ H5_GCC_CLANG_DIAG_OFF("format-nonliteral") static int -test_get_file_image(const char *test_banner, const int file_name_num, hid_t fapl, hbool_t user) +test_get_file_image(const char *test_banner, const int file_name_num, hid_t fapl, bool user) { char file_name[1024] = "\0"; void *insertion_ptr = NULL; void *image_ptr = NULL; void *file_image_ptr = NULL; - hbool_t is_family_file = FALSE; - hbool_t identical; + bool is_family_file = false; + bool identical; int data[100]; int i; int fd = -1; @@ -710,7 +710,7 @@ test_get_file_image(const char *test_banner, const int file_name_num, hid_t fapl VERIFY(driver >= 0, "H5Pget_driver(fapl) failed"); if (driver == H5FD_FAMILY) - is_family_file = TRUE; + is_family_file = true; /* setup the file name */ h5_fixname(FILENAME2[file_name_num], fapl, file_name, sizeof(file_name)); @@ -885,11 +885,11 @@ test_get_file_image(const char *test_banner, const int file_name_num, hid_t fapl } /* verify that the file and the image contain the same data */ - identical = TRUE; + identical = true; i = 0; while ((i < (int)image_size) && identical) { if (((char *)image_ptr)[i] != ((char *)file_image_ptr)[i]) - identical = FALSE; + identical = false; i++; } VERIFY(identical, "file and image differ."); @@ -901,7 +901,7 @@ test_get_file_image(const char *test_banner, const int file_name_num, hid_t fapl VERIFY(core_fapl_id >= 0, "H5Pcreate() failed"); /* setup core_fapl_id to use the core file driver */ - err = H5Pset_fapl_core(core_fapl_id, (size_t)(64 * 1024), FALSE); + err = H5Pset_fapl_core(core_fapl_id, (size_t)(64 * 1024), false); VERIFY(err == SUCCEED, "H5Pset_fapl_core() failed."); /* Set file image in core fapl */ @@ -1121,7 +1121,7 @@ test_get_file_image_error_rejection(void) VERIFY(fapl_id >= 0, "H5Pcreate(2) failed"); /* setup the fapl for the multi file driver */ - err = H5Pset_fapl_multi(fapl_id, memb_map, memb_fapl, memb_name, memb_addr, FALSE); + err = H5Pset_fapl_multi(fapl_id, memb_map, memb_fapl, memb_name, memb_addr, false); VERIFY(err >= 0, "H5Pset_fapl_multi failed"); /* setup the file name */ @@ -1308,7 +1308,7 @@ main(void) { int errors = 0; hid_t fapl; - hbool_t driver_is_default_compatible; + bool driver_is_default_compatible; unsigned user; h5_reset(); @@ -1325,7 +1325,7 @@ main(void) } /* Perform tests with/without user block */ - for (user = FALSE; user <= TRUE; user++) { + for (user = false; user <= true; user++) { /* test H5Fget_file_image() with sec2 driver */ fapl = H5Pcreate(H5P_FILE_ACCESS); @@ -1343,7 +1343,7 @@ main(void) /* test H5Fget_file_image() with core driver */ fapl = H5Pcreate(H5P_FILE_ACCESS); - if (H5Pset_fapl_core(fapl, (size_t)(64 * 1024), TRUE) < 0) + if (H5Pset_fapl_core(fapl, (size_t)(64 * 1024), true) < 0) errors++; else errors += test_get_file_image("H5Fget_file_image() with core driver", 2, fapl, user); diff --git a/test/filenotclosed.c b/test/filenotclosed.c index 3142d4b..699b9ef 100644 --- a/test/filenotclosed.c +++ b/test/filenotclosed.c @@ -60,7 +60,7 @@ main(void) int buf[5] = {1, 2, 3, 4, 5}; /* The data to be written to the dataset */ char filename[100]; /* File name */ const char *env_h5_drvr; /* File Driver value from environment */ - hbool_t contig_addr_vfd; /* Contiguous address vfd */ + bool contig_addr_vfd; /* Contiguous address vfd */ /* Get the VFD to use */ env_h5_drvr = HDgetenv(HDF5_DRIVER); @@ -72,7 +72,7 @@ main(void) * Further investigation is needed to resolve the test failure with the * split/multi driver. Please see HDFFV-10160. */ - contig_addr_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); + contig_addr_vfd = (bool)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); if (!contig_addr_vfd) { SKIPPED(); HDputs(" Temporary skipped for a spilt/multi driver"); diff --git a/test/fillval.c b/test/fillval.c index 6813233..88f8114 100644 --- a/test/fillval.c +++ b/test/fillval.c @@ -2605,7 +2605,7 @@ main(int argc, char *argv[]) int nerrors = 0, argno, test_contig = 1, test_chunk = 1, test_compact = 1; hid_t fapl = (-1), fapl2 = (-1); /* File access property lists */ unsigned new_format; /* Whether to use the new format or not */ - hbool_t driver_is_default_compatible; + bool driver_is_default_compatible; if (argc >= 2) { test_contig = test_chunk = test_compact = 0; @@ -2642,7 +2642,7 @@ main(int argc, char *argv[]) TEST_ERROR; /* Loop over using new group format */ - for (new_format = FALSE; new_format <= TRUE; new_format++) { + for (new_format = false; new_format <= true; new_format++) { hid_t my_fapl; /* Set the FAPL for the type of format */ diff --git a/test/filter_fail.c b/test/filter_fail.c index 0044cf9..7a8051a 100644 --- a/test/filter_fail.c +++ b/test/filter_fail.c @@ -91,7 +91,7 @@ filter_fail(unsigned int flags, size_t H5_ATTR_UNUSED cd_nelmts, const unsigned *------------------------------------------------------------------------- */ static herr_t -test_filter_write(char *file_name, hid_t my_fapl, hbool_t cache_enabled) +test_filter_write(char *file_name, hid_t my_fapl, bool cache_enabled) { hid_t file = -1; hid_t dataset = -1; /* dataset ID */ @@ -129,7 +129,7 @@ test_filter_write(char *file_name, hid_t my_fapl, hbool_t cache_enabled) TEST_ERROR; /* Check that the filter was registered */ - if (TRUE != H5Zfilter_avail(H5Z_FILTER_FAIL_TEST)) + if (true != H5Zfilter_avail(H5Z_FILTER_FAIL_TEST)) FAIL_STACK_ERROR; /* Enable the filter as mandatory */ @@ -375,7 +375,7 @@ main(void) /* The chunk cache is used so that the flushing of data chunks happens * during H5Dclose. All values are default. */ - nerrors += (test_filter_write(filename, fapl, TRUE) < 0 ? 1 : 0); + nerrors += (test_filter_write(filename, fapl, true) < 0 ? 1 : 0); nerrors += (test_filter_read(filename, fapl) < 0 ? 1 : 0); h5_fixname(FILENAME[1], fapl, filename, sizeof filename); @@ -386,7 +386,7 @@ main(void) TEST_ERROR; /* Run the test again. */ - nerrors += (test_filter_write(filename, fapl, FALSE) < 0 ? 1 : 0); + nerrors += (test_filter_write(filename, fapl, false) < 0 ? 1 : 0); nerrors += (test_filter_read(filename, fapl) < 0 ? 1 : 0); /* Verify symbol table messages are cached */ diff --git a/test/filter_plugin.c b/test/filter_plugin.c index 6bd63d5..8c53b9f 100644 --- a/test/filter_plugin.c +++ b/test/filter_plugin.c @@ -144,11 +144,11 @@ error: *------------------------------------------------------------------------- */ static herr_t -compare_2D_arrays(int **dset1, int **dset2, const hsize_t *sizes, /*OUT*/ hbool_t *are_same) +compare_2D_arrays(int **dset1, int **dset2, const hsize_t *sizes, /*OUT*/ bool *are_same) { hsize_t i, j; /* index variables */ - *are_same = TRUE; + *are_same = true; /* Check all the array values. This could optionally emit any * bad data, but it's not clear how that would help debugging. @@ -156,7 +156,7 @@ compare_2D_arrays(int **dset1, int **dset2, const hsize_t *sizes, /*OUT*/ hbool_ for (i = 0; i < sizes[0]; i++) for (j = 0; j < sizes[1]; j++) if (dset1[i][j] != dset2[i][j]) { - *are_same = FALSE; + *are_same = false; return SUCCEED; } @@ -176,19 +176,19 @@ compare_2D_arrays(int **dset1, int **dset2, const hsize_t *sizes, /*OUT*/ hbool_ static herr_t ensure_filter_works(hid_t fid, const char *name, hid_t dcpl_id) { - hid_t did = -1; /* Dataset ID */ - hid_t dxpl_id = -1; /* Dataset xfer property list ID */ - hid_t write_dxpl_id = -1; /* Dataset xfer property list ID for writing */ - hid_t sid = -1; /* Dataspace ID */ - void *tconv_buf = NULL; /* Temporary conversion buffer */ - int **orig = NULL; /* Data written to the dataset */ - int **read = NULL; /* Data read from the dataset */ - size_t r, c; /* Data rows and columns */ - size_t hs_r, hs_c, hs_offr, hs_offc; /* Hypserslab sizes and offsets */ - size_t i, j; /* Local index variables */ - int n = 0; /* Value written to point array */ - hbool_t are_same; /* Output from dataset compare function */ - int ***save_array = NULL; /* (Global) array where the final data go */ + hid_t did = -1; /* Dataset ID */ + hid_t dxpl_id = -1; /* Dataset xfer property list ID */ + hid_t write_dxpl_id = -1; /* Dataset xfer property list ID for writing */ + hid_t sid = -1; /* Dataspace ID */ + void *tconv_buf = NULL; /* Temporary conversion buffer */ + int **orig = NULL; /* Data written to the dataset */ + int **read = NULL; /* Data read from the dataset */ + size_t r, c; /* Data rows and columns */ + size_t hs_r, hs_c, hs_offr, hs_offc; /* Hypserslab sizes and offsets */ + size_t i, j; /* Local index variables */ + int n = 0; /* Value written to point array */ + bool are_same; /* Output from dataset compare function */ + int ***save_array = NULL; /* (Global) array where the final data go */ /* initialize */ r = (size_t)sizes_g[0]; @@ -222,7 +222,7 @@ ensure_filter_works(hid_t fid, const char *name, hid_t dcpl_id) TESTING(" filters (setup)"); /* Check if all the filters are available */ - if (H5Pall_filters_avail(dcpl_id) != TRUE) + if (H5Pall_filters_avail(dcpl_id) != true) TEST_ERROR; /* Create the dataset */ @@ -243,7 +243,7 @@ ensure_filter_works(hid_t fid, const char *name, hid_t dcpl_id) /* The input buffer was calloc'd and has not been initialized yet */ if (compare_2D_arrays(orig, read, sizes_g, &are_same) < 0) TEST_ERROR; - if (FALSE == are_same) + if (false == are_same) TEST_ERROR; PASSED(); @@ -278,7 +278,7 @@ ensure_filter_works(hid_t fid, const char *name, hid_t dcpl_id) /* Check that the values read are the same as the values written */ if (compare_2D_arrays(orig, read, sizes_g, &are_same) < 0) TEST_ERROR; - if (FALSE == are_same) + if (false == are_same) TEST_ERROR; PASSED(); @@ -306,7 +306,7 @@ ensure_filter_works(hid_t fid, const char *name, hid_t dcpl_id) /* Check that the values read are the same as the values written */ if (compare_2D_arrays(orig, read, sizes_g, &are_same) < 0) TEST_ERROR; - if (FALSE == are_same) + if (false == are_same) TEST_ERROR; PASSED(); @@ -330,7 +330,7 @@ ensure_filter_works(hid_t fid, const char *name, hid_t dcpl_id) /* Check that the values read are the same as the values written */ if (compare_2D_arrays(orig, read, sizes_g, &are_same) < 0) TEST_ERROR; - if (FALSE == are_same) + if (false == are_same) TEST_ERROR; PASSED(); @@ -366,7 +366,7 @@ ensure_filter_works(hid_t fid, const char *name, hid_t dcpl_id) /* Check that the values read are the same as the values written */ if (compare_2D_arrays(orig, read, sizes_g, &are_same) < 0) TEST_ERROR; - if (FALSE == are_same) + if (false == are_same) TEST_ERROR; PASSED(); @@ -642,7 +642,7 @@ test_dataset_read_with_filters(hid_t fid) TESTING("dataset read I/O with deflate filter"); #ifdef H5_HAVE_FILTER_DEFLATE - if (H5Zfilter_avail(H5Z_FILTER_DEFLATE) != TRUE) + if (H5Zfilter_avail(H5Z_FILTER_DEFLATE) != true) TEST_ERROR; if ((did = H5Dopen2(fid, DSET_DEFLATE_NAME, H5P_DEFAULT)) < 0) @@ -960,7 +960,7 @@ test_path_api_calls(void) HDputs("Testing access to the filter path table"); - if (H5Zfilter_avail(FILTER1_ID) != TRUE) + if (H5Zfilter_avail(FILTER1_ID) != true) TEST_ERROR; /* Set the number of paths to create for this test. @@ -1443,7 +1443,7 @@ main(void) /* ENSURE THAT WRITING TO DATASETS AND CREATING GROUPS WORKS */ /*******************************************************************/ /* Test with old & new format groups */ - for (new_format = FALSE; new_format <= TRUE; new_format++) { + for (new_format = false; new_format <= true; new_format++) { hid_t my_fapl_id; /* Testing setup */ diff --git a/test/flush1.c b/test/flush1.c index 074c76c..288b269 100644 --- a/test/flush1.c +++ b/test/flush1.c @@ -38,7 +38,7 @@ static const char *FILENAME[] = {"flush", "flush-swmr", "noflu /* Number of sub-groups created in the containing group */ #define NGROUPS 100 -static hid_t create_file(const char *filename, hid_t fapl_id, hbool_t swmr); +static hid_t create_file(const char *filename, hid_t fapl_id, bool swmr); static herr_t add_dset_to_file(hid_t fid, const char *dset_name); /*------------------------------------------------------------------------- @@ -52,7 +52,7 @@ static herr_t add_dset_to_file(hid_t fid, const char *dset_name); *------------------------------------------------------------------------- */ static hid_t -create_file(const char *filename, hid_t fapl_id, hbool_t swmr) +create_file(const char *filename, hid_t fapl_id, bool swmr) { hid_t fid = -1; /* file ID */ hid_t top_gid = -1; /* containing group ID */ @@ -176,12 +176,12 @@ error: int main(void) { - char *driver = NULL; /* name of current VFD (from env var) */ - hbool_t vfd_supports_swmr; /* whether the current VFD supports SWMR */ - hid_t fid = -1; /* file ID */ - hid_t fapl_id = -1; /* file access proplist ID */ - char filename[1024]; /* filename */ - hbool_t use_swmr; /* whether or not to use SWMR I/O */ + char *driver = NULL; /* name of current VFD (from env var) */ + bool vfd_supports_swmr; /* whether the current VFD supports SWMR */ + hid_t fid = -1; /* file ID */ + hid_t fapl_id = -1; /* file access proplist ID */ + char filename[1024]; /* filename */ + bool use_swmr; /* whether or not to use SWMR I/O */ h5_reset(); if ((fapl_id = h5_fileaccess()) < 0) @@ -198,7 +198,7 @@ main(void) /* Create a file and flush */ TESTING("H5Fflush (part1 with flush)"); h5_fixname(FILENAME[0], fapl_id, filename, sizeof(filename)); - use_swmr = FALSE; + use_swmr = false; if ((fid = create_file(filename, fapl_id, use_swmr)) < 0) TEST_ERROR; if (H5Fflush(fid, H5F_SCOPE_GLOBAL) < 0) @@ -209,7 +209,7 @@ main(void) TESTING("H5Fflush (part1 with flush + SWMR)"); if (vfd_supports_swmr) { h5_fixname(FILENAME[1], fapl_id, filename, sizeof(filename)); - use_swmr = TRUE; + use_swmr = true; if ((fid = create_file(filename, fapl_id, use_swmr)) < 0) TEST_ERROR; if (H5Fflush(fid, H5F_SCOPE_GLOBAL) < 0) @@ -222,7 +222,7 @@ main(void) /* Create a file which will not be flushed */ TESTING("H5Fflush (part1 without flush)"); h5_fixname(FILENAME[2], fapl_id, filename, sizeof(filename)); - use_swmr = FALSE; + use_swmr = false; if ((fid = create_file(filename, fapl_id, use_swmr)) < 0) TEST_ERROR; PASSED(); @@ -231,7 +231,7 @@ main(void) TESTING("H5Fflush (part1 without flush + SWMR)"); if (vfd_supports_swmr) { h5_fixname(FILENAME[3], fapl_id, filename, sizeof(filename)); - use_swmr = TRUE; + use_swmr = true; if ((fid = create_file(filename, fapl_id, use_swmr)) < 0) TEST_ERROR; PASSED(); @@ -242,7 +242,7 @@ main(void) /* Create a file, flush, add a dataset, flush */ TESTING("H5Fflush (part1 with flush and later addition and another flush)"); h5_fixname(FILENAME[4], fapl_id, filename, sizeof(filename)); - use_swmr = FALSE; + use_swmr = false; if ((fid = create_file(filename, fapl_id, use_swmr)) < 0) TEST_ERROR; if (H5Fflush(fid, H5F_SCOPE_GLOBAL) < 0) @@ -257,7 +257,7 @@ main(void) TESTING("H5Fflush (part1 with flush and later addition and another flush + SWMR)"); if (vfd_supports_swmr) { h5_fixname(FILENAME[5], fapl_id, filename, sizeof(filename)); - use_swmr = TRUE; + use_swmr = true; if ((fid = create_file(filename, fapl_id, use_swmr)) < 0) TEST_ERROR; if (H5Fflush(fid, H5F_SCOPE_GLOBAL) < 0) @@ -274,7 +274,7 @@ main(void) /* Create a file, flush, add a dataset, (no flush) */ TESTING("H5Fflush (part1 with flush and later addition)"); h5_fixname(FILENAME[6], fapl_id, filename, sizeof(filename)); - use_swmr = FALSE; + use_swmr = false; if ((fid = create_file(filename, fapl_id, use_swmr)) < 0) TEST_ERROR; if (H5Fflush(fid, H5F_SCOPE_GLOBAL) < 0) @@ -287,7 +287,7 @@ main(void) TESTING("H5Fflush (part1 with flush and later addition + SWMR)"); if (vfd_supports_swmr) { h5_fixname(FILENAME[7], fapl_id, filename, sizeof(filename)); - use_swmr = TRUE; + use_swmr = true; if ((fid = create_file(filename, fapl_id, use_swmr)) < 0) TEST_ERROR; if (H5Fflush(fid, H5F_SCOPE_GLOBAL) < 0) diff --git a/test/flush2.c b/test/flush2.c index 05beed7..e0f4224 100644 --- a/test/flush2.c +++ b/test/flush2.c @@ -39,19 +39,19 @@ static const char *FILENAME[] = {"flush", "flush-swmr", "noflu /* Number of sub-groups created in the containing group */ #define NGROUPS 100 -static hbool_t dset_ok(hid_t fid, const char *dset_name); -static hbool_t file_ok(const char *filename, hid_t fapl_id, hbool_t check_second_dset); +static bool dset_ok(hid_t fid, const char *dset_name); +static bool file_ok(const char *filename, hid_t fapl_id, bool check_second_dset); /*------------------------------------------------------------------------- * Function: dset_ok * * Purpose: Checks if the data in a dataset is what it is supposed to be. * - * Return: TRUE/FALSE + * Return: true/false * *------------------------------------------------------------------------- */ -static hbool_t +static bool dset_ok(hid_t fid, const char *dset_name) { hid_t sid = -1; /* dataspace ID */ @@ -86,7 +86,7 @@ dset_ok(hid_t fid, const char *dset_name) free(data); - return TRUE; + return true; error: H5E_BEGIN_TRY @@ -98,7 +98,7 @@ error: free(data); - return FALSE; + return false; } /* end dset_ok() */ /*------------------------------------------------------------------------- @@ -106,12 +106,12 @@ error: * * Purpose: Checks that the contents of a file are what they should be. * - * Return: TRUE/FALSE + * Return: true/false * *------------------------------------------------------------------------- */ -static hbool_t -file_ok(const char *filename, hid_t fapl_id, hbool_t check_second_dset) +static bool +file_ok(const char *filename, hid_t fapl_id, bool check_second_dset) { hid_t fid = -1; /* file ID */ hid_t top_gid = -1; /* containing group ID */ @@ -146,7 +146,7 @@ file_ok(const char *filename, hid_t fapl_id, hbool_t check_second_dset) if (H5Fclose(fid) < 0) goto error; - return TRUE; + return true; error: H5E_BEGIN_TRY @@ -157,7 +157,7 @@ error: } H5E_END_TRY - return FALSE; + return false; } /* end file_ok() */ /*------------------------------------------------------------------------- @@ -173,9 +173,9 @@ error: static herr_t clear_status_flags(const char *filename, hid_t fapl_id) { - hid_t new_fapl_id = -1; /* copy of the file access plist ID */ - hid_t fid = -1; /* file ID */ - hbool_t clear = TRUE; + hid_t new_fapl_id = -1; /* copy of the file access plist ID */ + hid_t fid = -1; /* file ID */ + bool clear = true; /* Get a copy of fapl */ if ((new_fapl_id = H5Pcopy(fapl_id)) < 0) @@ -224,12 +224,12 @@ int main(void) { char *driver = NULL; /* name of current VFD (from env var) */ - hbool_t vfd_supports_swmr; /* whether the current VFD supports SWMR */ + bool vfd_supports_swmr; /* whether the current VFD supports SWMR */ hid_t fapl_id = -1; /* file access proplist ID */ char filename[1024]; /* filename */ - hbool_t check_second_dset; /* whether or not to check the second dset */ + bool check_second_dset; /* whether or not to check the second dset */ H5E_auto2_t func; /* for shutting off error reporting */ - hbool_t driver_is_default_vfd_compatible; + bool driver_is_default_vfd_compatible; h5_reset(); if ((fapl_id = h5_fileaccess()) < 0) @@ -253,7 +253,7 @@ main(void) /* Check the case where the file was flushed */ TESTING("H5Fflush (part2 with flush)"); h5_fixname(FILENAME[0], fapl_id, filename, sizeof(filename)); - check_second_dset = FALSE; + check_second_dset = false; if (file_ok(filename, fapl_id, check_second_dset)) PASSED(); else @@ -264,7 +264,7 @@ main(void) TESTING("H5Fflush (part2 with flush + SWMR)"); if (vfd_supports_swmr) { h5_fixname(FILENAME[1], fapl_id, filename, sizeof(filename)); - check_second_dset = FALSE; + check_second_dset = false; if (clear_status_flags(filename, fapl_id) < 0) TEST_ERROR; if (file_ok(filename, fapl_id, check_second_dset)) @@ -284,7 +284,7 @@ main(void) if (H5Eset_auto2(H5E_DEFAULT, NULL, NULL) < 0) FAIL_STACK_ERROR; h5_fixname(FILENAME[2], fapl_id, filename, sizeof(filename)); - check_second_dset = FALSE; + check_second_dset = false; if (file_ok(filename, fapl_id, check_second_dset)) { #if defined H5_HAVE_WIN32_API && !defined(hdf5_EXPORTS) SKIPPED(); @@ -309,7 +309,7 @@ main(void) if (H5Eset_auto2(H5E_DEFAULT, NULL, NULL) < 0) FAIL_STACK_ERROR; h5_fixname(FILENAME[3], fapl_id, filename, sizeof(filename)); - check_second_dset = FALSE; + check_second_dset = false; if (clear_status_flags(filename, fapl_id) < 0) TEST_ERROR; if (file_ok(filename, fapl_id, check_second_dset)) { @@ -334,7 +334,7 @@ main(void) * added afterward and then flushed */ TESTING("H5Fflush (part2 with flush and later addition and another flush)"); - check_second_dset = TRUE; + check_second_dset = true; h5_fixname(FILENAME[4], fapl_id, filename, sizeof(filename)); if (file_ok(filename, fapl_id, check_second_dset)) PASSED(); @@ -347,7 +347,7 @@ main(void) */ TESTING("H5Fflush (part2 with flush and later addition and another flush + SWMR)"); if (vfd_supports_swmr) { - check_second_dset = TRUE; + check_second_dset = true; h5_fixname(FILENAME[5], fapl_id, filename, sizeof(filename)); if (clear_status_flags(filename, fapl_id) < 0) TEST_ERROR; @@ -370,7 +370,7 @@ main(void) if (H5Eset_auto2(H5E_DEFAULT, NULL, NULL) < 0) FAIL_STACK_ERROR; h5_fixname(FILENAME[6], fapl_id, filename, sizeof(filename)); - check_second_dset = TRUE; + check_second_dset = true; if (file_ok(filename, fapl_id, check_second_dset)) { #if defined H5_HAVE_WIN32_API && !defined(hdf5_EXPORTS) SKIPPED(); @@ -397,7 +397,7 @@ main(void) if (H5Eset_auto2(H5E_DEFAULT, NULL, NULL) < 0) FAIL_STACK_ERROR; h5_fixname(FILENAME[7], fapl_id, filename, sizeof(filename)); - check_second_dset = TRUE; + check_second_dset = true; if (clear_status_flags(filename, fapl_id) < 0) TEST_ERROR; if (file_ok(filename, fapl_id, check_second_dset)) { diff --git a/test/flushrefresh.c b/test/flushrefresh.c index 745b6ef..f42f65c 100644 --- a/test/flushrefresh.c +++ b/test/flushrefresh.c @@ -1199,7 +1199,7 @@ refresh_verification(const char *obj_pathname) H5O_native_info_t refreshed_ninfo; int tries = 800, sleep_tries = 400; int token_cmp; - hbool_t ok = FALSE; + bool ok = false; HDremove(SIGNAL_BETWEEN_PROCESSES_2); @@ -1304,7 +1304,7 @@ refresh_verification(const char *obj_pathname) (flushed_ninfo.hdr.nmesgs != refreshed_ninfo.hdr.nmesgs) && (flushed_ninfo.hdr.nchunks != refreshed_ninfo.hdr.nchunks) && (flushed_ninfo.hdr.space.total != refreshed_ninfo.hdr.space.total)) { - ok = TRUE; + ok = true; break; } diff --git a/test/freespace.c b/test/freespace.c index e1628b7..a118a72 100644 --- a/test/freespace.c +++ b/test/freespace.c @@ -276,10 +276,10 @@ TEST_sect_free(H5FS_section_info_t *sect) /* * Determine if the section can be shrunk and set _udata accordingly - * if _udata passed in is NULL, return FALSE + * if _udata passed in is NULL, return false * Otherwise: - * if section's address+size is the end of file, return TRUE - * otherwise return FALSE + * if section's address+size is the end of file, return true + * otherwise return false */ static herr_t TEST_sect_can_shrink(const H5FS_section_info_t *_sect, void *_udata) @@ -289,15 +289,15 @@ TEST_sect_can_shrink(const H5FS_section_info_t *_sect, void *_udata) haddr_t end, eoa; if (can_shrink == NULL) - return FALSE; + return false; end = sect->sect_info.addr + sect->sect_info.size; eoa = TEST_get_eoa(); if (end == eoa) - *can_shrink = TRUE; + *can_shrink = true; else - *can_shrink = FALSE; + *can_shrink = false; return (htri_t)*can_shrink; } /* TEST_sect_can_shrink() */ @@ -317,11 +317,11 @@ TEST_sect_shrinking(H5FS_section_info_t **_sect, void *_udata) if (TEST_sect_free((H5FS_section_info_t *)*sect) < 0) TEST_ERROR; *sect = NULL; - return TRUE; + return true; } /* end if */ error: - return FALSE; + return false; } /* @@ -593,7 +593,7 @@ test_fs_sect_add(hid_t fapl) TEST_free_section_t *sect_node = NULL; unsigned init_flags = 0; h5_stat_size_t file_size = 0, tmp_file_size = 0, fr_meta_size = 0; - unsigned can_shrink = FALSE; + unsigned can_shrink = false; TESTING("adding a section via H5FS_sect_add() to free-space: test 1"); @@ -936,7 +936,7 @@ test_fs_sect_find(hid_t fapl) TEST_free_section_t *sect_node1 = NULL, *sect_node2, *sect_node3 = NULL, *sect_node4 = NULL; TEST_free_section_t *node; - htri_t node_found = FALSE; + htri_t node_found = false; unsigned init_flags = 0; TESTING("H5FS_sect_find(): free-space is empty"); @@ -1320,7 +1320,7 @@ test_fs_sect_merge(hid_t fapl) TEST_free_section_t *sect_node1 = NULL, *sect_node2 = NULL, *sect_node3 = NULL, *sect_node4 = NULL; unsigned init_flags = 0; - htri_t node_found = FALSE; + htri_t node_found = false; TEST_free_section_t *node; TESTING("the merge of sections when H5FS_sect_add() to free-space: test 1"); @@ -1798,8 +1798,8 @@ test_fs_sect_shrink(hid_t fapl) TEST_free_section_t *sect_node1 = NULL, *sect_node2 = NULL; unsigned init_flags = 0; - unsigned can_shrink = FALSE; - htri_t node_found = FALSE; + unsigned can_shrink = false; + htri_t node_found = false; TEST_free_section_t *node; TESTING("shrinking of sections when H5FS_sect_add() to free-space: test 1"); @@ -1839,7 +1839,7 @@ test_fs_sect_shrink(hid_t fapl) init_sect_node(sect_node1, (haddr_t)TEST_SECT_ADDR100, (hsize_t)TEST_SECT_SIZE50, TEST_FSPACE_SECT_TYPE_NEW, H5FS_SECT_LIVE); - can_shrink = FALSE; + can_shrink = false; if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node1, H5FS_ADD_RETURNED_SPACE, &can_shrink) < 0) FAIL_STACK_ERROR; @@ -1874,7 +1874,7 @@ test_fs_sect_shrink(hid_t fapl) init_sect_node(sect_node1, (haddr_t)TEST_SECT_ADDR100, (hsize_t)TEST_SECT_SIZE50, TEST_FSPACE_SECT_TYPE, H5FS_SECT_LIVE); - can_shrink = FALSE; + can_shrink = false; if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node1, H5FS_ADD_RETURNED_SPACE, &can_shrink) < 0) FAIL_STACK_ERROR; @@ -2505,7 +2505,7 @@ test_fs_sect_extend(hid_t fapl) if ((status = H5FS_sect_try_extend(f, frsp, (haddr_t)TEST_SECT_SIZE80, (hsize_t)TEST_SECT_SIZE20, (hsize_t)TEST_SECT_SIZE40, 0, NULL)) < 0) FAIL_STACK_ERROR; - if (FALSE == status) + if (false == status) TEST_ERROR; /* Succeed in extending the block: free space info is decremented accordingly */ @@ -2582,7 +2582,7 @@ test_fs_sect_extend(hid_t fapl) if ((status = H5FS_sect_try_extend(f, frsp, (haddr_t)TEST_SECT_ADDR80, (hsize_t)TEST_SECT_SIZE20, (hsize_t)TEST_SECT_SIZE50, 0, NULL)) < 0) FAIL_STACK_ERROR; - if (TRUE == status) + if (true == status) TEST_ERROR; /* Not able to extend the block: free space info remains the same */ @@ -2656,7 +2656,7 @@ test_fs_sect_extend(hid_t fapl) if ((status = H5FS_sect_try_extend(f, frsp, (haddr_t)TEST_SECT_ADDR80, (hsize_t)TEST_SECT_SIZE20, (hsize_t)TEST_SECT_SIZE30, 0, NULL)) < 0) TEST_ERROR; - if (FALSE == status) + if (false == status) TEST_ERROR; /* Succeed in extending the block: total free space is decreased but other info remains the same */ @@ -2731,7 +2731,7 @@ test_fs_sect_extend(hid_t fapl) if ((status = H5FS_sect_try_extend(f, frsp, (haddr_t)TEST_SECT_ADDR80, (hsize_t)TEST_SECT_SIZE15, (hsize_t)TEST_SECT_SIZE40, 0, NULL)) < 0) TEST_ERROR; - if (TRUE == status) + if (true == status) TEST_ERROR; /* Not able to extend the block: free space manager info remains the same */ @@ -2876,7 +2876,7 @@ main(void) { hid_t fapl = -1; /* File access property list for data files */ unsigned nerrors = 0; /* Cumulative error count */ - hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ + bool api_ctx_pushed = false; /* Whether API context pushed */ h5_reset(); @@ -2888,7 +2888,7 @@ main(void) /* Push API context */ if (H5CX_push() < 0) FAIL_STACK_ERROR; - api_ctx_pushed = TRUE; + api_ctx_pushed = true; /* make sure alignment is not set for tests to succeed */ if (H5Pset_alignment(fapl, (hsize_t)1, (hsize_t)1) < 0) { @@ -2913,9 +2913,9 @@ main(void) HDputs("All free-space tests passed."); /* Pop API context */ - if (api_ctx_pushed && H5CX_pop(FALSE) < 0) + if (api_ctx_pushed && H5CX_pop(false) < 0) FAIL_STACK_ERROR; - api_ctx_pushed = FALSE; + api_ctx_pushed = false; h5_cleanup(FILENAME, fapl); exit(EXIT_SUCCESS); @@ -2929,7 +2929,7 @@ error: H5E_END_TRY if (api_ctx_pushed) - H5CX_pop(FALSE); + H5CX_pop(false); exit(EXIT_FAILURE); } /* main() */ diff --git a/test/gen_bad_ohdr.c b/test/gen_bad_ohdr.c index d2a9d09..452c622 100644 --- a/test/gen_bad_ohdr.c +++ b/test/gen_bad_ohdr.c @@ -29,23 +29,23 @@ #define ATTRNAME2 "Attribute #2" #endif /* H5O_ENABLE_BAD_MESG_COUNT */ -#ifndef TRUE -#define TRUE 1 -#endif /* TRUE */ -#ifndef FALSE -#define FALSE 0 -#endif /* FALSE */ +#ifndef true +#define true 1 +#endif /* true */ +#ifndef false +#define false 0 +#endif /* false */ int main(void) { #ifdef H5O_ENABLE_BAD_MESG_COUNT - hid_t fid = -1; /* File ID */ - hid_t gid = -1; /* Group ID */ - hid_t sid = -1; /* Dataspace ID */ - hid_t aid = -1; /* Attribute ID */ - hid_t gcpl = -1; /* Group creation property list ID */ - hbool_t store_bad_mesg_count; /* Flag for storing a bad message count */ + hid_t fid = -1; /* File ID */ + hid_t gid = -1; /* Group ID */ + hid_t sid = -1; /* Dataspace ID */ + hid_t aid = -1; /* Attribute ID */ + hid_t gcpl = -1; /* Group creation property list ID */ + bool store_bad_mesg_count; /* Flag for storing a bad message count */ /* Create test file */ if ((fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) @@ -56,7 +56,7 @@ main(void) goto error; /* Add property for storing bad message count */ - store_bad_mesg_count = TRUE; + store_bad_mesg_count = true; if (H5Pinsert2(gcpl, H5O_BAD_MESG_COUNT_NAME, H5O_BAD_MESG_COUNT_SIZE, &store_bad_mesg_count, NULL, NULL, NULL, NULL, NULL, NULL) < 0) goto error; diff --git a/test/gen_bogus.c b/test/gen_bogus.c index adccc5c..5ace0c9 100644 --- a/test/gen_bogus.c +++ b/test/gen_bogus.c @@ -23,12 +23,12 @@ #define FILENAME "tbogus.h5" #endif /* H5O_ENABLE_BOGUS */ -#ifndef TRUE -#define TRUE 1 -#endif /* TRUE */ -#ifndef FALSE -#define FALSE 0 -#endif /* FALSE */ +#ifndef true +#define true 1 +#endif /* true */ +#ifndef false +#define false 0 +#endif /* false */ #ifdef H5O_ENABLE_BOGUS diff --git a/test/gen_filespace.c b/test/gen_filespace.c index 69c1c1e..59896b3 100644 --- a/test/gen_filespace.c +++ b/test/gen_filespace.c @@ -26,8 +26,8 @@ const char *FILENAMES[] = { #define DATASET "dset" #define NUM_ELMTS 100 -#define FALSE 0 -#define TRUE 1 +#define false 0 +#define true 1 /* * Compile and run this program in the trunk to generate @@ -59,7 +59,7 @@ main(void) j = 0; for (fs_strategy = H5F_FSPACE_STRATEGY_FSM_AGGR; fs_strategy < H5F_FSPACE_STRATEGY_NTYPES; fs_strategy++) { - for (fs_persist = FALSE; fs_persist <= TRUE; fs_persist++) { + for (fs_persist = false; fs_persist <= true; fs_persist++) { if (fs_persist && fs_strategy >= H5F_FSPACE_STRATEGY_AGGR) continue; diff --git a/test/gen_plist.c b/test/gen_plist.c index bd94e9c..a15b424 100644 --- a/test/gen_plist.c +++ b/test/gen_plist.c @@ -48,12 +48,12 @@ main(void) int little_endian; int word_length; H5AC_cache_config_t my_cache_config = {H5AC__CURR_CACHE_CONFIG_VERSION, - 1 /*TRUE*/, - 0 /*FALSE*/, - 0 /*FALSE*/, + 1 /*true*/, + 0 /*false*/, + 0 /*false*/, "temp", - 1 /*TRUE*/, - 0 /*FALSE*/, + 1 /*true*/, + 0 /*false*/, (2 * 2048 * 1024), 0.3, (64 * 1024 * 1024), @@ -62,7 +62,7 @@ main(void) H5C_incr__threshold, 0.8, 3.0, - 1 /*TRUE*/, + 1 /*true*/, (8 * 1024 * 1024), H5C_flash_incr__add_space, 2.0, @@ -70,14 +70,14 @@ main(void) H5C_decr__age_out_with_threshold, 0.997, 0.8, - 1 /*TRUE*/, + 1 /*true*/, (3 * 1024 * 1024), 3, - 0 /*FALSE*/, + 0 /*false*/, 0.2, (256 * 2048), H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY}; - H5AC_cache_image_config_t my_cache_image_config = {H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION, TRUE, FALSE, + H5AC_cache_image_config_t my_cache_image_config = {H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION, true, false, -1}; /* check endianness */ @@ -119,7 +119,7 @@ main(void) if ((ret = H5Pset_fill_value(dcpl1, H5T_STD_I32BE, &fill)) < 0) assert(ret > 0); - if ((ret = H5Pset_dset_no_attrs_hint(dcpl1, FALSE)) < 0) + if ((ret = H5Pset_dset_no_attrs_hint(dcpl1, false)) < 0) assert(ret > 0); max_size[0] = 100; @@ -186,7 +186,7 @@ main(void) if ((ret = H5Pset_selection_io(dxpl1, H5D_SELECTION_IO_MODE_ON)) < 0) assert(ret > 0); - if ((ret = H5Pset_modify_write_buf(dxpl1, TRUE)) < 0) + if ((ret = H5Pset_modify_write_buf(dxpl1, true)) < 0) assert(ret > 0); if ((ret = encode_plist(dxpl1, little_endian, word_length, "testfiles/plist_files/dxpl_")) < 0) @@ -233,7 +233,7 @@ main(void) if ((ret = encode_plist(lcpl1, little_endian, word_length, "testfiles/plist_files/def_lcpl_")) < 0) assert(ret > 0); - if ((ret = H5Pset_create_intermediate_group(lcpl1, 1 /*TRUE*/)) < 0) + if ((ret = H5Pset_create_intermediate_group(lcpl1, 1 /*true*/)) < 0) assert(ret > 0); if ((ret = encode_plist(lcpl1, little_endian, word_length, "testfiles/plist_files/lcpl_")) < 0) @@ -394,7 +394,7 @@ main(void) if ((ret = H5Pset_sizes(fcpl1, 8, 4) < 0)) assert(ret > 0); - if ((ret = H5Pset_file_space_strategy(fcpl1, H5F_FSPACE_STRATEGY_PAGE, TRUE, (hsize_t)1)) < 0) + if ((ret = H5Pset_file_space_strategy(fcpl1, H5F_FSPACE_STRATEGY_PAGE, true, (hsize_t)1)) < 0) assert(ret > 0); if ((ret = H5Pset_file_space_page_size(fcpl1, (hsize_t)4096)) < 0) diff --git a/test/genall5.c b/test/genall5.c index 005e944..21a7fb9 100644 --- a/test/genall5.c +++ b/test/genall5.c @@ -32,7 +32,7 @@ * * If pass is false on entry, do nothing. * - * If an error is detected, set pass to FALSE, and set + * If an error is detected, set pass to false, and set * failure_mssg to point to an appropriate error message. * * Return: void @@ -51,7 +51,7 @@ ns_grp_0(hid_t fid, const char *group_name) gcpl = H5Pcreate(H5P_GROUP_CREATE); if (gcpl <= 0) { - pass = FALSE; + pass = false; failure_mssg = "ns_grp_0: H5Pcreate() failed"; } assert(gcpl > 0); @@ -61,7 +61,7 @@ ns_grp_0(hid_t fid, const char *group_name) ret = H5Pset_link_creation_order(gcpl, H5P_CRT_ORDER_TRACKED); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ns_grp_0: H5Pset_link_creation_order() failed"; } assert(ret >= 0); @@ -71,7 +71,7 @@ ns_grp_0(hid_t fid, const char *group_name) gid = H5Gcreate2(fid, group_name, H5P_DEFAULT, gcpl, H5P_DEFAULT); if (gid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "ns_grp_0: H5Gcreate2() failed"; } assert(gid > 0); @@ -81,7 +81,7 @@ ns_grp_0(hid_t fid, const char *group_name) ret = H5Pclose(gcpl); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ns_grp_0: H5Pclose(gcpl) failed"; } assert(ret >= 0); @@ -91,7 +91,7 @@ ns_grp_0(hid_t fid, const char *group_name) ret = H5Gclose(gid); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ns_grp_0: H5Gclose(gid) failed"; } assert(ret >= 0); @@ -107,7 +107,7 @@ ns_grp_0(hid_t fid, const char *group_name) * * If pass is false on entry, do nothing. * - * If an error is detected, set pass to FALSE, and set + * If an error is detected, set pass to false, and set * failure_mssg to point to an appropriate error message. * * Return: void @@ -128,7 +128,7 @@ vrfy_ns_grp_0(hid_t fid, const char *group_name) gid = H5Gopen2(fid, group_name, H5P_DEFAULT); if (gid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_0: H5Gopen2() failed"; } assert(gid > 0); @@ -138,7 +138,7 @@ vrfy_ns_grp_0(hid_t fid, const char *group_name) gcpl = H5Gget_create_plist(gid); if (gcpl <= 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_0: H5Gget_create_plist() failed"; } assert(gcpl > 0); @@ -148,11 +148,11 @@ vrfy_ns_grp_0(hid_t fid, const char *group_name) ret = H5Pget_link_creation_order(gcpl, &crt_order_flags); if (gcpl <= 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_0: H5Pget_link_creation_order() failed"; } else if (H5P_CRT_ORDER_TRACKED != crt_order_flags) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_0: H5P_CRT_ORDER_TRACKED != crt_order_flags"; } assert(ret >= 0); @@ -163,7 +163,7 @@ vrfy_ns_grp_0(hid_t fid, const char *group_name) ret = H5Pclose(gcpl); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_0: H5Pclose() failed"; } assert(ret >= 0); @@ -174,38 +174,38 @@ vrfy_ns_grp_0(hid_t fid, const char *group_name) ret = H5Gget_info(gid, &grp_info); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_0: H5Gget_info() failed"; } else if (H5G_STORAGE_TYPE_COMPACT != grp_info.storage_type) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_0: H5G_STORAGE_TYPE_COMPACT != grp_info.storage_type"; } else if (0 != grp_info.nlinks) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_0: 0 != grp_info.nlinks"; } else if (0 != grp_info.max_corder) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_0: 0 != grp_info.max_corder"; } - else if (FALSE != grp_info.mounted) { - pass = FALSE; - failure_mssg = "vrfy_ns_grp_0: FALSE != grp_info.mounted"; + else if (false != grp_info.mounted) { + pass = false; + failure_mssg = "vrfy_ns_grp_0: false != grp_info.mounted"; } assert(ret >= 0); assert(H5G_STORAGE_TYPE_COMPACT == grp_info.storage_type); assert(0 == grp_info.nlinks); assert(0 == grp_info.max_corder); - assert(FALSE == grp_info.mounted); + assert(false == grp_info.mounted); } if (pass) { ret = H5Gclose(gid); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_0: H5Gclose() failed"; } assert(ret >= 0); @@ -221,7 +221,7 @@ vrfy_ns_grp_0(hid_t fid, const char *group_name) * * If pass is false on entry, do nothing. * - * If an error is detected, set pass to FALSE, and set + * If an error is detected, set pass to false, and set * failure_mssg to point to an appropriate error message. * * Return: void @@ -242,7 +242,7 @@ ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) gcpl = H5Pcreate(H5P_GROUP_CREATE); if (gcpl <= 0) { - pass = FALSE; + pass = false; failure_mssg = "ns_grp_c: H5Pcreate(H5P_GROUP_CREATE) failed"; } assert(gcpl > 0); @@ -252,7 +252,7 @@ ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) ret = H5Pset_link_creation_order(gcpl, H5P_CRT_ORDER_TRACKED); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ns_grp_c: H5Pset_link_creation_order() failed"; } assert(ret >= 0); @@ -262,7 +262,7 @@ ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) gid = H5Gcreate2(fid, group_name, H5P_DEFAULT, gcpl, H5P_DEFAULT); if (gid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "ns_grp_c: H5Gcreate2() failed"; } assert(gid > 0); @@ -273,15 +273,15 @@ ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) ret = H5Pget_link_phase_change(gcpl, &max_compact, NULL); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ns_grp_c: H5Pget_link_phase_change() failed"; } else if (nlinks <= 0) { - pass = FALSE; + pass = false; failure_mssg = "ns_grp_c: nlinks <= 0"; } else if (nlinks >= max_compact) { - pass = FALSE; + pass = false; failure_mssg = "ns_grp_c: nlinks >= max_compact"; } @@ -300,7 +300,7 @@ ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) ret = H5Lcreate_soft(group_name, gid, linkname, H5P_DEFAULT, H5P_DEFAULT); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ns_grp_c: H5Lcreate_soft() failed"; } assert(ret >= 0); @@ -309,7 +309,7 @@ ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) ret = H5Lcreate_hard(fid, "/", gid, linkname, H5P_DEFAULT, H5P_DEFAULT); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ns_grp_c: H5Lcreate_hard() failed"; } assert(ret >= 0); @@ -319,7 +319,7 @@ ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) ret = H5Lcreate_external("external.h5", "/ext", gid, linkname, H5P_DEFAULT, H5P_DEFAULT); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ns_grp_c: H5Lcreate_external() failed"; } assert(ret >= 0); @@ -332,7 +332,7 @@ ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) ret = H5Pclose(gcpl); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ns_grp_c: H5Pclose(gcpl) failed"; } assert(ret >= 0); @@ -342,7 +342,7 @@ ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) ret = H5Gclose(gid); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ns_grp_c: H5Gclose(gid) failed"; } assert(ret >= 0); @@ -358,7 +358,7 @@ ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) * * If pass is false on entry, do nothing. * - * If an error is detected, set pass to FALSE, and set + * If an error is detected, set pass to false, and set * failure_mssg to point to an appropriate error message. * * Return: void @@ -380,7 +380,7 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) gid = H5Gopen2(fid, group_name, H5P_DEFAULT); if (gid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_c: H5Gopen2() failed"; } assert(gid > 0); @@ -390,7 +390,7 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) gcpl = H5Gget_create_plist(gid); if (gcpl <= 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_c: H5Gget_create_plist(gid) failed"; } assert(gcpl > 0); @@ -400,11 +400,11 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) ret = H5Pget_link_creation_order(gcpl, &crt_order_flags); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_c: H5Pget_link_creation_order() failed"; } else if (H5P_CRT_ORDER_TRACKED != crt_order_flags) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_c: H5P_CRT_ORDER_TRACKED != crt_order_flags"; } assert(ret >= 0); @@ -415,7 +415,7 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) ret = H5Pclose(gcpl); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_c: H5Pclose() failed"; } assert(ret >= 0); @@ -426,31 +426,31 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) ret = H5Gget_info(gid, &grp_info); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_c: H5Gget_info() failed"; } else if (H5G_STORAGE_TYPE_COMPACT != grp_info.storage_type) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_c: H5G_STORAGE_TYPE_COMPACT != grp_info.storage_type"; } else if (nlinks != grp_info.nlinks) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_c: nlinks != grp_info.nlinks"; } else if (nlinks != grp_info.max_corder) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_c: nlinks != grp_info.max_corder"; } - else if (FALSE != grp_info.mounted) { - pass = FALSE; - failure_mssg = "vrfy_ns_grp_c: FALSE != grp_info.mounted"; + else if (false != grp_info.mounted) { + pass = false; + failure_mssg = "vrfy_ns_grp_c: false != grp_info.mounted"; } assert(ret >= 0); assert(H5G_STORAGE_TYPE_COMPACT == grp_info.storage_type); assert(nlinks == grp_info.nlinks); assert(nlinks == grp_info.max_corder); - assert(FALSE == grp_info.mounted); + assert(false == grp_info.mounted); } u = 0; @@ -463,7 +463,7 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) link_exists = H5Lexists(gid, linkname, H5P_DEFAULT); if (link_exists < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_c: H5Lexists() failed"; } assert(link_exists >= 0); @@ -472,23 +472,23 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) ret = H5Lget_info2(gid, linkname, &lnk_info, H5P_DEFAULT); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_c: H5Lget_info() failed"; } - else if (TRUE != lnk_info.corder_valid) { - pass = FALSE; - failure_mssg = "vrfy_ns_grp_c: TRUE != lnk_info.corder_valid"; + else if (true != lnk_info.corder_valid) { + pass = false; + failure_mssg = "vrfy_ns_grp_c: true != lnk_info.corder_valid"; } else if (u != lnk_info.corder) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_c: u != lnk_info.corder"; } else if (H5T_CSET_ASCII != lnk_info.cset) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_c: H5T_CSET_ASCII != lnk_info.cset"; } assert(ret >= 0); - assert(TRUE == lnk_info.corder_valid); + assert(true == lnk_info.corder_valid); assert(u == lnk_info.corder); assert(H5T_CSET_ASCII == lnk_info.cset); @@ -496,11 +496,11 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) char *slinkval; if (H5L_TYPE_SOFT != lnk_info.type) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_c: H5L_TYPE_SOFT != lnk_info.type"; } else if ((HDstrlen(group_name) + 1) != lnk_info.u.val_size) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_c: (HDstrlen(group_name) + 1) != lnk_info.u.val_size"; } assert(H5L_TYPE_SOFT == lnk_info.type); @@ -509,18 +509,18 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) slinkval = (char *)malloc(lnk_info.u.val_size); if (!slinkval) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_c: malloc of slinkval failed"; } assert(slinkval); ret = H5Lget_val(gid, linkname, slinkval, lnk_info.u.val_size, H5P_DEFAULT); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_c: H5Lget_val() failed"; } else if (0 != HDstrcmp(slinkval, group_name)) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_c: 0 != HDstrcmp(slinkval, group_name)"; } assert(ret >= 0); @@ -533,7 +533,7 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) int token_cmp = 0; if (H5L_TYPE_HARD != lnk_info.type) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_c: H5L_TYPE_HARD != lnk_info.type"; } assert(H5L_TYPE_HARD == lnk_info.type); @@ -542,17 +542,17 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) ret = H5Oget_info3(fid, &root_oinfo, H5O_INFO_BASIC); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_c: H5Oget_info() failed."; } else { if (H5Otoken_cmp(fid, &root_oinfo.token, &lnk_info.u.token, &token_cmp) < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_c: H5Otoken_cmp() failed."; } if (token_cmp) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_c: root_oinfo.token != lnk_info.u.token"; } } @@ -567,7 +567,7 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) assert(2 == (u % 3)); if (H5L_TYPE_EXTERNAL != lnk_info.type) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_c: H5L_TYPE_EXTERNAL != lnk_info.type"; } assert(H5L_TYPE_EXTERNAL == lnk_info.type); @@ -575,29 +575,29 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) elinkval = malloc(lnk_info.u.val_size); if (!elinkval) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_c: malloc of elinkval failed."; } assert(elinkval); ret = H5Lget_val(gid, linkname, elinkval, lnk_info.u.val_size, H5P_DEFAULT); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_c: H5Lget_val() failed."; } assert(ret >= 0); ret = H5Lunpack_elink_val(elinkval, lnk_info.u.val_size, NULL, &file, &path); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_c: H5Lunpack_elink_val() failed."; } else if (0 != HDstrcmp(file, "external.h5")) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_c: 0 != HDstrcmp(file, \"external.h5\")"; } else if (0 != HDstrcmp(path, "/ext")) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_c: 0 != HDstrcmp(path, \"/ext\")"; } assert(ret >= 0); @@ -614,7 +614,7 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) ret = H5Gclose(gid); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_c: H5Gclose() failed."; } assert(ret >= 0); @@ -630,7 +630,7 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) * * If pass is false on entry, do nothing. * - * If an error is detected, set pass to FALSE, and set + * If an error is detected, set pass to false, and set * failure_mssg to point to an appropriate error message. * * Return: void @@ -651,7 +651,7 @@ ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) gcpl = H5Pcreate(H5P_GROUP_CREATE); if (gcpl <= 0) { - pass = FALSE; + pass = false; failure_mssg = "ns_grp_d: H5Pcreate() failed."; } assert(gcpl > 0); @@ -661,7 +661,7 @@ ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) ret = H5Pset_link_creation_order(gcpl, H5P_CRT_ORDER_TRACKED); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ns_grp_d: H5Pset_link_creation_order() failed."; } assert(ret >= 0); @@ -671,7 +671,7 @@ ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) gid = H5Gcreate2(fid, group_name, H5P_DEFAULT, gcpl, H5P_DEFAULT); if (gid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "ns_grp_d: H5Gcreate2() failed."; } assert(gid > 0); @@ -682,11 +682,11 @@ ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) ret = H5Pget_link_phase_change(gcpl, &max_compact, NULL); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ns_grp_d: H5Pget_link_phase_change() failed."; } else if (nlinks <= max_compact) { - pass = FALSE; + pass = false; failure_mssg = "ns_grp_d: nlinks <= max_compact"; } assert(ret >= 0); @@ -703,7 +703,7 @@ ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) ret = H5Lcreate_soft(group_name, gid, linkname, H5P_DEFAULT, H5P_DEFAULT); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ns_grp_d: H5Lcreate_soft() failed."; } assert(ret >= 0); @@ -712,7 +712,7 @@ ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) ret = H5Lcreate_hard(fid, "/", gid, linkname, H5P_DEFAULT, H5P_DEFAULT); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ns_grp_d: H5Lcreate_hard() failed."; } assert(ret >= 0); @@ -723,7 +723,7 @@ ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) ret = H5Lcreate_external("external.h5", "/ext", gid, linkname, H5P_DEFAULT, H5P_DEFAULT); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ns_grp_d: H5Lcreate_external() failed."; } assert(ret >= 0); @@ -736,7 +736,7 @@ ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) ret = H5Pclose(gcpl); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ns_grp_d: H5Pclose() failed."; } assert(ret >= 0); @@ -746,7 +746,7 @@ ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) ret = H5Gclose(gid); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ns_grp_d: H5Gclose() failed."; } assert(ret >= 0); @@ -762,7 +762,7 @@ ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) * * If pass is false on entry, do nothing. * - * If an error is detected, set pass to FALSE, and set + * If an error is detected, set pass to false, and set * failure_mssg to point to an appropriate error message. * * Return: void @@ -784,7 +784,7 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) gid = H5Gopen2(fid, group_name, H5P_DEFAULT); if (gid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_d: H5Gopen2() failed."; } assert(gid > 0); @@ -794,7 +794,7 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) gcpl = H5Gget_create_plist(gid); if (gcpl <= 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_d: H5Gget_create_plist() failed."; } assert(gcpl > 0); @@ -804,11 +804,11 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) ret = H5Pget_link_creation_order(gcpl, &crt_order_flags); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_d: H5Pget_link_creation_order() failed."; } else if (H5P_CRT_ORDER_TRACKED != crt_order_flags) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_d: H5P_CRT_ORDER_TRACKED != crt_order_flags"; } assert(ret >= 0); @@ -819,7 +819,7 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) ret = H5Pclose(gcpl); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_d: H5Pclose() failed."; } assert(ret >= 0); @@ -830,30 +830,30 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) ret = H5Gget_info(gid, &grp_info); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_d: H5Gget_info() failed."; } else if (H5G_STORAGE_TYPE_DENSE != grp_info.storage_type) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_d: H5G_STORAGE_TYPE_DENSE != grp_info.storage_type"; } else if (nlinks != grp_info.nlinks) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_d: nlinks != grp_info.nlinks"; } else if (nlinks != grp_info.max_corder) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_d: nlinks != grp_info.max_corder"; } - else if (FALSE != grp_info.mounted) { - pass = FALSE; - failure_mssg = "vrfy_ns_grp_d: FALSE != grp_info.mounted"; + else if (false != grp_info.mounted) { + pass = false; + failure_mssg = "vrfy_ns_grp_d: false != grp_info.mounted"; } assert(ret >= 0); assert(H5G_STORAGE_TYPE_DENSE == grp_info.storage_type); assert(nlinks == grp_info.nlinks); assert(nlinks == grp_info.max_corder); - assert(FALSE == grp_info.mounted); + assert(false == grp_info.mounted); } u = 0; @@ -866,7 +866,7 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) link_exists = H5Lexists(gid, linkname, H5P_DEFAULT); if (link_exists < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_d: H5Lexists() failed."; } assert(link_exists >= 0); @@ -875,23 +875,23 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) ret = H5Lget_info2(gid, linkname, &lnk_info, H5P_DEFAULT); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_d: H5Lget_info() failed."; } - else if (TRUE != lnk_info.corder_valid) { - pass = FALSE; - failure_mssg = "vrfy_ns_grp_d: TRUE != lnk_info.corder_valid"; + else if (true != lnk_info.corder_valid) { + pass = false; + failure_mssg = "vrfy_ns_grp_d: true != lnk_info.corder_valid"; } else if (u != lnk_info.corder) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_d: u != lnk_info.corder"; } else if (H5T_CSET_ASCII != lnk_info.cset) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_d: H5T_CSET_ASCII != lnk_info.cset"; } assert(ret >= 0); - assert(TRUE == lnk_info.corder_valid); + assert(true == lnk_info.corder_valid); assert(u == lnk_info.corder); assert(H5T_CSET_ASCII == lnk_info.cset); @@ -899,11 +899,11 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) char *slinkval; if (H5L_TYPE_SOFT != lnk_info.type) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_d: H5L_TYPE_SOFT != lnk_info.type"; } else if ((HDstrlen(group_name) + 1) != lnk_info.u.val_size) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_d: H5L_TYPE_SOFT != lnk_info.type"; } assert(H5L_TYPE_SOFT == lnk_info.type); @@ -912,18 +912,18 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) slinkval = (char *)malloc(lnk_info.u.val_size); if (!slinkval) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_d: malloc of slinkval failed"; } assert(slinkval); ret = H5Lget_val(gid, linkname, slinkval, lnk_info.u.val_size, H5P_DEFAULT); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_d: H5Lget_val() failed"; } else if (0 != HDstrcmp(slinkval, group_name)) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_d: 0 != HDstrcmp(slinkval, group_name)"; } assert(ret >= 0); @@ -936,7 +936,7 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) int token_cmp = 0; if (H5L_TYPE_HARD != lnk_info.type) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_d: H5L_TYPE_HARD != lnk_info.type"; } assert(H5L_TYPE_HARD == lnk_info.type); @@ -944,17 +944,17 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) memset(&root_oinfo, 0, sizeof(root_oinfo)); ret = H5Oget_info3(fid, &root_oinfo, H5O_INFO_BASIC); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_d: H5Oget_info() failed."; } else { if (H5Otoken_cmp(fid, &root_oinfo.token, &lnk_info.u.token, &token_cmp) < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_d: H5Otoken_cmp() failed."; } if (token_cmp) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_d: root_oinfo.token != lnk_info.u.token"; } } @@ -969,7 +969,7 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) assert(2 == (u % 3)); if (H5L_TYPE_EXTERNAL != lnk_info.type) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_d: H5L_TYPE_EXTERNAL != lnk_info.type"; } assert(H5L_TYPE_EXTERNAL == lnk_info.type); @@ -977,29 +977,29 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) elinkval = malloc(lnk_info.u.val_size); if (!elinkval) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_d: malloc of elinkval failed."; } assert(elinkval); ret = H5Lget_val(gid, linkname, elinkval, lnk_info.u.val_size, H5P_DEFAULT); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_d: H5Lget_val failed."; } assert(ret >= 0); ret = H5Lunpack_elink_val(elinkval, lnk_info.u.val_size, NULL, &file, &path); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_d: H5Lunpack_elink_val failed."; } else if (0 != HDstrcmp(file, "external.h5")) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_d: 0 != HDstrcmp(file, \"external.h5\")."; } else if (0 != HDstrcmp(path, "/ext")) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_d: 0 != HDstrcmp(path, \"/ext\")"; } assert(ret >= 0); @@ -1016,7 +1016,7 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) ret = H5Gclose(gid); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ns_grp_d: H5Gclose() failed."; } assert(ret >= 0); @@ -1031,7 +1031,7 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) * * If pass is false on entry, do nothing. * - * If an error is detected, set pass to FALSE, and set + * If an error is detected, set pass to false, and set * failure_mssg to point to an appropriate error message. * * Return: void @@ -1051,7 +1051,7 @@ os_grp_0(hid_t fid, const char *group_name) if (pass) { /* get the file's file access property list */ fapl = H5Fget_access_plist(fid); if (fapl <= 0) { - pass = FALSE; + pass = false; failure_mssg = "os_grp_0: H5Fget_access_plist() failed."; } assert(fapl > 0); @@ -1060,7 +1060,7 @@ os_grp_0(hid_t fid, const char *group_name) if (pass) { /* get low and high bounds from fapl */ ret = H5Pget_libver_bounds(fapl, &low, &high); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "os_grp_0: H5Pget_libver_bounds() failed(1)."; } assert(ret >= 0); @@ -1070,7 +1070,7 @@ os_grp_0(hid_t fid, const char *group_name) if (low >= H5F_LIBVER_V18) { ret = H5Fset_libver_bounds(fid, H5F_LIBVER_EARLIEST, high); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "os_grp_0: H5Fset_libver_bounds() failed(1)."; } assert(ret >= 0); @@ -1080,7 +1080,7 @@ os_grp_0(hid_t fid, const char *group_name) if (pass) { gid = H5Gcreate2(fid, group_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "os_grp_0: H5Gcreate2() failed."; } assert(gid > 0); @@ -1090,7 +1090,7 @@ os_grp_0(hid_t fid, const char *group_name) ret = H5Gclose(gid); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "os_grp_0: H5Gclose() failed."; } assert(ret >= 0); @@ -1100,7 +1100,7 @@ os_grp_0(hid_t fid, const char *group_name) if (low >= H5F_LIBVER_V18) { ret = H5Fset_libver_bounds(fid, low, high); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "os_grp_0: H5Fset_libver_bounds() failed(1)."; } assert(ret >= 0); @@ -1116,7 +1116,7 @@ os_grp_0(hid_t fid, const char *group_name) * * If pass is false on entry, do nothing. * - * If an error is detected, set pass to FALSE, and set + * If an error is detected, set pass to false, and set * failure_mssg to point to an appropriate error message. * * Return: void @@ -1137,7 +1137,7 @@ vrfy_os_grp_0(hid_t fid, const char *group_name) gid = H5Gopen2(fid, group_name, H5P_DEFAULT); if (gid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_0: H5Gopen2() failed."; } assert(gid > 0); @@ -1147,7 +1147,7 @@ vrfy_os_grp_0(hid_t fid, const char *group_name) gcpl = H5Gget_create_plist(gid); if (gcpl <= 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_0: H5Gget_create_plist() failed."; } assert(gcpl > 0); @@ -1158,11 +1158,11 @@ vrfy_os_grp_0(hid_t fid, const char *group_name) ret = H5Pget_link_creation_order(gcpl, &crt_order_flags); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_0: H5Pget_link_creation_order() failed"; } else if (0 != crt_order_flags) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_0: 0 != crt_order_flags"; } assert(ret >= 0); @@ -1173,7 +1173,7 @@ vrfy_os_grp_0(hid_t fid, const char *group_name) ret = H5Pclose(gcpl); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_0: H5Pclose() failed."; } assert(ret >= 0); @@ -1184,37 +1184,37 @@ vrfy_os_grp_0(hid_t fid, const char *group_name) ret = H5Gget_info(gid, &grp_info); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_0: H5Gget_info() failed."; } else if (H5G_STORAGE_TYPE_SYMBOL_TABLE != grp_info.storage_type) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_0: H5G_STORAGE_TYPE_SYMBOL_TABLE != grp_info.storage_type"; } else if (0 != grp_info.nlinks) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_0: 0 != grp_info.nlinks"; } else if (0 != grp_info.max_corder) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_0: 0 != grp_info.max_corder"; } - else if (FALSE != grp_info.mounted) { - pass = FALSE; - failure_mssg = "vrfy_os_grp_0: FALSE != grp_info.mounted"; + else if (false != grp_info.mounted) { + pass = false; + failure_mssg = "vrfy_os_grp_0: false != grp_info.mounted"; } assert(ret >= 0); assert(H5G_STORAGE_TYPE_SYMBOL_TABLE == grp_info.storage_type); assert(0 == grp_info.nlinks); assert(0 == grp_info.max_corder); - assert(FALSE == grp_info.mounted); + assert(false == grp_info.mounted); } if (pass) { ret = H5Gclose(gid); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_0: H5Gclose() failed."; } assert(ret >= 0); @@ -1230,7 +1230,7 @@ vrfy_os_grp_0(hid_t fid, const char *group_name) * * If pass is false on entry, do nothing. * - * If an error is detected, set pass to FALSE, and set + * If an error is detected, set pass to false, and set * failure_mssg to point to an appropriate error message. * * Return: void @@ -1250,7 +1250,7 @@ os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) if (pass) { /* get the file's file access property list */ fapl = H5Fget_access_plist(fid); if (fapl <= 0) { - pass = FALSE; + pass = false; failure_mssg = "os_grp_n: H5Fget_access_plist() failed."; } assert(fapl > 0); @@ -1259,7 +1259,7 @@ os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) if (pass) { /* get low and high bounds from fapl */ ret = H5Pget_libver_bounds(fapl, &low, &high); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "os_grp_0: H5Pget_libver_bounds() failed(1)."; } assert(ret >= 0); @@ -1269,7 +1269,7 @@ os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) if (low >= H5F_LIBVER_V18) { ret = H5Fset_libver_bounds(fid, H5F_LIBVER_EARLIEST, high); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "os_grp_0: H5Fset_libver_bounds() failed(1)."; } assert(ret >= 0); @@ -1279,7 +1279,7 @@ os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) if (pass) { gid = H5Gcreate2(fid, group_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "os_grp_n: H5Gcreate2() failed."; } assert(gid > 0); @@ -1296,7 +1296,7 @@ os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) if (0 == (u % 2)) { ret = H5Lcreate_soft(group_name, gid, linkname, H5P_DEFAULT, H5P_DEFAULT); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "os_grp_n: H5Lcreate_soft() failed."; } assert(ret >= 0); @@ -1306,7 +1306,7 @@ os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) ret = H5Lcreate_hard(fid, "/", gid, linkname, H5P_DEFAULT, H5P_DEFAULT); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "os_grp_n: H5Lcreate_hard() failed."; } assert(ret >= 0); @@ -1319,7 +1319,7 @@ os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) ret = H5Gclose(gid); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "os_grp_n: H5Gclose() failed."; } assert(ret >= 0); @@ -1329,7 +1329,7 @@ os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) if (low >= H5F_LIBVER_V18) { ret = H5Fset_libver_bounds(fid, low, high); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "os_grp_n: H5Fset_libver_bounds() failed(2)."; } assert(ret >= 0); @@ -1346,7 +1346,7 @@ os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) * * If pass is false on entry, do nothing. * - * If an error is detected, set pass to FALSE, and set + * If an error is detected, set pass to false, and set * failure_mssg to point to an appropriate error message. * * Return: void @@ -1367,7 +1367,7 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) gid = H5Gopen2(fid, group_name, H5P_DEFAULT); if (gid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_n: H5Gopen2() failed"; } assert(gid > 0); @@ -1377,7 +1377,7 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) gcpl = H5Gget_create_plist(gid); if (gcpl <= 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_n: H5Gget_create_plist() failed"; } assert(gcpl > 0); @@ -1387,11 +1387,11 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) ret = H5Pget_link_creation_order(gcpl, &crt_order_flags); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_n: H5Pget_link_creation_order"; } else if (0 != crt_order_flags) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_n: 0 != crt_order_flags"; } assert(ret >= 0); @@ -1402,7 +1402,7 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) ret = H5Pclose(gcpl); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_n: H5Pclose() failed"; } assert(ret >= 0); @@ -1414,30 +1414,30 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) ret = H5Gget_info(gid, &grp_info); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_n: H5Gget_info() failed"; } else if (H5G_STORAGE_TYPE_SYMBOL_TABLE != grp_info.storage_type) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_n: H5G_STORAGE_TYPE_SYMBOL_TABLE != grp_info.storage_type"; } else if (nlinks != grp_info.nlinks) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_n: nlinks != grp_info.nlinks"; } else if (0 != grp_info.max_corder) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_n: 0 != grp_info.max_corder"; } - else if (FALSE != grp_info.mounted) { - pass = FALSE; - failure_mssg = "vrfy_os_grp_n: FALSE != grp_info.mounted"; + else if (false != grp_info.mounted) { + pass = false; + failure_mssg = "vrfy_os_grp_n: false != grp_info.mounted"; } assert(ret >= 0); assert(H5G_STORAGE_TYPE_SYMBOL_TABLE == grp_info.storage_type); assert(nlinks == grp_info.nlinks); assert(0 == grp_info.max_corder); - assert(FALSE == grp_info.mounted); + assert(false == grp_info.mounted); } u = 0; @@ -1450,7 +1450,7 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) link_exists = H5Lexists(gid, linkname, H5P_DEFAULT); if (link_exists < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_n: H5Lexists() failed"; } assert(link_exists >= 0); @@ -1459,30 +1459,30 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) ret = H5Lget_info2(gid, linkname, &lnk_info, H5P_DEFAULT); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_n: H5Lget_info() failed"; } - else if (FALSE != lnk_info.corder_valid) { - pass = FALSE; - failure_mssg = "vrfy_os_grp_n: FALSE != lnk_info.corder_valid"; + else if (false != lnk_info.corder_valid) { + pass = false; + failure_mssg = "vrfy_os_grp_n: false != lnk_info.corder_valid"; } else if (H5T_CSET_ASCII != lnk_info.cset) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_n: H5T_CSET_ASCII != lnk_info.cset"; } assert(ret >= 0); - assert(FALSE == lnk_info.corder_valid); + assert(false == lnk_info.corder_valid); assert(H5T_CSET_ASCII == lnk_info.cset); if (0 == (u % 2)) { char *slinkval; if (H5L_TYPE_SOFT != lnk_info.type) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_n: H5L_TYPE_SOFT != lnk_info.type"; } else if ((HDstrlen(group_name) + 1) != lnk_info.u.val_size) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_n: (HDstrlen(group_name) + 1) != lnk_info.u.val_size"; } assert(H5L_TYPE_SOFT == lnk_info.type); @@ -1491,7 +1491,7 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) slinkval = (char *)malloc(lnk_info.u.val_size); if (!slinkval) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_n: malloc of slinkval failed"; } assert(slinkval); @@ -1499,11 +1499,11 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) ret = H5Lget_val(gid, linkname, slinkval, lnk_info.u.val_size, H5P_DEFAULT); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_n: H5Lget_val() failed"; } else if (0 != HDstrcmp(slinkval, group_name)) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_n: 0 != HDstrcmp(slinkval, group_name)"; } assert(ret >= 0); @@ -1518,7 +1518,7 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) assert(1 == (u % 2)); if (H5L_TYPE_HARD != lnk_info.type) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_n: H5L_TYPE_HARD != lnk_info.type"; } assert(H5L_TYPE_HARD == lnk_info.type); @@ -1527,17 +1527,17 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) ret = H5Oget_info3(fid, &root_oinfo, H5O_INFO_BASIC); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_n: H5Oget_info() failed."; } else { if (H5Otoken_cmp(fid, &root_oinfo.token, &lnk_info.u.token, &token_cmp) < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_n: H5Otoken_cmp() failed."; } if (token_cmp) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_n: root_oinfo.token != lnk_info.u.token"; } } @@ -1552,7 +1552,7 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) ret = H5Gclose(gid); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_os_grp_n: H5Gclose() failed."; } assert(ret >= 0); @@ -1569,7 +1569,7 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) * * If pass is false on entry, do nothing. * - * If an error is detected, set pass to FALSE, and set + * If an error is detected, set pass to false, and set * failure_mssg to point to an appropriate error message. * * Return: void @@ -1577,7 +1577,7 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) *------------------------------------------------------------------------- */ void -ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) +ds_ctg_i(hid_t fid, const char *dset_name, bool write_data) { int *wdata = NULL; unsigned u; @@ -1590,7 +1590,7 @@ ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) sid = H5Screate_simple(1, dims, NULL); if (sid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "ds_ctg_i: H5Screate_simple() failed"; } assert(sid > 0); @@ -1600,7 +1600,7 @@ ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) dsid = H5Dcreate2(fid, dset_name, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (dsid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "ds_ctg_i: H5Dcreate2() failed"; } assert(dsid > 0); @@ -1610,7 +1610,7 @@ ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Sclose(sid); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ds_ctg_i: H5Sclose() failed"; } assert(ret >= 0); @@ -1620,7 +1620,7 @@ ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) wdata = (int *)malloc(sizeof(int) * DSET_DIMS); if (!wdata) { - pass = FALSE; + pass = false; failure_mssg = "ds_ctg_i: malloc of wdata failed."; } assert(wdata); @@ -1633,7 +1633,7 @@ ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Dwrite(dsid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ds_ctg_i: H5Dwrite() failed."; } assert(ret >= 0); @@ -1645,7 +1645,7 @@ ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Dclose(dsid); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ds_ctg_i: H5Dclose() failed"; } assert(ret >= 0); @@ -1661,7 +1661,7 @@ ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) * * If pass is false on entry, do nothing. * - * If an error is detected, set pass to FALSE, and set + * If an error is detected, set pass to false, and set * failure_mssg to point to an appropriate error message. * * Return: void @@ -1669,7 +1669,7 @@ ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) *------------------------------------------------------------------------- */ void -vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) +vrfy_ds_ctg_i(hid_t fid, const char *dset_name, bool write_data) { int *rdata = NULL; unsigned u; @@ -1688,7 +1688,7 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) dsid = H5Dopen2(fid, dset_name, H5P_DEFAULT); if (dsid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_i: H5Dopen2() failed."; } assert(dsid > 0); @@ -1698,7 +1698,7 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) sid = H5Dget_space(dsid); if (sid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_i: H5Dget_space() failed."; } assert(sid > 0); @@ -1708,7 +1708,7 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) ndims = H5Sget_simple_extent_ndims(sid); if (1 != ndims) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_i: 1 != ndims"; } assert(1 == ndims); @@ -1718,15 +1718,15 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Sget_simple_extent_dims(sid, dims, max_dims); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_i: H5Sget_simple_extent_dims() failed"; } else if (DSET_DIMS != dims[0]) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_i: DSET_DIMS != dims[0]"; } else if (DSET_DIMS != max_dims[0]) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_i: DSET_DIMS != max_dims[0]"; } assert(ret >= 0); @@ -1738,7 +1738,7 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Sclose(sid); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_i: H5Sclose() failed."; } assert(ret >= 0); @@ -1748,7 +1748,7 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) tid = H5Dget_type(dsid); if (tid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_i: H5Dget_type() failed."; } assert(tid > 0); @@ -1758,7 +1758,7 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) type_equal = H5Tequal(tid, H5T_NATIVE_INT); if (1 != type_equal) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_i: type not H5T_NATIVE_INT"; } assert(1 == type_equal); @@ -1768,7 +1768,7 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Tclose(tid); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_i: H5Tclose() failed."; } assert(ret >= 0); @@ -1778,15 +1778,15 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Dget_space_status(dsid, &allocation); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_i: H5Dget_space_status() failed."; } else if (write_data && (allocation != H5D_SPACE_STATUS_ALLOCATED)) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_i: write_data && allocation != H5D_SPACE_STATUS_ALLOCATED"; } else if (!write_data && (allocation != H5D_SPACE_STATUS_NOT_ALLOCATED)) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_i: !write_data && allocation != H5D_SPACE_STATUS_NOT_ALLOCATED"; } assert(ret >= 0); @@ -1798,7 +1798,7 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) dcpl = H5Dget_create_plist(dsid); if (dcpl <= 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_i: H5Dget_create_plist() failed."; } assert(dcpl > 0); @@ -1808,7 +1808,7 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) layout = H5Pget_layout(dcpl); if (H5D_CONTIGUOUS != layout) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_i: H5D_CONTIGUOUS != layout"; } assert(H5D_CONTIGUOUS == layout); @@ -1818,7 +1818,7 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Pclose(dcpl); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_i: H5Pclose() failed."; } assert(ret >= 0); @@ -1828,7 +1828,7 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) rdata = (int *)malloc(sizeof(int) * DSET_DIMS); if (!rdata) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_i: malloc of rdata failed."; } assert(rdata); @@ -1837,7 +1837,7 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) if ((pass) && (write_data)) { ret = H5Dread(dsid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_i: H5Dread() failed."; } assert(ret >= 0); @@ -1846,7 +1846,7 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) if ((pass) && (write_data)) { for (u = 0; u < DSET_DIMS; u++) { if ((int)u != rdata[u]) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_i: u != rdata[u]."; break; } @@ -1860,7 +1860,7 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Dclose(dsid); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_i: H5Dclose() failed"; } assert(ret >= 0); @@ -1877,7 +1877,7 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) * * If pass is false on entry, do nothing. * - * If an error is detected, set pass to FALSE, and set + * If an error is detected, set pass to false, and set * failure_mssg to point to an appropriate error message. * * Return: void @@ -1885,7 +1885,7 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) *------------------------------------------------------------------------- */ void -ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) +ds_chk_i(hid_t fid, const char *dset_name, bool write_data) { int *wdata = NULL; unsigned u; @@ -1900,7 +1900,7 @@ ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) sid = H5Screate_simple(1, dims, NULL); if (sid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "ds_chk_i: H5Screate_simple() failed."; } assert(sid > 0); @@ -1910,7 +1910,7 @@ ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) dcpl = H5Pcreate(H5P_DATASET_CREATE); if (dcpl <= 0) { - pass = FALSE; + pass = false; failure_mssg = "ds_chk_i: H5Pcreate() failed."; } assert(dcpl > 0); @@ -1920,7 +1920,7 @@ ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Pset_chunk(dcpl, 1, chunk_dims); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ds_chk_i: H5Pset_chunk() failed."; } assert(ret >= 0); @@ -1930,7 +1930,7 @@ ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) dsid = H5Dcreate2(fid, dset_name, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT); if (dsid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "ds_chk_i: H5Dcreate2() failed"; } assert(dsid > 0); @@ -1940,7 +1940,7 @@ ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Pclose(dcpl); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ds_chk_i: H5Pclose() failed."; } assert(ret >= 0); @@ -1950,7 +1950,7 @@ ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Sclose(sid); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ds_chk_i: H5Sclose() failed."; } assert(ret >= 0); @@ -1960,7 +1960,7 @@ ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) wdata = (int *)malloc(sizeof(int) * DSET_DIMS); if (!wdata) { - pass = FALSE; + pass = false; failure_mssg = "ds_chk_i: malloc of wdata failed."; } assert(wdata); @@ -1972,7 +1972,7 @@ ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Dwrite(dsid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ds_chk_i: H5Dwrite() failed."; } assert(ret >= 0); @@ -1983,7 +1983,7 @@ ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Dclose(dsid); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ds_chk_i: H5Dclose() failed."; } assert(ret >= 0); @@ -1999,7 +1999,7 @@ ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) * * If pass is false on entry, do nothing. * - * If an error is detected, set pass to FALSE, and set + * If an error is detected, set pass to false, and set * failure_mssg to point to an appropriate error message. * * Return: void @@ -2007,7 +2007,7 @@ ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) *------------------------------------------------------------------------- */ void -vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) +vrfy_ds_chk_i(hid_t fid, const char *dset_name, bool write_data) { int *rdata = NULL; unsigned u; @@ -2026,7 +2026,7 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) dsid = H5Dopen2(fid, dset_name, H5P_DEFAULT); if (dsid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_chk_i: H5Dopen2() failed."; } assert(dsid > 0); @@ -2036,7 +2036,7 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) sid = H5Dget_space(dsid); if (sid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_chk_i: H5Dget_space() failed."; } assert(sid > 0); @@ -2046,7 +2046,7 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) ndims = H5Sget_simple_extent_ndims(sid); if (1 != ndims) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_chk_i: 1 != ndims"; } assert(1 == ndims); @@ -2056,15 +2056,15 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Sget_simple_extent_dims(sid, dims, max_dims); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_chk_i: H5Sget_simple_extent_dims() failed"; } else if (DSET_DIMS != dims[0]) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_chk_i: DSET_DIMS != dims[0]"; } else if (DSET_DIMS != max_dims[0]) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_chk_i: DSET_DIMS != max_dims[0]"; } assert(ret >= 0); @@ -2076,7 +2076,7 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Sclose(sid); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_chk_i: H5Sclose() failed."; } assert(ret >= 0); @@ -2086,7 +2086,7 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) tid = H5Dget_type(dsid); if (tid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_chk_i: H5Dget_type() failed."; } assert(tid > 0); @@ -2096,7 +2096,7 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) type_equal = H5Tequal(tid, H5T_NATIVE_INT); if (1 != type_equal) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_chk_i: tid != H5T_NATIVE_INT"; } assert(1 == type_equal); @@ -2106,7 +2106,7 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Tclose(tid); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_chk_i: H5Tclose() failed."; } assert(ret >= 0); @@ -2116,15 +2116,15 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Dget_space_status(dsid, &allocation); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_chk_i: H5Dget_space_status() failed."; } else if (write_data && (allocation != H5D_SPACE_STATUS_ALLOCATED)) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_chk_i: write_data && allocation != H5D_SPACE_STATUS_ALLOCATED"; } else if (!write_data && (allocation != H5D_SPACE_STATUS_NOT_ALLOCATED)) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_chk_i: !write_data && allocation != H5D_SPACE_STATUS_NOT_ALLOCATED"; } assert(ret >= 0); @@ -2136,7 +2136,7 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) dcpl = H5Dget_create_plist(dsid); if (dcpl <= 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_chk_i: H5Dget_create_plist() failed."; } assert(dcpl > 0); @@ -2146,7 +2146,7 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) layout = H5Pget_layout(dcpl); if (H5D_CHUNKED != layout) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_chk_i: H5D_CHUNKED != layout"; } assert(H5D_CHUNKED == layout); @@ -2156,11 +2156,11 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Pget_chunk(dcpl, 1, chunk_dims); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_chk_i: H5Pget_chunk"; } else if (DSET_CHUNK_DIMS != chunk_dims[0]) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_chk_i: "; } assert(ret >= 0); @@ -2171,7 +2171,7 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Pclose(dcpl); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_chk_i: H5Pclose() failed."; } assert(ret >= 0); @@ -2181,7 +2181,7 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) rdata = (int *)malloc(sizeof(int) * DSET_DIMS); if (!rdata) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_chk_i: malloc of rdata failed."; } assert(rdata); @@ -2190,7 +2190,7 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) if ((pass) && (write_data)) { ret = H5Dread(dsid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_chk_i: H5Dread() failed."; } assert(ret >= 0); @@ -2199,7 +2199,7 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) if ((pass) && (write_data)) { for (u = 0; u < DSET_DIMS; u++) { if ((int)u != rdata[u]) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_chk_i: u != rdata[u]"; break; } @@ -2213,7 +2213,7 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Dclose(dsid); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_chk_i: H5Dclose() failed."; } assert(ret >= 0); @@ -2230,7 +2230,7 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) * * If pass is false on entry, do nothing. * - * If an error is detected, set pass to FALSE, and set + * If an error is detected, set pass to false, and set * failure_mssg to point to an appropriate error message. * * Return: void @@ -2238,7 +2238,7 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) *------------------------------------------------------------------------- */ void -ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) +ds_cpt_i(hid_t fid, const char *dset_name, bool write_data) { int *wdata = NULL; unsigned u; @@ -2252,7 +2252,7 @@ ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) sid = H5Screate_simple(1, dims, NULL); if (sid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "ds_cpt_i: H5Screate_simple() failed."; } assert(sid > 0); @@ -2262,7 +2262,7 @@ ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) dcpl = H5Pcreate(H5P_DATASET_CREATE); if (dcpl <= 0) { - pass = FALSE; + pass = false; failure_mssg = "ds_cpt_i: H5Pcreate() failed."; } assert(dcpl > 0); @@ -2272,7 +2272,7 @@ ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Pset_layout(dcpl, H5D_COMPACT); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ds_cpt_i: H5Pset_layout() failed."; } assert(ret >= 0); @@ -2282,7 +2282,7 @@ ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) dsid = H5Dcreate2(fid, dset_name, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT); if (dsid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "ds_cpt_i: H5Dcreate2() failed."; } assert(dsid > 0); @@ -2292,7 +2292,7 @@ ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Pclose(dcpl); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ds_cpt_i: H5Pclose() failed."; } assert(ret >= 0); @@ -2302,7 +2302,7 @@ ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Sclose(sid); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ds_cpt_i: H5Sclose() failed."; } assert(ret >= 0); @@ -2312,7 +2312,7 @@ ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) wdata = (int *)malloc(sizeof(int) * DSET_COMPACT_DIMS); if (!wdata) { - pass = FALSE; + pass = false; failure_mssg = "ds_cpt_i: malloc of wdata failed."; } assert(wdata); @@ -2325,7 +2325,7 @@ ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Dwrite(dsid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ds_cpt_i: H5Dwrite() failed."; } assert(ret >= 0); @@ -2337,7 +2337,7 @@ ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Dclose(dsid); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ds_cpt_i: H5Dclose() failed."; } assert(ret >= 0); @@ -2353,7 +2353,7 @@ ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) * * If pass is false on entry, do nothing. * - * If an error is detected, set pass to FALSE, and set + * If an error is detected, set pass to false, and set * failure_mssg to point to an appropriate error message. * * Return: void @@ -2361,7 +2361,7 @@ ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) *------------------------------------------------------------------------- */ void -vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) +vrfy_ds_cpt_i(hid_t fid, const char *dset_name, bool write_data) { int *rdata = NULL; unsigned u; @@ -2380,7 +2380,7 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) dsid = H5Dopen2(fid, dset_name, H5P_DEFAULT); if (dsid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_cpt_i: H5Dopen2() failed."; } assert(dsid > 0); @@ -2390,7 +2390,7 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) sid = H5Dget_space(dsid); if (sid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_cpt_i: H5Dget_space() failed."; } assert(sid > 0); @@ -2400,7 +2400,7 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) ndims = H5Sget_simple_extent_ndims(sid); if (1 != ndims) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_cpt_i: 1 != ndims"; } assert(1 == ndims); @@ -2410,15 +2410,15 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Sget_simple_extent_dims(sid, dims, max_dims); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_cpt_i: H5Sget_simple_extent_dims() failed"; } else if (DSET_COMPACT_DIMS != dims[0]) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_cpt_i: DSET_COMPACT_DIMS != dims[0]"; } else if (DSET_COMPACT_DIMS != max_dims[0]) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_cpt_i: DSET_COMPACT_DIMS != max_dims[0]"; } assert(ret >= 0); @@ -2430,7 +2430,7 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Sclose(sid); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_cpt_i: H5Sclose() failed."; } assert(ret >= 0); @@ -2440,7 +2440,7 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) tid = H5Dget_type(dsid); if (tid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_cpt_i: H5Dget_type() failed."; } assert(tid > 0); @@ -2450,7 +2450,7 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) type_equal = H5Tequal(tid, H5T_NATIVE_INT); if (1 != type_equal) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_cpt_i: type != H5T_NATIVE_INT"; } assert(1 == type_equal); @@ -2460,7 +2460,7 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Tclose(tid); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_cpt_i: H5Tclose() failed."; } assert(ret >= 0); @@ -2470,11 +2470,11 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Dget_space_status(dsid, &allocation); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_cpt_i: H5Dget_space_status() failed."; } else if (H5D_SPACE_STATUS_ALLOCATED != allocation) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_cpt_i: H5D_SPACE_STATUS_ALLOCATED != allocation"; } assert(ret >= 0); @@ -2485,7 +2485,7 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) dcpl = H5Dget_create_plist(dsid); if (dcpl <= 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_cpt_i: H5Dget_create_plist() failed."; } assert(dcpl > 0); @@ -2495,7 +2495,7 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) layout = H5Pget_layout(dcpl); if (H5D_COMPACT != layout) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_cpt_i: H5D_COMPACT != layout"; } assert(H5D_COMPACT == layout); @@ -2505,7 +2505,7 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Pclose(dcpl); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_cpt_i: H5Pclose() failed."; } assert(ret >= 0); @@ -2515,7 +2515,7 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) rdata = (int *)malloc(sizeof(int) * DSET_COMPACT_DIMS); if (!rdata) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_cpt_i: malloc of rdata failed."; } assert(rdata); @@ -2524,7 +2524,7 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) if ((pass) && (write_data)) { ret = H5Dread(dsid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_cpt_i: H5Dread() failed."; } assert(ret >= 0); @@ -2533,7 +2533,7 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) if ((pass) && (write_data)) { for (u = 0; u < DSET_COMPACT_DIMS; u++) { if ((int)u != rdata[u]) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_cpt_i: (int)u != rdata[u]"; break; } @@ -2547,7 +2547,7 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Dclose(dsid); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_cpt_i: H5Dclose() failed."; } assert(ret >= 0); @@ -2564,7 +2564,7 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) * * If pass is false on entry, do nothing. * - * If an error is detected, set pass to FALSE, and set + * If an error is detected, set pass to false, and set * failure_mssg to point to an appropriate error message. * * Return: void @@ -2572,7 +2572,7 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) *------------------------------------------------------------------------- */ void -ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) +ds_ctg_v(hid_t fid, const char *dset_name, bool write_data) { hid_t dsid = -1; hid_t sid = -1; @@ -2586,7 +2586,7 @@ ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) sid = H5Screate_simple(1, dims, NULL); if (sid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "ds_ctg_v: H5Screate_simple"; } assert(sid > 0); @@ -2596,7 +2596,7 @@ ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) tid = H5Tvlen_create(H5T_NATIVE_INT); if (tid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "ds_ctg_v: H5Tvlen_create() failed."; } assert(tid > 0); @@ -2606,7 +2606,7 @@ ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) dsid = H5Dcreate2(fid, dset_name, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (dsid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "ds_ctg_v: H5Dcreate2() failed."; } assert(dsid > 0); @@ -2616,7 +2616,7 @@ ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) wdata = (hvl_t *)malloc(sizeof(hvl_t) * DSET_SMALL_DIMS); if (!wdata) { - pass = FALSE; + pass = false; failure_mssg = "ds_ctg_v: malloc of wdata failed."; } assert(wdata); @@ -2632,7 +2632,7 @@ ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) tdata = (int *)malloc(sizeof(int) * len); if (!tdata) { - pass = FALSE; + pass = false; failure_mssg = "ds_ctg_v: malloc of tdata failed."; break; } @@ -2650,7 +2650,7 @@ ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Dwrite(dsid, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ds_ctg_v: H5Dwrite() failed."; } assert(ret >= 0); @@ -2660,7 +2660,7 @@ ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Treclaim(tid, sid, H5P_DEFAULT, wdata); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ds_ctg_v: H5Treclaim() failed."; } assert(ret >= 0); @@ -2672,7 +2672,7 @@ ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Sclose(sid); if (sid < 0) { - pass = FALSE; + pass = false; failure_mssg = "ds_ctg_v: H5Sclose() failed."; } assert(ret >= 0); @@ -2682,7 +2682,7 @@ ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Tclose(tid); if (tid < 0) { - pass = FALSE; + pass = false; failure_mssg = "ds_ctg_v: H5Tclose() failed."; } assert(ret >= 0); @@ -2692,7 +2692,7 @@ ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Dclose(dsid); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "ds_ctg_v: H5Dclose() failed."; } assert(ret >= 0); @@ -2708,7 +2708,7 @@ ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) * * If pass is false on entry, do nothing. * - * If an error is detected, set pass to FALSE, and set + * If an error is detected, set pass to false, and set * failure_mssg to point to an appropriate error message. * * Return: void @@ -2716,7 +2716,7 @@ ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) *------------------------------------------------------------------------- */ void -vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) +vrfy_ds_ctg_v(hid_t fid, const char *dset_name, bool write_data) { hid_t dsid = -1; hid_t sid = -1; @@ -2736,7 +2736,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) dsid = H5Dopen2(fid, dset_name, H5P_DEFAULT); if (dsid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_v: H5Dopen2() failed."; } assert(dsid > 0); @@ -2746,7 +2746,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) sid = H5Dget_space(dsid); if (sid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_v: H5Dget_space() failed"; } assert(sid > 0); @@ -2756,7 +2756,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) ndims = H5Sget_simple_extent_ndims(sid); if (1 != ndims) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_v: 1 != ndims"; } assert(1 == ndims); @@ -2766,15 +2766,15 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Sget_simple_extent_dims(sid, dims, max_dims); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_v: H5Sget_simple_extent_dims() failed."; } else if (DSET_SMALL_DIMS != dims[0]) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_v: DSET_SMALL_DIMS != dims[0]"; } else if (DSET_SMALL_DIMS != max_dims[0]) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_v: DSET_SMALL_DIMS != max_dims[0]"; } assert(ret >= 0); @@ -2786,7 +2786,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) tid = H5Dget_type(dsid); if (tid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_v: H5Dget_type() failed."; } assert(tid > 0); @@ -2796,7 +2796,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) tmp_tid = H5Tvlen_create(H5T_NATIVE_INT); if (tmp_tid <= 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_v: H5Tvlen_create() failed."; } assert(tmp_tid > 0); @@ -2806,7 +2806,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) type_equal = H5Tequal(tid, tmp_tid); if (1 != type_equal) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_v: type != vlen H5T_NATIVE_INT"; } assert(1 == type_equal); @@ -2816,7 +2816,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Tclose(tmp_tid); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_v: H5Tclose() failed."; } assert(ret >= 0); @@ -2826,15 +2826,15 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Dget_space_status(dsid, &allocation); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_v: H5Dget_space_status() failed"; } else if (write_data && (allocation != H5D_SPACE_STATUS_ALLOCATED)) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_v: write_data && allocation != H5D_SPACE_STATUS_ALLOCATED"; } else if (!write_data && (allocation != H5D_SPACE_STATUS_NOT_ALLOCATED)) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_v: !write_data && allocation != H5D_SPACE_STATUS_NOT_ALLOCATED"; } assert(ret >= 0); @@ -2846,7 +2846,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) dcpl = H5Dget_create_plist(dsid); if (dcpl <= 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_v: H5Dget_create_plist() failed."; } assert(dcpl > 0); @@ -2856,7 +2856,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) layout = H5Pget_layout(dcpl); if (H5D_CONTIGUOUS != layout) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_v: H5D_CONTIGUOUS != layout"; } assert(H5D_CONTIGUOUS == layout); @@ -2866,7 +2866,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Pclose(dcpl); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_v: H5Pclose() failed."; } assert(ret >= 0); @@ -2876,7 +2876,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) rdata = (hvl_t *)malloc(sizeof(hvl_t) * DSET_SMALL_DIMS); if (!rdata) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_v: malloc of rdata failed."; } assert(rdata); @@ -2886,7 +2886,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Dread(dsid, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_v: H5Dread() failed."; } assert(ret >= 0); @@ -2902,12 +2902,12 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) int *tdata = (int *)rdata[u].p; if (!tdata) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_v: !tdata"; break; } else if ((int)(u + v) != tdata[v]) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_v: (int)(u + v) != tdata[v]"; break; } @@ -2921,7 +2921,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Treclaim(tid, sid, H5P_DEFAULT, rdata); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_v: H5Treclaim() failed."; } assert(ret >= 0); @@ -2933,7 +2933,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Sclose(sid); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_v: H5Sclose() failed."; } assert(ret >= 0); @@ -2943,7 +2943,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Tclose(tid); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_v: H5Tclose() failed."; } assert(ret >= 0); @@ -2953,7 +2953,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) ret = H5Dclose(dsid); if (ret < 0) { - pass = FALSE; + pass = false; failure_mssg = "vrfy_ds_ctg_v: H5Dclose() failed."; } assert(ret >= 0); @@ -2971,7 +2971,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) * * If pass is false on entry, do nothing. * - * If an error is detected, set pass to FALSE, and set + * If an error is detected, set pass to false, and set * failure_mssg to point to an appropriate error message. * * This function was initially created to assist in testing @@ -3069,13 +3069,13 @@ create_zoo(hid_t fid, const char *base_path, int proc_num) if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/F", base_path); assert(HDstrlen(full_path) < 1024); - ds_ctg_i(fid, full_path, FALSE); + ds_ctg_i(fid, full_path, false); } if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/F", base_path); assert(HDstrlen(full_path) < 1024); - vrfy_ds_ctg_i(fid, full_path, FALSE); + vrfy_ds_ctg_i(fid, full_path, false); } /* Add & verify a contiguous dataset w/integer datatype (with data) @@ -3084,13 +3084,13 @@ create_zoo(hid_t fid, const char *base_path, int proc_num) if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/G", base_path); assert(HDstrlen(full_path) < 1024); - ds_ctg_i(fid, full_path, TRUE); + ds_ctg_i(fid, full_path, true); } if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/G", base_path); assert(HDstrlen(full_path) < 1024); - vrfy_ds_ctg_i(fid, full_path, TRUE); + vrfy_ds_ctg_i(fid, full_path, true); } /* Add & verify a chunked dataset w/integer datatype (but no data) @@ -3099,13 +3099,13 @@ create_zoo(hid_t fid, const char *base_path, int proc_num) if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/H", base_path); assert(HDstrlen(full_path) < 1024); - ds_chk_i(fid, full_path, FALSE); + ds_chk_i(fid, full_path, false); } if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/H", base_path); assert(HDstrlen(full_path) < 1024); - vrfy_ds_chk_i(fid, full_path, FALSE); + vrfy_ds_chk_i(fid, full_path, false); } /* Add & verify a chunked dataset w/integer datatype (and data) @@ -3114,13 +3114,13 @@ create_zoo(hid_t fid, const char *base_path, int proc_num) if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/I", base_path); assert(HDstrlen(full_path) < 1024); - ds_chk_i(fid, full_path, TRUE); + ds_chk_i(fid, full_path, true); } if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/I", base_path); assert(HDstrlen(full_path) < 1024); - vrfy_ds_chk_i(fid, full_path, TRUE); + vrfy_ds_chk_i(fid, full_path, true); } /* Add & verify a compact dataset w/integer datatype (but no data) @@ -3129,13 +3129,13 @@ create_zoo(hid_t fid, const char *base_path, int proc_num) if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/J", base_path); assert(HDstrlen(full_path) < 1024); - ds_cpt_i(fid, full_path, FALSE); + ds_cpt_i(fid, full_path, false); } if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/J", base_path); assert(HDstrlen(full_path) < 1024); - vrfy_ds_cpt_i(fid, full_path, FALSE); + vrfy_ds_cpt_i(fid, full_path, false); } /* Add & verify a compact dataset w/integer datatype (and data) @@ -3144,13 +3144,13 @@ create_zoo(hid_t fid, const char *base_path, int proc_num) if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/K", base_path); assert(HDstrlen(full_path) < 1024); - ds_cpt_i(fid, full_path, TRUE); + ds_cpt_i(fid, full_path, true); } if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/K", base_path); assert(HDstrlen(full_path) < 1024); - vrfy_ds_cpt_i(fid, full_path, TRUE); + vrfy_ds_cpt_i(fid, full_path, true); } /* Add & verify a contiguous dataset w/variable-length datatype @@ -3159,13 +3159,13 @@ create_zoo(hid_t fid, const char *base_path, int proc_num) if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/L", base_path); assert(HDstrlen(full_path) < 1024); - ds_ctg_v(fid, full_path, FALSE); + ds_ctg_v(fid, full_path, false); } if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/L", base_path); assert(HDstrlen(full_path) < 1024); - vrfy_ds_ctg_v(fid, full_path, FALSE); + vrfy_ds_ctg_v(fid, full_path, false); } /* Add & verify a contiguous dataset w/variable-length datatype @@ -3174,13 +3174,13 @@ create_zoo(hid_t fid, const char *base_path, int proc_num) if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/M", base_path); assert(HDstrlen(full_path) < 1024); - ds_ctg_v(fid, full_path, TRUE); + ds_ctg_v(fid, full_path, true); } if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/M", base_path); assert(HDstrlen(full_path) < 1024); - vrfy_ds_ctg_v(fid, full_path, TRUE); + vrfy_ds_ctg_v(fid, full_path, true); } } /* create_zoo() */ @@ -3193,7 +3193,7 @@ create_zoo(hid_t fid, const char *base_path, int proc_num) * * If pass is false on entry, do nothing. * - * If an error is detected, set pass to FALSE, and set + * If an error is detected, set pass to false, and set * failure_mssg to point to an appropriate error message. * * This function was initially created to assist in testing @@ -3261,7 +3261,7 @@ validate_zoo(hid_t fid, const char *base_path, int proc_num) if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/F", base_path); assert(HDstrlen(full_path) < 1024); - vrfy_ds_ctg_i(fid, full_path, FALSE); + vrfy_ds_ctg_i(fid, full_path, false); } /* validate a contiguous dataset w/integer datatype (with data) @@ -3270,7 +3270,7 @@ validate_zoo(hid_t fid, const char *base_path, int proc_num) if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/G", base_path); assert(HDstrlen(full_path) < 1024); - vrfy_ds_ctg_i(fid, full_path, TRUE); + vrfy_ds_ctg_i(fid, full_path, true); } /* validate a chunked dataset w/integer datatype (but no data) @@ -3279,7 +3279,7 @@ validate_zoo(hid_t fid, const char *base_path, int proc_num) if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/H", base_path); assert(HDstrlen(full_path) < 1024); - vrfy_ds_chk_i(fid, full_path, FALSE); + vrfy_ds_chk_i(fid, full_path, false); } /* validate a chunked dataset w/integer datatype (and data) @@ -3288,7 +3288,7 @@ validate_zoo(hid_t fid, const char *base_path, int proc_num) if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/I", base_path); assert(HDstrlen(full_path) < 1024); - vrfy_ds_chk_i(fid, full_path, TRUE); + vrfy_ds_chk_i(fid, full_path, true); } /* Validate a compact dataset w/integer datatype (but no data) @@ -3297,7 +3297,7 @@ validate_zoo(hid_t fid, const char *base_path, int proc_num) if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/J", base_path); assert(HDstrlen(full_path) < 1024); - vrfy_ds_cpt_i(fid, full_path, FALSE); + vrfy_ds_cpt_i(fid, full_path, false); } /* validate a compact dataset w/integer datatype (and data) @@ -3306,7 +3306,7 @@ validate_zoo(hid_t fid, const char *base_path, int proc_num) if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/K", base_path); assert(HDstrlen(full_path) < 1024); - vrfy_ds_cpt_i(fid, full_path, TRUE); + vrfy_ds_cpt_i(fid, full_path, true); } /* validate a contiguous dataset w/variable-length datatype @@ -3315,7 +3315,7 @@ validate_zoo(hid_t fid, const char *base_path, int proc_num) if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/L", base_path); assert(HDstrlen(full_path) < 1024); - vrfy_ds_ctg_v(fid, full_path, FALSE); + vrfy_ds_ctg_v(fid, full_path, false); } /* validate a contiguous dataset w/variable-length datatype @@ -3324,7 +3324,7 @@ validate_zoo(hid_t fid, const char *base_path, int proc_num) if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/M", base_path); assert(HDstrlen(full_path) < 1024); - vrfy_ds_ctg_v(fid, full_path, TRUE); + vrfy_ds_ctg_v(fid, full_path, true); } } /* validate_zoo() */ diff --git a/test/genall5.h b/test/genall5.h index bd365d7..e299c83 100644 --- a/test/genall5.h +++ b/test/genall5.h @@ -33,14 +33,14 @@ void vrfy_os_grp_0(hid_t fid, const char *group_name); void os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks); void vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks); -void ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data); -void vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data); +void ds_ctg_i(hid_t fid, const char *dset_name, bool write_data); +void vrfy_ds_ctg_i(hid_t fid, const char *dset_name, bool write_data); -void ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data); -void vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data); +void ds_chk_i(hid_t fid, const char *dset_name, bool write_data); +void vrfy_ds_chk_i(hid_t fid, const char *dset_name, bool write_data); -void ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data); -void vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data); +void ds_cpt_i(hid_t fid, const char *dset_name, bool write_data); +void vrfy_ds_cpt_i(hid_t fid, const char *dset_name, bool write_data); -void ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data); -void vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data); +void ds_ctg_v(hid_t fid, const char *dset_name, bool write_data); +void vrfy_ds_ctg_v(hid_t fid, const char *dset_name, bool write_data); diff --git a/test/getname.c b/test/getname.c index 12f85d0..869248e 100644 --- a/test/getname.c +++ b/test/getname.c @@ -3676,7 +3676,7 @@ test_elinks(hid_t fapl) hid_t group, group2; /* Group IDs */ char name[NAME_BUF_SIZE]; /* Buffer for storing object's name */ ssize_t namelen; /* Length of object's name */ - hbool_t name_cached; /* Indicate if name is cached */ + bool name_cached; /* Indicate if name is cached */ /* Initialize the file names */ h5_fixname(FILENAME[1], fapl, filename1, sizeof filename1); @@ -3711,7 +3711,7 @@ test_elinks(hid_t fapl) /* Query the external link object's name */ *name = '\0'; - name_cached = FALSE; + name_cached = false; namelen = H5I__get_name_test(group, (char *)name, sizeof(name), &name_cached); if (!((HDstrcmp(name, "/Group2") == 0) && (namelen == 7) && name_cached)) TEST_ERROR; @@ -3726,7 +3726,7 @@ test_elinks(hid_t fapl) /* Query the external link to external link object's name */ *name = '\0'; - name_cached = FALSE; + name_cached = false; namelen = H5I__get_name_test(group, (char *)name, sizeof(name), &name_cached); if (!((HDstrcmp(name, "/Group2") == 0) && (namelen == 7) && name_cached)) TEST_ERROR; @@ -3750,11 +3750,11 @@ error: int main(void) { - hid_t file_id = (-1); - int nerrors = 0; - hid_t fapl; - char filename0[1024]; - hbool_t driver_is_parallel; + hid_t file_id = (-1); + int nerrors = 0; + hid_t fapl; + char filename0[1024]; + bool driver_is_parallel; /* Reset the library and get the file access property list */ h5_reset(); diff --git a/test/gheap.c b/test/gheap.c index 714ba27..00012e6 100644 --- a/test/gheap.c +++ b/test/gheap.c @@ -557,9 +557,9 @@ error: int main(void) { - int nerrors = 0; - hid_t fapl_id = H5I_INVALID_HID; - hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ + int nerrors = 0; + hid_t fapl_id = H5I_INVALID_HID; + bool api_ctx_pushed = false; /* Whether API context pushed */ h5_reset(); if ((fapl_id = h5_fileaccess()) < 0) @@ -568,7 +568,7 @@ main(void) /* Push API context */ if (H5CX_push() < 0) FAIL_STACK_ERROR; - api_ctx_pushed = TRUE; + api_ctx_pushed = true; nerrors += test_1(fapl_id); nerrors += test_2(fapl_id); @@ -585,9 +585,9 @@ main(void) HDputs("All global heap tests passed."); /* Pop API context */ - if (api_ctx_pushed && H5CX_pop(FALSE) < 0) + if (api_ctx_pushed && H5CX_pop(false) < 0) FAIL_STACK_ERROR; - api_ctx_pushed = FALSE; + api_ctx_pushed = false; h5_cleanup(FILENAME, fapl_id); exit(EXIT_SUCCESS); @@ -600,7 +600,7 @@ error: H5E_END_TRY if (api_ctx_pushed) - H5CX_pop(FALSE); + H5CX_pop(false); HDputs("*** TESTS FAILED ***"); exit(EXIT_FAILURE); diff --git a/test/h5test.c b/test/h5test.c index 70e81cc..d7d53bd 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -119,7 +119,7 @@ uint64_t vol_cap_flags_g = H5VL_CAP_FLAG_NONE; static herr_t h5_errors(hid_t estack, void *client_data); static char *h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fullname, - size_t size, hbool_t nest_printf, hbool_t subst_for_superblock); + size_t size, bool nest_printf, bool subst_for_superblock); /*------------------------------------------------------------------------- * Function: h5_errors @@ -362,7 +362,7 @@ h5_test_init(void) char * h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size) { - return (h5_fixname_real(base_name, fapl, ".h5", fullname, size, FALSE, FALSE)); + return (h5_fixname_real(base_name, fapl, ".h5", fullname, size, false, false)); } /*------------------------------------------------------------------------- @@ -384,7 +384,7 @@ h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size) char * h5_fixname_superblock(const char *base_name, hid_t fapl_id, char *fullname, size_t size) { - return (h5_fixname_real(base_name, fapl_id, ".h5", fullname, size, FALSE, TRUE)); + return (h5_fixname_real(base_name, fapl_id, ".h5", fullname, size, false, true)); } /*------------------------------------------------------------------------- @@ -403,7 +403,7 @@ h5_fixname_superblock(const char *base_name, hid_t fapl_id, char *fullname, size char * h5_fixname_no_suffix(const char *base_name, hid_t fapl, char *fullname, size_t size) { - return (h5_fixname_real(base_name, fapl, NULL, fullname, size, FALSE, FALSE)); + return (h5_fixname_real(base_name, fapl, NULL, fullname, size, false, false)); } /*------------------------------------------------------------------------- @@ -425,7 +425,7 @@ h5_fixname_no_suffix(const char *base_name, hid_t fapl, char *fullname, size_t s char * h5_fixname_printf(const char *base_name, hid_t fapl, char *fullname, size_t size) { - return (h5_fixname_real(base_name, fapl, ".h5", fullname, size, TRUE, FALSE)); + return (h5_fixname_real(base_name, fapl, ".h5", fullname, size, true, false)); } /*------------------------------------------------------------------------- @@ -449,7 +449,7 @@ h5_fixname_printf(const char *base_name, hid_t fapl, char *fullname, size_t size */ static char * h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fullname, size_t size, - hbool_t nest_printf, hbool_t subst_for_superblock) + bool nest_printf, bool subst_for_superblock) { const char *prefix = NULL; const char *driver_env_var = NULL; /* HDF5_DRIVER environment variable */ @@ -562,7 +562,7 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu " export HDF5_PARAPREFIX\n" "*** End of Hint ***\n"); - explained = TRUE; + explained = true; #ifdef HDF5_PARAPREFIX prefix = HDF5_PARAPREFIX; #endif /* HDF5_PARAPREFIX */ @@ -2005,19 +2005,19 @@ done: * Purpose: Checks if file locking is enabled on this file system. * * Return: SUCCEED/FAIL - * are_enabled will be FALSE if file locking is disabled on + * are_enabled will be false if file locking is disabled on * the file system of if there were errors. * *------------------------------------------------------------------------- */ herr_t -h5_check_if_file_locking_enabled(hbool_t *is_enabled) +h5_check_if_file_locking_enabled(bool *is_enabled) { const char *filename = "locking_test_file"; int pmode = O_RDWR | O_CREAT | O_TRUNC; int fd = -1; - *is_enabled = TRUE; + *is_enabled = true; if ((fd = HDopen(filename, pmode, H5_POSIX_CREATE_MODE_RW)) < 0) goto error; @@ -2033,7 +2033,7 @@ h5_check_if_file_locking_enabled(hbool_t *is_enabled) * error condition. */ errno = 0; - *is_enabled = FALSE; + *is_enabled = false; } else goto error; @@ -2049,7 +2049,7 @@ h5_check_if_file_locking_enabled(hbool_t *is_enabled) return SUCCEED; error: - *is_enabled = FALSE; + *is_enabled = false; if (fd > -1) { HDclose(fd); HDremove(filename); @@ -2064,14 +2064,14 @@ error: * default VFD. If `drv_name` is NULL, the HDF5_DRIVER * environment is checked instead (if it is set). * - * Return: TRUE/FALSE + * Return: true/false * *------------------------------------------------------------------------- */ -hbool_t +bool h5_using_default_driver(const char *drv_name) { - hbool_t ret_val = TRUE; + bool ret_val = true; assert(H5_DEFAULT_VFD == H5FD_SEC2); @@ -2094,12 +2094,12 @@ h5_using_default_driver(const char *drv_name) * which are not currently supported for parallel HDF5, such * as writing of VL or region reference datatypes. * - * Return: TRUE/FALSE + * Return: true/false * *------------------------------------------------------------------------- */ herr_t -h5_using_parallel_driver(hid_t fapl_id, hbool_t *driver_is_parallel) +h5_using_parallel_driver(hid_t fapl_id, bool *driver_is_parallel) { unsigned long feat_flags = 0; hid_t driver_id = H5I_INVALID_HID; @@ -2142,7 +2142,7 @@ h5_using_parallel_driver(hid_t fapl_id, hbool_t *driver_is_parallel) *------------------------------------------------------------------------- */ herr_t -h5_driver_is_default_vfd_compatible(hid_t fapl_id, hbool_t *default_vfd_compatible) +h5_driver_is_default_vfd_compatible(hid_t fapl_id, bool *default_vfd_compatible) { unsigned long feat_flags = 0; hid_t driver_id = H5I_INVALID_HID; @@ -2187,14 +2187,14 @@ h5_driver_is_default_vfd_compatible(hid_t fapl_id, hbool_t *default_vfd_compatib * Eventually, this should become a VFD feature flag so this * check is less fragile. * - * Return: TRUE/FALSE + * Return: true/false * *------------------------------------------------------------------------- */ -hbool_t +bool h5_driver_uses_multiple_files(const char *drv_name, unsigned flags) { - hbool_t ret_val = FALSE; + bool ret_val = false; if (!drv_name) drv_name = HDgetenv(HDF5_DRIVER); @@ -2203,12 +2203,12 @@ h5_driver_uses_multiple_files(const char *drv_name, unsigned flags) if ((flags & H5_EXCLUDE_MULTIPART_DRIVERS) == 0) { if (!HDstrcmp(drv_name, "split") || !HDstrcmp(drv_name, "multi") || !HDstrcmp(drv_name, "family") || !HDstrcmp(drv_name, H5FD_SUBFILING_NAME)) - return TRUE; + return true; } if ((flags & H5_EXCLUDE_NON_MULTIPART_DRIVERS) == 0) { if (!HDstrcmp(drv_name, "splitter")) - return TRUE; + return true; } } diff --git a/test/h5test.h b/test/h5test.h index 6cb00e5..98190d2 100644 --- a/test/h5test.h +++ b/test/h5test.h @@ -289,11 +289,11 @@ H5TEST_DLL H5VL_class_t *h5_get_dummy_vol_class(void); H5TEST_DLL const char *h5_get_version_string(H5F_libver_t libver); H5TEST_DLL int h5_compare_file_bytes(char *fname1, char *fname2); H5TEST_DLL int h5_duplicate_file_by_bytes(const char *orig, const char *dest); -H5TEST_DLL herr_t h5_check_if_file_locking_enabled(hbool_t *are_enabled); -H5TEST_DLL hbool_t h5_using_default_driver(const char *drv_name); -H5TEST_DLL herr_t h5_using_parallel_driver(hid_t fapl_id, hbool_t *driver_is_parallel); -H5TEST_DLL herr_t h5_driver_is_default_vfd_compatible(hid_t fapl_id, hbool_t *default_vfd_compatible); -H5TEST_DLL hbool_t h5_driver_uses_multiple_files(const char *drv_name, unsigned flags); +H5TEST_DLL herr_t h5_check_if_file_locking_enabled(bool *are_enabled); +H5TEST_DLL bool h5_using_default_driver(const char *drv_name); +H5TEST_DLL herr_t h5_using_parallel_driver(hid_t fapl_id, bool *driver_is_parallel); +H5TEST_DLL herr_t h5_driver_is_default_vfd_compatible(hid_t fapl_id, bool *default_vfd_compatible); +H5TEST_DLL bool h5_driver_uses_multiple_files(const char *drv_name, unsigned flags); /* Functions that will replace components of a FAPL */ H5TEST_DLL herr_t h5_get_libver_fapl(hid_t fapl_id); diff --git a/test/hdfs.c b/test/hdfs.c index 52e2eae..156046d 100644 --- a/test/hdfs.c +++ b/test/hdfs.c @@ -687,7 +687,7 @@ test_vfd_open(void) unsigned flags; int which_fapl; haddr_t maxaddr; - hbool_t might_use_other_driver; + bool might_use_other_driver; }; /************************ @@ -701,7 +701,7 @@ test_vfd_open(void) H5F_ACC_RDONLY, FAPL_H5P_DEFAULT, MAXADDR, - TRUE, + true, }, { "generic file access property list is invalid", @@ -709,7 +709,7 @@ test_vfd_open(void) H5F_ACC_RDONLY, FAPL_UNCONFIGURED, MAXADDR, - TRUE, + true, }, { "filename cannot be null", @@ -717,7 +717,7 @@ test_vfd_open(void) H5F_ACC_RDONLY, FAPL_HDFS, MAXADDR, - FALSE, + false, }, { "filename cannot be empty", @@ -725,7 +725,7 @@ test_vfd_open(void) H5F_ACC_RDONLY, FAPL_HDFS, MAXADDR, - FALSE, + false, }, { "file at filename must exist", @@ -733,7 +733,7 @@ test_vfd_open(void) H5F_ACC_RDONLY, FAPL_HDFS, MAXADDR, - FALSE, + false, }, { "read-write flag not supported", @@ -741,7 +741,7 @@ test_vfd_open(void) H5F_ACC_RDWR, FAPL_HDFS, MAXADDR, - FALSE, + false, }, { "truncate flag not supported", @@ -749,7 +749,7 @@ test_vfd_open(void) H5F_ACC_TRUNC, FAPL_HDFS, MAXADDR, - FALSE, + false, }, { "create flag not supported", @@ -757,7 +757,7 @@ test_vfd_open(void) H5F_ACC_CREAT, FAPL_HDFS, MAXADDR, - FALSE, + false, }, { "EXCL flag not supported", @@ -765,7 +765,7 @@ test_vfd_open(void) H5F_ACC_EXCL, FAPL_HDFS, MAXADDR, - FALSE, + false, }, { "maxaddr cannot be 0 (caught in `H5FD_open()`)", @@ -773,7 +773,7 @@ test_vfd_open(void) H5F_ACC_RDONLY, FAPL_HDFS, 0, - FALSE, + false, }, }; unsigned i = 0; @@ -820,7 +820,7 @@ test_vfd_open(void) } H5E_END_TRY if (NULL != fd) { - if (TRUE == T.might_use_other_driver && H5FD_HDFS != fd->driver_id) { + if (true == T.might_use_other_driver && H5FD_HDFS != fd->driver_id) { fprintf(stderr, "\n!!!!! WARNING !!!!!\n" " Successful open of file on local system " "with non-HDFS VFD.\n"); @@ -1379,10 +1379,10 @@ test_noops_and_autofails(void) H5E_BEGIN_TRY{JSVERIFY(FAIL, H5FDwrite(file, H5FD_MEM_DRAW, H5P_DEFAULT, 1000, 35, data), "write must fail")} H5E_END_TRY - H5E_BEGIN_TRY{JSVERIFY(FAIL, H5FDtruncate(file, H5P_DEFAULT, FALSE), "truncate must fail")} H5E_END_TRY + H5E_BEGIN_TRY{JSVERIFY(FAIL, H5FDtruncate(file, H5P_DEFAULT, false), "truncate must fail")} H5E_END_TRY H5E_BEGIN_TRY{ - JSVERIFY(FAIL, H5FDtruncate(file, H5P_DEFAULT, TRUE), "truncate must fail (closing)")} H5E_END_TRY + JSVERIFY(FAIL, H5FDtruncate(file, H5P_DEFAULT, true), "truncate must fail (closing)")} H5E_END_TRY /************ * TEARDOWN * diff --git a/test/lheap.c b/test/lheap.c index 5f99c43..8ffb4b6 100644 --- a/test/lheap.c +++ b/test/lheap.c @@ -51,8 +51,8 @@ main(void) int i, j; /* miscellaneous counters */ char buf[1024]; /* the value to store */ const char *s; /* value to read */ - hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ - hbool_t driver_is_default_compatible; + bool api_ctx_pushed = false; /* Whether API context pushed */ + bool driver_is_default_compatible; /* Reset library */ h5_reset(); @@ -61,7 +61,7 @@ main(void) /* Push API context */ if (H5CX_push() < 0) FAIL_STACK_ERROR; - api_ctx_pushed = TRUE; + api_ctx_pushed = true; /* * Test writing to the heap... @@ -200,9 +200,9 @@ main(void) TEST_ERROR; /* Pop API context */ - if (api_ctx_pushed && H5CX_pop(FALSE) < 0) + if (api_ctx_pushed && H5CX_pop(false) < 0) FAIL_STACK_ERROR; - api_ctx_pushed = FALSE; + api_ctx_pushed = false; HDputs("All local heap tests passed."); h5_cleanup(FILENAME, fapl); @@ -218,7 +218,7 @@ error: H5E_END_TRY if (api_ctx_pushed) - H5CX_pop(FALSE); + H5CX_pop(false); return EXIT_FAILURE; } diff --git a/test/links.c b/test/links.c index 8f6af5b..96bd7d6 100644 --- a/test/links.c +++ b/test/links.c @@ -160,7 +160,7 @@ typedef struct { int stop; /* # of iterations to stop after */ int64_t curr; /* Current creation order value */ size_t max_visit; /* Size of "visited link" flag array */ - hbool_t *visited; /* Pointer to array of "visited link" flags */ + bool *visited; /* Pointer to array of "visited link" flags */ } link_iter_info_t; /* Link visit structs */ @@ -415,7 +415,7 @@ fix_ext_filename(char *path_name, char *cwd, const char *file_name) *------------------------------------------------------------------------- */ static int -mklinks(hid_t fapl, hbool_t new_format) +mklinks(hid_t fapl, bool new_format) { hid_t file, scalar, grp, d1; hsize_t size[1] = {1}; @@ -484,7 +484,7 @@ error: *------------------------------------------------------------------------- */ static int -new_links(hid_t fapl, hbool_t new_format) +new_links(hid_t fapl, bool new_format) { hid_t file_a, file_b = (-1); hid_t grp1_a = (-1), grp1_b = (-1), grp2_a = (-1), grp2_b = (-1); @@ -610,7 +610,7 @@ error: *------------------------------------------------------------------------- */ static int -cklinks(hid_t fapl, hbool_t new_format) +cklinks(hid_t fapl, bool new_format) { hid_t file; H5O_info2_t oinfo1, oinfo2; @@ -653,15 +653,15 @@ cklinks(hid_t fapl, hbool_t new_format) HDputs(" expected file location."); TEST_ERROR; } /* end if */ - if (H5Lexists(file, "/", H5P_DEFAULT) != TRUE) + if (H5Lexists(file, "/", H5P_DEFAULT) != true) FAIL_STACK_ERROR; - if (H5Lexists(file, "d1", H5P_DEFAULT) != TRUE) + if (H5Lexists(file, "d1", H5P_DEFAULT) != true) FAIL_STACK_ERROR; - if (H5Lexists(file, "grp1/hard", H5P_DEFAULT) != TRUE) + if (H5Lexists(file, "grp1/hard", H5P_DEFAULT) != true) FAIL_STACK_ERROR; - if (H5Lexists(file, "/grp1", H5P_DEFAULT) != TRUE) + if (H5Lexists(file, "/grp1", H5P_DEFAULT) != true) FAIL_STACK_ERROR; - if (H5Lexists(file, "/grp1/hard", H5P_DEFAULT) != TRUE) + if (H5Lexists(file, "/grp1/hard", H5P_DEFAULT) != true) FAIL_STACK_ERROR; H5E_BEGIN_TRY { @@ -707,7 +707,7 @@ cklinks(hid_t fapl, hbool_t new_format) HDputs(" Soft link test failed. Wrong link value"); TEST_ERROR; } /* end if */ - if (H5Lexists(file, "grp1/soft", H5P_DEFAULT) != TRUE) + if (H5Lexists(file, "grp1/soft", H5P_DEFAULT) != true) FAIL_STACK_ERROR; /* Dangling link */ @@ -738,7 +738,7 @@ cklinks(hid_t fapl, hbool_t new_format) HDputs(" Dangling link test failed. Wrong link value"); TEST_ERROR; } /* end if */ - if (H5Lexists(file, "grp1/dangle", H5P_DEFAULT) != TRUE) + if (H5Lexists(file, "grp1/dangle", H5P_DEFAULT) != true) FAIL_STACK_ERROR; /* Recursive link */ @@ -771,7 +771,7 @@ cklinks(hid_t fapl, hbool_t new_format) } /* end if */ /* Non-existent link */ - if (H5Lexists(file, "foobar", H5P_DEFAULT) == TRUE) + if (H5Lexists(file, "foobar", H5P_DEFAULT) == true) FAIL_STACK_ERROR; /* Cleanup */ @@ -796,7 +796,7 @@ error: *------------------------------------------------------------------------- */ static int -ck_new_links(hid_t fapl, hbool_t new_format) +ck_new_links(hid_t fapl, bool new_format) { hid_t file; H5O_info2_t oi_dset, oi_hard1, oi_hard2; @@ -860,7 +860,7 @@ error: *------------------------------------------------------------------------- */ static int -long_links(hid_t fapl, hbool_t new_format) +long_links(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1; /* Group ID */ @@ -939,7 +939,7 @@ error: *------------------------------------------------------------------------- */ static int -toomany(hid_t fapl, hbool_t new_format) +toomany(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1, gid2 = -1; /* Group IDs */ @@ -1138,7 +1138,7 @@ error: *------------------------------------------------------------------------- */ static int -test_lcpl(hid_t fapl, hbool_t new_format) +test_lcpl(hid_t fapl, bool new_format) { hid_t file_id = -1; hid_t group_id = -1; @@ -1351,7 +1351,7 @@ error: *------------------------------------------------------------------------- */ static int -test_move(hid_t fapl, hbool_t new_format) +test_move(hid_t fapl, bool new_format) { hid_t file_a = -1, file_b = -1; hid_t grp_1 = -1, grp_2 = -1, grp_move = -1, moved_grp = -1; @@ -1407,13 +1407,13 @@ test_move(hid_t fapl, hbool_t new_format) /* Move a soft link across files. Should succeed. */ if (H5Lmove(grp_2, "soft", file_b, "soft_new_name", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR; - if (H5Lexists(file_b, "soft_new_name", H5P_DEFAULT) != TRUE) + if (H5Lexists(file_b, "soft_new_name", H5P_DEFAULT) != true) TEST_ERROR; /* Move an external link across files. Should succeed. */ if (H5Lmove(grp_2, "ext", file_b, "ext_new_name", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR; - if (H5Lexists(file_b, "ext_new_name", H5P_DEFAULT) != TRUE) + if (H5Lexists(file_b, "ext_new_name", H5P_DEFAULT) != true) TEST_ERROR; /* Move a group across groups in the same file while renaming it. */ @@ -1518,7 +1518,7 @@ error: *------------------------------------------------------------------------- */ static int -test_copy(hid_t fapl, hbool_t new_format) +test_copy(hid_t fapl, bool new_format) { hid_t file_a = -1, file_b = -1; hid_t grp_1 = -1, grp_2 = -1, grp_move = -1, moved_grp = -1; @@ -1574,13 +1574,13 @@ test_copy(hid_t fapl, hbool_t new_format) /* Copy a soft link across files. Should succeed. */ if (H5Lcopy(grp_2, "soft", file_b, "soft_new_name", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR; - if (H5Lexists(file_b, "soft_new_name", H5P_DEFAULT) != TRUE) + if (H5Lexists(file_b, "soft_new_name", H5P_DEFAULT) != true) TEST_ERROR; /* Copy an external link across files. Should succeed. */ if (H5Lcopy(grp_2, "ext", file_b, "ext_new_name", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR; - if (H5Lexists(file_b, "ext_new_name", H5P_DEFAULT) != TRUE) + if (H5Lexists(file_b, "ext_new_name", H5P_DEFAULT) != true) TEST_ERROR; /* Move a group across groups in the same file while renaming it. */ @@ -1693,7 +1693,7 @@ error: *------------------------------------------------------------------------- */ static int -test_move_preserves(hid_t fapl_id, hbool_t new_format) +test_move_preserves(hid_t fapl_id, bool new_format) { hid_t file_id = -1; hid_t group_id = -1; @@ -1756,7 +1756,7 @@ test_move_preserves(hid_t fapl_id, hbool_t new_format) old_cset = linfo.cset; if (old_cset != H5T_CSET_UTF8) TEST_ERROR; - if (linfo.corder_valid != TRUE) + if (linfo.corder_valid != true) TEST_ERROR; old_corder = linfo.corder; if (old_corder != 0) @@ -1783,7 +1783,7 @@ test_move_preserves(hid_t fapl_id, hbool_t new_format) TEST_ERROR; if (old_cset != linfo.cset) TEST_ERROR; - if (linfo.corder_valid != TRUE) + if (linfo.corder_valid != true) TEST_ERROR; if (old_corder != linfo.corder) TEST_ERROR; @@ -1800,7 +1800,7 @@ test_move_preserves(hid_t fapl_id, hbool_t new_format) TEST_ERROR; if (old_corder == linfo.corder) TEST_ERROR; - if (linfo.corder_valid != TRUE) + if (linfo.corder_valid != true) TEST_ERROR; if (linfo.corder != 1) TEST_ERROR; @@ -1819,7 +1819,7 @@ test_move_preserves(hid_t fapl_id, hbool_t new_format) TEST_ERROR; if (H5Lget_info2(file_id, "group_copied", &linfo, H5P_DEFAULT) < 0) TEST_ERROR; - if (linfo.corder_valid != TRUE) + if (linfo.corder_valid != true) TEST_ERROR; if (linfo.corder != 2) TEST_ERROR; @@ -1837,7 +1837,7 @@ test_move_preserves(hid_t fapl_id, hbool_t new_format) TEST_ERROR; if (H5Lget_info2(file_id, "group_copied2", &linfo, H5P_DEFAULT) < 0) TEST_ERROR; - if (linfo.corder_valid != TRUE) + if (linfo.corder_valid != true) TEST_ERROR; if (linfo.corder != 3) TEST_ERROR; @@ -1853,7 +1853,7 @@ test_move_preserves(hid_t fapl_id, hbool_t new_format) TEST_ERROR; if (H5Lget_info2(file_id, "group", &linfo, H5P_DEFAULT) < 0) TEST_ERROR; - if (linfo.corder_valid != TRUE) + if (linfo.corder_valid != true) TEST_ERROR; if (old_corder != linfo.corder) TEST_ERROR; @@ -1871,7 +1871,7 @@ test_move_preserves(hid_t fapl_id, hbool_t new_format) TEST_ERROR; if (H5Lget_info2(file_id, "group_moved", &linfo, H5P_DEFAULT) < 0) TEST_ERROR; - if (linfo.corder_valid != TRUE) + if (linfo.corder_valid != true) TEST_ERROR; if (linfo.corder != 4) TEST_ERROR; @@ -1889,7 +1889,7 @@ test_move_preserves(hid_t fapl_id, hbool_t new_format) TEST_ERROR; if (H5Lget_info2(file_id, "group_moved_again", &linfo, H5P_DEFAULT) < 0) TEST_ERROR; - if (linfo.corder_valid != TRUE) + if (linfo.corder_valid != true) TEST_ERROR; if (linfo.corder != 5) TEST_ERROR; @@ -1933,7 +1933,7 @@ error: */ #ifndef H5_NO_DEPRECATED_SYMBOLS static int -test_deprec(hid_t fapl, hbool_t new_format) +test_deprec(hid_t fapl, bool new_format) { hid_t file_id = -1; hid_t group1_id = -1; @@ -2014,9 +2014,9 @@ test_deprec(hid_t fapl, hbool_t new_format) TEST_ERROR; /* Test that H5Glink created hard links properly */ - if (H5Gget_objinfo(file_id, "/group2", TRUE, &sb_hard1) < 0) + if (H5Gget_objinfo(file_id, "/group2", true, &sb_hard1) < 0) FAIL_STACK_ERROR; - if (H5Gget_objinfo(file_id, "/group1/link_to_group2", TRUE, &sb_hard2) < 0) + if (H5Gget_objinfo(file_id, "/group1/link_to_group2", true, &sb_hard2) < 0) FAIL_STACK_ERROR; if (memcmp(&sb_hard1.objno, sb_hard2.objno, sizeof(sb_hard1.objno)) != 0) { @@ -2027,9 +2027,9 @@ test_deprec(hid_t fapl, hbool_t new_format) } /* end if */ /* Test for the other hard link created */ - if (H5Gget_objinfo(file_id, "/group1", TRUE, &sb_hard1) < 0) + if (H5Gget_objinfo(file_id, "/group1", true, &sb_hard1) < 0) FAIL_STACK_ERROR; - if (H5Gget_objinfo(file_id, "/group2/link_to_group1", TRUE, &sb_hard2) < 0) + if (H5Gget_objinfo(file_id, "/group2/link_to_group1", true, &sb_hard2) < 0) FAIL_STACK_ERROR; if (memcmp(&sb_hard1.objno, sb_hard2.objno, sizeof(sb_hard1.objno)) != 0) { @@ -2040,7 +2040,7 @@ test_deprec(hid_t fapl, hbool_t new_format) } /* end if */ /* Test the soft link */ - if (H5Gget_objinfo(file_id, "/group2/soft_link_to_group1", FALSE, &sb_soft1) < 0) + if (H5Gget_objinfo(file_id, "/group2/soft_link_to_group1", false, &sb_soft1) < 0) FAIL_STACK_ERROR; if (sb_soft1.type != H5G_LINK) TEST_ERROR; @@ -2055,13 +2055,13 @@ test_deprec(hid_t fapl, hbool_t new_format) /* Test non-existing links with H5Gget_objinfo */ H5E_BEGIN_TRY { - if (H5Gget_objinfo(file_id, "/group2/soft_link_no_exist", TRUE, NULL) >= 0) + if (H5Gget_objinfo(file_id, "/group2/soft_link_no_exist", true, NULL) >= 0) FAIL_STACK_ERROR; } H5E_END_TRY /* Test the dangling soft link */ - if (H5Gget_objinfo(file_id, "/group2/dangle_soft_link", FALSE, &sb_soft2) < 0) + if (H5Gget_objinfo(file_id, "/group2/dangle_soft_link", false, &sb_soft2) < 0) FAIL_STACK_ERROR; if (sb_soft2.type != H5G_LINK) TEST_ERROR; @@ -2135,7 +2135,7 @@ error: *------------------------------------------------------------------------- */ static int -cklinks_deprec(hid_t fapl, hbool_t new_format) +cklinks_deprec(hid_t fapl, bool new_format) { hid_t file; H5O_info1_t oinfo1, oinfo2; @@ -2171,15 +2171,15 @@ cklinks_deprec(hid_t fapl, hbool_t new_format) HDputs(" expected file location."); TEST_ERROR; } /* end if */ - if (H5Lexists(file, "/", H5P_DEFAULT) != TRUE) + if (H5Lexists(file, "/", H5P_DEFAULT) != true) FAIL_STACK_ERROR; - if (H5Lexists(file, "d1", H5P_DEFAULT) != TRUE) + if (H5Lexists(file, "d1", H5P_DEFAULT) != true) FAIL_STACK_ERROR; - if (H5Lexists(file, "grp1/hard", H5P_DEFAULT) != TRUE) + if (H5Lexists(file, "grp1/hard", H5P_DEFAULT) != true) FAIL_STACK_ERROR; - if (H5Lexists(file, "/grp1", H5P_DEFAULT) != TRUE) + if (H5Lexists(file, "/grp1", H5P_DEFAULT) != true) FAIL_STACK_ERROR; - if (H5Lexists(file, "/grp1/hard", H5P_DEFAULT) != TRUE) + if (H5Lexists(file, "/grp1/hard", H5P_DEFAULT) != true) FAIL_STACK_ERROR; H5E_BEGIN_TRY { @@ -2223,7 +2223,7 @@ cklinks_deprec(hid_t fapl, hbool_t new_format) HDputs(" Soft link test failed. Wrong link value"); TEST_ERROR; } /* end if */ - if (H5Lexists(file, "grp1/soft", H5P_DEFAULT) != TRUE) + if (H5Lexists(file, "grp1/soft", H5P_DEFAULT) != true) FAIL_STACK_ERROR; /* Dangling link */ @@ -2254,7 +2254,7 @@ cklinks_deprec(hid_t fapl, hbool_t new_format) HDputs(" Dangling link test failed. Wrong link value"); TEST_ERROR; } /* end if */ - if (H5Lexists(file, "grp1/dangle", H5P_DEFAULT) != TRUE) + if (H5Lexists(file, "grp1/dangle", H5P_DEFAULT) != true) FAIL_STACK_ERROR; /* Recursive link */ @@ -2287,7 +2287,7 @@ cklinks_deprec(hid_t fapl, hbool_t new_format) } /* end if */ /* Non-existent link */ - if (H5Lexists(file, "foobar", H5P_DEFAULT) == TRUE) + if (H5Lexists(file, "foobar", H5P_DEFAULT) == true) FAIL_STACK_ERROR; /* Cleanup */ @@ -2311,7 +2311,7 @@ error: *------------------------------------------------------------------------- */ static int -test_lcpl_deprec(hid_t fapl, hbool_t new_format) +test_lcpl_deprec(hid_t fapl, bool new_format) { hid_t file_id = -1; hid_t group_id = -1; @@ -2525,7 +2525,7 @@ error: *------------------------------------------------------------------------- */ static int -test_move_preserves_deprec(hid_t fapl_id, hbool_t new_format) +test_move_preserves_deprec(hid_t fapl_id, bool new_format) { hid_t file_id = -1; hid_t group_id = -1; @@ -2589,7 +2589,7 @@ test_move_preserves_deprec(hid_t fapl_id, hbool_t new_format) old_cset = linfo.cset; if (old_cset != H5T_CSET_UTF8) TEST_ERROR; - if (linfo.corder_valid != TRUE) + if (linfo.corder_valid != true) TEST_ERROR; old_corder = linfo.corder; if (old_corder != 0) @@ -2616,7 +2616,7 @@ test_move_preserves_deprec(hid_t fapl_id, hbool_t new_format) TEST_ERROR; if (old_cset != linfo.cset) TEST_ERROR; - if (linfo.corder_valid != TRUE) + if (linfo.corder_valid != true) TEST_ERROR; if (old_corder != linfo.corder) TEST_ERROR; @@ -2633,7 +2633,7 @@ test_move_preserves_deprec(hid_t fapl_id, hbool_t new_format) TEST_ERROR; if (old_corder == linfo.corder) TEST_ERROR; - if (linfo.corder_valid != TRUE) + if (linfo.corder_valid != true) TEST_ERROR; if (linfo.corder != 1) TEST_ERROR; @@ -2652,7 +2652,7 @@ test_move_preserves_deprec(hid_t fapl_id, hbool_t new_format) TEST_ERROR; if (H5Lget_info1(file_id, "group_copied", &linfo, H5P_DEFAULT) < 0) TEST_ERROR; - if (linfo.corder_valid != TRUE) + if (linfo.corder_valid != true) TEST_ERROR; if (linfo.corder != 2) TEST_ERROR; @@ -2670,7 +2670,7 @@ test_move_preserves_deprec(hid_t fapl_id, hbool_t new_format) TEST_ERROR; if (H5Lget_info1(file_id, "group_copied2", &linfo, H5P_DEFAULT) < 0) TEST_ERROR; - if (linfo.corder_valid != TRUE) + if (linfo.corder_valid != true) TEST_ERROR; if (linfo.corder != 3) TEST_ERROR; @@ -2686,7 +2686,7 @@ test_move_preserves_deprec(hid_t fapl_id, hbool_t new_format) TEST_ERROR; if (H5Lget_info1(file_id, "group", &linfo, H5P_DEFAULT) < 0) TEST_ERROR; - if (linfo.corder_valid != TRUE) + if (linfo.corder_valid != true) TEST_ERROR; if (old_corder != linfo.corder) TEST_ERROR; @@ -2704,7 +2704,7 @@ test_move_preserves_deprec(hid_t fapl_id, hbool_t new_format) TEST_ERROR; if (H5Lget_info1(file_id, "group_moved", &linfo, H5P_DEFAULT) < 0) TEST_ERROR; - if (linfo.corder_valid != TRUE) + if (linfo.corder_valid != true) TEST_ERROR; if (linfo.corder != 4) TEST_ERROR; @@ -2722,7 +2722,7 @@ test_move_preserves_deprec(hid_t fapl_id, hbool_t new_format) TEST_ERROR; if (H5Lget_info1(file_id, "group_moved_again", &linfo, H5P_DEFAULT) < 0) TEST_ERROR; - if (linfo.corder_valid != TRUE) + if (linfo.corder_valid != true) TEST_ERROR; if (linfo.corder != 5) TEST_ERROR; @@ -2765,7 +2765,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_root_deprec(hid_t fapl, hbool_t new_format) +external_link_root_deprec(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1, gid2 = -1; /* Group IDs */ @@ -2794,7 +2794,7 @@ external_link_root_deprec(hid_t fapl, hbool_t new_format) TEST_ERROR; /* Check that external links are registered with the library */ - if (H5Lis_registered(H5L_TYPE_EXTERNAL) != TRUE) + if (H5Lis_registered(H5L_TYPE_EXTERNAL) != true) TEST_ERROR; /* Create file with link to first file */ @@ -2984,7 +2984,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_query_deprec(hid_t fapl, hbool_t new_format) +external_link_query_deprec(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1; /* Group IDs */ @@ -3138,7 +3138,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_closing_deprec(hid_t fapl, hbool_t new_format) +external_link_closing_deprec(hid_t fapl, bool new_format) { hid_t fid1 = (-1), fid2 = (-1), fid3 = (-1), fid4 = (-1); hid_t gid = (-1), tid = (-1), tid2 = (-1), sid = (-1), did = (-1); @@ -3366,7 +3366,7 @@ external_link_closing_deprec(hid_t fapl, hbool_t new_format) /* Add a few regular groups and a soft link in file2 using 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 (H5Lcreate_soft("/elink2", fid1, "elink/file2group1/file2group2/slink", lcpl_id, H5P_DEFAULT) < 0) TEST_ERROR; @@ -3636,9 +3636,9 @@ ud_hard_links_deprec(hid_t fapl) TEST_ERROR; /* Check that external links are registered and UD hard links are not */ - if (H5Lis_registered(H5L_TYPE_EXTERNAL) != TRUE) + if (H5Lis_registered(H5L_TYPE_EXTERNAL) != true) TEST_ERROR; - if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != FALSE) + if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != false) TEST_ERROR; /* Register "user-defined hard links" with the library */ @@ -3646,9 +3646,9 @@ ud_hard_links_deprec(hid_t fapl) TEST_ERROR; /* Check that UD hard links are now registered */ - if (H5Lis_registered(H5L_TYPE_EXTERNAL) != TRUE) + if (H5Lis_registered(H5L_TYPE_EXTERNAL) != true) TEST_ERROR; - if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != TRUE) + if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != true) TEST_ERROR; /* Create a group for the UD hard link to point to */ @@ -3793,7 +3793,7 @@ ud_link_reregister_deprec(hid_t fapl) TEST_ERROR; /* Check that UD hard links are not registered */ - if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != FALSE) + if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != false) TEST_ERROR; /* Register "user-defined hard links" with the library */ @@ -3801,7 +3801,7 @@ ud_link_reregister_deprec(hid_t fapl) TEST_ERROR; /* Check that UD hard links are registered */ - if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != TRUE) + if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != true) TEST_ERROR; /* Point a UD defined hard link to a group in the same way as the previous test */ @@ -3827,7 +3827,7 @@ ud_link_reregister_deprec(hid_t fapl) TEST_ERROR; /* Check that UD hard links are no longer registered */ - if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != FALSE) + if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != false) TEST_ERROR; /* Verify that we can't traverse the ud link anymore */ @@ -3852,7 +3852,7 @@ ud_link_reregister_deprec(hid_t fapl) TEST_ERROR; /* Check that UD hard links are registered again */ - if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != TRUE) + if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != true) TEST_ERROR; /* Open a group through the ud link (now a different class of link). @@ -3901,7 +3901,7 @@ ud_link_reregister_deprec(hid_t fapl) * other link type */ if (H5Lregister(UD_hard_class_deprec) < 0) FAIL_STACK_ERROR; - if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != TRUE) + if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != true) FAIL_STACK_ERROR; /* Ensure we can open the group through the UD link (now that UD hard @@ -3932,7 +3932,7 @@ ud_link_reregister_deprec(hid_t fapl) if (H5Lunregister((H5L_type_t)UD_HARD_TYPE) < 0) FAIL_STACK_ERROR; - if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != FALSE) + if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != false) FAIL_STACK_ERROR; PASSED(); @@ -3950,7 +3950,7 @@ error: } /* end ud_link_reregister_deprec() */ static int -ud_callbacks_deprec(hid_t fapl, hbool_t new_format) +ud_callbacks_deprec(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1; /* Group ID */ @@ -3972,11 +3972,11 @@ ud_callbacks_deprec(hid_t fapl, hbool_t new_format) TEST_ERROR; /* Check that registered link classes are, and unregistered ones aren't */ - if (H5Lis_registered(H5L_TYPE_EXTERNAL) != TRUE) + if (H5Lis_registered(H5L_TYPE_EXTERNAL) != true) TEST_ERROR; - if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != FALSE) + if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != false) TEST_ERROR; - if (H5Lis_registered((H5L_type_t)UD_CB_TYPE) != FALSE) + if (H5Lis_registered((H5L_type_t)UD_CB_TYPE) != false) TEST_ERROR; /* Hit two birds with one stone: register UD hard links from previous @@ -3990,11 +3990,11 @@ ud_callbacks_deprec(hid_t fapl, hbool_t new_format) TEST_ERROR; /* Check that registered link classes are, and unregistered ones aren't */ - if (H5Lis_registered(H5L_TYPE_EXTERNAL) != TRUE) + if (H5Lis_registered(H5L_TYPE_EXTERNAL) != true) TEST_ERROR; - if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != TRUE) + if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != true) TEST_ERROR; - if (H5Lis_registered((H5L_type_t)UD_CB_TYPE) != TRUE) + if (H5Lis_registered((H5L_type_t)UD_CB_TYPE) != true) TEST_ERROR; /* Create a group for the UD link to point to */ @@ -4127,7 +4127,7 @@ error: *------------------------------------------------------------------------- */ static int -lapl_nlinks_deprec(hid_t fapl, hbool_t new_format) +lapl_nlinks_deprec(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1, gid2 = -1; /* Group IDs */ @@ -4434,7 +4434,7 @@ error: *------------------------------------------------------------------------- */ static int -linkinfo_deprec(hid_t fapl, hbool_t new_format) +linkinfo_deprec(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1; /* Group ID */ @@ -4579,11 +4579,11 @@ corder_create_compact_deprec(hid_t fapl) TEST_ERROR; /* Check on group's initial status */ - if (H5G__is_empty_test(group_id) != TRUE) + if (H5G__is_empty_test(group_id) != true) TEST_ERROR; - if (H5G__has_stab_test(group_id) == TRUE) + if (H5G__has_stab_test(group_id) == true) TEST_ERROR; - if (H5G__is_new_dense_test(group_id) == TRUE) + if (H5G__is_new_dense_test(group_id) == true) TEST_ERROR; /* Query the group creation properties */ @@ -4599,13 +4599,13 @@ corder_create_compact_deprec(hid_t fapl) TEST_ERROR; /* Verify state of group */ - if (H5G__has_links_test(group_id, &nlinks) != TRUE) + if (H5G__has_links_test(group_id, &nlinks) != true) TEST_ERROR; if (nlinks != (u + 1)) TEST_ERROR; - if (H5G__has_stab_test(group_id) == TRUE) + if (H5G__has_stab_test(group_id) == true) TEST_ERROR; - if (H5G__is_new_dense_test(group_id) == TRUE) + if (H5G__is_new_dense_test(group_id) == true) TEST_ERROR; } /* end for */ @@ -4630,13 +4630,13 @@ corder_create_compact_deprec(hid_t fapl) FAIL_STACK_ERROR; /* Verify state of group */ - if (H5G__has_links_test(group_id, &nlinks) != TRUE) + if (H5G__has_links_test(group_id, &nlinks) != true) TEST_ERROR; if (nlinks != max_compact) TEST_ERROR; - if (H5G__has_stab_test(group_id) == TRUE) + if (H5G__has_stab_test(group_id) == true) TEST_ERROR; - if (H5G__is_new_dense_test(group_id) == TRUE) + if (H5G__is_new_dense_test(group_id) == true) TEST_ERROR; /* Loop through links, checking their creation order values */ @@ -4650,7 +4650,7 @@ corder_create_compact_deprec(hid_t fapl) TEST_ERROR; /* Verify creation order of link */ - if (linfo.corder_valid != TRUE) + if (linfo.corder_valid != true) TEST_ERROR; if (linfo.corder != u) TEST_ERROR; @@ -4723,11 +4723,11 @@ corder_create_dense_deprec(hid_t fapl) TEST_ERROR; /* Check on group's initial status */ - if (H5G__is_empty_test(group_id) != TRUE) + if (H5G__is_empty_test(group_id) != true) TEST_ERROR; - if (H5G__has_stab_test(group_id) == TRUE) + if (H5G__has_stab_test(group_id) == true) TEST_ERROR; - if (H5G__is_new_dense_test(group_id) == TRUE) + if (H5G__is_new_dense_test(group_id) == true) TEST_ERROR; /* Query the group creation properties */ @@ -4743,13 +4743,13 @@ corder_create_dense_deprec(hid_t fapl) TEST_ERROR; /* Verify state of group */ - if (H5G__has_links_test(group_id, &nlinks) != TRUE) + if (H5G__has_links_test(group_id, &nlinks) != true) TEST_ERROR; if (nlinks != (u + 1)) TEST_ERROR; - if (H5G__has_stab_test(group_id) == TRUE) + if (H5G__has_stab_test(group_id) == true) TEST_ERROR; - if (H5G__is_new_dense_test(group_id) == TRUE) + if (H5G__is_new_dense_test(group_id) == true) TEST_ERROR; } /* end for */ @@ -4761,11 +4761,11 @@ corder_create_dense_deprec(hid_t fapl) TEST_ERROR; /* Verify state of group */ - if (H5G__has_links_test(group_id, NULL) == TRUE) + if (H5G__has_links_test(group_id, NULL) == true) TEST_ERROR; - if (H5G__has_stab_test(group_id) == TRUE) + if (H5G__has_stab_test(group_id) == true) TEST_ERROR; - if (H5G__is_new_dense_test(group_id) != TRUE) + if (H5G__is_new_dense_test(group_id) != true) TEST_ERROR; /* Retrieve & verify # of records in the name & creation order indices */ @@ -4795,11 +4795,11 @@ corder_create_dense_deprec(hid_t fapl) FAIL_STACK_ERROR; /* Verify state of group */ - if (H5G__has_links_test(group_id, NULL) == TRUE) + if (H5G__has_links_test(group_id, NULL) == true) TEST_ERROR; - if (H5G__has_stab_test(group_id) == TRUE) + if (H5G__has_stab_test(group_id) == true) TEST_ERROR; - if (H5G__is_new_dense_test(group_id) != TRUE) + if (H5G__is_new_dense_test(group_id) != true) TEST_ERROR; /* Loop through links, checking their creation order values */ @@ -4813,7 +4813,7 @@ corder_create_dense_deprec(hid_t fapl) TEST_ERROR; /* Verify creation order of link */ - if (linfo.corder_valid != TRUE) + if (linfo.corder_valid != true) TEST_ERROR; if (linfo.corder != u) TEST_ERROR; @@ -4855,8 +4855,7 @@ error: *------------------------------------------------------------------------- */ static int -link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, hbool_t hard_link, - hbool_t use_index) +link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, bool hard_link, bool use_index) { char tmpname[NAME_BUF_SIZE]; /* Temporary link name */ char valname[NAME_BUF_SIZE]; /* Link value name */ @@ -5078,9 +5077,9 @@ link_info_by_idx_deprec(hid_t fapl) herr_t ret; /* Generic return value */ /* Loop over creating hard or soft links */ - for (hard_link = FALSE; hard_link <= TRUE; hard_link++) { + for (hard_link = false; hard_link <= true; hard_link++) { /* 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++) { if (hard_link) { if (use_index) TESTING("querying info by index w/creation order index, using hard links and deprecated " @@ -5169,7 +5168,7 @@ link_info_by_idx_deprec(hid_t fapl) } /* end for */ /* Verify state of group */ - if (H5G__has_links_test(group_id, NULL) != TRUE) + if (H5G__has_links_test(group_id, NULL) != true) TEST_ERROR; /* Check for out of bound offset queries */ @@ -5224,7 +5223,7 @@ link_info_by_idx_deprec(hid_t fapl) } /* end else */ /* Verify state of group */ - if (H5G__is_new_dense_test(group_id) != TRUE) + if (H5G__is_new_dense_test(group_id) != true) TEST_ERROR; /* Verify link information for new link */ @@ -5315,7 +5314,7 @@ link_info_by_idx_old_deprec(hid_t fapl) herr_t ret; /* Generic return value */ /* Loop over creating hard or soft links */ - for (hard_link = FALSE; hard_link <= TRUE; hard_link++) { + for (hard_link = false; hard_link <= true; hard_link++) { if (hard_link) TESTING("querying info by index in old-style group, using hard links and deprecated routines"); else @@ -5467,7 +5466,7 @@ link_info_by_idx_old_deprec(hid_t fapl) TEST_ERROR; /* Verify state of group */ - if (H5G__has_stab_test(group_id) != TRUE) + if (H5G__has_stab_test(group_id) != true) TEST_ERROR; /* Close the group */ @@ -5526,7 +5525,7 @@ delete_by_idx_deprec(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) { @@ -5624,12 +5623,12 @@ delete_by_idx_deprec(hid_t fapl) TEST_ERROR; /* Verify link information for new link */ - if (link_info_by_idx_check_deprec(group_id, objname, (hsize_t)u, TRUE, use_index) < 0) + if (link_info_by_idx_check_deprec(group_id, objname, (hsize_t)u, true, use_index) < 0) TEST_ERROR; } /* end for */ /* Verify state of group (compact) */ - if (H5G__has_links_test(group_id, NULL) != TRUE) + if (H5G__has_links_test(group_id, NULL) != true) TEST_ERROR; /* Check for out of bound deletion */ @@ -5679,7 +5678,7 @@ delete_by_idx_deprec(hid_t fapl) TEST_ERROR; /* Verify state of group (empty) */ - if (H5G__has_links_test(group_id, NULL) == TRUE) + if (H5G__has_links_test(group_id, NULL) == true) TEST_ERROR; /* Create more links, to push group into dense form */ @@ -5698,11 +5697,11 @@ delete_by_idx_deprec(hid_t fapl) /* Verify state of group (dense) */ if (u >= max_compact) - if (H5G__is_new_dense_test(group_id) != TRUE) + if (H5G__is_new_dense_test(group_id) != true) TEST_ERROR; /* Verify link information for new link */ - if (link_info_by_idx_check_deprec(group_id, objname, (hsize_t)u, TRUE, use_index) < 0) + if (link_info_by_idx_check_deprec(group_id, objname, (hsize_t)u, true, use_index) < 0) TEST_ERROR; } /* end for */ @@ -5753,9 +5752,9 @@ delete_by_idx_deprec(hid_t fapl) TEST_ERROR; /* Verify state of group (empty) */ - if (H5G__has_links_test(group_id, NULL) == TRUE) + if (H5G__has_links_test(group_id, NULL) == true) TEST_ERROR; - if (H5G__is_new_dense_test(group_id) == TRUE) + if (H5G__is_new_dense_test(group_id) == true) TEST_ERROR; /* Check for deletion on empty group again */ @@ -5785,11 +5784,11 @@ delete_by_idx_deprec(hid_t fapl) /* Verify state of group (dense) */ if (u >= max_compact) - if (H5G__is_new_dense_test(group_id) != TRUE) + if (H5G__is_new_dense_test(group_id) != true) TEST_ERROR; /* Verify link information for new link */ - if (link_info_by_idx_check_deprec(group_id, objname, (hsize_t)u, TRUE, use_index) < 0) + if (link_info_by_idx_check_deprec(group_id, objname, (hsize_t)u, true, use_index) < 0) TEST_ERROR; } /* end for */ @@ -5866,9 +5865,9 @@ delete_by_idx_deprec(hid_t fapl) TEST_ERROR; /* Verify state of group (empty) */ - if (H5G__has_links_test(group_id, NULL) == TRUE) + if (H5G__has_links_test(group_id, NULL) == true) TEST_ERROR; - if (H5G__is_new_dense_test(group_id) == TRUE) + if (H5G__is_new_dense_test(group_id) == true) TEST_ERROR; /* Close the group */ @@ -6042,7 +6041,7 @@ delete_by_idx_old_deprec(hid_t fapl) TEST_ERROR; /* Verify state of group */ - if (H5G__has_stab_test(group_id) != TRUE) + if (H5G__has_stab_test(group_id) != true) TEST_ERROR; /* Delete links in middle */ @@ -6141,7 +6140,7 @@ delete_by_idx_old_deprec(hid_t fapl) TEST_ERROR; /* Verify state of group */ - if (H5G__has_stab_test(group_id) != TRUE) + if (H5G__has_stab_test(group_id) != true) TEST_ERROR; /* Close the group */ @@ -6222,7 +6221,7 @@ link_iterate_deprec_cb(hid_t group_id, const char *link_name, const H5L_info1_t 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) @@ -6295,7 +6294,7 @@ link_iterate_check_deprec(hid_t group_id, H5_index_t idx_type, H5_iter_order_t o iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); if (H5Literate1(group_id, idx_type, order, &skip, link_iterate_deprec_cb, iter_info) < 0) TEST_ERROR; @@ -6303,7 +6302,7 @@ link_iterate_check_deprec(hid_t group_id, H5_index_t idx_type, H5_iter_order_t o if (skip != max_links) TEST_ERROR; for (v = 0; v < max_links; v++) - if (iter_info->visited[v] == FALSE) + if (iter_info->visited[v] == false) TEST_ERROR; /* Iterate over links in group, with H5Giterate */ @@ -6312,7 +6311,7 @@ link_iterate_check_deprec(hid_t group_id, H5_index_t idx_type, H5_iter_order_t o iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); if (H5Giterate(group_id, ".", &gskip, group_iterate_deprec_cb, iter_info) < 0) TEST_ERROR; @@ -6320,7 +6319,7 @@ link_iterate_check_deprec(hid_t group_id, H5_index_t idx_type, H5_iter_order_t o if (gskip != (int)max_links) TEST_ERROR; for (v = 0; v < max_links; v++) - if (iter_info->visited[v] == FALSE) + if (iter_info->visited[v] == false) TEST_ERROR; /* Skip over some links in group */ @@ -6329,7 +6328,7 @@ link_iterate_check_deprec(hid_t group_id, H5_index_t idx_type, H5_iter_order_t o iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = (int64_t)(order != H5_ITER_DEC ? skip : ((max_links - 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); if (H5Literate1(group_id, idx_type, order, &skip, link_iterate_deprec_cb, iter_info) < 0) TEST_ERROR; @@ -6338,12 +6337,12 @@ link_iterate_check_deprec(hid_t group_id, H5_index_t idx_type, H5_iter_order_t o TEST_ERROR; if (order == H5_ITER_INC) { for (v = 0; v < (max_links / 2); v++) - if (iter_info->visited[v + (max_links / 2)] == FALSE) + if (iter_info->visited[v + (max_links / 2)] == false) TEST_ERROR; } /* end if */ else if (order == H5_ITER_DEC) { for (v = 0; v < (max_links / 2); v++) - if (iter_info->visited[v] == FALSE) + if (iter_info->visited[v] == false) TEST_ERROR; } /* end if */ else { @@ -6351,7 +6350,7 @@ link_iterate_check_deprec(hid_t group_id, H5_index_t idx_type, H5_iter_order_t o assert(order == H5_ITER_NATIVE); for (v = 0; v < max_links; v++) - if (iter_info->visited[v] == TRUE) + if (iter_info->visited[v] == true) nvisit++; if (nvisit != (max_links / 2)) @@ -6364,7 +6363,7 @@ link_iterate_check_deprec(hid_t group_id, H5_index_t idx_type, H5_iter_order_t o iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? (unsigned)gskip : ((max_links - 1) - (unsigned)gskip); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); if (H5Giterate(group_id, ".", &gskip, group_iterate_deprec_cb, iter_info) < 0) TEST_ERROR; @@ -6373,12 +6372,12 @@ link_iterate_check_deprec(hid_t group_id, H5_index_t idx_type, H5_iter_order_t o TEST_ERROR; if (order == H5_ITER_INC) { for (v = 0; v < (max_links / 2); v++) - if (iter_info->visited[v + (max_links / 2)] == FALSE) + if (iter_info->visited[v + (max_links / 2)] == false) TEST_ERROR; } /* end if */ else if (order == H5_ITER_DEC) { for (v = 0; v < (max_links / 2); v++) - if (iter_info->visited[v] == FALSE) + if (iter_info->visited[v] == false) TEST_ERROR; } /* end if */ else { @@ -6386,7 +6385,7 @@ link_iterate_check_deprec(hid_t group_id, H5_index_t idx_type, H5_iter_order_t o assert(order == H5_ITER_NATIVE); for (v = 0; v < max_links; v++) - if (iter_info->visited[v] == TRUE) + if (iter_info->visited[v] == true) nvisit++; if (nvisit != (max_links / 2)) @@ -6399,7 +6398,7 @@ link_iterate_check_deprec(hid_t group_id, H5_index_t idx_type, H5_iter_order_t o iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); if ((ret = H5Literate1(group_id, idx_type, order, &skip, link_iterate_deprec_cb, iter_info)) < 0) TEST_ERROR; if (ret != CORDER_ITER_STOP) @@ -6413,7 +6412,7 @@ link_iterate_check_deprec(hid_t group_id, H5_index_t idx_type, H5_iter_order_t o iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); if ((ret = H5Giterate(group_id, ".", &gskip, group_iterate_deprec_cb, iter_info)) < 0) TEST_ERROR; if (ret != CORDER_ITER_STOP) @@ -6463,7 +6462,7 @@ link_iterate_deprec(hid_t fapl) char objname[NAME_BUF_SIZE]; /* Object name */ char filename[NAME_BUF_SIZE]; /* File name */ link_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 skip; /* # of links to skip in group */ unsigned u; /* Local index variable */ herr_t ret; /* Generic return value */ @@ -6478,7 +6477,7 @@ link_iterate_deprec(hid_t fapl) /* Allocate the "visited link" array */ iter_info.max_visit = max_compact * 2; - if (NULL == (visited = (hbool_t *)malloc(sizeof(hbool_t) * iter_info.max_visit))) + if (NULL == (visited = (bool *)malloc(sizeof(bool) * iter_info.max_visit))) TEST_ERROR; iter_info.visited = visited; @@ -6487,7 +6486,7 @@ link_iterate_deprec(hid_t fapl) /* Loop over operating in different orders */ for (order = H5_ITER_INC; order <= H5_ITER_NATIVE; 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) { @@ -6581,7 +6580,7 @@ link_iterate_deprec(hid_t fapl) } /* end for */ /* Verify state of group (compact) */ - if (H5G__has_links_test(group_id, NULL) != TRUE) + if (H5G__has_links_test(group_id, NULL) != true) TEST_ERROR; /* Check for out of bound iteration on compact group */ @@ -6614,7 +6613,7 @@ link_iterate_deprec(hid_t fapl) } /* end for */ /* Verify state of group (dense) */ - if (H5G__is_new_dense_test(group_id) != TRUE) + if (H5G__is_new_dense_test(group_id) != true) TEST_ERROR; /* Check for out of bound iteration on dense group */ @@ -6719,7 +6718,7 @@ link_iterate_old_deprec_cb(hid_t group_id, const char *link_name, const H5L_info 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) @@ -6775,7 +6774,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); if (H5Literate1(group_id, H5_INDEX_NAME, order, &skip, link_iterate_old_deprec_cb, iter_info) < 0) TEST_ERROR; @@ -6783,7 +6782,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma if (skip != max_links) TEST_ERROR; for (v = 0; v < max_links; v++) - if (iter_info->visited[v] == FALSE) + if (iter_info->visited[v] == false) TEST_ERROR; /* Iterate over links in group, with H5Giterate */ @@ -6792,7 +6791,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); if (H5Giterate(group_id, ".", &gskip, group_iterate_old_deprec_cb, iter_info) < 0) TEST_ERROR; @@ -6800,7 +6799,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma if (gskip != (int)max_links) TEST_ERROR; for (v = 0; v < max_links; v++) - if (iter_info->visited[v] == FALSE) + if (iter_info->visited[v] == false) TEST_ERROR; /* Skip over some links in group */ @@ -6809,7 +6808,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = (int64_t)(order != H5_ITER_DEC ? skip : ((max_links - 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); if (H5Literate1(group_id, H5_INDEX_NAME, order, &skip, link_iterate_old_deprec_cb, iter_info) < 0) TEST_ERROR; @@ -6818,12 +6817,12 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma TEST_ERROR; if (order == H5_ITER_INC) { for (v = 0; v < (max_links / 2); v++) - if (iter_info->visited[v + (max_links / 2)] == FALSE) + if (iter_info->visited[v + (max_links / 2)] == false) TEST_ERROR; } /* end if */ else if (order == H5_ITER_DEC) { for (v = 0; v < (max_links / 2); v++) - if (iter_info->visited[v] == FALSE) + if (iter_info->visited[v] == false) TEST_ERROR; } /* end if */ else { @@ -6831,7 +6830,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma assert(order == H5_ITER_NATIVE); for (v = 0; v < max_links; v++) - if (iter_info->visited[v] == TRUE) + if (iter_info->visited[v] == true) nvisit++; if (nvisit != (max_links / 2)) @@ -6844,7 +6843,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? (unsigned)gskip : ((max_links - 1) - (unsigned)gskip); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); if (H5Giterate(group_id, ".", &gskip, group_iterate_old_deprec_cb, iter_info) < 0) TEST_ERROR; @@ -6853,12 +6852,12 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma TEST_ERROR; if (order == H5_ITER_INC) { for (v = 0; v < (max_links / 2); v++) - if (iter_info->visited[v + (max_links / 2)] == FALSE) + if (iter_info->visited[v + (max_links / 2)] == false) TEST_ERROR; } /* end if */ else if (order == H5_ITER_DEC) { for (v = 0; v < (max_links / 2); v++) - if (iter_info->visited[v] == FALSE) + if (iter_info->visited[v] == false) TEST_ERROR; } /* end if */ else { @@ -6866,7 +6865,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma assert(order == H5_ITER_NATIVE); for (v = 0; v < max_links; v++) - if (iter_info->visited[v] == TRUE) + if (iter_info->visited[v] == true) nvisit++; if (nvisit != (max_links / 2)) @@ -6879,7 +6878,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); if ((ret = H5Literate1(group_id, H5_INDEX_NAME, order, &skip, link_iterate_old_deprec_cb, iter_info)) < 0) TEST_ERROR; if (ret != CORDER_ITER_STOP) @@ -6893,7 +6892,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); if ((ret = H5Giterate(group_id, ".", &gskip, group_iterate_old_deprec_cb, iter_info)) < 0) TEST_ERROR; if (ret != CORDER_ITER_STOP) @@ -6954,14 +6953,14 @@ link_iterate_old_deprec(hid_t fapl) char objname[NAME_BUF_SIZE]; /* Object name */ char filename[NAME_BUF_SIZE]; /* File name */ link_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 skip; /* # of links to skip in group */ unsigned u; /* Local index variable */ herr_t ret; /* Generic return value */ /* Allocate the "visited link" array */ iter_info.max_visit = CORDER_NLINKS; - if (NULL == (visited = (hbool_t *)malloc(sizeof(hbool_t) * iter_info.max_visit))) + if (NULL == (visited = (bool *)malloc(sizeof(bool) * iter_info.max_visit))) TEST_ERROR; iter_info.visited = visited; @@ -7011,7 +7010,7 @@ link_iterate_old_deprec(hid_t fapl) } /* end for */ /* Verify state of group (symbol table) */ - if (H5G__has_stab_test(group_id) != TRUE) + if (H5G__has_stab_test(group_id) != true) TEST_ERROR; /* Check for out of bound iteration on old-style group */ @@ -7082,7 +7081,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_root(hid_t fapl, hbool_t new_format) +external_link_root(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1, gid2 = -1; /* Group IDs */ @@ -7111,7 +7110,7 @@ external_link_root(hid_t fapl, hbool_t new_format) TEST_ERROR; /* Check that external links are registered with the library */ - if (H5Lis_registered(H5L_TYPE_EXTERNAL) != TRUE) + if (H5Lis_registered(H5L_TYPE_EXTERNAL) != true) TEST_ERROR; /* Create file with link to first file */ @@ -7301,7 +7300,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_path(hid_t fapl, hbool_t new_format) +external_link_path(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1, gid2 = -1; /* Group IDs */ @@ -7423,7 +7422,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_mult(hid_t fapl, hbool_t new_format) +external_link_mult(hid_t fapl, bool new_format) { hid_t fid = -1, fid2 = -1; /* File IDs */ hid_t gid = -1, gid2 = -1; /* Group IDs */ @@ -7621,7 +7620,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_self(hid_t fapl, hbool_t new_format) +external_link_self(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1, gid2 = -1; /* Group IDs */ @@ -7648,7 +7647,7 @@ external_link_self(hid_t fapl, hbool_t new_format) /* Create an lcpl with intermediate group creation set */ 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; /* Create a series of groups within the file: /A/B and /X/Y/Z */ @@ -7812,7 +7811,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_pingpong(hid_t fapl, hbool_t new_format) +external_link_pingpong(hid_t fapl, bool new_format) { hid_t fid = (-1); /* File ID */ hid_t gid = (-1), gid2 = (-1); /* Group IDs */ @@ -7964,7 +7963,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_toomany(hid_t fapl, hbool_t new_format) +external_link_toomany(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1, gid2 = -1; /* Group IDs */ @@ -8113,7 +8112,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_dangling(hid_t fapl, hbool_t new_format) +external_link_dangling(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1; /* Group IDs */ @@ -8233,7 +8232,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_prefix(hid_t fapl, hbool_t new_format) +external_link_prefix(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1; /* Group IDs */ @@ -8330,7 +8329,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_abs_mainpath(hid_t fapl, hbool_t new_format) +external_link_abs_mainpath(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1; /* Group IDs */ @@ -8426,7 +8425,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_rel_mainpath(hid_t fapl, hbool_t new_format) +external_link_rel_mainpath(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1; /* Group IDs */ @@ -8514,7 +8513,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_cwd(hid_t fapl, hbool_t new_format) +external_link_cwd(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1; /* Group IDs */ @@ -8608,7 +8607,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_abstar(hid_t fapl, hbool_t new_format) +external_link_abstar(hid_t fapl, bool new_format) { hid_t fid = (-1); /* File ID */ hid_t gid = (-1); /* Group IDs */ @@ -8706,7 +8705,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_abstar_cur(hid_t fapl, hbool_t new_format) +external_link_abstar_cur(hid_t fapl, bool new_format) { hid_t fid = (-1); /* File ID */ hid_t gid = (-1); /* Group IDs */ @@ -8803,7 +8802,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_reltar(hid_t fapl, hbool_t new_format) +external_link_reltar(hid_t fapl, bool new_format) { hid_t fid = (-1); /* File ID */ hid_t gid = (-1); /* Group IDs */ @@ -8886,7 +8885,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_chdir(hid_t fapl, hbool_t new_format) +external_link_chdir(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1; /* Group IDs */ @@ -8992,7 +8991,7 @@ error: *------------------------------------------------------------------------- */ static int -external_set_elink_fapl1(hid_t fapl, hbool_t new_format) +external_set_elink_fapl1(hid_t fapl, bool new_format) { hid_t fid = (-1); hid_t fidA = (-1), fidB = (-1); @@ -9077,7 +9076,7 @@ external_set_elink_fapl1(hid_t fapl, hbool_t new_format) /* create "multi" fapl */ multi_fapl = h5_fileaccess(); - if (H5Pset_fapl_multi(multi_fapl, memb_map, memb_fapl, memb_name, memb_addr, TRUE) < 0) + if (H5Pset_fapl_multi(multi_fapl, memb_map, memb_fapl, memb_name, memb_addr, true) < 0) TEST_ERROR; /* set up name for external linked target file B: "extlinks16B" */ @@ -9209,7 +9208,7 @@ error: *------------------------------------------------------------------------- */ static int -external_set_elink_fapl2(hid_t fapl, hbool_t new_format) +external_set_elink_fapl2(hid_t fapl, bool new_format) { hid_t fid = H5I_INVALID_HID; hid_t gid = H5I_INVALID_HID; @@ -9267,7 +9266,7 @@ external_set_elink_fapl2(hid_t fapl, hbool_t new_format) /* create fapl for the target file to be a "core" file */ core_fapl = h5_fileaccess(); - if (H5Pset_fapl_core(core_fapl, (size_t)CORE_INCREMENT, TRUE) < 0) + if (H5Pset_fapl_core(core_fapl, (size_t)CORE_INCREMENT, true) < 0) TEST_ERROR; /* set up name for external linked target file: "extlinks17" */ @@ -9323,7 +9322,7 @@ external_set_elink_fapl2(hid_t fapl, hbool_t new_format) TEST_ERROR; /* create fapl to be a "core" file without backing store */ - if (H5Pset_fapl_core(core_fapl, (size_t)CORE_INCREMENT, FALSE) < 0) + if (H5Pset_fapl_core(core_fapl, (size_t)CORE_INCREMENT, false) < 0) TEST_ERROR; /* Set file access property list for link access to use the "core" driver */ @@ -9427,7 +9426,7 @@ error: *------------------------------------------------------------------------- */ static int -external_set_elink_fapl3(hbool_t new_format) +external_set_elink_fapl3(bool new_format) { hid_t core_fapl = -1, stdio_fapl = -1; hid_t lapl_id = -1, new_lapl_id = -1, l_fapl = -1, out_fapl; @@ -9439,7 +9438,7 @@ external_set_elink_fapl3(hbool_t new_format) /* create fapl for the target file to be a "core" file */ core_fapl = h5_fileaccess(); - if (H5Pset_fapl_core(core_fapl, (size_t)CORE_INCREMENT, TRUE) < 0) + if (H5Pset_fapl_core(core_fapl, (size_t)CORE_INCREMENT, true) < 0) TEST_ERROR; stdio_fapl = h5_fileaccess(); @@ -9529,7 +9528,7 @@ error: *------------------------------------------------------------------------- */ static int -external_set_elink_acc_flags(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) +external_set_elink_acc_flags(const char *env_h5_drvr, hid_t fapl, bool new_format) { hid_t file1 = -1, file2 = -1, group = -1, subgroup = -1, gapl = -1; char filename1[NAME_BUF_SIZE], filename2[NAME_BUF_SIZE]; @@ -9867,7 +9866,7 @@ external_set_elink_cb_cb(const char *parent_file, const char *parent_group, cons /* Main test function */ static int -external_set_elink_cb(hid_t fapl, hbool_t new_format) +external_set_elink_cb(hid_t fapl, bool new_format) { hid_t file1 = -1, file2 = -1, group = -1, gapl = -1, fam_fapl = -1, ret_fapl = -1, base_driver; set_elink_cb_t op_data, *op_data_p; @@ -9886,7 +9885,7 @@ external_set_elink_cb(hid_t fapl, hbool_t new_format) /* Core file driver has issues when used as the member file driver for a family file */ /* Family file driver cannot be used with family or multi drivers for member files */ /* Also disable parallel member drivers, because H5F_HAS_FEATURE(H5FD_FEAT_HAS_MPI) - would report FALSE, causing problems */ + would report false, causing problems */ base_driver = H5Pget_driver(fapl); op_data.base_fapl = (base_driver == H5FD_FAMILY || base_driver == H5FD_MULTI || base_driver == H5FD_MPIO || @@ -10098,7 +10097,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_win1(hid_t fapl, hbool_t new_format) +external_link_win1(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1; /* Group IDs */ @@ -10192,7 +10191,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_win2(hid_t fapl, hbool_t new_format) +external_link_win2(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1; /* Group IDs */ @@ -10289,7 +10288,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_win3(hid_t fapl, hbool_t new_format) +external_link_win3(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1; /* Group IDs */ @@ -10383,7 +10382,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_win4(hid_t fapl, hbool_t new_format) +external_link_win4(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1; /* Group IDs */ @@ -10474,7 +10473,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_win5(hid_t fapl, hbool_t new_format) +external_link_win5(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1; /* Group IDs */ @@ -10575,7 +10574,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_win6(hid_t fapl, hbool_t new_format) +external_link_win6(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1; /* Group IDs */ @@ -10673,7 +10672,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_win7(hid_t fapl, hbool_t new_format) +external_link_win7(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1; /* Group IDs */ @@ -10769,7 +10768,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_win8(hid_t fapl, hbool_t new_format) +external_link_win8(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1; /* Group IDs */ @@ -10868,7 +10867,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_win9(hid_t fapl, hbool_t new_format) +external_link_win9(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1; /* Group IDs */ @@ -10961,7 +10960,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_recursive(hid_t fapl, hbool_t new_format) +external_link_recursive(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1; /* Group IDs */ @@ -11031,7 +11030,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_query(hid_t fapl, hbool_t new_format) +external_link_query(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1; /* Group IDs */ @@ -11184,7 +11183,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_unlink_compact(hid_t fapl, hbool_t new_format) +external_link_unlink_compact(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1, gid2 = -1; /* Group IDs */ @@ -11277,7 +11276,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_unlink_dense(hid_t fapl, hbool_t new_format) +external_link_unlink_dense(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gcpl = -1; /* Group creation property list ID */ @@ -11307,7 +11306,7 @@ external_link_unlink_dense(hid_t fapl, hbool_t new_format) FAIL_STACK_ERROR; /* Check on root group's status */ - if (H5G__is_empty_test(gid) != TRUE) + if (H5G__is_empty_test(gid) != true) TEST_ERROR; /* Query the group creation properties */ @@ -11323,13 +11322,13 @@ external_link_unlink_dense(hid_t fapl, hbool_t new_format) TEST_ERROR; /* Check on root group's status */ - if (H5G__is_empty_test(gid) == TRUE) + if (H5G__is_empty_test(gid) == true) TEST_ERROR; - if (H5G__has_links_test(gid, &nmsgs) != TRUE) + if (H5G__has_links_test(gid, &nmsgs) != true) TEST_ERROR; if (nmsgs != 1) TEST_ERROR; - if (H5G__has_stab_test(gid) == TRUE) + if (H5G__has_stab_test(gid) == true) TEST_ERROR; /* Create enough objects in the root group to change it into a "dense" group */ @@ -11342,11 +11341,11 @@ external_link_unlink_dense(hid_t fapl, hbool_t new_format) } /* end for */ /* Check on root group's status */ - if (H5G__is_empty_test(gid) == TRUE) + if (H5G__is_empty_test(gid) == true) TEST_ERROR; - if (H5G__has_links_test(gid, NULL) == TRUE) + if (H5G__has_links_test(gid, NULL) == true) TEST_ERROR; - if (H5G__is_new_dense_test(gid) != TRUE) + if (H5G__is_new_dense_test(gid) != true) TEST_ERROR; /* Close group creation property list */ @@ -11395,15 +11394,15 @@ external_link_unlink_dense(hid_t fapl, hbool_t new_format) } /* end for */ /* Check on root group's status */ - if (H5G__is_empty_test(gid) == TRUE) + if (H5G__is_empty_test(gid) == true) TEST_ERROR; - if (H5G__has_links_test(gid, &nmsgs) != TRUE) + if (H5G__has_links_test(gid, &nmsgs) != true) TEST_ERROR; if (nmsgs != (min_dense - 1)) TEST_ERROR; - if (H5G__is_new_dense_test(gid) == TRUE) + if (H5G__is_new_dense_test(gid) == true) TEST_ERROR; - if (H5G__has_stab_test(gid) == TRUE) + if (H5G__has_stab_test(gid) == true) TEST_ERROR; /* Close root group */ @@ -11454,7 +11453,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_move(hid_t fapl, hbool_t new_format) +external_link_move(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1, gid2 = -1; /* Group IDs */ @@ -11689,7 +11688,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_ride(hid_t fapl, hbool_t new_format) +external_link_ride(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gcpl = -1; /* Group creation property list ID */ @@ -11719,7 +11718,7 @@ external_link_ride(hid_t fapl, hbool_t new_format) FAIL_STACK_ERROR; /* Check on root group's status */ - if (H5G__is_empty_test(gid) != TRUE) + if (H5G__is_empty_test(gid) != true) TEST_ERROR; /* Query the group creation properties */ @@ -11738,16 +11737,16 @@ external_link_ride(hid_t fapl, hbool_t new_format) } /* end for */ /* Check on root group's status */ - if (H5G__is_empty_test(gid) == TRUE) + if (H5G__is_empty_test(gid) == true) TEST_ERROR; - if (H5G__has_links_test(gid, NULL) == TRUE) + if (H5G__has_links_test(gid, NULL) == true) TEST_ERROR; if (new_format) { - if (H5G__is_new_dense_test(gid) != TRUE) + if (H5G__is_new_dense_test(gid) != true) TEST_ERROR; } /* end if */ else { - if (H5G__has_stab_test(gid) != TRUE) + if (H5G__has_stab_test(gid) != true) TEST_ERROR; } /* end else */ @@ -11757,11 +11756,11 @@ external_link_ride(hid_t fapl, hbool_t new_format) TEST_ERROR; /* Check on root group's status */ - if (H5G__is_empty_test(gid) == TRUE) + if (H5G__is_empty_test(gid) == true) TEST_ERROR; - if (H5G__has_links_test(gid, NULL) == TRUE) + if (H5G__has_links_test(gid, NULL) == true) TEST_ERROR; - if (H5G__is_new_dense_test(gid) != TRUE) + if (H5G__is_new_dense_test(gid) != true) TEST_ERROR; /* Close group creation property list */ @@ -11830,15 +11829,15 @@ external_link_ride(hid_t fapl, hbool_t new_format) } /* end for */ /* Check on root group's status */ - if (H5G__is_empty_test(gid) == TRUE) + if (H5G__is_empty_test(gid) == true) TEST_ERROR; - if (H5G__has_links_test(gid, &nmsgs) != TRUE) + if (H5G__has_links_test(gid, &nmsgs) != true) TEST_ERROR; if (nmsgs != (min_dense - 1)) TEST_ERROR; - if (H5G__has_stab_test(gid) == TRUE) + if (H5G__has_stab_test(gid) == true) TEST_ERROR; - if (H5G__is_new_dense_test(gid) == TRUE) + if (H5G__is_new_dense_test(gid) == true) TEST_ERROR; /* Close root group */ @@ -11921,7 +11920,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_closing(hid_t fapl, hbool_t new_format) +external_link_closing(hid_t fapl, bool new_format) { hid_t fid1 = (-1), fid2 = (-1), fid3 = (-1), fid4 = (-1); hid_t gid = (-1), tid = (-1), tid2 = (-1), sid = (-1), did = (-1); @@ -12149,7 +12148,7 @@ external_link_closing(hid_t fapl, hbool_t new_format) /* Add a few regular groups and a soft link in file2 using 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 (H5Lcreate_soft("/elink2", fid1, "elink/file2group1/file2group2/slink", lcpl_id, H5P_DEFAULT) < 0) TEST_ERROR; @@ -12237,7 +12236,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_endian(hbool_t new_format) +external_link_endian(bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1, gid2 = -1; /* Group IDs */ @@ -12322,7 +12321,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_strong(hid_t fapl, hbool_t new_format) +external_link_strong(hid_t fapl, bool new_format) { hid_t my_fapl = (-1); /* File access property list */ hid_t fid1 = (-1), fid2 = (-1); /* File ID */ @@ -12427,31 +12426,31 @@ error: *------------------------------------------------------------------------- */ static int -external_symlink(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) +external_symlink(const char *env_h5_drvr, hid_t fapl, bool new_format) { #ifdef H5_HAVE_SYMLINK - hid_t file1 = H5I_INVALID_HID; - hid_t file2 = H5I_INVALID_HID; - hid_t file3 = H5I_INVALID_HID; - hid_t file4 = H5I_INVALID_HID; - hid_t file5 = H5I_INVALID_HID; - hid_t group2 = H5I_INVALID_HID; - hid_t group3 = H5I_INVALID_HID; - hid_t group4 = H5I_INVALID_HID; - hid_t group5 = H5I_INVALID_HID; - char *filename1 = NULL; - char *filename2a = NULL; - char *filename2b = NULL; - char *filename3a = NULL; - char *filename3b = NULL; - char *filename4a = NULL; - char *filename4b = NULL; - char *filename5a = NULL; - char *filename5b = NULL; - char *tmpname = NULL; - char *cwdpath = NULL; - hbool_t have_posix_compat_vfd; /* Whether VFD used is compatible w/POSIX I/O calls */ -#endif /* H5_HAVE_SYMLINK */ + hid_t file1 = H5I_INVALID_HID; + hid_t file2 = H5I_INVALID_HID; + hid_t file3 = H5I_INVALID_HID; + hid_t file4 = H5I_INVALID_HID; + hid_t file5 = H5I_INVALID_HID; + hid_t group2 = H5I_INVALID_HID; + hid_t group3 = H5I_INVALID_HID; + hid_t group4 = H5I_INVALID_HID; + hid_t group5 = H5I_INVALID_HID; + char *filename1 = NULL; + char *filename2a = NULL; + char *filename2b = NULL; + char *filename3a = NULL; + char *filename3b = NULL; + char *filename4a = NULL; + char *filename4b = NULL; + char *filename5a = NULL; + char *filename5b = NULL; + char *tmpname = NULL; + char *cwdpath = NULL; + bool have_posix_compat_vfd; /* Whether VFD used is compatible w/POSIX I/O calls */ +#endif /* H5_HAVE_SYMLINK */ if (new_format) TESTING("external links w/symlink files (w/new group format)"); @@ -12462,8 +12461,8 @@ external_symlink(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) /* Skip test when using VFDs that can't provide a POSIX compatible file * descriptor. */ - have_posix_compat_vfd = (hbool_t)(!HDstrcmp(env_h5_drvr, "sec2") || !HDstrcmp(env_h5_drvr, "core") || - !HDstrcmp(env_h5_drvr, "nomatch")); + have_posix_compat_vfd = (bool)(!HDstrcmp(env_h5_drvr, "sec2") || !HDstrcmp(env_h5_drvr, "core") || + !HDstrcmp(env_h5_drvr, "nomatch")); if (!have_posix_compat_vfd) { SKIPPED(); HDputs(" Current VFD doesn't support POSIX I/O calls"); @@ -12726,7 +12725,7 @@ error: *------------------------------------------------------------------------- */ static int -external_copy_invalid_object(hid_t fapl, hbool_t new_format) +external_copy_invalid_object(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1; /* Group ID */ @@ -12806,7 +12805,7 @@ error: *------------------------------------------------------------------------- */ static int -external_dont_fail_to_source(hid_t fapl, hbool_t new_format) +external_dont_fail_to_source(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1; /* Group ID */ @@ -12875,7 +12874,7 @@ error: *------------------------------------------------------------------------- */ static int -external_file_cache(hid_t fapl, hbool_t new_format) +external_file_cache(hid_t fapl, bool new_format) { hid_t my_fapl = -1; /* Temporary FAPL */ hid_t fid1 = -1; /* File ID */ @@ -13233,7 +13232,7 @@ error: *------------------------------------------------------------------------- */ static int -external_open_twice(hid_t fapl, hbool_t new_format) +external_open_twice(hid_t fapl, bool new_format) { hid_t fid1 = -1; /* File ID */ hid_t fid2 = -1; /* File ID */ @@ -13448,7 +13447,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_with_committed_datatype(hid_t fapl, hbool_t new_format) +external_link_with_committed_datatype(hid_t fapl, bool new_format) { hid_t fid1 = -1, fid2 = -1; /* File IDs */ hid_t gid1 = -1, gid2 = -1; /* Group IDs */ @@ -13529,7 +13528,7 @@ external_link_with_committed_datatype(hid_t fapl, hbool_t new_format) FAIL_STACK_ERROR; /* Verify the datatype is not committed */ - if (H5Tcommitted(atid) == TRUE) + if (H5Tcommitted(atid) == true) FAIL_STACK_ERROR; /* Close the attribute */ @@ -13568,7 +13567,7 @@ external_link_with_committed_datatype(hid_t fapl, hbool_t new_format) FAIL_STACK_ERROR; /* Verify the datatype is not committed */ - if (H5Tcommitted(dtid) == TRUE) + if (H5Tcommitted(dtid) == true) FAIL_STACK_ERROR; /* Close the dataset */ @@ -13610,7 +13609,7 @@ external_link_with_committed_datatype(hid_t fapl, hbool_t new_format) FAIL_STACK_ERROR; /* Verify the datatype is committed */ - if (H5Tcommitted(tid) == FALSE) + if (H5Tcommitted(tid) == false) FAIL_STACK_ERROR; /* Open the group which is externally linked to target file */ @@ -13626,7 +13625,7 @@ external_link_with_committed_datatype(hid_t fapl, hbool_t new_format) FAIL_STACK_ERROR; /* Verify the attribute's datatype is not committed */ - if (H5Tcommitted(atid) == TRUE) + if (H5Tcommitted(atid) == true) FAIL_STACK_ERROR; /* Close the attribute */ @@ -13646,7 +13645,7 @@ external_link_with_committed_datatype(hid_t fapl, hbool_t new_format) FAIL_STACK_ERROR; /* Verify the dataset's datatype is not committed */ - if (H5Tcommitted(dtid) == TRUE) + if (H5Tcommitted(dtid) == true) FAIL_STACK_ERROR; /* Read the dataset */ @@ -13715,7 +13714,7 @@ error: *------------------------------------------------------------------------- */ static int -external_link_public_macros(hid_t fapl, hbool_t new_format) +external_link_public_macros(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ H5L_info2_t linfo; /* Link information */ @@ -13744,7 +13743,7 @@ external_link_public_macros(hid_t fapl, hbool_t new_format) TEST_ERROR; /* Check that external links are registered with the library */ - if (H5Lis_registered(H5L_TYPE_EXTERNAL) != TRUE) + if (H5Lis_registered(H5L_TYPE_EXTERNAL) != true) TEST_ERROR; /* Create file with link to first file */ @@ -14016,9 +14015,9 @@ ud_hard_links(hid_t fapl) TEST_ERROR; /* Check that external links are registered and UD hard links are not */ - if (H5Lis_registered(H5L_TYPE_EXTERNAL) != TRUE) + if (H5Lis_registered(H5L_TYPE_EXTERNAL) != true) TEST_ERROR; - if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != FALSE) + if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != false) TEST_ERROR; /* Register "user-defined hard links" with the library */ @@ -14026,9 +14025,9 @@ ud_hard_links(hid_t fapl) TEST_ERROR; /* Check that UD hard links are now registered */ - if (H5Lis_registered(H5L_TYPE_EXTERNAL) != TRUE) + if (H5Lis_registered(H5L_TYPE_EXTERNAL) != true) TEST_ERROR; - if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != TRUE) + if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != true) TEST_ERROR; /* Create a group for the UD hard link to point to */ @@ -14201,7 +14200,7 @@ ud_link_reregister(hid_t fapl) TEST_ERROR; /* Check that UD hard links are not registered */ - if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != FALSE) + if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != false) TEST_ERROR; /* Register "user-defined hard links" with the library */ @@ -14209,7 +14208,7 @@ ud_link_reregister(hid_t fapl) TEST_ERROR; /* Check that UD hard links are registered */ - if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != TRUE) + if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != true) TEST_ERROR; /* Point a UD defined hard link to a group in the same way as the previous test */ @@ -14235,7 +14234,7 @@ ud_link_reregister(hid_t fapl) TEST_ERROR; /* Check that UD hard links are no longer registered */ - if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != FALSE) + if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != false) TEST_ERROR; /* Verify that we can't traverse the ud link anymore */ @@ -14260,7 +14259,7 @@ ud_link_reregister(hid_t fapl) TEST_ERROR; /* Check that UD hard links are registered again */ - if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != TRUE) + if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != true) TEST_ERROR; /* Open a group through the ud link (now a different class of link). @@ -14309,7 +14308,7 @@ ud_link_reregister(hid_t fapl) * other link type */ if (H5Lregister(UD_hard_class) < 0) FAIL_STACK_ERROR; - if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != TRUE) + if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != true) FAIL_STACK_ERROR; /* Ensure we can open the group through the UD link (now that UD hard @@ -14340,7 +14339,7 @@ ud_link_reregister(hid_t fapl) if (H5Lunregister((H5L_type_t)UD_HARD_TYPE) < 0) FAIL_STACK_ERROR; - if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != FALSE) + if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != false) FAIL_STACK_ERROR; PASSED(); @@ -14502,7 +14501,7 @@ error: } /* end UD_cb_query() */ static int -ud_callbacks(hid_t fapl, hbool_t new_format) +ud_callbacks(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1; /* Group ID */ @@ -14524,11 +14523,11 @@ ud_callbacks(hid_t fapl, hbool_t new_format) TEST_ERROR; /* Check that registered link classes are, and unregistered ones aren't */ - if (H5Lis_registered(H5L_TYPE_EXTERNAL) != TRUE) + if (H5Lis_registered(H5L_TYPE_EXTERNAL) != true) TEST_ERROR; - if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != FALSE) + if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != false) TEST_ERROR; - if (H5Lis_registered((H5L_type_t)UD_CB_TYPE) != FALSE) + if (H5Lis_registered((H5L_type_t)UD_CB_TYPE) != false) TEST_ERROR; /* Hit two birds with one stone: register UD hard links from previous @@ -14542,11 +14541,11 @@ ud_callbacks(hid_t fapl, hbool_t new_format) TEST_ERROR; /* Check that registered link classes are, and unregistered ones aren't */ - if (H5Lis_registered(H5L_TYPE_EXTERNAL) != TRUE) + if (H5Lis_registered(H5L_TYPE_EXTERNAL) != true) TEST_ERROR; - if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != TRUE) + if (H5Lis_registered((H5L_type_t)UD_HARD_TYPE) != true) TEST_ERROR; - if (H5Lis_registered((H5L_type_t)UD_CB_TYPE) != TRUE) + if (H5Lis_registered((H5L_type_t)UD_CB_TYPE) != true) TEST_ERROR; /* Create a group for the UD link to point to */ @@ -14702,7 +14701,7 @@ error: } /* end UD_plist_traverse() */ static int -lapl_udata(hid_t fapl, hbool_t new_format) +lapl_udata(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1, gid2 = -1; /* Group IDs */ @@ -15027,7 +15026,7 @@ const H5L_class_t UD_error4_class[1] = {{ }}; static int -ud_link_errors(hid_t fapl, hbool_t new_format) +ud_link_errors(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1; /* Group IDs */ @@ -15214,7 +15213,7 @@ error: *------------------------------------------------------------------------- */ static int -lapl_nlinks(hid_t fapl, hbool_t new_format) +lapl_nlinks(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1, gid2 = -1; /* Group IDs */ @@ -15521,7 +15520,7 @@ error: *------------------------------------------------------------------------- */ static int -linkinfo(hid_t fapl, hbool_t new_format) +linkinfo(hid_t fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t gid = -1; /* Group ID */ @@ -15638,7 +15637,7 @@ error: *------------------------------------------------------------------------- */ static int -check_all_closed(hid_t fapl, hbool_t new_format, int stopat) +check_all_closed(hid_t fapl, bool new_format, int stopat) { hid_t fid = -1; char filename[NAME_BUF_SIZE]; @@ -15840,7 +15839,7 @@ visit_link_cb(hid_t H5_ATTR_UNUSED group_id, const char *name, const H5L_info2_t *------------------------------------------------------------------------- */ static int -link_visit(hid_t fapl, hbool_t new_format) +link_visit(hid_t fapl, bool new_format) { lvisit_ud_t udata; /* User-data for visiting */ hid_t fid = -1; @@ -15917,7 +15916,7 @@ error: *------------------------------------------------------------------------- */ static int -link_visit_by_name(hid_t fapl, hbool_t new_format) +link_visit_by_name(hid_t fapl, bool new_format) { lvisit_ud_t udata; /* User-data for visiting */ hid_t fid = -1; @@ -16031,7 +16030,7 @@ visit_obj_cb(hid_t H5_ATTR_UNUSED group_id, const char *name, const H5O_info2_t *------------------------------------------------------------------------- */ static int -obj_visit(hid_t fapl, hbool_t new_format) +obj_visit(hid_t fapl, bool new_format) { ovisit_ud_t udata; /* User-data for visiting */ hid_t fid = -1; @@ -16112,7 +16111,7 @@ error: *------------------------------------------------------------------------- */ static int -obj_visit_by_name(hid_t fapl, hbool_t new_format) +obj_visit_by_name(hid_t fapl, bool new_format) { ovisit_ud_t udata; /* User-data for visiting */ hid_t fid = -1; @@ -16230,7 +16229,7 @@ visit_obj_stop_cb(hid_t H5_ATTR_UNUSED group_id, const char H5_ATTR_UNUSED *name *------------------------------------------------------------------------- */ static int -obj_visit_stop(hid_t fapl, hbool_t new_format) +obj_visit_stop(hid_t fapl, bool new_format) { unsigned nvisited; /* User-data for visiting */ hid_t fid = -1; @@ -16359,7 +16358,7 @@ link_filter_filter(unsigned int flags, size_t cd_nelmts, const unsigned int cd_v } /* end link_filter_filter */ static int -link_filters(hid_t fapl, hbool_t new_format) +link_filters(hid_t fapl, bool new_format) { hid_t fid = -1, fcpl = -1; hid_t gid1 = -1, gid2 = -1, gcpl1 = -1, gcpl2 = -1; @@ -16418,8 +16417,8 @@ link_filters(hid_t fapl, hbool_t new_format) /* Register and add custom filter */ filter_class.version = H5Z_CLASS_T_VERS; filter_class.id = H5Z_FILTER_RESERVED + 42; - filter_class.encoder_present = TRUE; - filter_class.decoder_present = TRUE; + filter_class.encoder_present = true; + filter_class.decoder_present = true; filter_class.name = "custom_link_filter"; filter_class.can_apply = link_filter_can_apply; filter_class.set_local = link_filter_set_local; @@ -16433,7 +16432,7 @@ link_filters(hid_t fapl, hbool_t new_format) /* Test various other filter functions for use on gcpl's */ if (H5Pget_nfilters(gcpl1) != nfilters) TEST_ERROR; - if (H5Pall_filters_avail(gcpl1) != TRUE) + if (H5Pall_filters_avail(gcpl1) != true) TEST_ERROR; /* Create a group using this filter, add some soft links to it */ @@ -16489,13 +16488,13 @@ link_filters(hid_t fapl, hbool_t new_format) TEST_ERROR; /* Verify that all links have been copied */ - if (H5Lexists(gid2, "link1", H5P_DEFAULT) != TRUE) + if (H5Lexists(gid2, "link1", H5P_DEFAULT) != true) TEST_ERROR; - if (H5Lexists(gid2, "link2", H5P_DEFAULT) != TRUE) + if (H5Lexists(gid2, "link2", H5P_DEFAULT) != true) TEST_ERROR; - if (H5Lexists(gid2, "link3", H5P_DEFAULT) != TRUE) + if (H5Lexists(gid2, "link3", H5P_DEFAULT) != true) TEST_ERROR; - if (H5Lexists(gid2, "link4", H5P_DEFAULT) != TRUE) + if (H5Lexists(gid2, "link4", H5P_DEFAULT) != true) TEST_ERROR; /* Retrieve gcpl, verify number of filters */ @@ -16596,7 +16595,7 @@ link_filters(hid_t fapl, hbool_t new_format) /* Create lcpl, setting the "create intermediate groups" flag */ if ((lcpl = H5Pcreate(H5P_LINK_CREATE)) < 0) TEST_ERROR; - if (H5Pset_create_intermediate_group(lcpl, (unsigned)TRUE) < 0) + if (H5Pset_create_intermediate_group(lcpl, (unsigned)true) < 0) TEST_ERROR; /* Create new group, with missing intermediate groups, in compressed group */ @@ -16770,7 +16769,7 @@ error: *------------------------------------------------------------------------- */ static int -obj_exists(hid_t fapl, hbool_t new_format) +obj_exists(hid_t fapl, bool new_format) { char filename[NAME_BUF_SIZE]; /* Buffer for file name */ hid_t fid = -1; /* File ID */ @@ -16805,7 +16804,7 @@ obj_exists(hid_t fapl, hbool_t new_format) FAIL_STACK_ERROR; /* Verify that H5Oexists_by_name() succeeds for hard linked object */ - if (TRUE != H5Oexists_by_name(fid, "group", H5P_DEFAULT)) + if (true != H5Oexists_by_name(fid, "group", H5P_DEFAULT)) TEST_ERROR; /* Verify that H5Oexists_by_name() returns false for non-existent object in non-root group */ @@ -16822,32 +16821,32 @@ obj_exists(hid_t fapl, hbool_t new_format) if (H5Lcreate_soft("dangle", fid, "soft1", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR; - /* Verify that H5Oexists_by_name() returns FALSE for dangling soft-link in root group */ - if (FALSE != H5Oexists_by_name(fid, "soft1", H5P_DEFAULT)) + /* Verify that H5Oexists_by_name() returns false for dangling soft-link in root group */ + if (false != H5Oexists_by_name(fid, "soft1", H5P_DEFAULT)) TEST_ERROR; /* Create soft-link in root group that points to object */ if (H5Lcreate_soft("/group", fid, "soft2", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR; - /* Verify that H5Oexists_by_name() returns TRUE for soft-link in root group that points to object */ - if (TRUE != H5Oexists_by_name(fid, "soft2", H5P_DEFAULT)) + /* Verify that H5Oexists_by_name() returns true for soft-link in root group that points to object */ + if (true != H5Oexists_by_name(fid, "soft2", H5P_DEFAULT)) TEST_ERROR; /* Create dangling soft-link in non-root group */ if (H5Lcreate_soft("dangle", fid, "group/soft1", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR; - /* Verify that H5Oexists_by_name() returns FALSE for dangling soft-link in non-root group */ - if (FALSE != H5Oexists_by_name(fid, "group/soft1", H5P_DEFAULT)) + /* Verify that H5Oexists_by_name() returns false for dangling soft-link in non-root group */ + if (false != H5Oexists_by_name(fid, "group/soft1", H5P_DEFAULT)) TEST_ERROR; /* Create soft-link in non-root group that points to object */ if (H5Lcreate_soft("/group", fid, "group/soft2", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR; - /* Verify that H5Oexists_by_name() returns TRUE for soft-link in non-root group that points to object */ - if (TRUE != H5Oexists_by_name(fid, "group/soft2", H5P_DEFAULT)) + /* Verify that H5Oexists_by_name() returns true for soft-link in non-root group that points to object */ + if (true != H5Oexists_by_name(fid, "group/soft2", H5P_DEFAULT)) TEST_ERROR; /* External links */ @@ -16855,53 +16854,53 @@ obj_exists(hid_t fapl, hbool_t new_format) if (H5Lcreate_external("nofile", "dangle", fid, "external1", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR; - /* Verify that H5Oexists_by_name() returns FALSE for dangling (file doesn't exist) external link in root + /* Verify that H5Oexists_by_name() returns false for dangling (file doesn't exist) external link in root * group */ - if (FALSE != H5Oexists_by_name(fid, "external1", H5P_DEFAULT)) + if (false != H5Oexists_by_name(fid, "external1", H5P_DEFAULT)) TEST_ERROR; /* Create dangling (object doesn't exist) external link in root group */ if (H5Lcreate_external(filename, "dangle", fid, "external2", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR; - /* Verify that H5Oexists_by_name() returns FALSE for dangling (object doesn't exist) external link in root + /* Verify that H5Oexists_by_name() returns false for dangling (object doesn't exist) external link in root * group */ - if (FALSE != H5Oexists_by_name(fid, "external2", H5P_DEFAULT)) + if (false != H5Oexists_by_name(fid, "external2", H5P_DEFAULT)) TEST_ERROR; /* Create external link in root group that points to object */ if (H5Lcreate_external(filename, "group", fid, "external3", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR; - /* Verify that H5Oexists_by_name() returns TRUE for external link in root group that points to object */ - if (TRUE != H5Oexists_by_name(fid, "external3", H5P_DEFAULT)) + /* Verify that H5Oexists_by_name() returns true for external link in root group that points to object */ + if (true != H5Oexists_by_name(fid, "external3", H5P_DEFAULT)) TEST_ERROR; /* Create dangling (file doesn't exist) external link in non-root group */ if (H5Lcreate_external("nofile", "dangle", fid, "group/external1", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR; - /* Verify that H5Oexists_by_name() returns FALSE for dangling (file doesn't exist) external link in + /* Verify that H5Oexists_by_name() returns false for dangling (file doesn't exist) external link in * non-root group */ - if (FALSE != H5Oexists_by_name(fid, "group/external1", H5P_DEFAULT)) + if (false != H5Oexists_by_name(fid, "group/external1", H5P_DEFAULT)) TEST_ERROR; /* Create dangling (object doesn't exist) external link in non-root group */ if (H5Lcreate_external(filename, "dangle", fid, "group/external2", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR; - /* Verify that H5Oexists_by_name() returns FALSE for dangling (object doesn't exist) external link in + /* Verify that H5Oexists_by_name() returns false for dangling (object doesn't exist) external link in * non-root group */ - if (FALSE != H5Oexists_by_name(fid, "group/external2", H5P_DEFAULT)) + if (false != H5Oexists_by_name(fid, "group/external2", H5P_DEFAULT)) TEST_ERROR; /* Create external link in non-root group that points to object */ if (H5Lcreate_external(filename, "group", fid, "group/external3", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR; - /* Verify that H5Oexists_by_name() returns TRUE for external link in non-root group that points to object + /* Verify that H5Oexists_by_name() returns true for external link in non-root group that points to object */ - if (TRUE != H5Oexists_by_name(fid, "group/external3", H5P_DEFAULT)) + if (true != H5Oexists_by_name(fid, "group/external3", H5P_DEFAULT)) TEST_ERROR; /* Soft->External links */ @@ -16909,24 +16908,24 @@ obj_exists(hid_t fapl, hbool_t new_format) if (H5Lcreate_soft("external1", fid, "soft-elink1", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR; - /* Verify that H5Oexists_by_name() returns FALSE */ - if (FALSE != H5Oexists_by_name(fid, "soft-elink1", H5P_DEFAULT)) + /* Verify that H5Oexists_by_name() returns false */ + if (false != H5Oexists_by_name(fid, "soft-elink1", H5P_DEFAULT)) TEST_ERROR; /* Create soft-link in root group that points to dangling (object doesn't exist) external link */ if (H5Lcreate_soft("external2", fid, "soft-elink2", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR; - /* Verify that H5Oexists_by_name() returns FALSE */ - if (FALSE != H5Oexists_by_name(fid, "soft-elink2", H5P_DEFAULT)) + /* Verify that H5Oexists_by_name() returns false */ + if (false != H5Oexists_by_name(fid, "soft-elink2", H5P_DEFAULT)) TEST_ERROR; /* Create soft-link in root group that points to external link that points to object */ if (H5Lcreate_soft("external3", fid, "soft-elink3", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR; - /* Verify that H5Oexists_by_name() returns TRUE */ - if (TRUE != H5Oexists_by_name(fid, "soft-elink3", H5P_DEFAULT)) + /* Verify that H5Oexists_by_name() returns true */ + if (true != H5Oexists_by_name(fid, "soft-elink3", H5P_DEFAULT)) TEST_ERROR; /* Create soft-link in root group that points to dangling (file doesn't exist) external link in non-root @@ -16934,8 +16933,8 @@ obj_exists(hid_t fapl, hbool_t new_format) if (H5Lcreate_soft("group/external1", fid, "soft-elink4", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR; - /* Verify that H5Oexists_by_name() returns FALSE */ - if (FALSE != H5Oexists_by_name(fid, "soft-elink4", H5P_DEFAULT)) + /* Verify that H5Oexists_by_name() returns false */ + if (false != H5Oexists_by_name(fid, "soft-elink4", H5P_DEFAULT)) TEST_ERROR; /* Create soft-link in root group that points to dangling (object doesn't exist) external link in non-root @@ -16943,40 +16942,40 @@ obj_exists(hid_t fapl, hbool_t new_format) if (H5Lcreate_soft("group/external2", fid, "soft-elink5", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR; - /* Verify that H5Oexists_by_name() returns FALSE */ - if (FALSE != H5Oexists_by_name(fid, "soft-elink5", H5P_DEFAULT)) + /* Verify that H5Oexists_by_name() returns false */ + if (false != H5Oexists_by_name(fid, "soft-elink5", H5P_DEFAULT)) TEST_ERROR; /* Create soft-link in root group that points to external link in non-root group that points to object */ if (H5Lcreate_soft("group/external3", fid, "soft-elink6", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR; - /* Verify that H5Oexists_by_name() returns TRUE */ - if (TRUE != H5Oexists_by_name(fid, "soft-elink6", H5P_DEFAULT)) + /* Verify that H5Oexists_by_name() returns true */ + if (true != H5Oexists_by_name(fid, "soft-elink6", H5P_DEFAULT)) TEST_ERROR; /* Create soft-link in non-root group that points to dangling (file doesn't exist) external link */ if (H5Lcreate_soft("/external1", fid, "group/soft-elink1", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR; - /* Verify that H5Oexists_by_name() returns FALSE */ - if (FALSE != H5Oexists_by_name(fid, "group/soft-elink1", H5P_DEFAULT)) + /* Verify that H5Oexists_by_name() returns false */ + if (false != H5Oexists_by_name(fid, "group/soft-elink1", H5P_DEFAULT)) TEST_ERROR; /* Create soft-link in non-root group that points to dangling (object doesn't exist) external link */ if (H5Lcreate_soft("/external2", fid, "group/soft-elink2", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR; - /* Verify that H5Oexists_by_name() returns FALSE */ - if (FALSE != H5Oexists_by_name(fid, "group/soft-elink2", H5P_DEFAULT)) + /* Verify that H5Oexists_by_name() returns false */ + if (false != H5Oexists_by_name(fid, "group/soft-elink2", H5P_DEFAULT)) TEST_ERROR; /* Create soft-link in non-root group that points to external link that points to object */ if (H5Lcreate_soft("/external3", fid, "group/soft-elink3", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR; - /* Verify that H5Oexists_by_name() returns TRUE */ - if (TRUE != H5Oexists_by_name(fid, "group/soft-elink3", H5P_DEFAULT)) + /* Verify that H5Oexists_by_name() returns true */ + if (true != H5Oexists_by_name(fid, "group/soft-elink3", H5P_DEFAULT)) TEST_ERROR; /* Create soft-link in non-root group that points to dangling (file doesn't exist) external link in @@ -16984,8 +16983,8 @@ obj_exists(hid_t fapl, hbool_t new_format) if (H5Lcreate_soft("/group/external1", fid, "group/soft-elink4", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR; - /* Verify that H5Oexists_by_name() returns FALSE */ - if (FALSE != H5Oexists_by_name(fid, "group/soft-elink4", H5P_DEFAULT)) + /* Verify that H5Oexists_by_name() returns false */ + if (false != H5Oexists_by_name(fid, "group/soft-elink4", H5P_DEFAULT)) TEST_ERROR; /* Create soft-link in non-root group that points to dangling (object doesn't exist) external link in @@ -16993,8 +16992,8 @@ obj_exists(hid_t fapl, hbool_t new_format) if (H5Lcreate_soft("/group/external2", fid, "group/soft-elink5", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR; - /* Verify that H5Oexists_by_name() returns FALSE */ - if (FALSE != H5Oexists_by_name(fid, "group/soft-elink5", H5P_DEFAULT)) + /* Verify that H5Oexists_by_name() returns false */ + if (false != H5Oexists_by_name(fid, "group/soft-elink5", H5P_DEFAULT)) TEST_ERROR; /* Create soft-link in non-root group that points to external link in non-root group that points to object @@ -17002,8 +17001,8 @@ obj_exists(hid_t fapl, hbool_t new_format) if (H5Lcreate_soft("/group/external3", fid, "group/soft-elink6", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR; - /* Verify that H5Oexists_by_name() returns TRUE */ - if (TRUE != H5Oexists_by_name(fid, "group/soft-elink6", H5P_DEFAULT)) + /* Verify that H5Oexists_by_name() returns true */ + if (true != H5Oexists_by_name(fid, "group/soft-elink6", H5P_DEFAULT)) TEST_ERROR; /* External->Soft links */ @@ -17011,56 +17010,56 @@ obj_exists(hid_t fapl, hbool_t new_format) if (H5Lcreate_external(filename, "soft1", fid, "elink-soft1", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR; - /* Verify that H5Oexists_by_name() returns FALSE */ - if (FALSE != H5Oexists_by_name(fid, "elink-soft1", H5P_DEFAULT)) + /* Verify that H5Oexists_by_name() returns false */ + if (false != H5Oexists_by_name(fid, "elink-soft1", H5P_DEFAULT)) TEST_ERROR; /* Create external link in root group that points to soft link in root group that points to object */ if (H5Lcreate_external(filename, "soft2", fid, "elink-soft2", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR; - /* Verify that H5Oexists_by_name() returns TRUE */ - if (TRUE != H5Oexists_by_name(fid, "elink-soft2", H5P_DEFAULT)) + /* Verify that H5Oexists_by_name() returns true */ + if (true != H5Oexists_by_name(fid, "elink-soft2", H5P_DEFAULT)) TEST_ERROR; /* Create external link in root group that points to dangling soft link in non-root group */ if (H5Lcreate_external(filename, "group/soft1", fid, "elink-soft3", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR; - /* Verify that H5Oexists_by_name() returns FALSE */ - if (FALSE != H5Oexists_by_name(fid, "elink-soft3", H5P_DEFAULT)) + /* Verify that H5Oexists_by_name() returns false */ + if (false != H5Oexists_by_name(fid, "elink-soft3", H5P_DEFAULT)) TEST_ERROR; /* Create external link in root group that points to soft link in root group that points to object */ if (H5Lcreate_external(filename, "group/soft2", fid, "elink-soft4", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR; - /* Verify that H5Oexists_by_name() returns TRUE */ - if (TRUE != H5Oexists_by_name(fid, "elink-soft4", H5P_DEFAULT)) + /* Verify that H5Oexists_by_name() returns true */ + if (true != H5Oexists_by_name(fid, "elink-soft4", H5P_DEFAULT)) TEST_ERROR; /* Create external link in non-root group that points to dangling soft link in root group */ if (H5Lcreate_external(filename, "soft1", fid, "group/elink-soft1", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR; - /* Verify that H5Oexists_by_name() returns FALSE */ - if (FALSE != H5Oexists_by_name(fid, "group/elink-soft1", H5P_DEFAULT)) + /* Verify that H5Oexists_by_name() returns false */ + if (false != H5Oexists_by_name(fid, "group/elink-soft1", H5P_DEFAULT)) TEST_ERROR; /* Create external link in non-root group that points to soft link in root group that points to object */ if (H5Lcreate_external(filename, "soft2", fid, "group/elink-soft2", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR; - /* Verify that H5Oexists_by_name() returns TRUE */ - if (TRUE != H5Oexists_by_name(fid, "group/elink-soft2", H5P_DEFAULT)) + /* Verify that H5Oexists_by_name() returns true */ + if (true != H5Oexists_by_name(fid, "group/elink-soft2", H5P_DEFAULT)) TEST_ERROR; /* Create external link in non-root group that points to dangling soft link in non-root group */ if (H5Lcreate_external(filename, "group/soft1", fid, "group/elink-soft3", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR; - /* Verify that H5Oexists_by_name() returns FALSE */ - if (FALSE != H5Oexists_by_name(fid, "group/elink-soft3", H5P_DEFAULT)) + /* Verify that H5Oexists_by_name() returns false */ + if (false != H5Oexists_by_name(fid, "group/elink-soft3", H5P_DEFAULT)) TEST_ERROR; /* Create external link in non-root group that points to soft link in non-root group that points to object @@ -17068,8 +17067,8 @@ obj_exists(hid_t fapl, hbool_t new_format) if (H5Lcreate_external(filename, "group/soft2", fid, "group/elink-soft4", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR; - /* Verify that H5Oexists_by_name() returns TRUE */ - if (TRUE != H5Oexists_by_name(fid, "group/elink-soft4", H5P_DEFAULT)) + /* Verify that H5Oexists_by_name() returns true */ + if (true != H5Oexists_by_name(fid, "group/elink-soft4", H5P_DEFAULT)) TEST_ERROR; /* Close file created */ @@ -17155,7 +17154,7 @@ corder_create_empty(hid_t fapl) TEST_ERROR; /* Check on group's status */ - if (H5G__is_empty_test(group_id) != TRUE) + if (H5G__is_empty_test(group_id) != true) TEST_ERROR; /* Close the group */ @@ -17179,7 +17178,7 @@ corder_create_empty(hid_t fapl) FAIL_STACK_ERROR; /* Check on group's status */ - if (H5G__is_empty_test(group_id) != TRUE) + if (H5G__is_empty_test(group_id) != true) TEST_ERROR; /* Retrieve group creation property list for group */ @@ -17261,11 +17260,11 @@ corder_create_compact(hid_t fapl) TEST_ERROR; /* Check on group's initial status */ - if (H5G__is_empty_test(group_id) != TRUE) + if (H5G__is_empty_test(group_id) != true) TEST_ERROR; - if (H5G__has_stab_test(group_id) == TRUE) + if (H5G__has_stab_test(group_id) == true) TEST_ERROR; - if (H5G__is_new_dense_test(group_id) == TRUE) + if (H5G__is_new_dense_test(group_id) == true) TEST_ERROR; /* Query the group creation properties */ @@ -17281,13 +17280,13 @@ corder_create_compact(hid_t fapl) TEST_ERROR; /* Verify state of group */ - if (H5G__has_links_test(group_id, &nlinks) != TRUE) + if (H5G__has_links_test(group_id, &nlinks) != true) TEST_ERROR; if (nlinks != (u + 1)) TEST_ERROR; - if (H5G__has_stab_test(group_id) == TRUE) + if (H5G__has_stab_test(group_id) == true) TEST_ERROR; - if (H5G__is_new_dense_test(group_id) == TRUE) + if (H5G__is_new_dense_test(group_id) == true) TEST_ERROR; } /* end for */ @@ -17312,13 +17311,13 @@ corder_create_compact(hid_t fapl) FAIL_STACK_ERROR; /* Verify state of group */ - if (H5G__has_links_test(group_id, &nlinks) != TRUE) + if (H5G__has_links_test(group_id, &nlinks) != true) TEST_ERROR; if (nlinks != max_compact) TEST_ERROR; - if (H5G__has_stab_test(group_id) == TRUE) + if (H5G__has_stab_test(group_id) == true) TEST_ERROR; - if (H5G__is_new_dense_test(group_id) == TRUE) + if (H5G__is_new_dense_test(group_id) == true) TEST_ERROR; /* Loop through links, checking their creation order values */ @@ -17332,7 +17331,7 @@ corder_create_compact(hid_t fapl) TEST_ERROR; /* Verify creation order of link */ - if (linfo.corder_valid != TRUE) + if (linfo.corder_valid != true) TEST_ERROR; if (linfo.corder != u) TEST_ERROR; @@ -17405,11 +17404,11 @@ corder_create_dense(hid_t fapl) TEST_ERROR; /* Check on group's initial status */ - if (H5G__is_empty_test(group_id) != TRUE) + if (H5G__is_empty_test(group_id) != true) TEST_ERROR; - if (H5G__has_stab_test(group_id) == TRUE) + if (H5G__has_stab_test(group_id) == true) TEST_ERROR; - if (H5G__is_new_dense_test(group_id) == TRUE) + if (H5G__is_new_dense_test(group_id) == true) TEST_ERROR; /* Query the group creation properties */ @@ -17425,13 +17424,13 @@ corder_create_dense(hid_t fapl) TEST_ERROR; /* Verify state of group */ - if (H5G__has_links_test(group_id, &nlinks) != TRUE) + if (H5G__has_links_test(group_id, &nlinks) != true) TEST_ERROR; if (nlinks != (u + 1)) TEST_ERROR; - if (H5G__has_stab_test(group_id) == TRUE) + if (H5G__has_stab_test(group_id) == true) TEST_ERROR; - if (H5G__is_new_dense_test(group_id) == TRUE) + if (H5G__is_new_dense_test(group_id) == true) TEST_ERROR; } /* end for */ @@ -17443,11 +17442,11 @@ corder_create_dense(hid_t fapl) TEST_ERROR; /* Verify state of group */ - if (H5G__has_links_test(group_id, NULL) == TRUE) + if (H5G__has_links_test(group_id, NULL) == true) TEST_ERROR; - if (H5G__has_stab_test(group_id) == TRUE) + if (H5G__has_stab_test(group_id) == true) TEST_ERROR; - if (H5G__is_new_dense_test(group_id) != TRUE) + if (H5G__is_new_dense_test(group_id) != true) TEST_ERROR; /* Retrieve & verify # of records in the name & creation order indices */ @@ -17477,11 +17476,11 @@ corder_create_dense(hid_t fapl) FAIL_STACK_ERROR; /* Verify state of group */ - if (H5G__has_links_test(group_id, NULL) == TRUE) + if (H5G__has_links_test(group_id, NULL) == true) TEST_ERROR; - if (H5G__has_stab_test(group_id) == TRUE) + if (H5G__has_stab_test(group_id) == true) TEST_ERROR; - if (H5G__is_new_dense_test(group_id) != TRUE) + if (H5G__is_new_dense_test(group_id) != true) TEST_ERROR; /* Loop through links, checking their creation order values */ @@ -17495,7 +17494,7 @@ corder_create_dense(hid_t fapl) TEST_ERROR; /* Verify creation order of link */ - if (linfo.corder_valid != TRUE) + if (linfo.corder_valid != true) TEST_ERROR; if (linfo.corder != u) TEST_ERROR; @@ -17620,11 +17619,11 @@ corder_transition(hid_t fapl) TEST_ERROR; /* Verify state of group */ - if (H5G__has_links_test(group_id, NULL) == TRUE) + if (H5G__has_links_test(group_id, NULL) == true) TEST_ERROR; - if (H5G__has_stab_test(group_id) == TRUE) + if (H5G__has_stab_test(group_id) == true) TEST_ERROR; - if (H5G__is_new_dense_test(group_id) != TRUE) + if (H5G__is_new_dense_test(group_id) != true) TEST_ERROR; /* Retrieve & verify # of records in the name & creation order indices */ @@ -17640,11 +17639,11 @@ corder_transition(hid_t fapl) TEST_ERROR; /* Verify state of group */ - if (H5G__has_links_test(group_id, NULL) == TRUE) + if (H5G__has_links_test(group_id, NULL) == true) TEST_ERROR; - if (H5G__has_stab_test(group_id) == TRUE) + if (H5G__has_stab_test(group_id) == true) TEST_ERROR; - if (H5G__is_new_dense_test(group_id) != TRUE) + if (H5G__is_new_dense_test(group_id) != true) TEST_ERROR; /* Retrieve & verify # of records in the name & creation order indices */ @@ -17660,13 +17659,13 @@ corder_transition(hid_t fapl) TEST_ERROR; /* Verify state of group */ - if (H5G__has_links_test(group_id, &nlinks) != TRUE) + if (H5G__has_links_test(group_id, &nlinks) != true) TEST_ERROR; if (nlinks != (min_dense - 1)) TEST_ERROR; - if (H5G__has_stab_test(group_id) == TRUE) + if (H5G__has_stab_test(group_id) == true) TEST_ERROR; - if (H5G__is_new_dense_test(group_id) == TRUE) + if (H5G__is_new_dense_test(group_id) == true) TEST_ERROR; /* Re-add links to get back into dense form */ @@ -17679,11 +17678,11 @@ corder_transition(hid_t fapl) } /* end for */ /* Verify state of group */ - if (H5G__has_links_test(group_id, NULL) == TRUE) + if (H5G__has_links_test(group_id, NULL) == true) TEST_ERROR; - if (H5G__has_stab_test(group_id) == TRUE) + if (H5G__has_stab_test(group_id) == true) TEST_ERROR; - if (H5G__is_new_dense_test(group_id) != TRUE) + if (H5G__is_new_dense_test(group_id) != true) TEST_ERROR; /* Retrieve & verify # of records in the name & creation order indices */ @@ -17709,11 +17708,11 @@ corder_transition(hid_t fapl) FAIL_STACK_ERROR; /* Verify state of group */ - if (H5G__has_links_test(group_id, NULL) == TRUE) + if (H5G__has_links_test(group_id, NULL) == true) TEST_ERROR; - if (H5G__has_stab_test(group_id) == TRUE) + if (H5G__has_stab_test(group_id) == true) TEST_ERROR; - if (H5G__is_new_dense_test(group_id) != TRUE) + if (H5G__is_new_dense_test(group_id) != true) TEST_ERROR; /* Retrieve & verify # of records in the name & creation order indices */ @@ -17729,11 +17728,11 @@ corder_transition(hid_t fapl) TEST_ERROR; /* Verify state of group */ - if (H5G__has_links_test(group_id, NULL) == TRUE) + if (H5G__has_links_test(group_id, NULL) == true) TEST_ERROR; - if (H5G__has_stab_test(group_id) == TRUE) + if (H5G__has_stab_test(group_id) == true) TEST_ERROR; - if (H5G__is_new_dense_test(group_id) != TRUE) + if (H5G__is_new_dense_test(group_id) != true) TEST_ERROR; /* Retrieve & verify # of records in the name & creation order indices */ @@ -17749,13 +17748,13 @@ corder_transition(hid_t fapl) TEST_ERROR; /* Verify state of group */ - if (H5G__has_links_test(group_id, &nlinks) != TRUE) + if (H5G__has_links_test(group_id, &nlinks) != true) TEST_ERROR; if (nlinks != (min_dense - 1)) TEST_ERROR; - if (H5G__has_stab_test(group_id) == TRUE) + if (H5G__has_stab_test(group_id) == true) TEST_ERROR; - if (H5G__is_new_dense_test(group_id) == TRUE) + if (H5G__is_new_dense_test(group_id) == true) TEST_ERROR; /* Re-add links to get back into dense form */ @@ -17768,11 +17767,11 @@ corder_transition(hid_t fapl) } /* end for */ /* Verify state of group */ - if (H5G__has_links_test(group_id, NULL) == TRUE) + if (H5G__has_links_test(group_id, NULL) == true) TEST_ERROR; - if (H5G__has_stab_test(group_id) == TRUE) + if (H5G__has_stab_test(group_id) == true) TEST_ERROR; - if (H5G__is_new_dense_test(group_id) != TRUE) + if (H5G__is_new_dense_test(group_id) != true) TEST_ERROR; /* Retrieve & verify # of records in the name & creation order indices */ @@ -17851,7 +17850,7 @@ corder_delete(hid_t fapl) /* Loop to leave file open when deleting group, or to close & re-open file * before deleting group */ - for (reopen_file = FALSE; reopen_file <= TRUE; reopen_file++) { + for (reopen_file = false; reopen_file <= true; reopen_file++) { /* Create file */ h5_fixname(FILENAME[0], fapl, filename, sizeof filename); @@ -17907,11 +17906,11 @@ corder_delete(hid_t fapl) } /* end for */ /* Verify state of group */ - if (H5G__has_links_test(group_id, NULL) == TRUE) + if (H5G__has_links_test(group_id, NULL) == true) TEST_ERROR; - if (H5G__has_stab_test(group_id) == TRUE) + if (H5G__has_stab_test(group_id) == true) TEST_ERROR; - if (H5G__is_new_dense_test(group_id) != TRUE) + if (H5G__is_new_dense_test(group_id) != true) TEST_ERROR; /* Retrieve & verify # of records in the name & creation order indices */ @@ -17984,7 +17983,7 @@ error: *------------------------------------------------------------------------- */ static int -link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t hard_link, hbool_t use_index) +link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, bool hard_link, bool use_index) { char tmpname[NAME_BUF_SIZE]; /* Temporary link name */ char valname[NAME_BUF_SIZE]; /* Link value name */ @@ -18206,9 +18205,9 @@ link_info_by_idx(hid_t fapl) herr_t ret; /* Generic return value */ /* Loop over creating hard or soft links */ - for (hard_link = FALSE; hard_link <= TRUE; hard_link++) { + for (hard_link = false; hard_link <= true; hard_link++) { /* 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++) { if (hard_link) { if (use_index) TESTING("querying info by index w/creation order index, using hard links"); @@ -18293,7 +18292,7 @@ link_info_by_idx(hid_t fapl) } /* end for */ /* Verify state of group */ - if (H5G__has_links_test(group_id, NULL) != TRUE) + if (H5G__has_links_test(group_id, NULL) != true) TEST_ERROR; /* Check for out of bound offset queries */ @@ -18348,7 +18347,7 @@ link_info_by_idx(hid_t fapl) } /* end else */ /* Verify state of group */ - if (H5G__is_new_dense_test(group_id) != TRUE) + if (H5G__is_new_dense_test(group_id) != true) TEST_ERROR; /* Verify link information for new link */ @@ -18442,7 +18441,7 @@ link_info_by_idx_old(hid_t fapl) herr_t ret; /* Generic return value */ /* Loop over creating hard or soft links */ - for (hard_link = FALSE; hard_link <= TRUE; hard_link++) { + for (hard_link = false; hard_link <= true; hard_link++) { if (hard_link) TESTING("querying info by index in old-style group, using hard links"); else @@ -18609,7 +18608,7 @@ link_info_by_idx_old(hid_t fapl) TEST_ERROR; /* Verify state of group */ - if (H5G__has_stab_test(group_id) != TRUE) + if (H5G__has_stab_test(group_id) != true) TEST_ERROR; /* Close the group */ @@ -18668,7 +18667,7 @@ delete_by_idx(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) { @@ -18766,12 +18765,12 @@ delete_by_idx(hid_t fapl) TEST_ERROR; /* Verify link information for new link */ - if (link_info_by_idx_check(group_id, objname, (hsize_t)u, TRUE, use_index) < 0) + if (link_info_by_idx_check(group_id, objname, (hsize_t)u, true, use_index) < 0) TEST_ERROR; } /* end for */ /* Verify state of group (compact) */ - if (H5G__has_links_test(group_id, NULL) != TRUE) + if (H5G__has_links_test(group_id, NULL) != true) TEST_ERROR; /* Check for out of bound deletion */ @@ -18821,7 +18820,7 @@ delete_by_idx(hid_t fapl) TEST_ERROR; /* Verify state of group (empty) */ - if (H5G__has_links_test(group_id, NULL) == TRUE) + if (H5G__has_links_test(group_id, NULL) == true) TEST_ERROR; /* Create more links, to push group into dense form */ @@ -18840,11 +18839,11 @@ delete_by_idx(hid_t fapl) /* Verify state of group (dense) */ if (u >= max_compact) - if (H5G__is_new_dense_test(group_id) != TRUE) + if (H5G__is_new_dense_test(group_id) != true) TEST_ERROR; /* Verify link information for new link */ - if (link_info_by_idx_check(group_id, objname, (hsize_t)u, TRUE, use_index) < 0) + if (link_info_by_idx_check(group_id, objname, (hsize_t)u, true, use_index) < 0) TEST_ERROR; } /* end for */ @@ -18895,9 +18894,9 @@ delete_by_idx(hid_t fapl) TEST_ERROR; /* Verify state of group (empty) */ - if (H5G__has_links_test(group_id, NULL) == TRUE) + if (H5G__has_links_test(group_id, NULL) == true) TEST_ERROR; - if (H5G__is_new_dense_test(group_id) == TRUE) + if (H5G__is_new_dense_test(group_id) == true) TEST_ERROR; /* Check for deletion on empty group again */ @@ -18927,11 +18926,11 @@ delete_by_idx(hid_t fapl) /* Verify state of group (dense) */ if (u >= max_compact) - if (H5G__is_new_dense_test(group_id) != TRUE) + if (H5G__is_new_dense_test(group_id) != true) TEST_ERROR; /* Verify link information for new link */ - if (link_info_by_idx_check(group_id, objname, (hsize_t)u, TRUE, use_index) < 0) + if (link_info_by_idx_check(group_id, objname, (hsize_t)u, true, use_index) < 0) TEST_ERROR; } /* end for */ @@ -19008,9 +19007,9 @@ delete_by_idx(hid_t fapl) TEST_ERROR; /* Verify state of group (empty) */ - if (H5G__has_links_test(group_id, NULL) == TRUE) + if (H5G__has_links_test(group_id, NULL) == true) TEST_ERROR; - if (H5G__is_new_dense_test(group_id) == TRUE) + if (H5G__is_new_dense_test(group_id) == true) TEST_ERROR; /* Close the group */ @@ -19198,7 +19197,7 @@ delete_by_idx_old(hid_t fapl) TEST_ERROR; /* Verify state of group */ - if (H5G__has_stab_test(group_id) != TRUE) + if (H5G__has_stab_test(group_id) != true) TEST_ERROR; /* Delete links in middle */ @@ -19306,7 +19305,7 @@ delete_by_idx_old(hid_t fapl) TEST_ERROR; /* Verify state of group */ - if (H5G__has_stab_test(group_id) != TRUE) + if (H5G__has_stab_test(group_id) != true) TEST_ERROR; /* Close the group */ @@ -19391,7 +19390,7 @@ link_iterate_cb(hid_t group_id, const char *link_name, const H5L_info2_t *info, 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) @@ -19469,7 +19468,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); if (H5Literate2(group_id, idx_type, order, &skip, link_iterate_cb, iter_info) < 0) TEST_ERROR; @@ -19477,7 +19476,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u if (skip != max_links) TEST_ERROR; for (v = 0; v < max_links; v++) - if (iter_info->visited[v] == FALSE) + if (iter_info->visited[v] == false) TEST_ERROR; #ifndef H5_NO_DEPRECATED_SYMBOLS @@ -19487,7 +19486,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); if (H5Giterate(group_id, ".", &gskip, group_iterate_cb, iter_info) < 0) TEST_ERROR; @@ -19495,7 +19494,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u if (gskip != (int)max_links) TEST_ERROR; for (v = 0; v < max_links; v++) - if (iter_info->visited[v] == FALSE) + if (iter_info->visited[v] == false) TEST_ERROR; #endif /* H5_NO_DEPRECATED_SYMBOLS */ @@ -19505,7 +19504,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = (int64_t)(order != H5_ITER_DEC ? skip : ((max_links - 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); if (H5Literate2(group_id, idx_type, order, &skip, link_iterate_cb, iter_info) < 0) TEST_ERROR; @@ -19514,12 +19513,12 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u TEST_ERROR; if (order == H5_ITER_INC) { for (v = 0; v < (max_links / 2); v++) - if (iter_info->visited[v + (max_links / 2)] == FALSE) + if (iter_info->visited[v + (max_links / 2)] == false) TEST_ERROR; } /* end if */ else if (order == H5_ITER_DEC) { for (v = 0; v < (max_links / 2); v++) - if (iter_info->visited[v] == FALSE) + if (iter_info->visited[v] == false) TEST_ERROR; } /* end if */ else { @@ -19527,7 +19526,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u assert(order == H5_ITER_NATIVE); for (v = 0; v < max_links; v++) - if (iter_info->visited[v] == TRUE) + if (iter_info->visited[v] == true) nvisit++; if (nvisit != (max_links / 2)) @@ -19541,7 +19540,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? (unsigned)gskip : ((max_links - 1) - (unsigned)gskip); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); if (H5Giterate(group_id, ".", &gskip, group_iterate_cb, iter_info) < 0) TEST_ERROR; @@ -19550,12 +19549,12 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u TEST_ERROR; if (order == H5_ITER_INC) { for (v = 0; v < (max_links / 2); v++) - if (iter_info->visited[v + (max_links / 2)] == FALSE) + if (iter_info->visited[v + (max_links / 2)] == false) TEST_ERROR; } /* end if */ else if (order == H5_ITER_DEC) { for (v = 0; v < (max_links / 2); v++) - if (iter_info->visited[v] == FALSE) + if (iter_info->visited[v] == false) TEST_ERROR; } /* end if */ else { @@ -19563,7 +19562,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u assert(order == H5_ITER_NATIVE); for (v = 0; v < max_links; v++) - if (iter_info->visited[v] == TRUE) + if (iter_info->visited[v] == true) nvisit++; if (nvisit != (max_links / 2)) @@ -19577,7 +19576,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); if ((ret = H5Literate2(group_id, idx_type, order, &skip, link_iterate_cb, iter_info)) < 0) TEST_ERROR; if (ret != CORDER_ITER_STOP) @@ -19592,7 +19591,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); if ((ret = H5Giterate(group_id, ".", &gskip, group_iterate_cb, iter_info)) < 0) TEST_ERROR; if (ret != CORDER_ITER_STOP) @@ -19643,7 +19642,7 @@ link_iterate(hid_t fapl) char objname[NAME_BUF_SIZE]; /* Object name */ char filename[NAME_BUF_SIZE]; /* File name */ link_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 skip; /* # of links to skip in group */ unsigned u; /* Local index variable */ herr_t ret; /* Generic return value */ @@ -19658,7 +19657,7 @@ link_iterate(hid_t fapl) /* Allocate the "visited link" array */ iter_info.max_visit = max_compact * 2; - if (NULL == (visited = (hbool_t *)malloc(sizeof(hbool_t) * iter_info.max_visit))) + if (NULL == (visited = (bool *)malloc(sizeof(bool) * iter_info.max_visit))) TEST_ERROR; iter_info.visited = visited; @@ -19667,7 +19666,7 @@ link_iterate(hid_t fapl) /* Loop over operating in different orders */ for (order = H5_ITER_INC; order <= H5_ITER_NATIVE; 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) { @@ -19761,7 +19760,7 @@ link_iterate(hid_t fapl) } /* end for */ /* Verify state of group (compact) */ - if (H5G__has_links_test(group_id, NULL) != TRUE) + if (H5G__has_links_test(group_id, NULL) != true) TEST_ERROR; /* Check for out of bound iteration on compact group */ @@ -19794,7 +19793,7 @@ link_iterate(hid_t fapl) } /* end for */ /* Verify state of group (dense) */ - if (H5G__is_new_dense_test(group_id) != TRUE) + if (H5G__is_new_dense_test(group_id) != true) TEST_ERROR; /* Check for out of bound iteration on dense group */ @@ -19903,7 +19902,7 @@ link_iterate_old_cb(hid_t group_id, const char *link_name, const H5L_info2_t *in 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) @@ -19963,7 +19962,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); if (H5Literate2(group_id, H5_INDEX_NAME, order, &skip, link_iterate_old_cb, iter_info) < 0) TEST_ERROR; @@ -19971,7 +19970,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links if (skip != max_links) TEST_ERROR; for (v = 0; v < max_links; v++) - if (iter_info->visited[v] == FALSE) + if (iter_info->visited[v] == false) TEST_ERROR; #ifndef H5_NO_DEPRECATED_SYMBOLS @@ -19981,7 +19980,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); if (H5Giterate(group_id, ".", &gskip, group_iterate_old_cb, iter_info) < 0) TEST_ERROR; @@ -19989,7 +19988,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links if (gskip != (int)max_links) TEST_ERROR; for (v = 0; v < max_links; v++) - if (iter_info->visited[v] == FALSE) + if (iter_info->visited[v] == false) TEST_ERROR; #endif /* H5_NO_DEPRECATED_SYMBOLS */ @@ -19999,7 +19998,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = (int64_t)(order != H5_ITER_DEC ? skip : ((max_links - 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); if (H5Literate2(group_id, H5_INDEX_NAME, order, &skip, link_iterate_old_cb, iter_info) < 0) TEST_ERROR; @@ -20008,12 +20007,12 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links TEST_ERROR; if (order == H5_ITER_INC) { for (v = 0; v < (max_links / 2); v++) - if (iter_info->visited[v + (max_links / 2)] == FALSE) + if (iter_info->visited[v + (max_links / 2)] == false) TEST_ERROR; } /* end if */ else if (order == H5_ITER_DEC) { for (v = 0; v < (max_links / 2); v++) - if (iter_info->visited[v] == FALSE) + if (iter_info->visited[v] == false) TEST_ERROR; } /* end if */ else { @@ -20021,7 +20020,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links assert(order == H5_ITER_NATIVE); for (v = 0; v < max_links; v++) - if (iter_info->visited[v] == TRUE) + if (iter_info->visited[v] == true) nvisit++; if (nvisit != (max_links / 2)) @@ -20035,7 +20034,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? (unsigned)gskip : ((max_links - 1) - (unsigned)gskip); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); if (H5Giterate(group_id, ".", &gskip, group_iterate_old_cb, iter_info) < 0) TEST_ERROR; @@ -20044,12 +20043,12 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links TEST_ERROR; if (order == H5_ITER_INC) { for (v = 0; v < (max_links / 2); v++) - if (iter_info->visited[v + (max_links / 2)] == FALSE) + if (iter_info->visited[v + (max_links / 2)] == false) TEST_ERROR; } /* end if */ else if (order == H5_ITER_DEC) { for (v = 0; v < (max_links / 2); v++) - if (iter_info->visited[v] == FALSE) + if (iter_info->visited[v] == false) TEST_ERROR; } /* end if */ else { @@ -20057,7 +20056,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links assert(order == H5_ITER_NATIVE); for (v = 0; v < max_links; v++) - if (iter_info->visited[v] == TRUE) + if (iter_info->visited[v] == true) nvisit++; if (nvisit != (max_links / 2)) @@ -20071,7 +20070,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); if ((ret = H5Literate2(group_id, H5_INDEX_NAME, order, &skip, link_iterate_old_cb, iter_info)) < 0) TEST_ERROR; if (ret != CORDER_ITER_STOP) @@ -20086,7 +20085,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(bool) * iter_info->max_visit); if ((ret = H5Giterate(group_id, ".", &gskip, group_iterate_old_cb, iter_info)) < 0) TEST_ERROR; if (ret != CORDER_ITER_STOP) @@ -20150,14 +20149,14 @@ link_iterate_old(hid_t fapl) char objname[NAME_BUF_SIZE]; /* Object name */ char filename[NAME_BUF_SIZE]; /* File name */ link_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 skip; /* # of links to skip in group */ unsigned u; /* Local index variable */ herr_t ret; /* Generic return value */ /* Allocate the "visited link" array */ iter_info.max_visit = CORDER_NLINKS; - if (NULL == (visited = (hbool_t *)malloc(sizeof(hbool_t) * iter_info.max_visit))) + if (NULL == (visited = (bool *)malloc(sizeof(bool) * iter_info.max_visit))) TEST_ERROR; iter_info.visited = visited; @@ -20204,7 +20203,7 @@ link_iterate_old(hid_t fapl) } /* end for */ /* Verify state of group (symbol table) */ - if (H5G__has_stab_test(group_id) != TRUE) + if (H5G__has_stab_test(group_id) != true) TEST_ERROR; /* Check for out of bound iteration on old-style group */ @@ -20429,7 +20428,7 @@ open_by_idx(hid_t fapl) /* Loop over operating in different orders */ for (order = H5_ITER_INC; order <= H5_ITER_NATIVE; 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) { @@ -20538,7 +20537,7 @@ open_by_idx(hid_t fapl) } /* Verify state of group (compact) */ - if (H5G__has_links_test(group_id, NULL) != TRUE) + if (H5G__has_links_test(group_id, NULL) != true) TEST_ERROR; /* Check for out of bound open by index on compact group */ @@ -20582,7 +20581,7 @@ open_by_idx(hid_t fapl) } /* end for */ /* Verify state of group (dense) */ - if (H5G__is_new_dense_test(group_id) != TRUE) + if (H5G__is_new_dense_test(group_id) != true) TEST_ERROR; /* Check for out of bound open by index on compact group */ @@ -20852,7 +20851,7 @@ open_by_idx_old(hid_t fapl) } /* end for */ /* Verify state of group (symbol table) */ - if (H5G__has_stab_test(group_id) != TRUE) + if (H5G__has_stab_test(group_id) != true) TEST_ERROR; /* Check for out of bound open by index */ @@ -21046,7 +21045,7 @@ object_info(hid_t fapl) /* Loop over operating in different orders */ for (order = H5_ITER_INC; order <= H5_ITER_NATIVE; 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) { @@ -21177,7 +21176,7 @@ object_info(hid_t fapl) } /* end for */ /* Verify state of group (compact) */ - if (H5G__has_links_test(group_id, NULL) != TRUE) + if (H5G__has_links_test(group_id, NULL) != true) TEST_ERROR; /* Check for out of bound query by index */ @@ -21238,7 +21237,7 @@ object_info(hid_t fapl) } /* end for */ /* Verify state of group (dense) */ - if (H5G__is_new_dense_test(group_id) != TRUE) + if (H5G__is_new_dense_test(group_id) != true) TEST_ERROR; /* Check for out of bound query by index */ @@ -21494,7 +21493,7 @@ object_info_old(hid_t fapl) } /* end for */ /* Verify state of group (symbol table) */ - if (H5G__has_stab_test(group_id) != TRUE) + if (H5G__has_stab_test(group_id) != true) TEST_ERROR; /* Check for out of bound query by index */ @@ -21597,7 +21596,7 @@ group_info(hid_t fapl) /* Loop over operating in different orders */ for (order = H5_ITER_INC; order <= H5_ITER_NATIVE; 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) { @@ -21863,7 +21862,7 @@ group_info(hid_t fapl) } /* end for */ /* Verify state of group (compact) */ - if (H5G__has_links_test(group_id, NULL) != TRUE) + if (H5G__has_links_test(group_id, NULL) != true) TEST_ERROR; /* Check for out of bound query by index */ @@ -22055,7 +22054,7 @@ group_info(hid_t fapl) } /* end for */ /* Verify state of group (dense) */ - if (H5G__is_new_dense_test(group_id) != TRUE) + if (H5G__is_new_dense_test(group_id) != true) TEST_ERROR; /* Check for out of bound query by index */ @@ -22342,7 +22341,7 @@ group_info_old(hid_t fapl) } /* end for */ /* Verify state of group (old-style) */ - if (H5G__has_stab_test(group_id) != TRUE) + if (H5G__has_stab_test(group_id) != true) TEST_ERROR; /* Check for out of bound query by index */ @@ -22413,7 +22412,7 @@ timestamps(hid_t fapl) H5O_info2_t oinfo, oinfo2; /* Object info for groups created */ H5O_native_info_t ninfo, ninfo2; /* Native info for groups created */ char filename[NAME_BUF_SIZE]; /* File name */ - hbool_t track_times; /* The object timestamp setting */ + bool track_times; /* The object timestamp setting */ /* Print test message */ TESTING("timestamps on objects"); @@ -22427,11 +22426,11 @@ timestamps(hid_t fapl) TEST_ERROR; /* Check default timestamp information */ - if (track_times != TRUE) + if (track_times != true) TEST_ERROR; /* Set a non-default object timestamp setting */ - if (H5Pset_obj_track_times(gcpl_id, FALSE) < 0) + if (H5Pset_obj_track_times(gcpl_id, false) < 0) TEST_ERROR; /* Query the object timestamp setting */ @@ -22439,7 +22438,7 @@ timestamps(hid_t fapl) TEST_ERROR; /* Check default timestamp information */ - if (track_times != FALSE) + if (track_times != false) TEST_ERROR; /* Create file */ @@ -22468,11 +22467,11 @@ timestamps(hid_t fapl) /* Query & verify the object timestamp settings */ if (H5Pget_obj_track_times(gcpl_id, &track_times) < 0) TEST_ERROR; - if (track_times != FALSE) + if (track_times != false) TEST_ERROR; if (H5Pget_obj_track_times(gcpl_id2, &track_times) < 0) TEST_ERROR; - if (track_times != TRUE) + if (track_times != true) TEST_ERROR; /* Query the object information for each group */ @@ -22550,11 +22549,11 @@ timestamps(hid_t fapl) /* Query & verify the object timestamp settings */ if (H5Pget_obj_track_times(gcpl_id, &track_times) < 0) TEST_ERROR; - if (track_times != FALSE) + if (track_times != false) TEST_ERROR; if (H5Pget_obj_track_times(gcpl_id2, &track_times) < 0) TEST_ERROR; - if (track_times != TRUE) + if (track_times != true) TEST_ERROR; /* Query the object information for each group */ @@ -22646,7 +22645,7 @@ main(void) unsigned minimize_dset_oh; unsigned efc; /* Whether to use the external file cache */ const char *env_h5_drvr; /* File Driver value from environment */ - hbool_t driver_is_default_compatible; + bool driver_is_default_compatible; env_h5_drvr = HDgetenv(HDF5_DRIVER); if (env_h5_drvr == NULL) @@ -22676,7 +22675,7 @@ main(void) dcpl_g = H5P_DEFAULT; } - for (new_format = FALSE; new_format <= TRUE; new_format++) { + for (new_format = false; new_format <= true; new_format++) { hid_t my_fapl; /* Check for FAPL to use */ @@ -22736,7 +22735,7 @@ main(void) nerrors += external_set_elink_acc_flags(env_h5_drvr, my_fapl, new_format) < 0 ? 1 : 0; /* Try external link tests both with and without the external file cache */ - for (efc = FALSE; efc <= TRUE; efc++) { + for (efc = false; efc <= true; efc++) { if (efc) { if (H5Pset_elink_file_cache_size(my_fapl, 8) < 0) TEST_ERROR; @@ -22817,7 +22816,7 @@ main(void) * so assume that everything that passed for external links * above has already been tested for UD links. */ - if (new_format == TRUE) { + if (new_format == true) { nerrors += ud_hard_links(fapl2) < 0 ? 1 : 0; /* requires new format groups */ #ifndef H5_NO_DEPRECATED_SYMBOLS nerrors += ud_hard_links_deprec(fapl2) < 0 ? 1 : 0; /* requires new format groups */ diff --git a/test/links_env.c b/test/links_env.c index 620380b..6b61921 100644 --- a/test/links_env.c +++ b/test/links_env.c @@ -30,7 +30,7 @@ static const char *FILENAME[] = {"extlinks_env0", /* 0: main file */ TMPDIR "extlinks_env1", /* 2 */ NULL}; -static int external_link_env(hid_t fapl, hbool_t new_format); +static int external_link_env(hid_t fapl, bool new_format); /*------------------------------------------------------------------------- * Function: external_link_env (moved from links.c) @@ -48,7 +48,7 @@ static int external_link_env(hid_t fapl, hbool_t new_format); *------------------------------------------------------------------------- */ static int -external_link_env(hid_t fapl, hbool_t new_format) +external_link_env(hid_t fapl, bool new_format) { hid_t fid = (-1); /* File ID */ hid_t gid = (-1); /* Group IDs */ @@ -162,13 +162,13 @@ main(void) h5_reset(); fapl = h5_fileaccess(); - nerrors += external_link_env(fapl, FALSE) < 0 ? 1 : 0; + nerrors += external_link_env(fapl, false) < 0 ? 1 : 0; /* Set the "use the latest version of the format" bounds for creating objects in the file */ if (H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) TEST_ERROR; - nerrors += external_link_env(fapl, TRUE) < 0 ? 1 : 0; + nerrors += external_link_env(fapl, true) < 0 ? 1 : 0; /* Verify symbol table messages are cached */ nerrors += (h5_verify_cached_stabs(FILENAME, fapl) < 0 ? 1 : 0); diff --git a/test/mdset.c b/test/mdset.c index 6e736df..0d2776d 100644 --- a/test/mdset.c +++ b/test/mdset.c @@ -50,8 +50,8 @@ static const char *FILENAME[] = {"mdset", "mdset1", "mdset2", NULL}; char dset_name[MAX_DSETS][DSET_MAX_NAME_LEN]; /* Whether these filters are available */ -htri_t deflate_avail = FALSE; -htri_t fletcher32_avail = FALSE; +htri_t deflate_avail = false; +htri_t fletcher32_avail = false; static int test_mdset_location(hid_t fapl_id) @@ -196,7 +196,7 @@ test_mdset(size_t niter, unsigned flags, hid_t fapl_id) unsigned *wbufi[MAX_DSETS][MAX_DSET_X]; unsigned *efbuf = NULL; unsigned *efbufi[MAX_DSETS][MAX_DSET_X]; - hbool_t do_read; + bool do_read; hsize_t start[3]; hsize_t count[3]; hsize_t points[3 * MAX_POINTS]; @@ -321,7 +321,7 @@ test_mdset(size_t niter, unsigned flags, hid_t fapl_id) for (j = 0; j < ndsets; j++) { hid_t source_dset; - hbool_t use_chunk = + bool use_chunk = (flags & MDSET_FLAG_CHUNK) || ((flags & MDSET_FLAG_MLAYOUT) && (j == 1 || j == 2)); /* Generate file dataspace */ @@ -388,7 +388,7 @@ test_mdset(size_t niter, unsigned flags, hid_t fapl_id) for (j = 0; j < OPS_PER_FILE; j++) { /* Decide whether to read or write. Can't read on the first iteration with external * layout because the write is needed to create the external file. */ - do_read = (j == 0 && flags & MDSET_FLAG_MLAYOUT) ? FALSE : (hbool_t)(HDrandom() % 2); + do_read = (j == 0 && flags & MDSET_FLAG_MLAYOUT) ? false : (bool)(HDrandom() % 2); /* Loop over datasets */ for (k = 0; k < ndsets; k++) { @@ -133,11 +133,11 @@ static unsigned test_mf_align_alloc3(const char *env_h5_drvr, hid_t fapl, hid_t static unsigned test_mf_align_alloc4(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl); static unsigned test_mf_align_alloc5(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl); static unsigned test_mf_align_alloc6(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl); -static unsigned test_mf_tmp(const char *env_h5_drvr, hid_t fapl, hbool_t new_format); -static unsigned test_mf_fs_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format); -static unsigned test_mf_strat_thres_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format); -static unsigned test_mf_fs_persist(const char *env_h5_drvr, hid_t fapl, hbool_t new_format); -static unsigned test_mf_strat_thres_persist(const char *env_h5_drvr, hid_t fapl, hbool_t new_format); +static unsigned test_mf_tmp(const char *env_h5_drvr, hid_t fapl, bool new_format); +static unsigned test_mf_fs_gone(const char *env_h5_drvr, hid_t fapl, bool new_format); +static unsigned test_mf_strat_thres_gone(const char *env_h5_drvr, hid_t fapl, bool new_format); +static unsigned test_mf_fs_persist(const char *env_h5_drvr, hid_t fapl, bool new_format); +static unsigned test_mf_strat_thres_persist(const char *env_h5_drvr, hid_t fapl, bool new_format); #ifdef PB_OUT static unsigned test_mf_fs_persist_split(void); static unsigned test_mf_fs_persist_multi(void); @@ -221,15 +221,15 @@ test_mf_eoa(const char *env_h5_drvr, hid_t fapl) haddr_t addr1, addr2; haddr_t ma_addr = HADDR_UNDEF, new_ma_addr = HADDR_UNDEF; hsize_t ma_size = 0; - hbool_t suitable_vfd; + bool suitable_vfd; TESTING("H5MM_alloc() of file allocation"); /* Skip test when using VFDs that has different address spaces for each * type of metadata allocation. Also skip test for Direct VFD. */ - suitable_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0 && - HDstrcmp(env_h5_drvr, "direct") != 0); + suitable_vfd = (bool)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0 && + HDstrcmp(env_h5_drvr, "direct") != 0); if (suitable_vfd) { /* Set the filename to use for this test */ h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); @@ -370,15 +370,15 @@ test_mf_eoa_shrink(const char *env_h5_drvr, hid_t fapl) haddr_t addr = 0; haddr_t ma_addr = HADDR_UNDEF, new_ma_addr = HADDR_UNDEF; hsize_t ma_size = 0, new_ma_size = 0; - hbool_t suitable_vfd; + bool suitable_vfd; TESTING("H5MF_try_shrink() of file allocation: test 1"); /* Skip test when using VFDs that has different address spaces for each * type of metadata allocation. Also skip test for Direct VFD. */ - suitable_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0 && - HDstrcmp(env_h5_drvr, "direct") != 0); + suitable_vfd = (bool)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0 && + HDstrcmp(env_h5_drvr, "direct") != 0); if (suitable_vfd) { /* Set the filename to use for this test (dependent on fapl) */ h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); @@ -658,15 +658,15 @@ test_mf_eoa_extend(const char *env_h5_drvr, hid_t fapl) htri_t was_extended; haddr_t ma_addr = HADDR_UNDEF, new_ma_addr = HADDR_UNDEF; hsize_t ma_size = 0, new_ma_size = 0; - hbool_t suitable_vfd; + bool suitable_vfd; TESTING("H5MF_try_extend() of file allocation: test 1"); /* Skip test when using VFDs that has different address spaces for each * type of metadata allocation. Also skip test for Direct VFD. */ - suitable_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0 && - HDstrcmp(env_h5_drvr, "direct") != 0); + suitable_vfd = (bool)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0 && + HDstrcmp(env_h5_drvr, "direct") != 0); if (suitable_vfd) { /* Set the filename to use for this test (dependent on fapl) */ h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); @@ -861,7 +861,7 @@ error: *------------------------------------------------------------------------- */ static unsigned -test_mf_tmp(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) +test_mf_tmp(const char *env_h5_drvr, hid_t fapl, bool new_format) { hid_t file = -1; /* File ID */ hid_t fapl2 = -1; /* File access property list */ @@ -899,7 +899,7 @@ test_mf_tmp(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) if (H5Pset_libver_bounds(fapl2, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) FAIL_STACK_ERROR; - H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, FALSE, (hsize_t)1); + H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, false, (hsize_t)1); } /* end if */ /* Create the file to work on */ @@ -1258,7 +1258,7 @@ test_mf_fs_alloc_free(hid_t fapl) /* Remove section A from free-space */ if (H5MF__find_sect(f, H5FD_MEM_SUPER, (hsize_t)TBLOCK_SIZE30, f->shared->fs_man[H5FD_MEM_SUPER], &tmp) != - TRUE) + true) TEST_ERROR; if (tmp != TBLOCK_ADDR70) @@ -1334,7 +1334,7 @@ test_mf_fs_alloc_free(hid_t fapl) /* Remove section A from free-space */ if (H5MF__find_sect(f, H5FD_MEM_SUPER, (hsize_t)TBLOCK_SIZE30, f->shared->fs_man[H5FD_MEM_SUPER], &tmp) != - TRUE) + true) TEST_ERROR; if (tmp != TBLOCK_ADDR70) @@ -1404,7 +1404,7 @@ test_mf_fs_alloc_free(hid_t fapl) /* Remove section A from free-space */ if (H5MF__find_sect(f, H5FD_MEM_SUPER, (hsize_t)TBLOCK_SIZE30, f->shared->fs_man[H5FD_MEM_SUPER], &tmp) != - TRUE) + true) TEST_ERROR; /* Verify that the block is section A in free-space */ @@ -1620,7 +1620,7 @@ test_mf_fs_extend(hid_t fapl) /* Remove the extended block */ if (H5MF__find_sect(f, H5FD_MEM_SUPER, (hsize_t)(TBLOCK_SIZE30 + TBLOCK_SIZE50), - f->shared->fs_man[H5FD_MEM_SUPER], &tmp) != TRUE) + f->shared->fs_man[H5FD_MEM_SUPER], &tmp) != true) TEST_ERROR; if (tmp != TBLOCK_ADDR70) @@ -1725,7 +1725,7 @@ test_mf_fs_extend(hid_t fapl) /* Remove the merged sections A & B from free-space */ if (H5MF__find_sect(f, H5FD_MEM_SUPER, (hsize_t)(TBLOCK_SIZE30 + TBLOCK_SIZE50), - f->shared->fs_man[H5FD_MEM_SUPER], &tmp) != TRUE) + f->shared->fs_man[H5FD_MEM_SUPER], &tmp) != true) TEST_ERROR; if (tmp != addr) @@ -1830,7 +1830,7 @@ test_mf_fs_extend(hid_t fapl) /* Remove the merged sections A & B from free-space */ if (H5MF__find_sect(f, H5FD_MEM_SUPER, (hsize_t)(TBLOCK_SIZE30 + TBLOCK_SIZE50), - f->shared->fs_man[H5FD_MEM_SUPER], &tmp) != TRUE) + f->shared->fs_man[H5FD_MEM_SUPER], &tmp) != true) TEST_ERROR; if (tmp != addr) @@ -1936,7 +1936,7 @@ test_mf_fs_extend(hid_t fapl) /* Remove section A from free-space manager */ if (H5MF__find_sect(f, H5FD_MEM_SUPER, (hsize_t)(TBLOCK_SIZE30 - 10), f->shared->fs_man[H5FD_MEM_SUPER], - &tmp) != TRUE) + &tmp) != true) TEST_ERROR; if (tmp != addr) @@ -1944,7 +1944,7 @@ test_mf_fs_extend(hid_t fapl) /* Remove section B from free-space manager */ if (H5MF__find_sect(f, H5FD_MEM_SUPER, (hsize_t)TBLOCK_SIZE50, f->shared->fs_man[H5FD_MEM_SUPER], &tmp) != - TRUE) + true) TEST_ERROR; if (H5Fclose(file) < 0) @@ -2012,12 +2012,12 @@ test_mf_fs_absorb(const char *env_h5_drvr, hid_t fapl) haddr_t ma_addr = HADDR_UNDEF; hsize_t ma_size = 0; H5MF_free_section_t *sect_node = NULL; - hbool_t contig_addr_vfd; /* Whether VFD used has a contiguous address space */ + bool contig_addr_vfd; /* Whether VFD used has a contiguous address space */ TESTING("A free-space section absorbs an aggregator: test 1"); /* Skip test when using VFDs that don't use the metadata aggregator */ - contig_addr_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); + contig_addr_vfd = (bool)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); if (contig_addr_vfd) { /* Set the filename to use for this test (dependent on fapl) */ h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); @@ -2062,7 +2062,7 @@ test_mf_fs_absorb(const char *env_h5_drvr, hid_t fapl) /* Verify that the section did absorb the aggregator */ if (H5MF__find_sect(f, H5FD_MEM_SUPER, (hsize_t)(ma_addr + ma_size), - f->shared->fs_man[H5FD_MEM_SUPER], &tmp) != TRUE) + f->shared->fs_man[H5FD_MEM_SUPER], &tmp) != true) TEST_ERROR; if (tmp != ma_addr) @@ -2122,7 +2122,7 @@ test_mf_fs_absorb(const char *env_h5_drvr, hid_t fapl) /* Verify that the section did absorb the aggregator */ if (H5MF__find_sect(f, H5FD_MEM_SUPER, (hsize_t)(ma_size + TBLOCK_SIZE30), - f->shared->fs_man[H5FD_MEM_SUPER], &tmp) != TRUE) + f->shared->fs_man[H5FD_MEM_SUPER], &tmp) != true) TEST_ERROR; if ((tmp + TBLOCK_SIZE30) != ma_addr) @@ -2188,13 +2188,13 @@ test_mf_aggr_alloc1(const char *env_h5_drvr, hid_t fapl) haddr_t addr1, addr2; haddr_t ma_addr = HADDR_UNDEF; hsize_t ma_size = 0; - hbool_t suitable_vfd; + bool suitable_vfd; TESTING("H5MF_alloc() of meta/sdata aggregator:test 1"); /* Skip test when using VFDs that don't use the metadata aggregator. Also skip test for Direct VFD. */ - suitable_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0 && - HDstrcmp(env_h5_drvr, "direct") != 0); + suitable_vfd = (bool)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0 && + HDstrcmp(env_h5_drvr, "direct") != 0); if (suitable_vfd) { /* Set the filename to use for this test (dependent on fapl) */ h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); @@ -2204,7 +2204,7 @@ test_mf_aggr_alloc1(const char *env_h5_drvr, hid_t fapl) TEST_ERROR; /* Set to H5F_FSPACE_STRATEGY_AGGR strategy */ - if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_AGGR, FALSE, (hsize_t)1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_AGGR, false, (hsize_t)1) < 0) TEST_ERROR; /* Create the file to work on */ @@ -2340,13 +2340,13 @@ test_mf_aggr_alloc2(const char *env_h5_drvr, hid_t fapl) haddr_t addr1, addr2, addr3; haddr_t ma_addr = HADDR_UNDEF; hsize_t ma_size = 0; - hbool_t suitable_vfd; + bool suitable_vfd; TESTING("H5MF_alloc() of meta/sdata aggregator:test 2"); /* Skip test when using VFDs that don't use the metadata aggregator. Also skip test for Direct VFD. */ - suitable_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0 && - HDstrcmp(env_h5_drvr, "direct") != 0); + suitable_vfd = (bool)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0 && + HDstrcmp(env_h5_drvr, "direct") != 0); if (suitable_vfd) { /* Set the filename to use for this test (dependent on fapl) */ h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); @@ -2499,12 +2499,12 @@ test_mf_aggr_alloc3(const char *env_h5_drvr, hid_t fapl) hsize_t ma_size = 0, new_ma_size = 0; haddr_t sdata_addr = HADDR_UNDEF; hsize_t sdata_size = 0; - hbool_t contig_addr_vfd; /* Whether VFD used has a contiguous address space */ + bool contig_addr_vfd; /* Whether VFD used has a contiguous address space */ TESTING("H5MF_alloc() of meta/sdata aggregator: test 3"); /* Skip test when using VFDs that don't use the metadata aggregator */ - contig_addr_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); + contig_addr_vfd = (bool)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); if (contig_addr_vfd) { /* Set the filename to use for this test (dependent on fapl) */ h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); @@ -2667,12 +2667,12 @@ test_mf_aggr_alloc4(const char *env_h5_drvr, hid_t fapl) haddr_t addr1, addr2, saddr1, saddr2, saddr3; haddr_t ma_addr = HADDR_UNDEF, new_ma_addr = HADDR_UNDEF, sdata_addr = HADDR_UNDEF; hsize_t ma_size = 0, new_ma_size = 0, sdata_size = 0; - hbool_t contig_addr_vfd; /* Whether VFD used has a contiguous address space */ + bool contig_addr_vfd; /* Whether VFD used has a contiguous address space */ TESTING("H5MF_alloc() of meta/sdata aggregator:test 4"); /* Skip test when using VFDs that don't use the metadata aggregator */ - contig_addr_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); + contig_addr_vfd = (bool)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); if (contig_addr_vfd) { /* Set the filename to use for this test (dependent on fapl) */ h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); @@ -2816,12 +2816,12 @@ test_mf_aggr_alloc5(const char *env_h5_drvr, hid_t fapl) haddr_t addr1, addr2, addr3; haddr_t ma_addr = HADDR_UNDEF, new_ma_addr = HADDR_UNDEF; hsize_t ma_size = 0, new_ma_size = 0; - hbool_t contig_addr_vfd; /* Whether VFD used has a contiguous address space */ + bool contig_addr_vfd; /* Whether VFD used has a contiguous address space */ TESTING("H5MF_alloc() of meta/sdata aggregator:test 5"); /* Skip test when using VFDs that don't use the metadata aggregator */ - contig_addr_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); + contig_addr_vfd = (bool)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); if (contig_addr_vfd) { /* Set the filename to use for this test (dependent on fapl) */ h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); @@ -2954,12 +2954,12 @@ test_mf_aggr_alloc6(const char *env_h5_drvr, hid_t fapl) haddr_t ma_addr = HADDR_UNDEF, new_ma_addr = HADDR_UNDEF, sdata_addr = HADDR_UNDEF; hsize_t ma_size = 0, new_ma_size = 0, sdata_size = 0; H5FS_stat_t state; - hbool_t contig_addr_vfd; /* Whether VFD used has a contiguous address space */ + bool contig_addr_vfd; /* Whether VFD used has a contiguous address space */ TESTING("H5MF_alloc() of meta/sdata aggregator:test 6"); /* Skip test when using VFDs that don't use the metadata aggregator */ - contig_addr_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); + contig_addr_vfd = (bool)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); if (contig_addr_vfd) { /* Set the filename to use for this test (dependent on fapl) */ h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); @@ -3128,12 +3128,12 @@ test_mf_aggr_alloc7(const char *env_h5_drvr, hid_t fapl) haddr_t ma_addr = HADDR_UNDEF, sdata_addr = HADDR_UNDEF; hsize_t ma_size = 0, sdata_size = 0; H5FS_stat_t state; - hbool_t contig_addr_vfd; /* Whether VFD used has a contiguous address space */ + bool contig_addr_vfd; /* Whether VFD used has a contiguous address space */ TESTING("H5MF_alloc() of meta/sdata aggregator:test 7"); /* Skip test when using VFDs that don't use the metadata aggregator */ - contig_addr_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); + contig_addr_vfd = (bool)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); if (contig_addr_vfd) { /* Set the filename to use for this test (dependent on fapl) */ h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); @@ -3299,12 +3299,12 @@ test_mf_aggr_extend(const char *env_h5_drvr, hid_t fapl) haddr_t ma_addr = HADDR_UNDEF, new_ma_addr = HADDR_UNDEF, sdata_addr = HADDR_UNDEF; hsize_t ma_size = 0, new_ma_size = 0, sdata_size = 0; htri_t was_extended; - hbool_t contig_addr_vfd; /* Whether VFD used has a contiguous address space */ + bool contig_addr_vfd; /* Whether VFD used has a contiguous address space */ TESTING("H5MF_try_extend() of meta/sdata aggregator: test 1"); /* Skip test when using VFDs that don't use the metadata aggregator */ - contig_addr_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); + contig_addr_vfd = (bool)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); if (contig_addr_vfd) { /* Set the filename to use for this test (dependent on fapl) */ h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); @@ -3597,12 +3597,12 @@ test_mf_aggr_absorb(const char *env_h5_drvr, hid_t fapl) haddr_t new_sdata_addr = HADDR_UNDEF; hsize_t ma_size = 0, new_ma_size = 0; hsize_t sdata_size = 0, new_sdata_size = 0; - hbool_t contig_addr_vfd; /* Whether VFD used has a contiguous address space */ + bool contig_addr_vfd; /* Whether VFD used has a contiguous address space */ TESTING("H5MF_try_shrink() of meta/sdata aggregator: test 1"); /* Skip test when using VFDs that don't use the metadata aggregator */ - contig_addr_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); + contig_addr_vfd = (bool)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); if (contig_addr_vfd) { /* Set the filename to use for this test (dependent on fapl) */ h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); @@ -3849,7 +3849,7 @@ test_mf_align_eoa(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) htri_t was_extended; H5FS_stat_t state; hsize_t alignment = 0, mis_align = 0, tmp = 0, accum = 0; - hbool_t suitable_vfd; + bool suitable_vfd; TESTING("H5MM_alloc() of file allocation with alignment: test 1"); @@ -3857,8 +3857,8 @@ test_mf_align_eoa(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) * don't push mis-aligned space fragments on the file free space list. * Also skip test for Direct VFD. */ - suitable_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "stdio") != 0 && HDstrcmp(env_h5_drvr, "split") != 0 && - HDstrcmp(env_h5_drvr, "multi") != 0 && HDstrcmp(env_h5_drvr, "direct") != 0); + suitable_vfd = (bool)(HDstrcmp(env_h5_drvr, "stdio") != 0 && HDstrcmp(env_h5_drvr, "split") != 0 && + HDstrcmp(env_h5_drvr, "multi") != 0 && HDstrcmp(env_h5_drvr, "direct") != 0); if (suitable_vfd) { /* Set the filename to use for this test (dependent on fapl) */ h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); @@ -4143,7 +4143,7 @@ test_mf_align_fs(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) H5FS_stat_t state; htri_t was_extended; hsize_t alignment = 0, tmp = 0, mis_align = 0; - hbool_t suitable_vfd; + bool suitable_vfd; TESTING("H5MF_alloc() of free-space manager with alignment: test 1"); @@ -4307,8 +4307,8 @@ test_mf_align_fs(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) * don't push mis-aligned space fragments on the file free space list * Also skip test for Direct VFD. */ - suitable_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "stdio") != 0 && HDstrcmp(env_h5_drvr, "split") != 0 && - HDstrcmp(env_h5_drvr, "multi") != 0 && HDstrcmp(env_h5_drvr, "direct") != 0); + suitable_vfd = (bool)(HDstrcmp(env_h5_drvr, "stdio") != 0 && HDstrcmp(env_h5_drvr, "split") != 0 && + HDstrcmp(env_h5_drvr, "multi") != 0 && HDstrcmp(env_h5_drvr, "direct") != 0); if (suitable_vfd) { if ((file_size = h5_get_file_size(filename, new_fapl)) < 0) TEST_ERROR; @@ -4506,7 +4506,7 @@ test_mf_align_alloc1(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) haddr_t ma_addr = HADDR_UNDEF; hsize_t ma_size = 0, mis_align = 0; hsize_t alignment = 0, tmp = 0; - hbool_t suitable_vfd; + bool suitable_vfd; TESTING("H5MF_alloc() of meta/sdata aggregator with alignment: test 1"); @@ -4514,8 +4514,8 @@ test_mf_align_alloc1(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) * don't push mis-aligned space fragments on the file free space list. * Also skip test for Direct VFD. */ - suitable_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "stdio") != 0 && HDstrcmp(env_h5_drvr, "split") != 0 && - HDstrcmp(env_h5_drvr, "multi") != 0 && HDstrcmp(env_h5_drvr, "direct") != 0); + suitable_vfd = (bool)(HDstrcmp(env_h5_drvr, "stdio") != 0 && HDstrcmp(env_h5_drvr, "split") != 0 && + HDstrcmp(env_h5_drvr, "multi") != 0 && HDstrcmp(env_h5_drvr, "direct") != 0); if (suitable_vfd) { /* Set the filename to use for this test (dependent on fapl) */ h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); @@ -4769,7 +4769,7 @@ test_mf_align_alloc2(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) haddr_t ma_addr = HADDR_UNDEF, sdata_addr = HADDR_UNDEF; hsize_t ma_size = 0, sdata_size = 0, mis_align = 0; hsize_t alignment = 0, tmp = 0; - hbool_t suitable_vfd; + bool suitable_vfd; TESTING("H5MF_alloc() of meta/sdata aggregator with alignment: test 2"); @@ -4777,8 +4777,8 @@ test_mf_align_alloc2(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) * don't push mis-aligned space fragments on the file free space list. * Also skip test for Direct VFD. */ - suitable_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "stdio") != 0 && HDstrcmp(env_h5_drvr, "split") != 0 && - HDstrcmp(env_h5_drvr, "multi") != 0 && HDstrcmp(env_h5_drvr, "direct") != 0); + suitable_vfd = (bool)(HDstrcmp(env_h5_drvr, "stdio") != 0 && HDstrcmp(env_h5_drvr, "split") != 0 && + HDstrcmp(env_h5_drvr, "multi") != 0 && HDstrcmp(env_h5_drvr, "direct") != 0); if (suitable_vfd) { /* Set the filename to use for this test (dependent on fapl) */ h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); @@ -5115,7 +5115,7 @@ test_mf_align_alloc3(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) haddr_t ma_addr = HADDR_UNDEF, sdata_addr = HADDR_UNDEF; hsize_t ma_size = 0, sdata_size = 0, mis_align = 0; hsize_t alignment = 0, tmp = 0; - hbool_t suitable_vfd; + bool suitable_vfd; TESTING("H5MF_alloc() of meta/sdata aggregator with alignment: test 3"); @@ -5123,8 +5123,8 @@ test_mf_align_alloc3(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) * don't push mis-aligned space fragments on the file free space list. * Also skip test for Direct VFD. */ - suitable_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "stdio") != 0 && HDstrcmp(env_h5_drvr, "split") != 0 && - HDstrcmp(env_h5_drvr, "multi") != 0 && HDstrcmp(env_h5_drvr, "direct") != 0); + suitable_vfd = (bool)(HDstrcmp(env_h5_drvr, "stdio") != 0 && HDstrcmp(env_h5_drvr, "split") != 0 && + HDstrcmp(env_h5_drvr, "multi") != 0 && HDstrcmp(env_h5_drvr, "direct") != 0); if (suitable_vfd) { /* Set the filename to use for this test (dependent on fapl) */ h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); @@ -5429,7 +5429,7 @@ test_mf_align_alloc4(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) haddr_t ma_addr = HADDR_UNDEF; hsize_t ma_size = 0, saved_ma_size = 0; hsize_t alignment = 0, mis_align = 0, tmp = 0; - hbool_t suitable_vfd; + bool suitable_vfd; TESTING("H5MF_alloc() of meta/sdata aggregator with alignment: test 4"); @@ -5437,8 +5437,8 @@ test_mf_align_alloc4(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) * don't push mis-aligned space fragments on the file free space list. * Also skip test for Direct VFD. */ - suitable_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "stdio") != 0 && HDstrcmp(env_h5_drvr, "split") != 0 && - HDstrcmp(env_h5_drvr, "multi") != 0 && HDstrcmp(env_h5_drvr, "direct") != 0); + suitable_vfd = (bool)(HDstrcmp(env_h5_drvr, "stdio") != 0 && HDstrcmp(env_h5_drvr, "split") != 0 && + HDstrcmp(env_h5_drvr, "multi") != 0 && HDstrcmp(env_h5_drvr, "direct") != 0); if (suitable_vfd) { /* Set the filename to use for this test (dependent on fapl) */ h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); @@ -5648,7 +5648,7 @@ test_mf_align_alloc5(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) haddr_t sdata_addr = HADDR_UNDEF, new_sdata_addr = HADDR_UNDEF; hsize_t ma_size = 0, new_ma_size = 0, sdata_size = 0, new_sdata_size = 0; hsize_t alignment = 0, mis_align = 0, tmp = 0; - hbool_t suitable_vfd; + bool suitable_vfd; TESTING("H5MF_alloc() of meta/sdata aggregator with alignment: test 5"); @@ -5656,8 +5656,8 @@ test_mf_align_alloc5(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) * don't push mis-aligned space fragments on the file free space list. * Also skip test for Direct VFD. */ - suitable_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "stdio") != 0 && HDstrcmp(env_h5_drvr, "split") != 0 && - HDstrcmp(env_h5_drvr, "multi") != 0 && HDstrcmp(env_h5_drvr, "direct") != 0); + suitable_vfd = (bool)(HDstrcmp(env_h5_drvr, "stdio") != 0 && HDstrcmp(env_h5_drvr, "split") != 0 && + HDstrcmp(env_h5_drvr, "multi") != 0 && HDstrcmp(env_h5_drvr, "direct") != 0); if (suitable_vfd) { /* Set the filename to use for this test (dependent on fapl) */ h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); @@ -5919,7 +5919,7 @@ test_mf_align_alloc6(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) haddr_t ma_addr = HADDR_UNDEF, new_ma_addr = HADDR_UNDEF, sdata_addr = HADDR_UNDEF; hsize_t ma_size = 0, new_ma_size = 0, sdata_size = 0; hsize_t alignment = 0, mis_align = 0, tmp = 0; - hbool_t suitable_vfd; + bool suitable_vfd; TESTING("H5MF_alloc() of meta/sdata aggregator with alignment: test 6"); @@ -5927,8 +5927,8 @@ test_mf_align_alloc6(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) * don't push mis-aligned space fragments on the file free space list. * Also skip test for Direct VFD. */ - suitable_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "stdio") != 0 && HDstrcmp(env_h5_drvr, "split") != 0 && - HDstrcmp(env_h5_drvr, "multi") != 0 && HDstrcmp(env_h5_drvr, "direct") != 0); + suitable_vfd = (bool)(HDstrcmp(env_h5_drvr, "stdio") != 0 && HDstrcmp(env_h5_drvr, "split") != 0 && + HDstrcmp(env_h5_drvr, "multi") != 0 && HDstrcmp(env_h5_drvr, "direct") != 0); if (suitable_vfd) { /* Set the filename to use for this test (dependent on fapl) */ h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); @@ -6126,7 +6126,7 @@ test_mf_bug1(const char *env_h5_drvr, hid_t fapl) haddr_t addr1, addr2; hsize_t block_size; hsize_t align; - hbool_t split = FALSE, multi = FALSE; + bool split = false, multi = false; TESTING("H5MF_alloc() bug 1"); @@ -6148,9 +6148,9 @@ test_mf_bug1(const char *env_h5_drvr, hid_t fapl) /* Check for split or multi driver */ if (!HDstrcmp(env_h5_drvr, "split")) - split = TRUE; + split = true; else if (!HDstrcmp(env_h5_drvr, "multi")) - multi = TRUE; + multi = true; /* Add alignment to member files for split/multi driver */ if (split || multi) { @@ -6178,7 +6178,7 @@ test_mf_bug1(const char *env_h5_drvr, hid_t fapl) hid_t memb_fapl_arr[H5FD_MEM_NTYPES]; char *memb_name[H5FD_MEM_NTYPES]; haddr_t memb_addr[H5FD_MEM_NTYPES]; - hbool_t relax; + bool relax; H5FD_mem_t mt; /* Get current multi settings */ @@ -6341,7 +6341,7 @@ test_mf_fs_persist_split(void) if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) FAIL_STACK_ERROR; - if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, TRUE, (hsize_t)1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, true, (hsize_t)1) < 0) FAIL_STACK_ERROR; /* Set the filename to use for this test (dependent on fapl) */ @@ -6624,7 +6624,7 @@ test_mf_fs_persist_multi(void) haddr_t gaddr1, gaddr2; /* File address for H5FD_MEM_GHEAP */ haddr_t tmp_addr; /* Temporary variable for address */ H5FS_section_info_t *node; /* Free space section node */ - htri_t node_found = FALSE; /* Indicate section is in free-space */ + htri_t node_found = false; /* Indicate section is in free-space */ H5FD_mem_t memb_map[H5FD_MEM_NTYPES]; /* Memory usage map */ hid_t memb_fapl[H5FD_MEM_NTYPES]; /* Member access properties */ char sv[H5FD_MEM_NTYPES][64]; /* Name generators */ @@ -6651,7 +6651,7 @@ test_mf_fs_persist_multi(void) if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) FAIL_STACK_ERROR; - if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, TRUE, (hsize_t)1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, true, (hsize_t)1) < 0) FAIL_STACK_ERROR; if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) @@ -6659,7 +6659,7 @@ test_mf_fs_persist_multi(void) MULTI_SETUP(memb_map, memb_fapl, memb_name, memb_addr, sv) - if (H5Pset_fapl_multi(fapl, memb_map, memb_fapl, memb_name, memb_addr, TRUE) < 0) + if (H5Pset_fapl_multi(fapl, memb_map, memb_fapl, memb_name, memb_addr, true) < 0) TEST_ERROR; /* Set the filename to use for this test (dependent on fapl) */ @@ -6931,7 +6931,7 @@ error: *------------------------------------------------------------------------- */ static unsigned -test_mf_fs_persist(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) +test_mf_fs_persist(const char *env_h5_drvr, hid_t fapl, bool new_format) { hid_t file = -1; /* File ID */ hid_t fcpl = -1; /* File creation property list ID */ @@ -6964,12 +6964,12 @@ test_mf_fs_persist(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) if (H5Pset_libver_bounds(fapl2, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) FAIL_STACK_ERROR; /* Set to paged aggregation and persisting free-space */ - if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, TRUE, (hsize_t)1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, true, (hsize_t)1) < 0) TEST_ERROR; } else { /* Setting: aggregation with persisting free-space */ - if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, TRUE, (hsize_t)1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, true, (hsize_t)1) < 0) TEST_ERROR; } @@ -7106,7 +7106,7 @@ error: *------------------------------------------------------------------------- */ static unsigned -test_mf_fs_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) +test_mf_fs_gone(const char *env_h5_drvr, hid_t fapl, bool new_format) { hid_t file = -1; /* File ID */ hid_t fcpl = -1; /* File creation property list */ @@ -7118,7 +7118,7 @@ test_mf_fs_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) haddr_t addr1, addr2, addr3, addr4; /* File address for H5FD_MEM_SUPER */ haddr_t addrx; H5FD_mem_t fs_type; - hbool_t contig_addr_vfd; + bool contig_addr_vfd; if (new_format) TESTING("File's free-space is going away with new library format"); @@ -7126,7 +7126,7 @@ test_mf_fs_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) TESTING("File's free-space is going away with old library format"); /* Current VFD that does not support contiguous address space */ - contig_addr_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); + contig_addr_vfd = (bool)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); if (contig_addr_vfd) { @@ -7148,7 +7148,7 @@ test_mf_fs_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) } /* Set to aggregation and persisting free-space */ - if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, TRUE, (hsize_t)1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, true, (hsize_t)1) < 0) FAIL_STACK_ERROR; /* Set the filename to use for this test (dependent on fapl) */ @@ -7296,7 +7296,7 @@ error: *------------------------------------------------------------------------- */ static unsigned -test_mf_strat_thres_persist(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) +test_mf_strat_thres_persist(const char *env_h5_drvr, hid_t fapl, bool new_format) { hid_t file = -1; /* File ID */ hid_t fcpl = -1; /* File creation property list template */ @@ -7309,7 +7309,7 @@ test_mf_strat_thres_persist(const char *env_h5_drvr, hid_t fapl, hbool_t new_for H5F_fspace_strategy_t fs_type; /* File space handling strategy */ hsize_t fs_threshold; /* Free-space section threshold */ unsigned fs_persist; /* To persist free-space or not */ - hbool_t contig_addr_vfd; + bool contig_addr_vfd; if (new_format) TESTING("File space strategy/persisting/threshold with new library format"); @@ -7317,7 +7317,7 @@ test_mf_strat_thres_persist(const char *env_h5_drvr, hid_t fapl, hbool_t new_for TESTING("File space strategy/persisting/threshold with old library format"); /* Current VFD that does not support contiguous address space */ - contig_addr_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); + contig_addr_vfd = (bool)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); /* Set the filename to use for this test (dependent on fapl) */ h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); @@ -7330,8 +7330,8 @@ test_mf_strat_thres_persist(const char *env_h5_drvr, hid_t fapl, hbool_t new_for if (H5Pset_libver_bounds(fapl2, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) FAIL_STACK_ERROR; - /* Test with TRUE or FALSE for persisting free-space */ - for (fs_persist = FALSE; fs_persist <= TRUE; fs_persist++) { + /* Test with true or false for persisting free-space */ + for (fs_persist = false; fs_persist <= true; fs_persist++) { for (fs_threshold = 0; fs_threshold <= TEST_THRESHOLD10; fs_threshold++) { @@ -7346,7 +7346,7 @@ test_mf_strat_thres_persist(const char *env_h5_drvr, hid_t fapl, hbool_t new_for FAIL_STACK_ERROR; /* Set default file space information */ - if (H5Pset_file_space_strategy(fcpl, fs_type, (hbool_t)fs_persist, fs_threshold) < 0) + if (H5Pset_file_space_strategy(fcpl, fs_type, (bool)fs_persist, fs_threshold) < 0) FAIL_STACK_ERROR; /* Create the file to work on */ @@ -7465,7 +7465,7 @@ error: *------------------------------------------------------------------------- */ static unsigned -test_mf_strat_thres_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) +test_mf_strat_thres_gone(const char *env_h5_drvr, hid_t fapl, bool new_format) { hid_t file = -1; /* File ID */ hid_t fcpl = -1; /* File creation property list template */ @@ -7479,7 +7479,7 @@ test_mf_strat_thres_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format unsigned fs_persist; /* To persist free-space or not */ H5FS_stat_t fs_state; /* Information for free-space manager */ H5FS_stat_t fs_state_zero; /* Information for free-space manager */ - hbool_t contig_addr_vfd; + bool contig_addr_vfd; if (new_format) TESTING("File space merge/shrink for section size < threshold with new library format"); @@ -7487,7 +7487,7 @@ test_mf_strat_thres_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format TESTING("File space merge/shrink for section size < threshold with old library format"); /* Current VFD that does not support contiguous address space */ - contig_addr_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); + contig_addr_vfd = (bool)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); /* Set the filename to use for this test (dependent on fapl) */ h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); @@ -7502,8 +7502,8 @@ test_mf_strat_thres_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format if (H5Pset_libver_bounds(fapl2, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) FAIL_STACK_ERROR; - /* Test with TRUE or FALSE for persisting free-space */ - for (fs_persist = FALSE; fs_persist <= TRUE; fs_persist++) { + /* Test with true or false for persisting free-space */ + for (fs_persist = false; fs_persist <= true; fs_persist++) { /* Testing for H5F_FSPACE_STRATEGY_FSM_AGGR and H5F_FSPACE_STRATEGY_PAGE strategies only */ for (fs_type = H5F_FSPACE_STRATEGY_FSM_AGGR; fs_type < H5F_FSPACE_STRATEGY_AGGR; fs_type++) { @@ -7746,13 +7746,13 @@ error: *------------------------------------------------------------------------- */ static int -set_multi_split(hid_t fapl, hsize_t pagesize, hbool_t is_multi_or_split) +set_multi_split(hid_t fapl, hsize_t pagesize, bool is_multi_or_split) { H5FD_mem_t memb_map[H5FD_MEM_NTYPES]; hid_t memb_fapl_arr[H5FD_MEM_NTYPES]; char *memb_name[H5FD_MEM_NTYPES]; haddr_t memb_addr[H5FD_MEM_NTYPES]; - hbool_t relax; + bool relax; H5FD_mem_t mt; assert(is_multi_or_split); @@ -7811,7 +7811,7 @@ test_page_alloc_xfree(const char *env_h5_drvr, hid_t fapl) haddr_t addr2, addr3; /* Addresses for small metadata blocks */ haddr_t saddr1; /* Addresses for small raw data blocks */ haddr_t gaddr1; /* Addresses for large data blocks */ - hbool_t split = FALSE, multi = FALSE; + bool split = false, multi = false; char filename[FILENAME_LEN]; /* Filename to use */ haddr_t found_addr; /* Address of the found section */ unsigned fs_persist; /* To persist free-space or not */ @@ -7820,9 +7820,9 @@ test_page_alloc_xfree(const char *env_h5_drvr, hid_t fapl) /* Check for split or multi driver */ if (!HDstrcmp(env_h5_drvr, "split")) - split = TRUE; + split = true; else if (!HDstrcmp(env_h5_drvr, "multi")) - multi = TRUE; + multi = true; if (!multi && !split) { @@ -7836,8 +7836,8 @@ test_page_alloc_xfree(const char *env_h5_drvr, hid_t fapl) if (set_multi_split(fapl_new, 4096, split) < 0) TEST_ERROR; - /* Test with TRUE or FALSE for persisting free-space */ - for (fs_persist = FALSE; fs_persist <= TRUE; fs_persist++) { + /* Test with true or false for persisting free-space */ + for (fs_persist = false; fs_persist <= true; fs_persist++) { H5F_mem_page_t fs_type; /* File creation property list */ @@ -8040,7 +8040,7 @@ test_page_try_shrink(const char *env_h5_drvr, hid_t fapl) haddr_t addr1; /* Address for small metadata block */ haddr_t saddr1; /* Address for small raw data block */ haddr_t gaddr1; /* Address for large data block */ - hbool_t contig_addr_vfd; /* Whether VFD used has a contiguous address space */ + bool contig_addr_vfd; /* Whether VFD used has a contiguous address space */ htri_t status; /* status from shrinking */ h5_stat_size_t file_size; /* File size */ char filename[FILENAME_LEN]; /* Filename to use */ @@ -8048,7 +8048,7 @@ test_page_try_shrink(const char *env_h5_drvr, hid_t fapl) TESTING("Paged aggregation for file space: H5MF_try_shrink()"); /* Current VFD that does not support continuous address space */ - contig_addr_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); + contig_addr_vfd = (bool)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); if (contig_addr_vfd) { @@ -8060,7 +8060,7 @@ test_page_try_shrink(const char *env_h5_drvr, hid_t fapl) FAIL_STACK_ERROR; /* Set the strategy to paged aggregation */ - if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, FALSE, (hsize_t)1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, false, (hsize_t)1) < 0) FAIL_STACK_ERROR; /* Create the file to work on */ @@ -8080,7 +8080,7 @@ test_page_try_shrink(const char *env_h5_drvr, hid_t fapl) /* Couldn't shrink due to the section (remaining space in the page) is in the small metadata * free-space manager */ - if (status == TRUE) + if (status == true) TEST_ERROR; /* Allocate a small raw data block with saddr1 */ @@ -8092,7 +8092,7 @@ test_page_try_shrink(const char *env_h5_drvr, hid_t fapl) /* Couldn't shrink due to the section (remaining space in the page) is in the small raw data * free-space manager */ - if (status == TRUE) + if (status == true) TEST_ERROR; /* Allocate a large data block with gaddr1 */ @@ -8104,7 +8104,7 @@ test_page_try_shrink(const char *env_h5_drvr, hid_t fapl) /* Couldn't shrink due to the section (remaining space in the page) is in the large-sized free-space * manager */ - if (status == TRUE) + if (status == true) TEST_ERROR; /* Free the block with saddr1--merge to become 1 page, then return to the large manager */ @@ -8168,15 +8168,15 @@ test_page_small_try_extend(const char *env_h5_drvr, hid_t fapl) H5F_t *f = NULL; /* Internal file object pointer */ haddr_t addr1, addr2, addr3; /* Addresses for small metadata blocks */ haddr_t saddr1; /* Address for small raw data block */ - hbool_t contig_addr_vfd; /* Whether VFD used has a contiguous address space */ + bool contig_addr_vfd; /* Whether VFD used has a contiguous address space */ htri_t was_extended; /* Whether the block can be extended or not */ char filename[FILENAME_LEN]; /* Filename to use */ TESTING("Paged aggregation for file space: H5MF_try_extend() a small block"); /* Current VFD that does not support continuous address space */ - contig_addr_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0 && - HDstrcmp(env_h5_drvr, "family") != 0); + contig_addr_vfd = (bool)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0 && + HDstrcmp(env_h5_drvr, "family") != 0); if (contig_addr_vfd) { @@ -8188,7 +8188,7 @@ test_page_small_try_extend(const char *env_h5_drvr, hid_t fapl) FAIL_STACK_ERROR; /* Set the strategy to paged aggregation */ - if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, FALSE, (hsize_t)1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, false, (hsize_t)1) < 0) FAIL_STACK_ERROR; /* Create the file to work on */ @@ -8206,7 +8206,7 @@ test_page_small_try_extend(const char *env_h5_drvr, hid_t fapl) was_extended = H5MF_try_extend(f, H5FD_MEM_OHDR, (haddr_t)addr1, (hsize_t)TBLOCK_SIZE98, (hsize_t)3100); /* Should succeed */ - if (was_extended != TRUE) + if (was_extended != true) TEST_ERROR; /* Allocate 2 small metadata blocks with addr2 and addr3--will be on another metadata page */ @@ -8228,7 +8228,7 @@ test_page_small_try_extend(const char *env_h5_drvr, hid_t fapl) was_extended = H5MF_try_extend(f, H5FD_MEM_OHDR, (haddr_t)addr1, (hsize_t)TBLOCK_SIZE3198, (hsize_t)TBLOCK_SIZE100); /* Shouldn't succeed--should not cross page boundary */ - if (was_extended == TRUE) + if (was_extended == true) TEST_ERROR; /* Try extending the block with addr1 into the free-space section that is big enough to fulfill the @@ -8236,7 +8236,7 @@ test_page_small_try_extend(const char *env_h5_drvr, hid_t fapl) was_extended = H5MF_try_extend(f, H5FD_MEM_OHDR, (haddr_t)addr1, (hsize_t)TBLOCK_SIZE3198, (hsize_t)TBLOCK_SIZE50); /* Should succeed */ - if (was_extended != TRUE) + if (was_extended != true) TEST_ERROR; /* Free the block with addr1 */ @@ -8251,14 +8251,14 @@ test_page_small_try_extend(const char *env_h5_drvr, hid_t fapl) was_extended = H5MF_try_extend(f, H5FD_MEM_OHDR, (haddr_t)addr1, (hsize_t)TBLOCK_SIZE3286, (hsize_t)TBLOCK_SIZE11); /* Shouldn't succeed */ - if (was_extended == TRUE) + if (was_extended == true) TEST_ERROR; /* Try extending the block into the threshold with size < H5F_FILE_SPACE_PGEND_META_THRES */ was_extended = H5MF_try_extend(f, H5FD_MEM_OHDR, (haddr_t)addr1, (hsize_t)TBLOCK_SIZE3286, (hsize_t)TBLOCK_SIZE2); /* Should succeed */ - if (was_extended != TRUE) + if (was_extended != true) TEST_ERROR; /* Free the block with addr3--will merge with the remaining sections to become a page and then free @@ -8272,14 +8272,14 @@ test_page_small_try_extend(const char *env_h5_drvr, hid_t fapl) was_extended = H5MF_try_extend(f, H5FD_MEM_DRAW, (haddr_t)saddr1, (hsize_t)TBLOCK_SIZE4086, (hsize_t)TBLOCK_SIZE11); /* Shouldn't succeed */ - if (was_extended == TRUE) + if (was_extended == true) TEST_ERROR; /* Try extending the block not crossing page boundary */ was_extended = H5MF_try_extend(f, H5FD_MEM_DRAW, (haddr_t)saddr1, (hsize_t)TBLOCK_SIZE4086, (hsize_t)TBLOCK_SIZE10); /* Should succeed */ - if (was_extended != TRUE) + if (was_extended != true) TEST_ERROR; /* The extended block is now "large" in size */ @@ -8287,7 +8287,7 @@ test_page_small_try_extend(const char *env_h5_drvr, hid_t fapl) was_extended = H5MF_try_extend(f, H5FD_MEM_DRAW, (haddr_t)saddr1, (hsize_t)TBLOCK_SIZE4096, (hsize_t)TBLOCK_SIZE10); /* Should succeed */ - if (was_extended != TRUE) + if (was_extended != true) TEST_ERROR; /* Try extending the large-sized block */ @@ -8295,7 +8295,7 @@ test_page_small_try_extend(const char *env_h5_drvr, hid_t fapl) (hsize_t)TBLOCK_SIZE5000); /* Should not succeed because the mis-aligned fragment in the page is in the large-sized free-space * manager */ - if (was_extended == TRUE) + if (was_extended == true) TEST_ERROR; /* Close the file */ @@ -8345,14 +8345,14 @@ test_page_large_try_extend(const char *env_h5_drvr, hid_t fapl) hid_t fcpl = -1; /* File creation property list */ H5F_t *f = NULL; /* Internal file object pointer */ haddr_t gaddr1, gaddr2, gaddr3, gaddr4; /* Addresses for large data blocks */ - hbool_t contig_addr_vfd; /* Whether VFD used has a contiguous address space */ + bool contig_addr_vfd; /* Whether VFD used has a contiguous address space */ htri_t was_extended; /* Whether the block can be extended or not */ char filename[FILENAME_LEN]; /* Filename to use */ TESTING("Paged aggregation for file space: H5MF_try_extend() a large block"); /* Current VFD that does not support continuous address space */ - contig_addr_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); + contig_addr_vfd = (bool)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); if (contig_addr_vfd) { @@ -8364,7 +8364,7 @@ test_page_large_try_extend(const char *env_h5_drvr, hid_t fapl) FAIL_STACK_ERROR; /* Set the strategy to paged aggregation */ - if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, FALSE, (hsize_t)1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, false, (hsize_t)1) < 0) FAIL_STACK_ERROR; /* Create the file to work on */ @@ -8386,7 +8386,7 @@ test_page_large_try_extend(const char *env_h5_drvr, hid_t fapl) was_extended = H5MF_try_extend(f, H5FD_MEM_DRAW, (haddr_t)gaddr1, (hsize_t)TBLOCK_SIZE6000, (hsize_t)TBLOCK_SIZE2192); /* Should succeed */ - if (was_extended != TRUE) + if (was_extended != true) TEST_ERROR; /* Allocate a large data block with gaddr2 */ @@ -8399,7 +8399,7 @@ test_page_large_try_extend(const char *env_h5_drvr, hid_t fapl) was_extended = H5MF_try_extend(f, H5FD_MEM_DRAW, (haddr_t)gaddr1, (hsize_t)TBLOCK_SIZE8192, (hsize_t)TBLOCK_SIZE50); /* Should not succeed */ - if (was_extended == TRUE) + if (was_extended == true) TEST_ERROR; /* Allocate a large data block with gaddr3 */ @@ -8413,7 +8413,7 @@ test_page_large_try_extend(const char *env_h5_drvr, hid_t fapl) was_extended = H5MF_try_extend(f, H5FD_MEM_DRAW, (haddr_t)gaddr2, (hsize_t)TBLOCK_SIZE8000, (hsize_t)TBLOCK_SIZE100); /* Should succeed */ - if (was_extended == FALSE) + if (was_extended == false) TEST_ERROR; /* Try extending the block with gaddr2--there is no free-space section big enough to fulfill the @@ -8421,7 +8421,7 @@ test_page_large_try_extend(const char *env_h5_drvr, hid_t fapl) was_extended = H5MF_try_extend(f, H5FD_MEM_DRAW, (haddr_t)gaddr2, (hsize_t)TBLOCK_SIZE8100, (hsize_t)TBLOCK_SIZE100); /* Should not succeed */ - if (was_extended == TRUE) + if (was_extended == true) TEST_ERROR; /* Try extending the block with gaddr2--there is a free-space section big enough to fulfill the @@ -8429,7 +8429,7 @@ test_page_large_try_extend(const char *env_h5_drvr, hid_t fapl) was_extended = H5MF_try_extend(f, H5FD_MEM_DRAW, (haddr_t)gaddr2, (hsize_t)TBLOCK_SIZE8100, (hsize_t)TBLOCK_SIZE90); /* Should succeed */ - if (was_extended == FALSE) + if (was_extended == false) TEST_ERROR; /* Try extending the block with gaddr2 */ @@ -8438,7 +8438,7 @@ test_page_large_try_extend(const char *env_h5_drvr, hid_t fapl) was_extended = H5MF_try_extend(f, H5FD_MEM_DRAW, (haddr_t)gaddr2, (hsize_t)TBLOCK_SIZE8190, (hsize_t)TBLOCK_SIZE5); /* Should not succeed */ - if (was_extended == TRUE) + if (was_extended == true) TEST_ERROR; /* Allocate a large data block with gaddr4 */ @@ -8456,7 +8456,7 @@ test_page_large_try_extend(const char *env_h5_drvr, hid_t fapl) was_extended = H5MF_try_extend(f, H5FD_MEM_DRAW, (haddr_t)gaddr2, (hsize_t)TBLOCK_SIZE8190, (hsize_t)TBLOCK_SIZE5); /* Should succeed */ - if (was_extended == FALSE) + if (was_extended == false) TEST_ERROR; /* Close file */ @@ -8506,7 +8506,7 @@ test_page_large(const char *env_h5_drvr, hid_t fapl) hid_t fcpl = -1; /* File creation property list ID */ H5F_t *f = NULL; /* Internal file object pointer */ haddr_t gaddr1, gaddr2, gaddr3, gaddr4; /* Addresses for blocks */ - hbool_t contig_addr_vfd; /* Whether VFD used has a contiguous address space */ + bool contig_addr_vfd; /* Whether VFD used has a contiguous address space */ H5FS_stat_t fs_stat; /* Information for free-space manager */ h5_stat_size_t file_size; /* File size */ char filename[FILENAME_LEN]; /* Filename to use */ @@ -8514,7 +8514,7 @@ test_page_large(const char *env_h5_drvr, hid_t fapl) TESTING("Paged aggregation for file space: large allocations and de-allocations"); /* Current VFD that does not support continuous address space */ - contig_addr_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); + contig_addr_vfd = (bool)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); if (contig_addr_vfd) { @@ -8526,7 +8526,7 @@ test_page_large(const char *env_h5_drvr, hid_t fapl) FAIL_STACK_ERROR; /* Set the strategy to paged aggregation */ - if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, FALSE, (hsize_t)1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, false, (hsize_t)1) < 0) FAIL_STACK_ERROR; /* Create the file to work on */ @@ -8662,16 +8662,16 @@ test_page_small(const char *env_h5_drvr, hid_t fapl) haddr_t saddr1, saddr2; /* Addresses for small raw data blocks */ H5FS_stat_t fs_stat; /* Information for free-space manager */ char filename[FILENAME_LEN]; /* Filename to use */ - hbool_t multi = FALSE, split = FALSE, family = FALSE; + bool multi = false, split = false, family = false; TESTING("Paged aggregation for file space: small allocations and de-allocations"); if (!HDstrcmp(env_h5_drvr, "split")) - split = TRUE; + split = true; else if (!HDstrcmp(env_h5_drvr, "multi")) - multi = TRUE; + multi = true; else if (!HDstrcmp(env_h5_drvr, "family")) - family = TRUE; + family = true; if (!multi && !split) { @@ -8683,7 +8683,7 @@ test_page_small(const char *env_h5_drvr, hid_t fapl) FAIL_STACK_ERROR; /* Set the strategy to paged aggregation */ - if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, FALSE, (hsize_t)1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, false, (hsize_t)1) < 0) FAIL_STACK_ERROR; /* Create the file to work on */ @@ -8834,15 +8834,15 @@ test_page_alignment(const char *env_h5_drvr, hid_t fapl) haddr_t saddr1, saddr2; /* Addresses for small raw data blocks */ haddr_t gaddr1, gaddr2; /* Addresses for blocks */ char filename[FILENAME_LEN]; /* Filename to use */ - hbool_t split = FALSE, multi = FALSE; + bool split = false, multi = false; TESTING("Paged aggregation and H5Pset_alignment: verify proper alignment is used"); /* Check for split or multi driver */ if (!HDstrcmp(env_h5_drvr, "split")) - split = TRUE; + split = true; else if (!HDstrcmp(env_h5_drvr, "multi")) - multi = TRUE; + multi = true; if (!multi && !split) { @@ -8871,7 +8871,7 @@ test_page_alignment(const char *env_h5_drvr, hid_t fapl) hid_t memb_fapl_arr[H5FD_MEM_NTYPES]; char *memb_name[H5FD_MEM_NTYPES]; haddr_t memb_addr[H5FD_MEM_NTYPES]; - hbool_t relax; + bool relax; H5FD_mem_t mt; /* Create fapl */ @@ -8939,7 +8939,7 @@ test_page_alignment(const char *env_h5_drvr, hid_t fapl) /* Set the strategy to paged aggregation and persisting free space */ /* The alignment to use will be the library's default file space page size */ - if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, TRUE, (hsize_t)1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, true, (hsize_t)1) < 0) TEST_ERROR; /* Create the file to work on */ @@ -9052,7 +9052,7 @@ test_page_alignment(const char *env_h5_drvr, hid_t fapl) TEST_ERROR; /* Set strategy to H5F_FSPACE_STRATEGY_AGGR but meta/raw data block is 0 as set in fapl_new */ - if (H5Pset_file_space_strategy(fcpl2, H5F_FSPACE_STRATEGY_AGGR, FALSE, (hsize_t)1) < 0) + if (H5Pset_file_space_strategy(fcpl2, H5F_FSPACE_STRATEGY_AGGR, false, (hsize_t)1) < 0) TEST_ERROR; /* fapl_new has latest format, H5Pset_alignment set, and disable meta/raw block */ @@ -9131,7 +9131,7 @@ main(void) unsigned nerrors = 0; /* Cumulative error count */ test_type_t curr_test; /* Current test being worked on */ const char *env_h5_drvr; /* File Driver value from environment */ - hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ + bool api_ctx_pushed = false; /* Whether API context pushed */ /* Get the VFD to use */ env_h5_drvr = HDgetenv(HDF5_DRIVER); @@ -9145,7 +9145,7 @@ main(void) /* Push API context */ if (H5CX_push() < 0) FAIL_STACK_ERROR; - api_ctx_pushed = TRUE; + api_ctx_pushed = true; /* Make a copy of the FAPL before adjusting the alignment */ if ((new_fapl = H5Pcopy(fapl)) < 0) @@ -9206,32 +9206,32 @@ main(void) } /* end for */ /* For old and new format--interaction with temporary file space allocation */ - nerrors += test_mf_tmp(env_h5_drvr, fapl, FALSE); - nerrors += test_mf_tmp(env_h5_drvr, fapl, TRUE); + nerrors += test_mf_tmp(env_h5_drvr, fapl, false); + nerrors += test_mf_tmp(env_h5_drvr, fapl, true); /* For old and new format--free-space merge/shrunk away */ /* Temporary: modify to skip testing for multi/split driver: fail file create when persisting free-space or using paged aggregation strategy */ - nerrors += test_mf_fs_gone(env_h5_drvr, fapl, FALSE); - nerrors += test_mf_fs_gone(env_h5_drvr, fapl, TRUE); + nerrors += test_mf_fs_gone(env_h5_drvr, fapl, false); + nerrors += test_mf_fs_gone(env_h5_drvr, fapl, true); /* Temporary: modify to skip testing multi/split driver: fail file create when persisting free-space or using paged aggregation strategy */ - nerrors += test_mf_strat_thres_gone(env_h5_drvr, fapl, FALSE); - nerrors += test_mf_strat_thres_gone(env_h5_drvr, fapl, TRUE); + nerrors += test_mf_strat_thres_gone(env_h5_drvr, fapl, false); + nerrors += test_mf_strat_thres_gone(env_h5_drvr, fapl, true); /* For old and new format--persisting free-space */ /* Temporary: Modify to skip testing for multi/split driver: fail file create when persisting free-space or using paged aggregation strategy */ - nerrors += test_mf_fs_persist(env_h5_drvr, fapl, FALSE); - nerrors += test_mf_fs_persist(env_h5_drvr, fapl, TRUE); + nerrors += test_mf_fs_persist(env_h5_drvr, fapl, false); + nerrors += test_mf_fs_persist(env_h5_drvr, fapl, true); /* Temporary: modify to skip testing for multi/split driver: fail file create when persisting free-space or using paged aggregation strategy */ - nerrors += test_mf_strat_thres_persist(env_h5_drvr, fapl, FALSE); - nerrors += test_mf_strat_thres_persist(env_h5_drvr, fapl, TRUE); + nerrors += test_mf_strat_thres_persist(env_h5_drvr, fapl, false); + nerrors += test_mf_strat_thres_persist(env_h5_drvr, fapl, true); /* Temporary skipped for multi/split drivers: fail file create when persisting free-space or using paged aggregation strategy */ @@ -9262,9 +9262,9 @@ main(void) h5_cleanup(FILENAME, fapl); /* Pop API context */ - if (api_ctx_pushed && H5CX_pop(FALSE) < 0) + if (api_ctx_pushed && H5CX_pop(false) < 0) FAIL_STACK_ERROR; - api_ctx_pushed = FALSE; + api_ctx_pushed = false; if (nerrors) goto error; @@ -9282,7 +9282,7 @@ error: H5E_END_TRY if (api_ctx_pushed) - H5CX_pop(FALSE); + H5CX_pop(false); return (1); } /* main() */ diff --git a/test/mirror_vfd.c b/test/mirror_vfd.c index e0068c0..4e14948 100644 --- a/test/mirror_vfd.c +++ b/test/mirror_vfd.c @@ -115,7 +115,7 @@ static herr_t _close_chunking_ids(unsigned min_dset, unsigned max_dset, hid_t *d hid_t *filespace_ids, hid_t *dataset_ids, hid_t *memspace_id); static herr_t populate_filepath(const char *dirname, const char *_basename, hid_t fapl_id, char *path_out, - hbool_t h5suffix); + bool h5suffix); static hid_t create_mirroring_split_fapl(const char *_basename, struct mirrortest_filenames *names, const struct mt_opts *opts); @@ -125,15 +125,15 @@ static hid_t create_mirroring_split_fapl(const char *_basename, struct mirrortes * * Purpose: Given a directory name and a base name, concatenate the two and * run h5fixname() to get the "actual" path to the intended target. - * `h5suffix' should be FALSE to keep the base name unaltered; - * TRUE will append the '.h5' h5suffix to the basename... - * FALSE -> h5fixname_no_suffix(), TRUE -> h5fixname() + * `h5suffix' should be false to keep the base name unaltered; + * true will append the '.h5' h5suffix to the basename... + * false -> h5fixname_no_suffix(), true -> h5fixname() * <h5fixname_prefix> / <dirname> / <basename> <h5prefix?> * * ---------------------------------------------------------------------------- */ static herr_t -populate_filepath(const char *dirname, const char *basename, hid_t fapl_id, char *path_out, hbool_t h5suffix) +populate_filepath(const char *dirname, const char *basename, hid_t fapl_id, char *path_out, bool h5suffix) { char *path = NULL; @@ -148,7 +148,7 @@ populate_filepath(const char *dirname, const char *basename, hid_t fapl_id, char basename) > H5FD_SPLITTER_PATH_MAX) TEST_ERROR; - if (h5suffix == TRUE) { + if (h5suffix == true) { if (h5_fixname(path, fapl_id, path_out, H5FD_SPLITTER_PATH_MAX) == NULL) TEST_ERROR; } @@ -184,10 +184,10 @@ build_paths(const char *basename, H5FD_splitter_vfd_config_t *splitter_config, if (NULL == (baselogname = calloc(H5FD_SPLITTER_PATH_MAX, sizeof(char)))) TEST_ERROR; - if (populate_filepath(MIRROR_RW_DIR, basename, splitter_config->rw_fapl_id, names->rw, TRUE) < 0) + if (populate_filepath(MIRROR_RW_DIR, basename, splitter_config->rw_fapl_id, names->rw, true) < 0) TEST_ERROR; - if (populate_filepath(MIRROR_WO_DIR, basename, splitter_config->wo_fapl_id, names->wo, TRUE) < 0) + if (populate_filepath(MIRROR_WO_DIR, basename, splitter_config->wo_fapl_id, names->wo, true) < 0) TEST_ERROR; if (basename == NULL || *basename == 0) @@ -195,7 +195,7 @@ build_paths(const char *basename, H5FD_splitter_vfd_config_t *splitter_config, if (HDsnprintf(baselogname, H5FD_SPLITTER_PATH_MAX, "%s_err.log", basename) > H5FD_SPLITTER_PATH_MAX) TEST_ERROR; - if (populate_filepath(MIRROR_WO_DIR, baselogname, splitter_config->wo_fapl_id, names->log, FALSE) < 0) + if (populate_filepath(MIRROR_WO_DIR, baselogname, splitter_config->wo_fapl_id, names->log, false) < 0) TEST_ERROR; free(baselogname); @@ -1217,7 +1217,7 @@ create_mirroring_split_fapl(const char *basename, struct mirrortest_filenames *n */ splitter_config->magic = H5FD_SPLITTER_MAGIC; splitter_config->version = H5FD_CURR_SPLITTER_VFD_CONFIG_VERSION; - splitter_config->ignore_wo_errs = FALSE; + splitter_config->ignore_wo_errs = false; splitter_config->rw_fapl_id = H5I_INVALID_HID; splitter_config->wo_fapl_id = H5I_INVALID_HID; diff --git a/test/mount.c b/test/mount.c index e418b25..9d87bbd 100644 --- a/test/mount.c +++ b/test/mount.c @@ -446,7 +446,7 @@ test_hide(hid_t fapl) hid_t file1 = -1, file2 = -1, grp = -1; H5O_info2_t oi1, oi2; char filename1[1024], filename2[1024]; - hbool_t same_obj; + bool same_obj; TESTING("name hiding under mount point"); h5_fixname(FILENAME[0], fapl, filename1, sizeof(filename1)); @@ -483,17 +483,17 @@ test_hide(hid_t fapl) if (H5Oget_info_by_name3(file1, "/file1", &oi2, H5O_INFO_BASIC, H5P_DEFAULT) < 0) FAIL_STACK_ERROR; - same_obj = TRUE; + same_obj = true; if (oi1.fileno == oi2.fileno) { int token_cmp; if (H5Otoken_cmp(file1, &oi1.token, &oi2.token, &token_cmp) < 0) FAIL_STACK_ERROR; if (token_cmp) - same_obj = FALSE; + same_obj = false; } else - same_obj = FALSE; + same_obj = false; if (!same_obj) { H5_FAILED(); @@ -541,7 +541,7 @@ test_assoc(hid_t fapl) hid_t file1 = -1, file2 = -1; H5O_info2_t oi1, oi2; char filename1[1024], filename2[1024]; - hbool_t same_obj; + bool same_obj; TESTING("mount point open"); h5_fixname(FILENAME[0], fapl, filename1, sizeof filename1); @@ -567,17 +567,17 @@ test_assoc(hid_t fapl) if (H5Oget_info_by_name3(file1, "/mnt1", &oi2, H5O_INFO_BASIC, H5P_DEFAULT) < 0) FAIL_STACK_ERROR; - same_obj = TRUE; + same_obj = true; if (oi1.fileno == oi2.fileno) { int token_cmp; if (H5Otoken_cmp(file1, &oi1.token, &oi2.token, &token_cmp) < 0) FAIL_STACK_ERROR; if (token_cmp) - same_obj = FALSE; + same_obj = false; } else - same_obj = FALSE; + same_obj = false; if (!same_obj) { H5_FAILED(); diff --git a/test/mtime.c b/test/mtime.c index 11668c8..4dc5957 100644 --- a/test/mtime.c +++ b/test/mtime.c @@ -46,7 +46,7 @@ main(void) signed char buf1[32], buf2[32]; char filename[1024]; int token_cmp; - hbool_t driver_is_default_compatible; + bool driver_is_default_compatible; h5_reset(); fapl = h5_fileaccess(); diff --git a/test/ntypes.c b/test/ntypes.c index 99ac151..c38feda 100644 --- a/test/ntypes.c +++ b/test/ntypes.c @@ -445,7 +445,7 @@ test_compound_dtype2(hid_t file) if ((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) TEST_ERROR; - if (H5Tequal(native_type, tid_m) != TRUE) + if (H5Tequal(native_type, tid_m) != true) TEST_ERROR; /* Verify the datatype of each field retrieved and converted */ @@ -711,7 +711,7 @@ test_compound_dtype(hid_t file) if ((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) TEST_ERROR; - if (H5Tequal(native_type, tid2) != TRUE) + if (H5Tequal(native_type, tid2) != true) TEST_ERROR; /* Verify the datatype of each field retrieved and converted */ @@ -1982,7 +1982,7 @@ test_vlstr_dtype(hid_t file) "Now we are engaged in a great civil war,", "testing whether that nation or any nation so conceived and so dedicated can long endure."}; char *rdata[SPACE1_DIM1]; /* Information read in */ - hbool_t rdata_alloc = FALSE; /* Whether the read data is allocated */ + bool rdata_alloc = false; /* Whether the read data is allocated */ hid_t dataset = -1; /* Dataset ID */ hid_t sid1 = -1; /* Dataspace ID */ hid_t tid1 = -1, dtype = -1, native_type = -1; /* Datatype ID */ @@ -2036,7 +2036,7 @@ test_vlstr_dtype(hid_t file) /* Read dataset from disk */ if (H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata) < 0) TEST_ERROR; - rdata_alloc = TRUE; + rdata_alloc = true; /* Compare data read in */ for (i = 0; i < SPACE1_DIM1; i++) { @@ -2071,7 +2071,7 @@ test_vlstr_dtype(hid_t file) /* Free memory for rdata */ for (i = 0; i < SPACE1_DIM1; i++) free(rdata[i]); - rdata_alloc = FALSE; + rdata_alloc = false; PASSED(); return 0; @@ -3052,10 +3052,10 @@ error: int main(void) { - hid_t file, fapl; - int nerrors = 0; - char filename[1024]; - hbool_t driver_is_parallel; + hid_t file, fapl; + int nerrors = 0; + char filename[1024]; + bool driver_is_parallel; h5_reset(); fapl = h5_fileaccess(); 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 */ diff --git a/test/objcopy_ref.c b/test/objcopy_ref.c index 7a81aea..05e006b 100644 --- a/test/objcopy_ref.c +++ b/test/objcopy_ref.c @@ -112,28 +112,28 @@ token_insert(H5O_info2_t *oinfo) * * 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 *oinfo) { size_t n; int token_cmp; if (oinfo->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]), &oinfo->token, &token_cmp) < 0) - return FALSE; + return false; if (0 == token_cmp) - return TRUE; + return true; } - return FALSE; + return false; } /* end token_lookup() */ /*------------------------------------------------------------------------- @@ -531,7 +531,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 * *------------------------------------------------------------------------- */ @@ -583,7 +583,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) */ @@ -601,7 +601,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) */ @@ -636,10 +636,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 || H5Tdetect_class(tid, H5T_REFERENCE) == TRUE) + if (H5Tdetect_class(tid, H5T_VLEN) == true || H5Tdetect_class(tid, H5T_REFERENCE) == true) if (H5Treclaim(tid, sid, H5P_DEFAULT, rbuf) < 0) TEST_ERROR; - if (H5Tdetect_class(tid2, H5T_VLEN) == TRUE || H5Tdetect_class(tid2, H5T_REFERENCE) == TRUE) + if (H5Tdetect_class(tid2, H5T_VLEN) == true || H5Tdetect_class(tid2, H5T_REFERENCE) == true) if (H5Treclaim(tid2, sid2, H5P_DEFAULT, rbuf2) < 0) TEST_ERROR; @@ -665,7 +665,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) @@ -680,7 +680,7 @@ error: H5Tclose(tid); } H5E_END_TRY - return FALSE; + return false; } /* end compare_attribute() */ /*------------------------------------------------------------------------- @@ -688,7 +688,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(). @@ -755,7 +755,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 @@ -764,7 +764,7 @@ error: H5Aclose(aid); } H5E_END_TRY - return FALSE; + return false; } /* end compare_std_attributes() */ /*------------------------------------------------------------------------- @@ -772,7 +772,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 * *------------------------------------------------------------------------- */ @@ -789,7 +789,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 */ @@ -852,7 +852,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++) { @@ -866,7 +866,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 */ @@ -896,7 +896,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 */ @@ -946,24 +946,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; @@ -1010,10 +1010,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() */ /*------------------------------------------------------------------------- @@ -1021,7 +1021,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 * *------------------------------------------------------------------------- */ @@ -1060,7 +1060,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) */ @@ -1078,7 +1078,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) */ @@ -1096,7 +1096,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) */ @@ -1162,10 +1162,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 || H5Tdetect_class(tid, H5T_REFERENCE) == TRUE) + if (H5Tdetect_class(tid, H5T_VLEN) == true || H5Tdetect_class(tid, H5T_REFERENCE) == true) if (H5Treclaim(tid, sid, H5P_DEFAULT, rbuf) < 0) TEST_ERROR; - if (H5Tdetect_class(tid2, H5T_VLEN) == TRUE || H5Tdetect_class(tid2, H5T_REFERENCE) == TRUE) + if (H5Tdetect_class(tid2, H5T_VLEN) == true || H5Tdetect_class(tid2, H5T_REFERENCE) == true) if (H5Treclaim(tid2, sid2, H5P_DEFAULT, rbuf2) < 0) TEST_ERROR; @@ -1192,11 +1192,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 @@ -1213,7 +1213,7 @@ error: H5Tclose(tid); } H5E_END_TRY - return FALSE; + return false; } /* end compare_datasets() */ /*------------------------------------------------------------------------- @@ -1221,7 +1221,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 * *------------------------------------------------------------------------- */ @@ -1334,19 +1334,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; @@ -1402,18 +1402,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() */ /*------------------------------------------------------------------------- @@ -1428,7 +1428,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 */ @@ -1675,7 +1675,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) @@ -1755,7 +1755,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; @@ -1918,7 +1918,7 @@ main(void) /* The tests... */ 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"); } /* end for */ /* Reset file token checking info */ diff --git a/test/ohdr.c b/test/ohdr.c index 95a4dc3..88654c6 100644 --- a/test/ohdr.c +++ b/test/ohdr.c @@ -138,7 +138,7 @@ test_cont(char *filename, hid_t fapl) nchunks = hdr_info.nchunks; /* remove the 1st H5O_NAME_ID message */ - if (H5O_msg_remove(&oh_locA, H5O_NAME_ID, 0, FALSE) < 0) + if (H5O_msg_remove(&oh_locA, H5O_NAME_ID, 0, false) < 0) FAIL_STACK_ERROR; if (H5O_get_hdr_info(&oh_locA, &hdr_info) < 0) @@ -201,7 +201,7 @@ test_ohdr_cache(char *filename, hid_t fapl) mdc_config.version = H5AC__CURR_CACHE_CONFIG_VERSION; if (H5Pget_mdc_config(my_fapl, &mdc_config) < 0) FAIL_STACK_ERROR; - mdc_config.set_initial_size = TRUE; + mdc_config.set_initial_size = true; mdc_config.initial_size = 32 * 1024; mdc_config.max_size = 64 * 1024; mdc_config.min_size = 8 * 1024; @@ -316,7 +316,7 @@ error: * bytes. For SWMR access, the read should be done all at one time. */ static herr_t -test_ohdr_swmr(hbool_t new_format) +test_ohdr_swmr(bool new_format) { hid_t fid = -1; /* File ID */ hid_t fapl = -1; /* File access property list */ @@ -652,7 +652,7 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl) FAIL_STACK_ERROR; /* Check that the "unknown" message was _NOT_ marked */ - if (H5O__check_msg_marked_test(did, FALSE) < 0) + if (H5O__check_msg_marked_test(did, false) < 0) FAIL_STACK_ERROR; /* Close the dataset */ @@ -734,7 +734,7 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl) FAIL_STACK_ERROR; /* Check that the "unknown" message was marked */ - if (H5O__check_msg_marked_test(did, TRUE) < 0) + if (H5O__check_msg_marked_test(did, true) < 0) FAIL_STACK_ERROR; /* Close the dataset */ @@ -922,7 +922,7 @@ test_minimized_dset_ohdr_attribute_addition(hid_t fapl_id) /* Set the 'no attrs' hint on the dcpl */ if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) == H5I_INVALID_HID) TEST_ERROR; - if (H5Pset_dset_no_attrs_hint(dcpl_id, TRUE) < 0) + if (H5Pset_dset_no_attrs_hint(dcpl_id, true) < 0) TEST_ERROR; /* The dataset doesn't need to contain data */ @@ -1138,14 +1138,14 @@ test_minimized_dset_ohdr_size_comparisons(hid_t fapl_id) dcpl_minimize = H5Pcreate(H5P_DATASET_CREATE); if (dcpl_minimize < 0) TEST_ERROR; - ret = H5Pset_dset_no_attrs_hint(dcpl_minimize, TRUE); + ret = H5Pset_dset_no_attrs_hint(dcpl_minimize, true); if (ret < 0) TEST_ERROR; dcpl_dontmin = H5Pcreate(H5P_DATASET_CREATE); if (dcpl_dontmin < 0) TEST_ERROR; - ret = H5Pset_dset_no_attrs_hint(dcpl_dontmin, FALSE); + ret = H5Pset_dset_no_attrs_hint(dcpl_dontmin, false); if (ret < 0) TEST_ERROR; @@ -1191,7 +1191,7 @@ test_minimized_dset_ohdr_size_comparisons(hid_t fapl_id) file_F_id = H5Fcreate(filename_b, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id); if (file_F_id < 0) TEST_ERROR; - ret = H5Fset_dset_no_attrs_hint(file_F_id, TRUE); + ret = H5Fset_dset_no_attrs_hint(file_F_id, true); if (ret < 0) TEST_ERROR; @@ -1342,7 +1342,7 @@ test_minimized_dset_ohdr_with_filter(hid_t fapl_id) dcpl_mx_id = H5Pcreate(H5P_DATASET_CREATE); if (dcpl_mx_id < 0) TEST_ERROR; - ret = H5Pset_dset_no_attrs_hint(dcpl_mx_id, TRUE); + ret = H5Pset_dset_no_attrs_hint(dcpl_mx_id, true); if (ret < 0) TEST_ERROR; @@ -1358,7 +1358,7 @@ test_minimized_dset_ohdr_with_filter(hid_t fapl_id) dcpl_mZ_id = H5Pcreate(H5P_DATASET_CREATE); if (dcpl_mZ_id < 0) TEST_ERROR; - ret = H5Pset_dset_no_attrs_hint(dcpl_mZ_id, TRUE); + ret = H5Pset_dset_no_attrs_hint(dcpl_mZ_id, true); if (ret < 0) TEST_ERROR; ret = H5Pset_chunk(dcpl_mZ_id, ndims, chunk_dim); @@ -1517,34 +1517,34 @@ test_minimized_dset_ohdr_modification_times(hid_t _fapl_id) dcpl_mx_id = H5Pcreate(H5P_DATASET_CREATE); if (dcpl_mx_id < 0) TEST_ERROR; - ret = H5Pset_dset_no_attrs_hint(dcpl_mx_id, TRUE); + ret = H5Pset_dset_no_attrs_hint(dcpl_mx_id, true); if (ret < 0) TEST_ERROR; dcpl_xT_id = H5Pcreate(H5P_DATASET_CREATE); if (dcpl_xT_id < 0) TEST_ERROR; - ret = H5Pset_obj_track_times(dcpl_xT_id, TRUE); + ret = H5Pset_obj_track_times(dcpl_xT_id, true); if (ret < 0) TEST_ERROR; dcpl_mT_id = H5Pcreate(H5P_DATASET_CREATE); if (dcpl_mT_id < 0) TEST_ERROR; - ret = H5Pset_dset_no_attrs_hint(dcpl_mT_id, TRUE); + ret = H5Pset_dset_no_attrs_hint(dcpl_mT_id, true); if (ret < 0) TEST_ERROR; - ret = H5Pset_obj_track_times(dcpl_mT_id, TRUE); + ret = H5Pset_obj_track_times(dcpl_mT_id, true); if (ret < 0) TEST_ERROR; dcpl_mN_id = H5Pcreate(H5P_DATASET_CREATE); if (dcpl_mN_id < 0) TEST_ERROR; - ret = H5Pset_dset_no_attrs_hint(dcpl_mN_id, TRUE); + ret = H5Pset_dset_no_attrs_hint(dcpl_mN_id, true); if (ret < 0) TEST_ERROR; - ret = H5Pset_obj_track_times(dcpl_mN_id, FALSE); + ret = H5Pset_obj_track_times(dcpl_mN_id, false); if (ret < 0) TEST_ERROR; @@ -1720,7 +1720,7 @@ test_minimized_dset_ohdr_fillvalue_backwards_compatability(hid_t _fapl_id) if (dcpl_id < 0) TEST_ERROR; - ret = H5Pset_dset_no_attrs_hint(dcpl_id, TRUE); + ret = H5Pset_dset_no_attrs_hint(dcpl_id, true); if (ret == FAIL) TEST_ERROR; @@ -1828,14 +1828,14 @@ main(void) hid_t file = -1; H5F_t *f = NULL; const char *env_h5_drvr; /* File driver value from environment */ - hbool_t single_file_vfd; /* Whether VFD used stores data in a single file */ + bool single_file_vfd; /* Whether VFD used stores data in a single file */ char filename[1024]; H5O_hdr_info_t hdr_info; /* Object info */ H5O_loc_t oh_loc; /* Object header locations */ H5F_libver_t low, high; /* File format bounds */ time_t time_new, ro; int i; /* Local index variable */ - hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ + bool api_ctx_pushed = false; /* Whether API context pushed */ herr_t ret; /* Generic return value */ /* Get the VFD to use */ @@ -1854,7 +1854,7 @@ main(void) /* Push API context */ if (H5CX_push() < 0) FAIL_STACK_ERROR; - api_ctx_pushed = TRUE; + api_ctx_pushed = true; /* Loop through all the combinations of low/high library format bounds */ for (low = H5F_LIBVER_EARLIEST; low < H5F_LIBVER_NBOUNDS; low++) { @@ -2029,9 +2029,9 @@ main(void) * Delete all time messages. */ TESTING("message deletion"); - if (H5O_msg_remove(&oh_loc, H5O_MTIME_NEW_ID, H5O_ALL, TRUE) < 0) + if (H5O_msg_remove(&oh_loc, H5O_MTIME_NEW_ID, H5O_ALL, true) < 0) FAIL_STACK_ERROR; - if (H5O_msg_remove(&oh_loc, H5O_MTIME_ID, H5O_ALL, TRUE) < 0) + if (H5O_msg_remove(&oh_loc, H5O_MTIME_ID, H5O_ALL, true) < 0) FAIL_STACK_ERROR; if (H5O_msg_read(&oh_loc, H5O_MTIME_NEW_ID, &ro)) FAIL_STACK_ERROR; @@ -2067,7 +2067,7 @@ main(void) H5E_END_TRY if (ret >= 0) TEST_ERROR; - if (H5O_msg_remove(&oh_loc, H5O_MTIME_NEW_ID, H5O_ALL, TRUE) < 0) + if (H5O_msg_remove(&oh_loc, H5O_MTIME_NEW_ID, H5O_ALL, true) < 0) FAIL_STACK_ERROR; PASSED(); @@ -2134,18 +2134,18 @@ main(void) if (H5FD__supports_swmr_test(env_h5_drvr)) { /* A test to exercise the re-read of the object header for SWMR access */ - if (test_ohdr_swmr(TRUE) < 0) + if (test_ohdr_swmr(true) < 0) TEST_ERROR; - if (test_ohdr_swmr(FALSE) < 0) + if (test_ohdr_swmr(false) < 0) TEST_ERROR; } else HDputs("Skipped SWMR tests for SWMR-incompatible VFD"); /* Pop API context */ - if (api_ctx_pushed && H5CX_pop(FALSE) < 0) + if (api_ctx_pushed && H5CX_pop(false) < 0) FAIL_STACK_ERROR; - api_ctx_pushed = FALSE; + api_ctx_pushed = false; HDputs("All object header tests passed."); h5_cleanup(FILENAME, fapl); @@ -2160,7 +2160,7 @@ error: H5E_END_TRY if (api_ctx_pushed) - H5CX_pop(FALSE); + H5CX_pop(false); return 1; } /* end main() */ diff --git a/test/onion.c b/test/onion.c index eb44a4f..576d8ad 100644 --- a/test/onion.c +++ b/test/onion.c @@ -68,7 +68,7 @@ struct write_info { const unsigned char *buf; }; struct revise_revision { - hbool_t truncate; /* onion-create, truncating any existing data */ + bool truncate; /* onion-create, truncating any existing data */ uint64_t revision_num; size_t n_writes; struct write_info writes[ONION_TEST_REV_REV_WRITES_MAX]; @@ -1308,7 +1308,7 @@ test_revision_record_encode_decode(void) uint64_t size_ret; H5FD_onion_revision_record_t r_out; uint32_t checksum = 0; - hbool_t badness = FALSE; + bool badness = false; char comment[25] = "Example comment message."; H5FD_onion_revision_record_t record = { H5FD_ONION_REVISION_RECORD_VERSION_CURR, @@ -1386,7 +1386,7 @@ test_revision_record_encode_decode(void) for (i = 0; i < exp_size; i++) { if (exp[i] != buf[i]) { - badness = TRUE; + badness = true; printf("Bad encoded record - Index %zu: expected 0x%02X but got 0x%02X\n", i, (unsigned int)exp[i], (unsigned int)buf[i]); } @@ -1897,9 +1897,9 @@ error: * Purpose: Test the ability of the Onion VFD to create a valid * 'onionized' file. * - * When `truncate_canonical` is FALSE, the canonical file is + * When `truncate_canonical` is false, the canonical file is * nonexistent on the backing store on onion-creation. - * When `truncate_canonical` is TRUE, a canonical file is created + * When `truncate_canonical` is true, a canonical file is created * on the backing store with known contents, which are to be * truncated on onion-creation. * @@ -1908,7 +1908,7 @@ error: *----------------------------------------------------------------------------- */ static int -test_create_oniontarget(hbool_t truncate_canonical, hbool_t with_initial_data) +test_create_oniontarget(bool truncate_canonical, bool with_initial_data) { const char *basename = "somesuch"; hid_t fapl_id = H5I_INVALID_HID; @@ -1929,11 +1929,11 @@ test_create_oniontarget(hbool_t truncate_canonical, hbool_t with_initial_data) struct expected_history filter; char *buf = NULL; - if (TRUE == truncate_canonical && TRUE == with_initial_data) + if (true == truncate_canonical && true == with_initial_data) TESTING("onion creation; truncate extant canonical; w/ initial data"); - else if (TRUE == truncate_canonical) + else if (true == truncate_canonical) TESTING("onion creation; truncate extant canonical; no initial data"); - else if (TRUE == with_initial_data) + else if (true == with_initial_data) TESTING("onion creation; no extant canonical; w/ initial data"); else TESTING("onion creation; no extant canonical; no initial data"); @@ -1955,7 +1955,7 @@ test_create_oniontarget(hbool_t truncate_canonical, hbool_t with_initial_data) HDremove(paths->recovery); /* Create canonical file to be truncated */ - if (TRUE == truncate_canonical) { + if (true == truncate_canonical) { /* Create canonical file. */ vfile_raw = H5FDopen(paths->canon, flags_create_s, onion_info.backing_fapl_id, HADDR_UNDEF); if (NULL == vfile_raw) @@ -2017,7 +2017,7 @@ test_create_oniontarget(hbool_t truncate_canonical, hbool_t with_initial_data) * WRITING */ - if (TRUE == with_initial_data) { + if (true == with_initial_data) { haddr_t half_size = 0; haddr_t buf_size = 0; @@ -2111,7 +2111,7 @@ test_create_oniontarget(hbool_t truncate_canonical, hbool_t with_initial_data) filter.revisions[0].n_index_entries = (uint64_t)(-1); /* don't care */ filter.revisions[0].revision_num = 0; filter.revisions[0].parent_revision_num = 0; - filter.revisions[0].logical_eof = (TRUE == with_initial_data) ? a_list_size_s : 0; + filter.revisions[0].logical_eof = (true == with_initial_data) ? a_list_size_s : 0; if (verify_history_as_expected_onion(vfile_raw, &filter) < 0) TEST_ERROR; @@ -2126,7 +2126,7 @@ test_create_oniontarget(hbool_t truncate_canonical, hbool_t with_initial_data) if (NULL == vfile_ro) TEST_ERROR; - if (TRUE == with_initial_data) { + if (true == with_initial_data) { /* Initial revision contains data */ if (H5FDget_eof(vfile_ro, H5FD_MEM_DRAW) != a_list_size_s) TEST_ERROR; @@ -2204,9 +2204,9 @@ error: * Purpose: Test the ability of the Onion VFD to create a valid * 'onionized' file. * - * When `truncate_canonical` is FALSE, the canonical file is + * When `truncate_canonical` is false, the canonical file is * nonexistent on the backing store on onion-creation. - * When `truncate_canonical` is TRUE, a canonical file is created + * When `truncate_canonical` is true, a canonical file is created * on the backing store with known contents, which are to be * truncated on onion-creation. * @@ -2263,12 +2263,12 @@ test_several_revisions_with_logical_gaps(void) HDremove(paths->recovery); /* Empty first revision */ - about[0].truncate = TRUE; + about[0].truncate = true; about[0].revision_num = H5FD_ONION_FAPL_INFO_REVISION_ID_LATEST; about[0].comment = "first"; about[0].n_writes = 0; - about[1].truncate = FALSE; + about[1].truncate = false; about[1].revision_num = H5FD_ONION_FAPL_INFO_REVISION_ID_LATEST; about[1].comment = "second"; about[1].n_writes = 1; @@ -2276,7 +2276,7 @@ test_several_revisions_with_logical_gaps(void) about[1].writes[0].size = a_list_size_s; about[1].writes[0].buf = a_list_s; - about[2].truncate = FALSE; + about[2].truncate = false; about[2].revision_num = H5FD_ONION_FAPL_INFO_REVISION_ID_LATEST; about[2].comment = "third"; about[2].n_writes = 1; /* TODO: several writes */ @@ -2284,7 +2284,7 @@ test_several_revisions_with_logical_gaps(void) about[2].writes[0].size = b_list_size_s; about[2].writes[0].buf = b_list_s; - about[3].truncate = FALSE; + about[3].truncate = false; about[3].revision_num = H5FD_ONION_FAPL_INFO_REVISION_ID_LATEST; about[3].comment = "fourth"; about[3].n_writes = 1; @@ -2577,10 +2577,10 @@ do_onion_open_and_writes(const char *filename, H5FD_onion_fapl_info_t *onion_inf size_t j = 0; unsigned int flags = H5F_ACC_RDWR; - if (i != 0 && about[i].truncate == TRUE) + if (i != 0 && about[i].truncate == true) goto error; - if (TRUE == about[i].truncate) + if (true == about[i].truncate) flags |= H5F_ACC_CREAT | H5F_ACC_TRUNC; onion_info_p->revision_num = about[i].revision_num; @@ -2712,7 +2712,7 @@ test_page_aligned_history_create(void) HDremove(paths->onion); HDremove(paths->recovery); - about[0].truncate = TRUE; + about[0].truncate = true; about[0].revision_num = H5FD_ONION_FAPL_INFO_REVISION_ID_LATEST; about[0].comment = "initial_commit"; about[0].n_writes = 1; @@ -2720,7 +2720,7 @@ test_page_aligned_history_create(void) about[0].writes[0].size = b_list_size_s; about[0].writes[0].buf = b_list_s; - about[1].truncate = FALSE; + about[1].truncate = false; about[1].revision_num = H5FD_ONION_FAPL_INFO_REVISION_ID_LATEST; about[1].comment = "second"; about[1].n_writes = 1; @@ -4941,10 +4941,10 @@ main(void) nerrors -= test_history_encode_decode_empty(); nerrors -= test_history_encode_decode(); nerrors -= test_revision_record_encode_decode(); - nerrors -= test_create_oniontarget(FALSE, FALSE); - nerrors -= test_create_oniontarget(TRUE, FALSE); - nerrors -= test_create_oniontarget(FALSE, TRUE); - nerrors -= test_create_oniontarget(TRUE, TRUE); + nerrors -= test_create_oniontarget(false, false); + nerrors -= test_create_oniontarget(true, false); + nerrors -= test_create_oniontarget(false, true); + nerrors -= test_create_oniontarget(true, true); nerrors -= test_several_revisions_with_logical_gaps(); nerrors -= test_page_aligned_history_create(); nerrors -= test_integration_create(); diff --git a/test/page_buffer.c b/test/page_buffer.c index 6eed35f..6fd3528 100644 --- a/test/page_buffer.c +++ b/test/page_buffer.c @@ -301,20 +301,20 @@ error: static unsigned set_multi_split(const char *env_h5_drvr, hid_t fapl, hsize_t pagesize) { - hbool_t split = FALSE; - hbool_t multi = FALSE; + bool split = false; + bool multi = false; H5FD_mem_t memb_map[H5FD_MEM_NTYPES]; hid_t memb_fapl_arr[H5FD_MEM_NTYPES]; char *memb_name[H5FD_MEM_NTYPES]; haddr_t memb_addr[H5FD_MEM_NTYPES]; - hbool_t relax; + bool relax; H5FD_mem_t mt; /* Check for split or multi driver */ if (!HDstrcmp(env_h5_drvr, "split")) - split = TRUE; + split = true; else if (!HDstrcmp(env_h5_drvr, "multi")) - multi = TRUE; + multi = true; if (split || multi) { @@ -2067,7 +2067,7 @@ main(void) hid_t fapl = -1; /* File access property list for data files */ unsigned nerrors = 0; /* Cumulative error count */ const char *env_h5_drvr = NULL; /* File Driver value from environment */ - hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ + bool api_ctx_pushed = false; /* Whether API context pushed */ h5_reset(); @@ -2095,7 +2095,7 @@ main(void) /* Push API context */ if (H5CX_push() < 0) FAIL_STACK_ERROR; - api_ctx_pushed = TRUE; + api_ctx_pushed = true; #ifdef H5_HAVE_PARALLEL @@ -2118,9 +2118,9 @@ main(void) goto error; /* Pop API context */ - if (api_ctx_pushed && H5CX_pop(FALSE) < 0) + if (api_ctx_pushed && H5CX_pop(false) < 0) FAIL_STACK_ERROR; - api_ctx_pushed = FALSE; + api_ctx_pushed = false; HDputs("All Page Buffering tests passed."); @@ -2136,7 +2136,7 @@ error: H5E_END_TRY if (api_ctx_pushed) - H5CX_pop(FALSE); + H5CX_pop(false); exit(EXIT_FAILURE); } /* main() */ diff --git a/test/ros3.c b/test/ros3.c index 267aa0a..52470f2 100644 --- a/test/ros3.c +++ b/test/ros3.c @@ -349,12 +349,12 @@ jserr_str(const char *expected, const char *actual, const char *reason) #define S3_TEST_RESOURCE_H5_PUBLIC "GMODO-SVM01.h5" #define S3_TEST_RESOURCE_MISSING "missing.csv" -static char url_text_restricted[S3_TEST_MAX_URL_SIZE] = ""; -static char url_text_public[S3_TEST_MAX_URL_SIZE] = ""; -static char url_h5_public[S3_TEST_MAX_URL_SIZE] = ""; -static char url_missing[S3_TEST_MAX_URL_SIZE] = ""; -static char s3_test_bucket_url[S3_TEST_MAX_URL_SIZE] = ""; -static hbool_t s3_test_bucket_defined = FALSE; +static char url_text_restricted[S3_TEST_MAX_URL_SIZE] = ""; +static char url_text_public[S3_TEST_MAX_URL_SIZE] = ""; +static char url_h5_public[S3_TEST_MAX_URL_SIZE] = ""; +static char url_missing[S3_TEST_MAX_URL_SIZE] = ""; +static char s3_test_bucket_url[S3_TEST_MAX_URL_SIZE] = ""; +static bool s3_test_bucket_defined = false; /* Global variables for aws test profile. * An attempt is made to read ~/.aws/credentials and ~/.aws/config upon test @@ -367,12 +367,12 @@ static char s3_test_aws_access_key_id[64]; static char s3_test_aws_secret_access_key[128]; H5FD_ros3_fapl_t restricted_access_fa = {H5FD_CURR_ROS3_FAPL_T_VERSION, /* fapl version */ - TRUE, /* authenticate */ + true, /* authenticate */ "", /* aws region */ "", /* access key id */ ""}; /* secret access key */ -H5FD_ros3_fapl_t anonymous_fa = {H5FD_CURR_ROS3_FAPL_T_VERSION, FALSE, "", "", ""}; +H5FD_ros3_fapl_t anonymous_fa = {H5FD_CURR_ROS3_FAPL_T_VERSION, false, "", "", ""}; /*--------------------------------------------------------------------------- * @@ -427,7 +427,7 @@ test_fapl_config_validation(void) SUCCEED, { H5FD_CURR_ROS3_FAPL_T_VERSION, /* version */ - FALSE, /* authenticate */ + false, /* authenticate */ "", /* aws_region */ "", /* secret_id */ "", /* secret_key */ @@ -438,7 +438,7 @@ test_fapl_config_validation(void) FAIL, { H5FD_CURR_ROS3_FAPL_T_VERSION, - TRUE, + true, "", "", "", @@ -449,7 +449,7 @@ test_fapl_config_validation(void) SUCCEED, { H5FD_CURR_ROS3_FAPL_T_VERSION, - TRUE, + true, "region", "me", "", @@ -460,7 +460,7 @@ test_fapl_config_validation(void) FAIL, { H5FD_CURR_ROS3_FAPL_T_VERSION, - TRUE, + true, "", "me", "", @@ -471,7 +471,7 @@ test_fapl_config_validation(void) FAIL, { H5FD_CURR_ROS3_FAPL_T_VERSION, - TRUE, + true, "where", "", "", @@ -482,7 +482,7 @@ test_fapl_config_validation(void) SUCCEED, { H5FD_CURR_ROS3_FAPL_T_VERSION, - TRUE, + true, "where", "who", "thisIsA GREAT seeeecrit", @@ -493,7 +493,7 @@ test_fapl_config_validation(void) FAIL, { 12345, - FALSE, + false, "", "", "", @@ -505,7 +505,7 @@ test_fapl_config_validation(void) SUCCEED, { H5FD_CURR_ROS3_FAPL_T_VERSION, - FALSE, + false, "someregion", "someid", "somekey", @@ -519,7 +519,7 @@ test_fapl_config_validation(void) * TESTS * *********/ - if (FALSE == s3_test_bucket_defined) { + if (false == s3_test_bucket_defined) { SKIPPED(); HDputs(" environment variable HDF5_ROS3_TEST_BUCKET_URL not defined"); fflush(stdout); @@ -625,7 +625,7 @@ test_ros3_fapl(void) unsigned long driver_flags = 0; /* VFD feature flags */ H5FD_ros3_fapl_t ros3_fa_0 = { H5FD_CURR_ROS3_FAPL_T_VERSION, /* version */ - FALSE, /* authenticate */ + false, /* authenticate */ "", /* aws_region */ "", /* secret_id */ "plugh", /* secret_key */ @@ -786,7 +786,7 @@ test_vfd_open(void) }, }; H5FD_t *fd = NULL; - hbool_t curl_ready = FALSE; + bool curl_ready = false; hid_t fapl_id = -1; hid_t fapl_file_access = -1; unsigned i = 0; @@ -794,7 +794,7 @@ test_vfd_open(void) TESTING("ROS3 VFD-level open"); - if (FALSE == s3_test_bucket_defined) { + if (false == s3_test_bucket_defined) { SKIPPED(); HDputs(" environment variable HDF5_ROS3_TEST_BUCKET_URL not defined"); fflush(stdout); @@ -802,7 +802,7 @@ test_vfd_open(void) } FAIL_IF(CURLE_OK != curl_global_init(CURL_GLOBAL_DEFAULT)) - curl_ready = TRUE; + curl_ready = true; fapl_file_access = H5Pcreate(H5P_FILE_ACCESS); FAIL_IF(fapl_file_access < 0) @@ -858,7 +858,7 @@ test_vfd_open(void) fapl_file_access = -1; curl_global_cleanup(); - curl_ready = FALSE; + curl_ready = false; PASSED(); return 0; @@ -885,7 +885,7 @@ error: } H5E_END_TRY } - if (curl_ready == TRUE) { + if (curl_ready == true) { curl_global_cleanup(); } @@ -929,7 +929,7 @@ test_eof_eoa(void) ************************/ H5FD_t *fd_shakespeare = NULL; - hbool_t curl_ready = FALSE; + bool curl_ready = false; hid_t fapl_id = -1; TESTING("ROS3 eof/eoa gets and sets"); @@ -941,7 +941,7 @@ test_eof_eoa(void) return 0; } - if (FALSE == s3_test_bucket_defined) { + if (false == s3_test_bucket_defined) { SKIPPED(); HDputs(" environment variable HDF5_ROS3_TEST_BUCKET_URL not defined"); fflush(stdout); @@ -953,7 +953,7 @@ test_eof_eoa(void) *********/ FAIL_IF(CURLE_OK != curl_global_init(CURL_GLOBAL_DEFAULT)) - curl_ready = TRUE; + curl_ready = true; fapl_id = H5Pcreate(H5P_FILE_ACCESS); FAIL_IF(0 > fapl_id) @@ -995,7 +995,7 @@ test_eof_eoa(void) fapl_id = -1; curl_global_cleanup(); - curl_ready = FALSE; + curl_ready = false; PASSED(); return 0; @@ -1007,7 +1007,7 @@ error: if (fd_shakespeare) (void)H5FDclose(fd_shakespeare); - if (TRUE == curl_ready) + if (true == curl_ready) curl_global_cleanup(); if (fapl_id >= 0) { H5E_BEGIN_TRY @@ -1049,7 +1049,7 @@ test_H5FDread_without_eoa_set_fails(void) return 0; } - if (FALSE == s3_test_bucket_defined) { + if (false == s3_test_bucket_defined) { SKIPPED(); HDputs(" environment variable HDF5_ROS3_TEST_BUCKET_URL not defined"); fflush(stdout); @@ -1220,7 +1220,7 @@ test_read(void) return 0; } - if (FALSE == s3_test_bucket_defined) { + if (false == s3_test_bucket_defined) { SKIPPED(); HDputs(" environment variable HDF5_ROS3_TEST_BUCKET_URL not defined"); fflush(stdout); @@ -1347,14 +1347,14 @@ test_noops_and_autofails(void) * test-local variables * ************************/ - hbool_t curl_ready = FALSE; + bool curl_ready = false; hid_t fapl_id = -1; H5FD_t *file = NULL; const char data[36] = "The Force shall be with you, always"; TESTING("ROS3 VFD always-fail and no-op routines"); - if (FALSE == s3_test_bucket_defined) { + if (false == s3_test_bucket_defined) { SKIPPED(); HDputs(" environment variable HDF5_ROS3_TEST_BUCKET_URL not defined"); fflush(stdout); @@ -1366,7 +1366,7 @@ test_noops_and_autofails(void) *********/ FAIL_IF(CURLE_OK != curl_global_init(CURL_GLOBAL_DEFAULT)) - curl_ready = TRUE; + curl_ready = true; /* create ROS3 fapl */ @@ -1388,10 +1388,10 @@ test_noops_and_autofails(void) H5E_BEGIN_TRY{JSVERIFY(FAIL, H5FDwrite(file, H5FD_MEM_DRAW, H5P_DEFAULT, 1000, 35, data), "write must fail")} H5E_END_TRY - H5E_BEGIN_TRY{JSVERIFY(FAIL, H5FDtruncate(file, H5P_DEFAULT, FALSE), "truncate must fail")} H5E_END_TRY + H5E_BEGIN_TRY{JSVERIFY(FAIL, H5FDtruncate(file, H5P_DEFAULT, false), "truncate must fail")} H5E_END_TRY H5E_BEGIN_TRY{ - JSVERIFY(FAIL, H5FDtruncate(file, H5P_DEFAULT, TRUE), "truncate must fail (closing)")} H5E_END_TRY + JSVERIFY(FAIL, H5FDtruncate(file, H5P_DEFAULT, true), "truncate must fail (closing)")} H5E_END_TRY /************ * TEARDOWN * @@ -1404,7 +1404,7 @@ test_noops_and_autofails(void) fapl_id = -1; curl_global_cleanup(); - curl_ready = FALSE; + curl_ready = false; PASSED(); return 0; @@ -1424,7 +1424,7 @@ error: if (file) { (void)H5FDclose(file); } - if (curl_ready == TRUE) { + if (curl_ready == true) { curl_global_cleanup(); } @@ -1466,7 +1466,7 @@ test_cmp(void) H5FD_t *fd_raven = NULL; H5FD_t *fd_shakes = NULL; H5FD_t *fd_raven_2 = NULL; - hbool_t curl_ready = FALSE; + bool curl_ready = false; hid_t fapl_id = -1; TESTING("ROS3 cmp (comparison)"); @@ -1478,7 +1478,7 @@ test_cmp(void) return 0; } - if (FALSE == s3_test_bucket_defined) { + if (false == s3_test_bucket_defined) { SKIPPED(); HDputs(" environment variable HDF5_ROS3_TEST_BUCKET_URL not defined"); fflush(stdout); @@ -1490,7 +1490,7 @@ test_cmp(void) *********/ FAIL_IF(CURLE_OK != curl_global_init(CURL_GLOBAL_DEFAULT)) - curl_ready = TRUE; + curl_ready = true; fapl_id = H5Pcreate(H5P_FILE_ACCESS); FAIL_IF(0 > fapl_id) @@ -1527,7 +1527,7 @@ test_cmp(void) fapl_id = -1; curl_global_cleanup(); - curl_ready = FALSE; + curl_ready = false; PASSED(); return 0; @@ -1543,7 +1543,7 @@ error: (void)H5FDclose(fd_raven_2); if (fd_shakes != NULL) (void)H5FDclose(fd_shakes); - if (TRUE == curl_ready) + if (true == curl_ready) curl_global_cleanup(); if (fapl_id >= 0) { H5E_BEGIN_TRY @@ -1599,7 +1599,7 @@ test_H5F_integration(void) return 0; } - if (FALSE == s3_test_bucket_defined) { + if (false == s3_test_bucket_defined) { SKIPPED(); HDputs(" environment variable HDF5_ROS3_TEST_BUCKET_URL not defined"); fflush(stdout); @@ -1702,7 +1702,7 @@ main(void) } else { HDstrncpy(s3_test_bucket_url, bucket_url_env, S3_TEST_MAX_URL_SIZE); - s3_test_bucket_defined = TRUE; + s3_test_bucket_defined = true; } if (S3_TEST_MAX_URL_SIZE < HDsnprintf(url_text_restricted, (size_t)S3_TEST_MAX_URL_SIZE, "%s/%s", diff --git a/test/s3comms.c b/test/s3comms.c index ea32769..ca79217 100644 --- a/test/s3comms.c +++ b/test/s3comms.c @@ -344,13 +344,13 @@ jserr_str(const char *expected, const char *actual, const char *reason) * startup -- if unable to open either file or cannot load region, id, and key, * tests connecting with S3 will not be run */ -static int s3_test_credentials_loaded = 0; -static char s3_test_aws_region[16] = ""; -static char s3_test_aws_access_key_id[64] = ""; -static char s3_test_aws_secret_access_key[128] = ""; -static char s3_test_aws_security_token[1024] = ""; -static char s3_test_bucket_url[S3_TEST_MAX_URL_SIZE] = ""; -static hbool_t s3_test_bucket_defined = FALSE; +static int s3_test_credentials_loaded = 0; +static char s3_test_aws_region[16] = ""; +static char s3_test_aws_access_key_id[64] = ""; +static char s3_test_aws_secret_access_key[128] = ""; +static char s3_test_aws_security_token[1024] = ""; +static char s3_test_bucket_url[S3_TEST_MAX_URL_SIZE] = ""; +static bool s3_test_bucket_defined = false; /*--------------------------------------------------------------------------- * @@ -585,7 +585,7 @@ test_bytes_to_hex(void) const char exp[17]; /* in size * 2 + 1 for null terminator */ const unsigned char in[8]; size_t size; - hbool_t lower; + bool lower; }; /************************ @@ -597,16 +597,16 @@ test_bytes_to_hex(void) "52F3000C9A", {82, 243, 0, 12, 154}, 5, - FALSE, + false, }, { "009a0cf3005200", /* lowercase alphas */ {0, 154, 12, 243, 0, 82, 0}, 7, - TRUE, + true, }, { - "", {17, 63, 26, 56}, 0, FALSE, /* irrelevant */ + "", {17, 63, 26, 56}, 0, false, /* irrelevant */ }, }; int i = 0; @@ -628,7 +628,7 @@ test_bytes_to_hex(void) /* dest cannot be null */ - JSVERIFY(FAIL, H5FD_s3comms_bytes_to_hex(NULL, (const unsigned char *)"nada", 5, FALSE), + JSVERIFY(FAIL, H5FD_s3comms_bytes_to_hex(NULL, (const unsigned char *)"nada", 5, false), "destination cannot be null") PASSED(); @@ -666,7 +666,7 @@ test_hrb_init_request(void) const char *resource; const char *exp_res; const char *version; - hbool_t ret_null; + bool ret_null; }; /************************ @@ -680,7 +680,7 @@ test_hrb_init_request(void) "/path/to/some/file", "/path/to/some/file", "HTTP/1.1", - FALSE, + false, }, { "null verb substitutes to GET", @@ -688,7 +688,7 @@ test_hrb_init_request(void) "/MYPATH/MYFILE.tiff", "/MYPATH/MYFILE.tiff", "HTTP/1.1", - FALSE, + false, }, { "demonstrate non-GET verb", @@ -696,7 +696,7 @@ test_hrb_init_request(void) "/MYPATH/MYFILE.tiff", "/MYPATH/MYFILE.tiff", "HTTP/1.1", - FALSE, + false, }, { "slash prepended to resource path, if necessary", @@ -704,7 +704,7 @@ test_hrb_init_request(void) "MYPATH/MYFILE.tiff", "/MYPATH/MYFILE.tiff", NULL, - FALSE, + false, }, { "null resource path causes problem", @@ -712,7 +712,7 @@ test_hrb_init_request(void) NULL, NULL, NULL, - TRUE, + true, }, }; struct testcase *C = NULL; @@ -725,7 +725,7 @@ test_hrb_init_request(void) for (i = 0; i < ncases; i++) { C = &cases[i]; req = H5FD_s3comms_hrb_init_request(C->verb, C->resource, C->version); - if (cases[i].ret_null == TRUE) { + if (cases[i].ret_null == true) { FAIL_IF(req != NULL); } else { @@ -1711,7 +1711,7 @@ test_s3r_get_filesize(void) /* setup -- compose url to target resource */ - if (FALSE == s3_test_bucket_defined) { + if (false == s3_test_bucket_defined) { SKIPPED(); HDputs(" environment variable HDF5_ROS3_TEST_BUCKET_URL not defined"); fflush(stdout); @@ -1762,7 +1762,7 @@ test_s3r_open(void) struct tm *now = NULL; char iso8601now[ISO8601_SIZE]; s3r_t *handle = NULL; - hbool_t curl_ready = FALSE; + bool curl_ready = false; parsed_url_t *purl = NULL; TESTING("s3r_open"); @@ -1773,7 +1773,7 @@ test_s3r_open(void) fflush(stdout); return 0; } - if (FALSE == s3_test_bucket_defined) { + if (false == s3_test_bucket_defined) { SKIPPED(); HDputs(" environment variable HDF5_ROS3_TEST_BUCKET_URL not defined"); fflush(stdout); @@ -1813,7 +1813,7 @@ test_s3r_open(void) S3_TEST_RESOURCE_TEXT_PUBLIC)); curl_global_init(CURL_GLOBAL_DEFAULT); - curl_ready = TRUE; + curl_ready = true; now = gmnow(); FAIL_IF(now == NULL) @@ -1907,7 +1907,7 @@ test_s3r_open(void) handle = NULL; curl_global_cleanup(); - curl_ready = FALSE; + curl_ready = false; FAIL_IF(FAIL == H5FD_s3comms_free_purl(purl)) purl = NULL; @@ -1923,7 +1923,7 @@ error: H5FD_s3comms_s3r_close(handle); if (purl != NULL) H5FD_s3comms_free_purl(purl); - if (curl_ready == TRUE) + if (curl_ready == true) curl_global_cleanup(); return -1; @@ -1961,7 +1961,7 @@ test_s3r_read(void) char url_raven[S3_TEST_MAX_URL_SIZE]; char buffer[S3COMMS_TEST_BUFFER_SIZE]; s3r_t *handle = NULL; - hbool_t curl_ready = FALSE; + bool curl_ready = false; unsigned int i = 0; TESTING("test_s3r_read"); @@ -1969,7 +1969,7 @@ test_s3r_read(void) /* * initial setup */ - if (FALSE == s3_test_bucket_defined) { + if (false == s3_test_bucket_defined) { SKIPPED(); HDputs(" environment variable HDF5_ROS3_TEST_BUCKET_URL not defined"); fflush(stdout); @@ -1977,7 +1977,7 @@ test_s3r_read(void) } curl_global_init(CURL_GLOBAL_DEFAULT); - curl_ready = TRUE; + curl_ready = true; FAIL_IF(S3_TEST_MAX_URL_SIZE < HDsnprintf(url_raven, S3_TEST_MAX_URL_SIZE, "%s/%s", s3_test_bucket_url, S3_TEST_RESOURCE_TEXT_PUBLIC)); @@ -2076,7 +2076,7 @@ test_s3r_read(void) handle = NULL; curl_global_cleanup(); - curl_ready = FALSE; + curl_ready = false; PASSED(); return 0; @@ -2089,7 +2089,7 @@ error: if (handle != NULL) H5FD_s3comms_s3r_close(handle); - if (curl_ready == TRUE) + if (curl_ready == true) curl_global_cleanup(); return -1; @@ -2378,7 +2378,7 @@ test_uriencode(void) struct testcase { const char *str; size_t s_len; - hbool_t encode_slash; + bool encode_slash; const char *expected; }; @@ -2389,37 +2389,37 @@ test_uriencode(void) struct testcase cases[] = {{ "/path/to/resource.jpg", 21, - FALSE, + false, "/path/to/resource.jpg", }, { "/path/to/resource.jpg", 21, - TRUE, + true, "%2Fpath%2Fto%2Fresource.jpg", }, { "string got_spaa ces", 20, - TRUE, + true, "string%20got_spaa%20%20ces", }, { "sp ac~es/and-sl ash.encoded", 27, - TRUE, + true, "sp%20ac~es%2Fand-sl%20ash.encoded", }, { "sp ac~es/and-sl ash.unencoded", 29, - FALSE, + false, "sp%20ac~es/and-sl%20ash.unencoded", }, { "/path/to/resource.txt", 0, - FALSE, + false, "", }}; @@ -2453,9 +2453,9 @@ test_uriencode(void) dest = (char *)malloc(sizeof(char) * 15); assert(dest != NULL); - JSVERIFY(FAIL, H5FD_s3comms_uriencode(NULL, "word$", 5, FALSE, &dest_written), + JSVERIFY(FAIL, H5FD_s3comms_uriencode(NULL, "word$", 5, false, &dest_written), "destination cannot be NULL"); - JSVERIFY(FAIL, H5FD_s3comms_uriencode(dest, NULL, 5, FALSE, &dest_written), + JSVERIFY(FAIL, H5FD_s3comms_uriencode(dest, NULL, 5, false, &dest_written), "source string cannot be NULL"); free(dest); @@ -2527,7 +2527,7 @@ main(void) } else { HDstrncpy(s3_test_bucket_url, bucket_url_env, S3_TEST_MAX_URL_SIZE); - s3_test_bucket_defined = TRUE; + s3_test_bucket_defined = true; } /* tests ordered roughly by dependence */ diff --git a/test/select_io_dset.c b/test/select_io_dset.c index 0f38aba..1e11941 100644 --- a/test/select_io_dset.c +++ b/test/select_io_dset.c @@ -163,7 +163,7 @@ test_no_type_conv(hid_t fid, unsigned chunked, unsigned dtrans, unsigned mwbuf) /* Set modify write buffer if requested */ if (mwbuf) - if (H5Pset_modify_write_buf(dxpl, TRUE) < 0) + if (H5Pset_modify_write_buf(dxpl, true) < 0) FAIL_STACK_ERROR; if ((ntrans_dxpl = H5Pcopy(dxpl)) < 0) @@ -282,7 +282,7 @@ test_no_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Set modify write buffer if requested */ if (mwbuf) - if (H5Pset_modify_write_buf(dxpl, TRUE) < 0) + if (H5Pset_modify_write_buf(dxpl, true) < 0) FAIL_STACK_ERROR; /* Create 1d data space */ @@ -453,7 +453,7 @@ test_larger_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsign /* Set modify write buffer if requested */ if (mwbuf) - if (H5Pset_modify_write_buf(dxpl, TRUE) < 0) + if (H5Pset_modify_write_buf(dxpl, true) < 0) FAIL_STACK_ERROR; if ((ntrans_dxpl = H5Pcopy(dxpl)) < 0) @@ -595,7 +595,7 @@ test_smaller_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsig /* Set modify write buffer if requested */ if (mwbuf) - if (H5Pset_modify_write_buf(dxpl, TRUE) < 0) + if (H5Pset_modify_write_buf(dxpl, true) < 0) FAIL_STACK_ERROR; if ((ntrans_dxpl = H5Pcopy(dxpl)) < 0) @@ -731,7 +731,7 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Set modify write buffer if requested */ if (mwbuf) - if (H5Pset_modify_write_buf(dxpl, TRUE) < 0) + if (H5Pset_modify_write_buf(dxpl, true) < 0) FAIL_STACK_ERROR; /* Allocate buffers for datasets */ @@ -1081,7 +1081,7 @@ test_multi_dsets_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsigned m /* Set modify write buffer if requested */ if (mwbuf) - if (H5Pset_modify_write_buf(dxpl, TRUE) < 0) + if (H5Pset_modify_write_buf(dxpl, true) < 0) FAIL_STACK_ERROR; if ((ntrans_dxpl = H5Pcopy(dxpl)) < 0) @@ -1401,7 +1401,7 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Set modify write buffer if requested */ if (mwbuf) - if (H5Pset_modify_write_buf(dxpl, TRUE) < 0) + if (H5Pset_modify_write_buf(dxpl, true) < 0) FAIL_STACK_ERROR; dims[0] = DSET_SELECT_DIM; @@ -1842,7 +1842,7 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Set modify write buffer if requested */ if (mwbuf) - if (H5Pset_modify_write_buf(dxpl, TRUE) < 0) + if (H5Pset_modify_write_buf(dxpl, true) < 0) FAIL_STACK_ERROR; dims[0] = DSET_SELECT_DIM; @@ -2276,7 +2276,7 @@ test_multi_dsets_all(int niter, hid_t fid, unsigned chunked, unsigned mwbuf) /* Set modify write buffer if requested */ if (mwbuf) - if (H5Pset_modify_write_buf(dxpl, TRUE) < 0) + if (H5Pset_modify_write_buf(dxpl, true) < 0) FAIL_STACK_ERROR; /* Set dataset layout: contiguous or chunked */ @@ -2843,7 +2843,7 @@ test_no_selection_io_cause_mode(const char *filename, hid_t fapl, uint32_t test_ hid_t sid = H5I_INVALID_HID; hsize_t dims[1]; hsize_t cdims[1]; - hbool_t is_chunked = FALSE; + bool is_chunked = false; hid_t tid = H5T_NATIVE_INT; uint32_t no_selection_io_cause_write = 0; uint32_t no_selection_io_cause_read = 0; @@ -2908,13 +2908,13 @@ test_no_selection_io_cause_mode(const char *filename, hid_t fapl, uint32_t test_ if (test_mode == TEST_DATASET_FILTER) { if (H5Pset_deflate(dcpl, 9) < 0) FAIL_STACK_ERROR; - is_chunked = TRUE; + is_chunked = true; no_selection_io_cause_write_expected |= H5D_SEL_IO_DATASET_FILTER; no_selection_io_cause_read_expected |= H5D_SEL_IO_DATASET_FILTER; } if (test_mode == TEST_CHUNK_CACHE) { - is_chunked = TRUE; + is_chunked = true; no_selection_io_cause_write_expected |= H5D_SEL_IO_CHUNK_CACHE; no_selection_io_cause_read_expected |= H5D_SEL_IO_CHUNK_CACHE; } @@ -2945,7 +2945,7 @@ test_no_selection_io_cause_mode(const char *filename, hid_t fapl, uint32_t test_ /* If we're using in-place type conversion sel io will succeed and only switch to scalar at the * VFL */ if (test_mode & TEST_IN_PLACE_TCONV) { - if (H5Pset_modify_write_buf(dxpl, TRUE) < 0) + if (H5Pset_modify_write_buf(dxpl, true) < 0) FAIL_STACK_ERROR; no_selection_io_cause_write_expected |= H5D_SEL_IO_NO_VECTOR_OR_SELECTION_IO_CB; } @@ -3140,14 +3140,14 @@ main(void) TEST_ERROR; /* Test with contiguous or chunked dataset */ - for (chunked = FALSE; chunked <= TRUE; chunked++) { + for (chunked = false; chunked <= true; chunked++) { /* Data transforms only apply to integer or floating-point datasets */ /* therefore, not all tests are run with data transform */ - for (dtrans = FALSE; dtrans <= TRUE; dtrans++) { + for (dtrans = false; dtrans <= true; dtrans++) { /* Test with and without modify_write_buf turned on */ - for (mwbuf = FALSE; mwbuf <= TRUE; mwbuf++) { + for (mwbuf = false; mwbuf <= true; mwbuf++) { /* Print configuration message */ printf("Testing for selection I/O "); if (chunked) diff --git a/test/set_extent.c b/test/set_extent.c index 661ef4e..9407807 100644 --- a/test/set_extent.c +++ b/test/set_extent.c @@ -78,21 +78,21 @@ typedef enum rank4_index_t { RANK4_NINDICES, /* Must be last */ } rank4_index_t; -static int do_ranks(hid_t fapl, hbool_t new_format, hbool_t use_select_io); -static int do_layouts(hid_t fapl, hbool_t use_select_io); - -static int test_rank1(hid_t fapl, hid_t dcpl, hid_t dxpl, hbool_t do_fill_value, hbool_t disable_edge_filters, - hbool_t set_istore_k); -static int test_rank2(hid_t fapl, hid_t dcpl, hid_t dxpl, hbool_t do_fill_value, hbool_t disable_edge_filters, - hbool_t set_istore_k); -static int test_rank3(hid_t fapl, hid_t dcpl, hid_t dxpl, hbool_t do_fill_value, hbool_t disable_edge_filters, - hbool_t set_istore_k); -static int test_random_rank4(hid_t fapl, hid_t dcpl, hid_t dxpl, hbool_t do_fillvalue, - hbool_t disable_edge_filters, hbool_t do_sparse, rank4_index_t index_type); -static int test_random_rank4_vl(hid_t fapl, hid_t dcpl, hid_t dxpl, hbool_t do_fillvalue, - hbool_t disable_edge_filters, hbool_t do_sparse, rank4_index_t index_type); - -static int test_external(hid_t fapl, hbool_t use_select_io); +static int do_ranks(hid_t fapl, bool new_format, bool use_select_io); +static int do_layouts(hid_t fapl, bool use_select_io); + +static int test_rank1(hid_t fapl, hid_t dcpl, hid_t dxpl, bool do_fill_value, bool disable_edge_filters, + bool set_istore_k); +static int test_rank2(hid_t fapl, hid_t dcpl, hid_t dxpl, bool do_fill_value, bool disable_edge_filters, + bool set_istore_k); +static int test_rank3(hid_t fapl, hid_t dcpl, hid_t dxpl, bool do_fill_value, bool disable_edge_filters, + bool set_istore_k); +static int test_random_rank4(hid_t fapl, hid_t dcpl, hid_t dxpl, bool do_fillvalue, bool disable_edge_filters, + bool do_sparse, rank4_index_t index_type); +static int test_random_rank4_vl(hid_t fapl, hid_t dcpl, hid_t dxpl, bool do_fillvalue, + bool disable_edge_filters, bool do_sparse, rank4_index_t index_type); + +static int test_external(hid_t fapl, bool use_select_io); static int test_layouts(H5D_layout_t layout, hid_t fapl, hid_t dxpl); static void test_random_rank4_dump(unsigned ndim_sets, hsize_t dim_log[][4], hsize_t cdims[4], int j, int k, int l, int m); @@ -111,13 +111,13 @@ main(void) unsigned chunk_cache; /* Whether to enable chunk caching */ int nerrors = 0; const char *env_h5_drvr; /* File Driver value from environment */ - hbool_t contig_addr_vfd; /* Whether VFD used has a contiguous address space */ + bool contig_addr_vfd; /* Whether VFD used has a contiguous address space */ env_h5_drvr = HDgetenv(HDF5_DRIVER); if (env_h5_drvr == NULL) env_h5_drvr = "nomatch"; /* Current VFD that does not support contiguous address space */ - contig_addr_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); + contig_addr_vfd = (bool)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); /* Initialize random number seed */ HDsrandom((unsigned)HDtime(NULL)); @@ -142,11 +142,11 @@ main(void) TEST_ERROR; /* Test with old & new format groups */ - for (new_format = FALSE; new_format <= TRUE; new_format++) { + for (new_format = false; new_format <= true; new_format++) { hid_t my_fapl; /* Test chunked datasets with and without chunk cache */ - for (chunk_cache = FALSE; chunk_cache <= TRUE; chunk_cache++) { + for (chunk_cache = false; chunk_cache <= true; chunk_cache++) { /* Output message about the type of format */ if (new_format) printf("Testing with new file format"); @@ -179,19 +179,19 @@ main(void) /* Tests which use chunked datasets */ if (!new_format || (new_format && contig_addr_vfd)) { /* Run do_ranks() with H5D_SELECTION_IO_MODE_DEFAULT/H5D_SELECTION_IO_MODE_ON */ - nerrors += do_ranks(my_fapl, new_format, FALSE) < 0 ? 1 : 0; - nerrors += do_ranks(my_fapl, new_format, TRUE) < 0 ? 1 : 0; + nerrors += do_ranks(my_fapl, new_format, false) < 0 ? 1 : 0; + nerrors += do_ranks(my_fapl, new_format, true) < 0 ? 1 : 0; } } /* end for */ /* Tests which do not use chunked datasets */ if (!new_format || (new_format && contig_addr_vfd)) { /* Run test_external() with H5D_SELECTION_IO_MODE_DEFAULT/H5D_SELECTION_IO_MODE_ON */ - nerrors += test_external(fapl, FALSE) < 0 ? 1 : 0; - nerrors += test_external(fapl, TRUE) < 0 ? 1 : 0; + nerrors += test_external(fapl, false) < 0 ? 1 : 0; + nerrors += test_external(fapl, true) < 0 ? 1 : 0; /* Run do_layouts() with H5D_SELECTION_IO_MODE_DEFAULT/H5D_SELECTION_IO_MODE_ON */ - nerrors += do_layouts(fapl, FALSE) < 0 ? 1 : 0; - nerrors += do_layouts(fapl, TRUE) < 0 ? 1 : 0; + nerrors += do_layouts(fapl, false) < 0 ? 1 : 0; + nerrors += do_layouts(fapl, true) < 0 ? 1 : 0; } } /* end for */ @@ -224,17 +224,17 @@ error: *------------------------------------------------------------------------- */ static int -do_ranks(hid_t fapl, hbool_t new_format, hbool_t use_select_io) +do_ranks(hid_t fapl, bool new_format, bool use_select_io) { - hbool_t do_fillvalue = FALSE; - hbool_t disable_edge_filters = FALSE; + bool do_fillvalue = false; + bool disable_edge_filters = false; rank4_index_t index_type; hid_t dcpl = -1; hid_t dxpl = -1; int fillvalue = FILL_VALUE; unsigned config; - hbool_t driver_is_parallel; + bool driver_is_parallel; if ((dxpl = H5Pcreate(H5P_DATASET_XFER)) < 0) TEST_ERROR; @@ -272,21 +272,21 @@ do_ranks(hid_t fapl, hbool_t new_format, hbool_t use_select_io) } /* end if */ if (config & CONFIG_FILL) { - do_fillvalue = TRUE; + do_fillvalue = true; if (H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fillvalue) < 0) TEST_ERROR; } /* end if */ else - do_fillvalue = FALSE; + do_fillvalue = false; if (config & CONFIG_EARLY_ALLOC) if (H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_EARLY) < 0) TEST_ERROR; if (config & CONFIG_UNFILT_EDGE) - disable_edge_filters = TRUE; + disable_edge_filters = true; else - disable_edge_filters = FALSE; + disable_edge_filters = false; /* Run tests */ if (do_fillvalue) { @@ -301,22 +301,22 @@ do_ranks(hid_t fapl, hbool_t new_format, hbool_t use_select_io) else if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0) TEST_ERROR; - if (test_rank1(fapl, dcpl, dxpl, do_fillvalue, disable_edge_filters, FALSE) < 0) { + if (test_rank1(fapl, dcpl, dxpl, do_fillvalue, disable_edge_filters, false) < 0) { DO_RANKS_PRINT_CONFIG("Rank 1") printf(" Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" : "H5D_FILL_TIME_ALLOC")); goto error; } /* end if */ - if (test_rank2(fapl, dcpl, dxpl, do_fillvalue, disable_edge_filters, FALSE) < 0) { + if (test_rank2(fapl, dcpl, dxpl, do_fillvalue, disable_edge_filters, false) < 0) { DO_RANKS_PRINT_CONFIG("Rank 2") printf(" Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" : "H5D_FILL_TIME_ALLOC")); goto error; } /* end if */ - if (test_rank3(fapl, dcpl, dxpl, do_fillvalue, disable_edge_filters, FALSE) < 0) { + if (test_rank3(fapl, dcpl, dxpl, do_fillvalue, disable_edge_filters, false) < 0) { DO_RANKS_PRINT_CONFIG("Rank 3") printf(" Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" : "H5D_FILL_TIME_ALLOC")); goto error; } /* end if */ - if (test_rank2(fapl, dcpl, dxpl, do_fillvalue, disable_edge_filters, TRUE) < 0) { + if (test_rank2(fapl, dcpl, dxpl, do_fillvalue, disable_edge_filters, true) < 0) { DO_RANKS_PRINT_CONFIG("Rank 2 with non-default indexed storage B-tree") printf(" Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" : "H5D_FILL_TIME_ALLOC")); goto error; @@ -329,19 +329,19 @@ do_ranks(hid_t fapl, hbool_t new_format, hbool_t use_select_io) if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0) TEST_ERROR; - if (test_rank1(fapl, dcpl, dxpl, do_fillvalue, disable_edge_filters, FALSE) < 0) { + if (test_rank1(fapl, dcpl, dxpl, do_fillvalue, disable_edge_filters, false) < 0) { DO_RANKS_PRINT_CONFIG("Rank 1") goto error; } /* end if */ - if (test_rank2(fapl, dcpl, dxpl, do_fillvalue, disable_edge_filters, FALSE) < 0) { + if (test_rank2(fapl, dcpl, dxpl, do_fillvalue, disable_edge_filters, false) < 0) { DO_RANKS_PRINT_CONFIG("Rank 2") goto error; } /* end if */ - if (test_rank3(fapl, dcpl, dxpl, do_fillvalue, disable_edge_filters, FALSE) < 0) { + if (test_rank3(fapl, dcpl, dxpl, do_fillvalue, disable_edge_filters, false) < 0) { DO_RANKS_PRINT_CONFIG("Rank 3") goto error; } /* end if */ - if (test_rank2(fapl, dcpl, dxpl, do_fillvalue, disable_edge_filters, TRUE) < 0) { + if (test_rank2(fapl, dcpl, dxpl, do_fillvalue, disable_edge_filters, true) < 0) { DO_RANKS_PRINT_CONFIG("Rank 2 with non-default indexed storage B-tree") goto error; } /* end if */ @@ -356,7 +356,7 @@ do_ranks(hid_t fapl, hbool_t new_format, hbool_t use_select_io) */ for (index_type = RANK4_INDEX_BTREE; index_type < RANK4_NINDICES; index_type++) { /* Standard test */ - if (test_random_rank4(fapl, dcpl, dxpl, do_fillvalue, disable_edge_filters, FALSE, index_type) < + if (test_random_rank4(fapl, dcpl, dxpl, do_fillvalue, disable_edge_filters, false, index_type) < 0) { DO_RANKS_PRINT_CONFIG("Randomized rank 4") printf(" Index: %s\n", index_type == RANK4_INDEX_BTREE @@ -367,7 +367,7 @@ do_ranks(hid_t fapl, hbool_t new_format, hbool_t use_select_io) if (!driver_is_parallel) { /* VL test */ - if (test_random_rank4_vl(fapl, dcpl, dxpl, do_fillvalue, disable_edge_filters, FALSE, + if (test_random_rank4_vl(fapl, dcpl, dxpl, do_fillvalue, disable_edge_filters, false, index_type) < 0) { DO_RANKS_PRINT_CONFIG("Randomized rank 4 variable length") printf(" Index: %s\n", index_type == RANK4_INDEX_BTREE @@ -379,7 +379,7 @@ do_ranks(hid_t fapl, hbool_t new_format, hbool_t use_select_io) /* Sparse allocation test (regular and VL) */ if (!(config & CONFIG_EARLY_ALLOC)) { - if (test_random_rank4(fapl, dcpl, dxpl, do_fillvalue, disable_edge_filters, TRUE, + if (test_random_rank4(fapl, dcpl, dxpl, do_fillvalue, disable_edge_filters, true, index_type) < 0) { DO_RANKS_PRINT_CONFIG("Randomized rank 4 with sparse allocation") printf(" Index: %s\n", index_type == RANK4_INDEX_BTREE @@ -389,7 +389,7 @@ do_ranks(hid_t fapl, hbool_t new_format, hbool_t use_select_io) } /* end if */ if (!driver_is_parallel) { - if (test_random_rank4_vl(fapl, dcpl, dxpl, do_fillvalue, disable_edge_filters, TRUE, + if (test_random_rank4_vl(fapl, dcpl, dxpl, do_fillvalue, disable_edge_filters, true, index_type) < 0) { DO_RANKS_PRINT_CONFIG("Randomized rank 4 variable length with sparse allocation") printf(" Index: %s\n", @@ -435,7 +435,7 @@ error: *------------------------------------------------------------------------- */ static int -do_layouts(hid_t fapl, hbool_t use_select_io) +do_layouts(hid_t fapl, bool use_select_io) { hid_t new_fapl = -1; hid_t dxpl = -1; @@ -510,8 +510,8 @@ error: */ static int -test_rank1(hid_t fapl, hid_t dcpl, hid_t dxpl, hbool_t do_fill_value, hbool_t disable_edge_filters, - hbool_t set_istore_k) +test_rank1(hid_t fapl, hid_t dcpl, hid_t dxpl, bool do_fill_value, bool disable_edge_filters, + bool set_istore_k) { hid_t fid = -1; @@ -844,8 +844,8 @@ error: */ static int -test_rank2(hid_t fapl, hid_t dcpl, hid_t dxpl, hbool_t do_fill_value, hbool_t disable_edge_filters, - hbool_t set_istore_k) +test_rank2(hid_t fapl, hid_t dcpl, hid_t dxpl, bool do_fill_value, bool disable_edge_filters, + bool set_istore_k) { hid_t fid = -1; @@ -1339,8 +1339,8 @@ error: */ static int -test_rank3(hid_t fapl, hid_t dcpl, hid_t dxpl, hbool_t do_fill_value, hbool_t disable_edge_filters, - hbool_t set_istore_k) +test_rank3(hid_t fapl, hid_t dcpl, hid_t dxpl, bool do_fill_value, bool disable_edge_filters, + bool set_istore_k) { hid_t fid = -1; @@ -1774,7 +1774,7 @@ error: *------------------------------------------------------------------------- */ static int -test_external(hid_t fapl, hbool_t use_select_io) +test_external(hid_t fapl, bool use_select_io) { hid_t fid = -1; @@ -2293,8 +2293,8 @@ error: *------------------------------------------------------------------------- */ static int -test_random_rank4(hid_t fapl, hid_t dcpl, hid_t dxpl, hbool_t do_fillvalue, hbool_t disable_edge_filters, - hbool_t do_sparse, rank4_index_t index_type) +test_random_rank4(hid_t fapl, hid_t dcpl, hid_t dxpl, bool do_fillvalue, bool disable_edge_filters, + bool do_sparse, rank4_index_t index_type) { hid_t file = -1; hid_t dset = -1; @@ -2318,8 +2318,8 @@ test_random_rank4(hid_t fapl, hid_t dcpl, hid_t dxpl, hbool_t do_fillvalue, hboo struct { hsize_t arr[RAND4_NITER + 1][4]; } *dim_log = NULL; /* Log of dataset dimensions */ - hbool_t zero_dim = FALSE; /* Whether a dimension is 0 */ - hbool_t writing = TRUE; /* Whether we're writing to the dset */ + bool zero_dim = false; /* Whether a dimension is 0 */ + bool writing = true; /* Whether we're writing to the dset */ unsigned scalar_iter; /* Iteration to shrink dset to 1x1x1x1 */ unsigned i, j, k, l, m; /* Local indices */ char filename[NAME_BUF_SIZE]; @@ -2399,12 +2399,12 @@ test_random_rank4(hid_t fapl, hid_t dcpl, hid_t dxpl, hbool_t do_fillvalue, hboo /* Generate new dataset size, 0-10 (0 much less likely). If i is * scalar_iter, set all dims to 1. */ - zero_dim = FALSE; + zero_dim = false; for (j = 0; j < 4; j++) { old_dims[j] = dims[j]; if ((dims[j] = (hsize_t)(i == scalar_iter ? 1 : (HDrandom() % 11))) == 0) if ((dims[j] = (hsize_t)(HDrandom() % 11)) == 0) - zero_dim = TRUE; + zero_dim = true; dim_log->arr[i + 1][j] = dims[j]; } /* end for */ @@ -2510,8 +2510,8 @@ error: *------------------------------------------------------------------------- */ static int -test_random_rank4_vl(hid_t fapl, hid_t dcpl, hid_t dxpl, hbool_t do_fillvalue, hbool_t disable_edge_filters, - hbool_t do_sparse, rank4_index_t index_type) +test_random_rank4_vl(hid_t fapl, hid_t dcpl, hid_t dxpl, bool do_fillvalue, bool disable_edge_filters, + bool do_sparse, rank4_index_t index_type) { hid_t file = -1; hid_t dset = -1; @@ -2536,8 +2536,8 @@ test_random_rank4_vl(hid_t fapl, hid_t dcpl, hid_t dxpl, hbool_t do_fillvalue, h struct { hsize_t arr[RAND4_NITER + 1][4]; } *dim_log = NULL; /* Log of dataset dimensions */ - hbool_t zero_dim = FALSE; /* Whether a dimension is 0 */ - hbool_t writing = TRUE; /* Whether we're writing to the dset */ + bool zero_dim = false; /* Whether a dimension is 0 */ + bool writing = true; /* Whether we're writing to the dset */ hvl_t fill_value; /* Fill value */ unsigned scalar_iter; /* Iteration to shrink dset to 1x1x1x1 */ unsigned i, j, k, l, m; /* Local indices */ @@ -2661,12 +2661,12 @@ test_random_rank4_vl(hid_t fapl, hid_t dcpl, hid_t dxpl, hbool_t do_fillvalue, h /* Generate new dataset size, 0-10 (0 much less likely). If i is * scalar_iter, set all dims to 1. */ - zero_dim = FALSE; + zero_dim = false; for (j = 0; j < 4; j++) { old_dims[j] = dims[j]; if ((dims[j] = (hsize_t)(i == scalar_iter ? 1 : (HDrandom() % 11))) == 0) if ((dims[j] = (hsize_t)(HDrandom() % 11)) == 0) - zero_dim = TRUE; + zero_dim = true; dim_log->arr[i + 1][j] = dims[j]; } diff --git a/test/stab.c b/test/stab.c index 6bdba65..78d13cc 100644 --- a/test/stab.c +++ b/test/stab.c @@ -83,7 +83,7 @@ static const char *FILENAME[] = {"stab", NULL}; *------------------------------------------------------------------------- */ static int -test_misc(hid_t fcpl, hid_t fapl, hbool_t new_format) +test_misc(hid_t fcpl, hid_t fapl, bool new_format) { hid_t fid = (-1); /* File ID */ hid_t g1 = (-1), g2 = (-1), g3 = (-1); @@ -184,7 +184,7 @@ error: *------------------------------------------------------------------------- */ static int -test_long(hid_t fcpl, hid_t fapl, hbool_t new_format) +test_long(hid_t fcpl, hid_t fapl, bool new_format) { hid_t fid = (-1); /* File ID */ hid_t g1 = (-1), g2 = (-1); @@ -268,7 +268,7 @@ error: *------------------------------------------------------------------------- */ static int -test_large(hid_t fcpl, hid_t fapl, hbool_t new_format) +test_large(hid_t fcpl, hid_t fapl, bool new_format) { hid_t fid = (-1); /* File ID */ hid_t cwg = (-1), dir = (-1); /* Group IDs */ @@ -293,7 +293,7 @@ test_large(hid_t fcpl, hid_t fapl, hbool_t new_format) if ((cwg = H5Gcreate2(fid, "/big", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; if (new_format) - if (H5G__has_stab_test(cwg) != FALSE) + if (H5G__has_stab_test(cwg) != false) TEST_ERROR; for (i = 0; i < LARGE_NOBJS; i++) { HDsnprintf(name, sizeof(name), "%05d%05d", (HDrandom() % 100000), i); @@ -303,7 +303,7 @@ test_large(hid_t fcpl, hid_t fapl, hbool_t new_format) TEST_ERROR; } if (new_format) - if (H5G__is_new_dense_test(cwg) != TRUE) + if (H5G__is_new_dense_test(cwg) != true) TEST_ERROR; if (H5Gclose(cwg) < 0) TEST_ERROR; @@ -431,7 +431,7 @@ lifecycle(hid_t fcpl, hid_t fapl2) TEST_ERROR; /* Use internal testing routine to check that the group has no links or symbol table */ - if (H5G__is_empty_test(gid) != TRUE) + if (H5G__is_empty_test(gid) != true) TEST_ERROR; /* Create first "bottom" group */ @@ -440,7 +440,7 @@ lifecycle(hid_t fcpl, hid_t fapl2) TEST_ERROR; /* Check on bottom group's status */ - if (H5G__is_empty_test(gid2) != TRUE) + if (H5G__is_empty_test(gid2) != true) TEST_ERROR; /* Close bottom group */ @@ -448,9 +448,9 @@ lifecycle(hid_t fcpl, hid_t fapl2) TEST_ERROR; /* Check on top group's status */ - if (H5G__is_empty_test(gid) == TRUE) + if (H5G__is_empty_test(gid) == true) TEST_ERROR; - if (H5G__has_links_test(gid, &nmsgs) != TRUE) + if (H5G__has_links_test(gid, &nmsgs) != true) TEST_ERROR; if (nmsgs != 1) TEST_ERROR; @@ -463,7 +463,7 @@ lifecycle(hid_t fcpl, hid_t fapl2) TEST_ERROR; /* Check on bottom group's status */ - if (H5G__is_empty_test(gid2) != TRUE) + if (H5G__is_empty_test(gid2) != true) TEST_ERROR; /* Close bottom group */ @@ -472,13 +472,13 @@ lifecycle(hid_t fcpl, hid_t fapl2) } /* end for */ /* Check on top group's status */ - if (H5G__is_empty_test(gid) == TRUE) + if (H5G__is_empty_test(gid) == true) TEST_ERROR; - if (H5G__has_links_test(gid, &nmsgs) != TRUE) + if (H5G__has_links_test(gid, &nmsgs) != true) TEST_ERROR; if (nmsgs != LIFECYCLE_MAX_COMPACT) TEST_ERROR; - if (H5G__is_new_dense_test(gid) != FALSE) + if (H5G__is_new_dense_test(gid) != false) TEST_ERROR; /* Check that the object header is only one chunk and the space has been allocated correctly */ @@ -499,7 +499,7 @@ lifecycle(hid_t fcpl, hid_t fapl2) TEST_ERROR; /* Check on bottom group's status */ - if (H5G__is_empty_test(gid2) != TRUE) + if (H5G__is_empty_test(gid2) != true) TEST_ERROR; /* Close bottom group */ @@ -507,11 +507,11 @@ lifecycle(hid_t fcpl, hid_t fapl2) TEST_ERROR; /* Check on top group's status */ - if (H5G__is_empty_test(gid) == TRUE) + if (H5G__is_empty_test(gid) == true) TEST_ERROR; - if (H5G__has_links_test(gid, NULL) == TRUE) + if (H5G__has_links_test(gid, NULL) == true) TEST_ERROR; - if (H5G__is_new_dense_test(gid) != TRUE) + if (H5G__is_new_dense_test(gid) != true) TEST_ERROR; /* Check that the object header is still one chunk and the space has been allocated correctly */ @@ -537,11 +537,11 @@ lifecycle(hid_t fcpl, hid_t fapl2) } /* end while */ /* Check on top group's status */ - if (H5G__is_empty_test(gid) == TRUE) + if (H5G__is_empty_test(gid) == true) TEST_ERROR; - if (H5G__has_links_test(gid, NULL) == TRUE) + if (H5G__has_links_test(gid, NULL) == true) TEST_ERROR; - if (H5G__is_new_dense_test(gid) != TRUE) + if (H5G__is_new_dense_test(gid) != true) TEST_ERROR; /* Unlink one more object from the group, which should transform back to using links */ @@ -551,9 +551,9 @@ lifecycle(hid_t fcpl, hid_t fapl2) u--; /* Check on top group's status */ - if (H5G__is_empty_test(gid) == TRUE) + if (H5G__is_empty_test(gid) == true) TEST_ERROR; - if (H5G__has_links_test(gid, &nmsgs) != TRUE) + if (H5G__has_links_test(gid, &nmsgs) != true) TEST_ERROR; if (nmsgs != (LIFECYCLE_MIN_DENSE - 1)) TEST_ERROR; @@ -568,7 +568,7 @@ lifecycle(hid_t fcpl, hid_t fapl2) FAIL_STACK_ERROR; /* Check on top group's status */ - if (H5G__is_empty_test(gid) != TRUE) + if (H5G__is_empty_test(gid) != true) TEST_ERROR; /* Close top group */ @@ -663,7 +663,7 @@ long_compact(hid_t fcpl, hid_t fapl2) TEST_ERROR; /* Use internal testing routine to check that the group has no links or dense storage */ - if (H5G__is_empty_test(gid) != TRUE) + if (H5G__is_empty_test(gid) != true) TEST_ERROR; /* Create first group with "long" name */ @@ -671,7 +671,7 @@ long_compact(hid_t fcpl, hid_t fapl2) TEST_ERROR; /* Check on bottom group's status */ - if (H5G__is_empty_test(gid2) != TRUE) + if (H5G__is_empty_test(gid2) != true) TEST_ERROR; /* Close bottom group */ @@ -680,11 +680,11 @@ long_compact(hid_t fcpl, hid_t fapl2) /* Check on top group's status */ /* (Should have dense storage to hold links, since name is too long for object header message) */ - if (H5G__is_empty_test(gid) == TRUE) + if (H5G__is_empty_test(gid) == true) TEST_ERROR; - if (H5G__has_links_test(gid, NULL) == TRUE) + if (H5G__has_links_test(gid, NULL) == true) TEST_ERROR; - if (H5G__is_new_dense_test(gid) != TRUE) + if (H5G__is_new_dense_test(gid) != true) TEST_ERROR; /* Create second group with "long" name */ @@ -693,7 +693,7 @@ long_compact(hid_t fcpl, hid_t fapl2) TEST_ERROR; /* Check on bottom group's status */ - if (H5G__is_empty_test(gid2) != TRUE) + if (H5G__is_empty_test(gid2) != true) TEST_ERROR; /* Close bottom group */ @@ -702,11 +702,11 @@ long_compact(hid_t fcpl, hid_t fapl2) /* Check on top group's status */ /* (Should have dense storage to hold links, since name is too long for object header message) */ - if (H5G__is_empty_test(gid) == TRUE) + if (H5G__is_empty_test(gid) == true) TEST_ERROR; - if (H5G__has_links_test(gid, NULL) == TRUE) + if (H5G__has_links_test(gid, NULL) == true) TEST_ERROR; - if (H5G__is_new_dense_test(gid) != TRUE) + if (H5G__is_new_dense_test(gid) != true) TEST_ERROR; /* Unlink second object from top group */ @@ -715,11 +715,11 @@ long_compact(hid_t fcpl, hid_t fapl2) /* Check on top group's status */ /* (Should still be dense storage to hold links, since name is too long for object header message) */ - if (H5G__is_empty_test(gid) == TRUE) + if (H5G__is_empty_test(gid) == true) TEST_ERROR; - if (H5G__has_links_test(gid, NULL) == TRUE) + if (H5G__has_links_test(gid, NULL) == true) TEST_ERROR; - if (H5G__is_new_dense_test(gid) != TRUE) + if (H5G__is_new_dense_test(gid) != true) TEST_ERROR; /* Unlink first object from top group */ @@ -729,7 +729,7 @@ long_compact(hid_t fcpl, hid_t fapl2) /* Check on top group's status */ /* (Should have deleted the dense storage now) */ - if (H5G__is_empty_test(gid) != TRUE) + if (H5G__is_empty_test(gid) != true) TEST_ERROR; /* Free object name */ @@ -809,11 +809,11 @@ read_old(void) TEST_ERROR; /* Check on old group's status */ - if (H5G__is_empty_test(gid) == FALSE) + if (H5G__is_empty_test(gid) == false) TEST_ERROR; - if (H5G__has_links_test(gid, NULL) == TRUE) + if (H5G__has_links_test(gid, NULL) == true) TEST_ERROR; - if (H5G__has_stab_test(gid) != TRUE) + if (H5G__has_stab_test(gid) != true) TEST_ERROR; /* Create a bunch of objects in the group */ @@ -823,7 +823,7 @@ read_old(void) TEST_ERROR; /* Check on bottom group's status */ - if (H5G__is_empty_test(gid2) != TRUE) + if (H5G__is_empty_test(gid2) != true) TEST_ERROR; /* Close bottom group */ @@ -833,11 +833,11 @@ read_old(void) /* Check on old group's status */ /* (Should stay in old "symbol table" form) */ - if (H5G__is_empty_test(gid) == TRUE) + if (H5G__is_empty_test(gid) == true) TEST_ERROR; - if (H5G__has_links_test(gid, NULL) == TRUE) + if (H5G__has_links_test(gid, NULL) == true) TEST_ERROR; - if (H5G__has_stab_test(gid) != TRUE) + if (H5G__has_stab_test(gid) != true) TEST_ERROR; /* Delete new objects from old group */ @@ -849,11 +849,11 @@ read_old(void) /* Check on old group's status */ /* (Should stay in old "symbol table" form, but have no links) */ - if (H5G__is_empty_test(gid) == FALSE) + if (H5G__is_empty_test(gid) == false) TEST_ERROR; - if (H5G__has_links_test(gid, NULL) == TRUE) + if (H5G__has_links_test(gid, NULL) == true) TEST_ERROR; - if (H5G__has_stab_test(gid) != TRUE) + if (H5G__has_stab_test(gid) != true) TEST_ERROR; /* Close old group */ @@ -947,7 +947,7 @@ no_compact(hid_t fcpl, hid_t fapl2) TEST_ERROR; /* Use internal testing routine to check that the group has no links or dense storage */ - if (H5G__is_empty_test(gid) != TRUE) + if (H5G__is_empty_test(gid) != true) TEST_ERROR; /* Create first "bottom" group */ @@ -956,7 +956,7 @@ no_compact(hid_t fcpl, hid_t fapl2) TEST_ERROR; /* Check on bottom group's status */ - if (H5G__is_empty_test(gid2) != TRUE) + if (H5G__is_empty_test(gid2) != true) TEST_ERROR; /* Close bottom group */ @@ -964,11 +964,11 @@ no_compact(hid_t fcpl, hid_t fapl2) TEST_ERROR; /* Check on top group's status */ - if (H5G__is_empty_test(gid) == TRUE) + if (H5G__is_empty_test(gid) == true) TEST_ERROR; - if (H5G__has_links_test(gid, NULL) == TRUE) + if (H5G__has_links_test(gid, NULL) == true) TEST_ERROR; - if (H5G__is_new_dense_test(gid) != TRUE) + if (H5G__is_new_dense_test(gid) != true) TEST_ERROR; /* Unlink object from top group */ @@ -977,7 +977,7 @@ no_compact(hid_t fcpl, hid_t fapl2) FAIL_STACK_ERROR; /* Check on top group's status */ - if (H5G__is_empty_test(gid) != TRUE) + if (H5G__is_empty_test(gid) != true) TEST_ERROR; /* Close top group */ @@ -1089,7 +1089,7 @@ gcpl_on_root(hid_t fapl2) /* Create a link creation property list, with intermediate group creation set */ if ((lcpl = H5Pcreate(H5P_LINK_CREATE)) < 0) TEST_ERROR; - if (H5Pset_create_intermediate_group(lcpl, TRUE) < 0) + if (H5Pset_create_intermediate_group(lcpl, true) < 0) TEST_ERROR; /* Create a group and intermediate groups, to check if root group settings are inherited */ @@ -1376,8 +1376,8 @@ main(void) hid_t fcpl, fcpl2; /* File creation property list ID */ unsigned new_format; /* Whether to use the new format or not */ const char *env_h5_drvr; /* File Driver value from environment */ - hbool_t contig_addr_vfd; /* Whether VFD used has a contiguous address space */ - hbool_t driver_is_default_compatible; + bool contig_addr_vfd; /* Whether VFD used has a contiguous address space */ + bool driver_is_default_compatible; int nerrors = 0; /* Get the VFD to use */ @@ -1386,7 +1386,7 @@ main(void) env_h5_drvr = "nomatch"; /* VFD that does not support contiguous address space */ - contig_addr_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); + contig_addr_vfd = (bool)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); /* Reset library */ h5_reset(); @@ -1415,7 +1415,7 @@ main(void) TEST_ERROR; /* Loop over using new group format */ - for (new_format = FALSE; new_format <= TRUE; new_format++) { + for (new_format = false; new_format <= true; new_format++) { hid_t my_fapl = fapl; hid_t my_fcpl = fcpl; diff --git a/test/swmr.c b/test/swmr.c index 0354744..1caf548 100644 --- a/test/swmr.c +++ b/test/swmr.c @@ -63,9 +63,9 @@ static int test_metadata_read_attempts(hid_t in_fapl); static int test_metadata_read_retry_info(hid_t in_fapl); /* Tests for H5Fstart_swmr_write() */ -static int test_start_swmr_write(hid_t in_fapl, hbool_t new_format); -static int test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format); -static int test_start_swmr_write_concur(hid_t in_fapl, hbool_t new_format); +static int test_start_swmr_write(hid_t in_fapl, bool new_format); +static int test_err_start_swmr_write(hid_t in_fapl, bool new_format); +static int test_start_swmr_write_concur(hid_t in_fapl, bool new_format); static int test_start_swmr_write_stress_ohdr(hid_t in_fapl); static int test_start_swmr_write_persist_dapl(hid_t in_fapl); @@ -90,16 +90,16 @@ static int test_file_lock_concur(hid_t fapl); static int test_file_lock_swmr_concur(hid_t fapl); /* Test file lock environment variable */ -static int test_file_locking(hid_t in_fapl, hbool_t turn_locking_on, hbool_t env_var_override); +static int test_file_locking(hid_t in_fapl, bool turn_locking_on, bool env_var_override); /* Tests for SWMR VFD flag */ static int test_swmr_vfd_flag(void); /* Tests for H5Drefresh: concurrent access */ -static int test_refresh_concur(hid_t in_fapl, hbool_t new_format); +static int test_refresh_concur(hid_t in_fapl, bool new_format); /* Tests for multiple opens of files and datasets with H5Drefresh() & H5Fstart_swmr_write(): same process */ -static int test_multiple_same(hid_t in_fapl, hbool_t new_format); +static int test_multiple_same(hid_t in_fapl, bool new_format); /* * Tests for H5Pget/set_metadata_read_attemps(), H5Fget_metadata_read_retry_info() @@ -120,7 +120,7 @@ test_metadata_read_attempts(hid_t in_fapl) hid_t fid = -1, fid1 = -1, fid2 = -1; /* File IDs */ hid_t driver_id = -1; /* ID for this VFD */ unsigned long driver_flags = 0; /* VFD feature flags */ - hbool_t compat_w_default_vfd; /* current VFD compat w/ H5P_DEFAULT? */ + bool compat_w_default_vfd; /* current VFD compat w/ H5P_DEFAULT? */ unsigned attempts; /* The # of read attempts */ char filename[NAME_BUF_SIZE]; /* File name */ herr_t ret; /* Generic return value */ @@ -138,7 +138,7 @@ test_metadata_read_attempts(hid_t in_fapl) FAIL_STACK_ERROR; if (H5FDdriver_query(driver_id, &driver_flags) < 0) FAIL_STACK_ERROR; - compat_w_default_vfd = (driver_flags & H5FD_FEAT_DEFAULT_VFD_COMPATIBLE) ? TRUE : FALSE; + compat_w_default_vfd = (driver_flags & H5FD_FEAT_DEFAULT_VFD_COMPATIBLE) ? true : false; if (!compat_w_default_vfd) { SKIPPED(); @@ -1570,7 +1570,7 @@ error: * Close the group and file */ static int -test_start_swmr_write(hid_t in_fapl, hbool_t new_format) +test_start_swmr_write(hid_t in_fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t fapl = -1; /* File access property */ @@ -1938,7 +1938,7 @@ error: * --fail to enable SWMR due to superblock version not 3 */ static int -test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format) +test_err_start_swmr_write(hid_t in_fapl, bool new_format) { hid_t fid = -1; /* File ID */ hid_t fid2 = -1; /* File ID */ @@ -2401,7 +2401,7 @@ error: #if !(defined(H5_HAVE_FORK) && defined(H5_HAVE_WAITPID)) static int -test_start_swmr_write_concur(hid_t H5_ATTR_UNUSED in_fapl, hbool_t new_format) +test_start_swmr_write_concur(hid_t H5_ATTR_UNUSED in_fapl, bool new_format) { if (new_format) { TESTING("H5Fstart_swmr_write()--concurrent access for latest format"); @@ -2418,7 +2418,7 @@ test_start_swmr_write_concur(hid_t H5_ATTR_UNUSED in_fapl, hbool_t new_format) #else /* !defined(H5_HAVE_FORK && defined(H5_HAVE_WAITPID) */ static int -test_start_swmr_write_concur(hid_t in_fapl, hbool_t new_format) +test_start_swmr_write_concur(hid_t in_fapl, bool new_format) { hid_t fid = -1, fid1 = -1, fid2 = -1; /* File IDs */ hid_t fapl; /* File access property list */ @@ -4716,7 +4716,7 @@ test_file_lock_same(hid_t in_fapl) /* Set locking in the fapl */ if ((fapl = H5Pcopy(in_fapl)) < 0) FAIL_STACK_ERROR; - if (H5Pset_file_locking(fapl, TRUE, TRUE) < 0) + if (H5Pset_file_locking(fapl, true, true) < 0) FAIL_STACK_ERROR; /* Set the filename to use for this test (dependent on fapl) */ @@ -5213,7 +5213,7 @@ test_file_lock_concur(hid_t in_fapl) /* Set locking in the fapl */ if ((fapl = H5Pcopy(in_fapl)) < 0) FAIL_STACK_ERROR; - if (H5Pset_file_locking(fapl, TRUE, TRUE) < 0) + if (H5Pset_file_locking(fapl, true, true) < 0) FAIL_STACK_ERROR; /* Set the filename to use for this test (dependent on fapl) */ @@ -5606,7 +5606,7 @@ test_file_lock_swmr_concur(hid_t in_fapl) /* Set locking in the fapl */ if ((fapl = H5Pcopy(in_fapl)) < 0) FAIL_STACK_ERROR; - if (H5Pset_file_locking(fapl, TRUE, TRUE) < 0) + if (H5Pset_file_locking(fapl, true, true) < 0) FAIL_STACK_ERROR; /* Set the filename to use for this test (dependent on fapl) */ @@ -6596,7 +6596,7 @@ error: ** *****************************************************************/ static int -test_file_locking(hid_t in_fapl, hbool_t turn_locking_on, hbool_t env_var_override) +test_file_locking(hid_t in_fapl, bool turn_locking_on, bool env_var_override) { #if !(defined(H5_HAVE_FORK) && defined(H5_HAVE_WAITPID)) if (turn_locking_on && env_var_override) @@ -6636,18 +6636,18 @@ test_file_locking(hid_t in_fapl, hbool_t turn_locking_on, hbool_t env_var_overri TEST_ERROR; /* Set locking in the fapl */ - if (H5Pset_file_locking(fapl, turn_locking_on ? TRUE : FALSE, TRUE) < 0) + if (H5Pset_file_locking(fapl, turn_locking_on ? true : false, true) < 0) TEST_ERROR; /* If requested, set the environment variable */ if (env_var_override) { - if (HDsetenv(HDF5_USE_FILE_LOCKING, turn_locking_on ? "FALSE" : "TRUE", TRUE) < 0) + if (HDsetenv(HDF5_USE_FILE_LOCKING, turn_locking_on ? "FALSE" : "TRUE", true) < 0) TEST_ERROR; if (H5F__reparse_file_lock_variable_test() < 0) TEST_ERROR; } else { - if (HDsetenv(HDF5_USE_FILE_LOCKING, "", TRUE) < 0) + if (HDsetenv(HDF5_USE_FILE_LOCKING, "", true) < 0) TEST_ERROR; if (H5F__reparse_file_lock_variable_test() < 0) TEST_ERROR; @@ -6803,7 +6803,7 @@ test_different_lock_flags(hid_t in_fapl) TEST_ERROR; /* Set locking in the fapl */ - if (H5Pset_file_locking(fapl_id, TRUE, TRUE) < 0) + if (H5Pset_file_locking(fapl_id, true, true) < 0) TEST_ERROR; /* Set the filename to use for this test (dependent on fapl) */ @@ -6818,7 +6818,7 @@ test_different_lock_flags(hid_t in_fapl) TEST_ERROR; /* Unset locking in the fapl */ - if (H5Pset_file_locking(fapl_id, FALSE, FALSE) < 0) + if (H5Pset_file_locking(fapl_id, false, false) < 0) TEST_ERROR; /* Open the test file with different flags (should FAIL) */ @@ -7073,7 +7073,7 @@ error: #if !(defined(H5_HAVE_FORK) && defined(H5_HAVE_WAITPID)) static int -test_refresh_concur(hid_t H5_ATTR_UNUSED in_fapl, hbool_t new_format) +test_refresh_concur(hid_t H5_ATTR_UNUSED in_fapl, bool new_format) { if (new_format) { TESTING("H5Drefresh()--concurrent access for latest format"); @@ -7090,7 +7090,7 @@ test_refresh_concur(hid_t H5_ATTR_UNUSED in_fapl, hbool_t new_format) #else /* !(defined(H5_HAVE_FORK) && defined(H5_HAVE_WAITPID)) */ static int -test_refresh_concur(hid_t in_fapl, hbool_t new_format) +test_refresh_concur(hid_t in_fapl, bool new_format) { hid_t fid = H5I_INVALID_HID; /* File ID */ hid_t fapl; /* File access property list */ @@ -7403,7 +7403,7 @@ error: * opens of files and datasets. */ static int -test_multiple_same(hid_t in_fapl, hbool_t new_format) +test_multiple_same(hid_t in_fapl, bool new_format) { hid_t fid = -1, fid1 = -1, fid2 = -1, fid3 = -1; /* File IDs */ hid_t fapl; /* File access property list */ @@ -7728,12 +7728,12 @@ error: int main(void) { - int nerrors = 0; /* The # of errors */ - hid_t fapl = H5I_INVALID_HID; /* File access property list ID */ - char *driver = NULL; /* VFD string (from env variable) */ - char *lock_env_var = NULL; /* file locking env var pointer */ - hbool_t use_file_locking; /* read from env var */ - hbool_t file_locking_enabled = FALSE; /* Checks if the file system supports locks */ + int nerrors = 0; /* The # of errors */ + hid_t fapl = H5I_INVALID_HID; /* File access property list ID */ + char *driver = NULL; /* VFD string (from env variable) */ + char *lock_env_var = NULL; /* file locking env var pointer */ + bool use_file_locking; /* read from env var */ + bool file_locking_enabled = false; /* Checks if the file system supports locks */ /* Testing setup */ h5_reset(); @@ -7753,9 +7753,9 @@ main(void) */ lock_env_var = HDgetenv(HDF5_USE_FILE_LOCKING); if (lock_env_var && !HDstrcmp(lock_env_var, "FALSE")) - use_file_locking = FALSE; + use_file_locking = false; else - use_file_locking = TRUE; + use_file_locking = true; /* Check if file locking is enabled on this file system */ if (use_file_locking) @@ -7770,10 +7770,10 @@ main(void) #ifdef OUT nerrors += test_bug_refresh(fapl); #endif - nerrors += test_refresh_concur(fapl, TRUE); - nerrors += test_refresh_concur(fapl, FALSE); - nerrors += test_multiple_same(fapl, TRUE); - nerrors += test_multiple_same(fapl, FALSE); + nerrors += test_refresh_concur(fapl, true); + nerrors += test_refresh_concur(fapl, false); + nerrors += test_multiple_same(fapl, true); + nerrors += test_multiple_same(fapl, false); /* Tests on H5Pget/set_metadata_read_attempts() and H5Fget_metadata_read_retry_info() */ nerrors += test_metadata_read_attempts(fapl); @@ -7785,12 +7785,12 @@ main(void) * H5Fcreate(write, latest format) or H5Fcreate(SWMR write, non-latest-format) * --both result in v3 superblock and latest version support */ - nerrors += test_start_swmr_write(fapl, TRUE); - nerrors += test_start_swmr_write(fapl, FALSE); - nerrors += test_err_start_swmr_write(fapl, TRUE); - nerrors += test_err_start_swmr_write(fapl, FALSE); - nerrors += test_start_swmr_write_concur(fapl, TRUE); - nerrors += test_start_swmr_write_concur(fapl, FALSE); + nerrors += test_start_swmr_write(fapl, true); + nerrors += test_start_swmr_write(fapl, false); + nerrors += test_err_start_swmr_write(fapl, true); + nerrors += test_err_start_swmr_write(fapl, false); + nerrors += test_start_swmr_write_concur(fapl, true); + nerrors += test_start_swmr_write_concur(fapl, false); nerrors += test_start_swmr_write_stress_ohdr(fapl); nerrors += test_start_swmr_write_persist_dapl(fapl); @@ -7838,10 +7838,10 @@ main(void) * so they should be run last. */ if (use_file_locking && file_locking_enabled) { - nerrors += test_file_locking(fapl, TRUE, TRUE); - nerrors += test_file_locking(fapl, TRUE, FALSE); - nerrors += test_file_locking(fapl, FALSE, TRUE); - nerrors += test_file_locking(fapl, FALSE, FALSE); + nerrors += test_file_locking(fapl, true, true); + nerrors += test_file_locking(fapl, true, false); + nerrors += test_file_locking(fapl, false, true); + nerrors += test_file_locking(fapl, false, false); } if (nerrors) diff --git a/test/swmr_generator.c b/test/swmr_generator.c index 75e392d..68b7a40 100644 --- a/test/swmr_generator.c +++ b/test/swmr_generator.c @@ -44,7 +44,7 @@ /* Local Prototypes */ /********************/ -static int gen_skeleton(const char *filename, hbool_t verbose, hbool_t swmr_write, int comp_level, +static int gen_skeleton(const char *filename, bool verbose, bool swmr_write, int comp_level, const char *index_type, unsigned random_seed); static void usage(void); @@ -57,10 +57,10 @@ static void usage(void); * Parameters: const char *filename * The SWMR test file's name. * - * hbool_t verbose + * bool verbose * Whether verbose console output is desired. * - * hbool_t swmr_write + * bool swmr_write * Whether to create the file with SWMR writing enabled * * int comp_level @@ -79,8 +79,8 @@ static void usage(void); *------------------------------------------------------------------------- */ static int -gen_skeleton(const char *filename, hbool_t verbose, hbool_t swmr_write, int comp_level, - const char *index_type, unsigned random_seed) +gen_skeleton(const char *filename, bool verbose, bool swmr_write, int comp_level, const char *index_type, + unsigned random_seed) { hid_t fid; /* File ID for new HDF5 file */ hid_t fcpl; /* File creation property list */ @@ -182,10 +182,10 @@ gen_skeleton(const char *filename, hbool_t verbose, hbool_t swmr_write, int comp /* Create the datasets */ for (u = 0; u < NLEVELS; u++) for (v = 0; v < symbol_count[u]; v++) { - hid_t dsid; /* Dataset ID */ - char name_buf[64]; - hbool_t move_dataspace_message = - FALSE; /* Whether to move the dataspace message out of object header chunk #0 */ + hid_t dsid; /* Dataset ID */ + char name_buf[64]; + bool move_dataspace_message = + false; /* Whether to move the dataspace message out of object header chunk #0 */ generate_name(name_buf, sizeof(name_buf), u, v); if ((dsid = H5Dcreate2(fid, name_buf, tid, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) @@ -193,7 +193,7 @@ gen_skeleton(const char *filename, hbool_t verbose, hbool_t swmr_write, int comp /* Determine if the dataspace message for this dataset should be * moved out of chunk #0 of the object header - * (Set to TRUE for every fourth dataset) + * (Set to true for every fourth dataset) */ move_dataspace_message = !(HDrandom() % 4); if (move_dataspace_message) { @@ -260,10 +260,10 @@ int main(int argc, char *argv[]) { int comp_level = -1; /* Compression level (-1 is no compression) */ - hbool_t verbose = TRUE; /* Whether to emit some informational messages */ - hbool_t swmr_write = FALSE; /* Whether to create file with SWMR_WRITE access */ + bool verbose = true; /* Whether to emit some informational messages */ + bool swmr_write = false; /* Whether to create file with SWMR_WRITE access */ const char *index_type = "b1"; /* Chunk index type */ - hbool_t use_seed = FALSE; /* Set to TRUE if a seed was set on the command line */ + bool use_seed = false; /* Set to true if a seed was set on the command line */ unsigned random_seed = 0; /* Random # seed */ unsigned u; /* Local index variables */ int temp; @@ -292,7 +292,7 @@ main(int argc, char *argv[]) /* Random # seed */ case 'r': - use_seed = TRUE; + use_seed = true; temp = atoi(argv[u + 1]); if (temp < 0) usage(); @@ -303,13 +303,13 @@ main(int argc, char *argv[]) /* Be quiet */ case 'q': - verbose = FALSE; + verbose = false; u++; break; /* Run with SWMR_WRITE */ case 's': - swmr_write = TRUE; + swmr_write = true; u++; break; diff --git a/test/swmr_reader.c b/test/swmr_reader.c index 08c6307..61d7ef0 100644 --- a/test/swmr_reader.c +++ b/test/swmr_reader.c @@ -34,9 +34,9 @@ /* Local Prototypes */ /********************/ -static int check_dataset(hid_t fid, hbool_t verbose, FILE *verbose_file, const char *sym_name, - symbol_t *record, hid_t rec_sid); -static int read_records(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned random_seed, +static int check_dataset(hid_t fid, bool verbose, FILE *verbose_file, const char *sym_name, symbol_t *record, + hid_t rec_sid); +static int read_records(const char *filename, bool verbose, FILE *verbose_file, unsigned random_seed, unsigned long nseconds, unsigned poll_time, unsigned ncommon, unsigned nrandom); /*******************/ @@ -55,7 +55,7 @@ static hid_t symbol_tid = -1; /* The type ID for the SWMR datasets */ * Parameters: hid_t fid * The SWMR test file's ID. * - * hbool_t verbose + * bool verbose * Whether verbose console output is desired. * * FILE *verbose_file @@ -78,7 +78,7 @@ static hid_t symbol_tid = -1; /* The type ID for the SWMR datasets */ *------------------------------------------------------------------------- */ static int -check_dataset(hid_t fid, hbool_t verbose, FILE *verbose_file, const char *sym_name, symbol_t *record, +check_dataset(hid_t fid, bool verbose, FILE *verbose_file, const char *sym_name, symbol_t *record, hid_t rec_sid) { hid_t dsid; /* Dataset ID */ @@ -163,7 +163,7 @@ check_dataset(hid_t fid, hbool_t verbose, FILE *verbose_file, const char *sym_na * Parameters: const char *filename * The SWMR test file's name. * - * hbool_t verbose + * bool verbose * Whether verbose console output is desired. * * FILE *verbose_file @@ -190,7 +190,7 @@ check_dataset(hid_t fid, hbool_t verbose, FILE *verbose_file, const char *sym_na *------------------------------------------------------------------------- */ static int -read_records(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned random_seed, +read_records(const char *filename, bool verbose, FILE *verbose_file, unsigned random_seed, unsigned long nseconds, unsigned poll_time, unsigned ncommon, unsigned nrandom) { time_t start_time; /* Starting time */ @@ -202,7 +202,7 @@ read_records(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned hid_t fapl; /* file access property list */ symbol_t record; /* The record to read from the dataset */ unsigned v; /* Local index variable */ - hbool_t use_log_vfd = FALSE; /* Use the log VFD (set this manually) */ + bool use_log_vfd = false; /* Use the log VFD (set this manually) */ assert(filename); assert(nseconds != 0); @@ -392,9 +392,9 @@ main(int argc, char *argv[]) int poll_time = 1; /* # of seconds between polling */ int ncommon = 5; /* # of common symbols to poll */ int nrandom = 10; /* # of random symbols to poll */ - hbool_t verbose = TRUE; /* Whether to emit some informational messages */ + bool verbose = true; /* Whether to emit some informational messages */ FILE *verbose_file = NULL; /* File handle for verbose output */ - hbool_t use_seed = FALSE; /* Set to 1 if a seed was set on the command line */ + bool use_seed = false; /* Set to 1 if a seed was set on the command line */ unsigned random_seed = 0; /* Random # seed */ unsigned u; /* Local index variables */ int temp; @@ -425,13 +425,13 @@ main(int argc, char *argv[]) /* Be quiet */ case 'q': - verbose = FALSE; + verbose = false; u++; break; /* Random # seed */ case 'r': - use_seed = TRUE; + use_seed = true; temp = atoi(argv[u + 1]); if (temp < 0) usage(); diff --git a/test/swmr_sparse_writer.c b/test/swmr_sparse_writer.c index edef5c6..88d0b51 100644 --- a/test/swmr_sparse_writer.c +++ b/test/swmr_sparse_writer.c @@ -173,7 +173,7 @@ add_records(hid_t fid, unsigned verbose, unsigned long nrecords, unsigned long f symbol_info_t *symbol; /* Symbol to write record to */ hid_t file_sid; /* Dataset's space ID */ hid_t aid; /* Attribute ID */ - hbool_t corked; /* Whether the dataset was corked */ + bool corked; /* Whether the dataset was corked */ /* Get a random dataset, according to the symbol distribution */ symbol = choose_dataset(); @@ -188,7 +188,7 @@ add_records(hid_t fid, unsigned verbose, unsigned long nrecords, unsigned long f * flushed before the data has been written */ if (H5Odisable_mdc_flushes(symbol->dsid) < 0) return -1; - corked = TRUE; + corked = true; if (H5Dset_extent(symbol->dsid, dim) < 0) return -1; @@ -204,7 +204,7 @@ add_records(hid_t fid, unsigned verbose, unsigned long nrecords, unsigned long f else { if ((aid = H5Aopen(symbol->dsid, "seq", H5P_DEFAULT)) < 0) return -1; - corked = FALSE; + corked = false; } /* end else */ /* Get the coordinate to write */ diff --git a/test/swmr_start_write.c b/test/swmr_start_write.c index 2bea7d4..267b4ce 100644 --- a/test/swmr_start_write.c +++ b/test/swmr_start_write.c @@ -35,10 +35,10 @@ /* Local Prototypes */ /********************/ -static hid_t create_file(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned random_seed); -static int create_datasets(hid_t fid, int comp_level, hbool_t verbose, FILE *verbose_file, +static hid_t create_file(const char *filename, bool verbose, FILE *verbose_file, unsigned random_seed); +static int create_datasets(hid_t fid, int comp_level, bool verbose, FILE *verbose_file, const char *index_type); -static int add_records(hid_t fid, hbool_t verbose, FILE *verbose_file, unsigned long nrecords, +static int add_records(hid_t fid, bool verbose, FILE *verbose_file, unsigned long nrecords, unsigned long flush_count); static void usage(void); @@ -63,7 +63,7 @@ static void usage(void); *------------------------------------------------------------------------- */ static hid_t -create_file(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned random_seed) +create_file(const char *filename, bool verbose, FILE *verbose_file, unsigned random_seed) { hid_t fid; /* File ID for new HDF5 file */ hid_t fcpl; /* File creation property list */ @@ -135,7 +135,7 @@ create_file(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned *------------------------------------------------------------------------- */ static int -create_datasets(hid_t fid, int comp_level, hbool_t verbose, FILE *verbose_file, const char *index_type) +create_datasets(hid_t fid, int comp_level, bool verbose, FILE *verbose_file, const char *index_type) { hid_t dcpl; /* Dataset creation property list */ hid_t tid; /* Datatype for dataset elements */ @@ -209,7 +209,7 @@ create_datasets(hid_t fid, int comp_level, hbool_t verbose, FILE *verbose_file, *------------------------------------------------------------------------- */ static int -add_records(hid_t fid, hbool_t verbose, FILE *verbose_file, unsigned long nrecords, unsigned long flush_count) +add_records(hid_t fid, bool verbose, FILE *verbose_file, unsigned long nrecords, unsigned long flush_count) { hid_t tid; /* Datatype ID for records */ hid_t mem_sid; /* Memory dataspace ID */ @@ -356,9 +356,9 @@ main(int argc, char *argv[]) hid_t fid; /* File ID for file opened */ long nrecords = 0; /* # of records to append */ long flush_count = 10000; /* # of records to write between flushing file */ - hbool_t verbose = TRUE; /* Whether to emit some informational messages */ + bool verbose = true; /* Whether to emit some informational messages */ FILE *verbose_file = NULL; /* File handle for verbose output */ - hbool_t use_seed = FALSE; /* Set to TRUE if a seed was set on the command line */ + bool use_seed = false; /* Set to true if a seed was set on the command line */ unsigned random_seed = 0; /* Random # seed */ int comp_level = -1; /* Compression level (-1 is no compression) */ const char *index_type = "b1"; /* Chunk index type */ @@ -399,13 +399,13 @@ main(int argc, char *argv[]) /* Be quiet */ case 'q': - verbose = FALSE; + verbose = false; u++; break; /* Random # seed */ case 'r': - use_seed = TRUE; + use_seed = true; temp = atoi(argv[u + 1]); if (temp < 0) usage(); diff --git a/test/swmr_writer.c b/test/swmr_writer.c index 8397c43..c66a09d 100644 --- a/test/swmr_writer.c +++ b/test/swmr_writer.c @@ -34,9 +34,9 @@ /* Local Prototypes */ /********************/ -static hid_t open_skeleton(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned random_seed, - hbool_t old); -static int add_records(hid_t fid, hbool_t verbose, FILE *verbose_file, unsigned long nrecords, +static hid_t open_skeleton(const char *filename, bool verbose, FILE *verbose_file, unsigned random_seed, + bool old); +static int add_records(hid_t fid, bool verbose, FILE *verbose_file, unsigned long nrecords, unsigned long flush_count); static void usage(void); @@ -48,7 +48,7 @@ static void usage(void); * Parameters: const char *filename * The filename of the SWMR HDF5 file to open * - * hbool_t verbose + * bool verbose * Whether or not to emit verbose console messages * * FILE *verbose_file @@ -57,7 +57,7 @@ static void usage(void); * unsigned random_seed * Random seed for the file (used for verbose logging) * - * hbool_t old + * bool old * Whether to write in "old" file format * * Return: Success: The file ID of the opened SWMR file @@ -68,12 +68,12 @@ static void usage(void); *------------------------------------------------------------------------- */ static hid_t -open_skeleton(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned random_seed, hbool_t old) +open_skeleton(const char *filename, bool verbose, FILE *verbose_file, unsigned random_seed, bool old) { hid_t fid; /* File ID for new HDF5 file */ hid_t fapl; /* File access property list */ unsigned u, v; /* Local index variable */ - hbool_t use_log_vfd = FALSE; /* Use the log VFD (set this manually) */ + bool use_log_vfd = false; /* Use the log VFD (set this manually) */ assert(filename); @@ -127,7 +127,7 @@ open_skeleton(const char *filename, hbool_t verbose, FILE *verbose_file, unsigne * Parameters: hid_t fid * The file ID of the SWMR HDF5 file * - * hbool_t verbose + * bool verbose * Whether or not to emit verbose console messages * * FILE *verbose_file @@ -145,7 +145,7 @@ open_skeleton(const char *filename, hbool_t verbose, FILE *verbose_file, unsigne *------------------------------------------------------------------------- */ static int -add_records(hid_t fid, hbool_t verbose, FILE *verbose_file, unsigned long nrecords, unsigned long flush_count) +add_records(hid_t fid, bool verbose, FILE *verbose_file, unsigned long nrecords, unsigned long flush_count) { hid_t tid; /* Datatype ID for records */ hid_t mem_sid; /* Memory dataspace ID */ @@ -279,10 +279,10 @@ main(int argc, char *argv[]) hid_t fid; /* File ID for file opened */ long nrecords = 0; /* # of records to append */ long flush_count = 10000; /* # of records to write between flushing file */ - hbool_t verbose = TRUE; /* Whether to emit some informational messages */ + bool verbose = true; /* Whether to emit some informational messages */ FILE *verbose_file = NULL; /* File handle for verbose output */ - hbool_t old = FALSE; /* Whether to use non-latest-format when opening file */ - hbool_t use_seed = FALSE; /* Set to TRUE if a seed was set on the command line */ + bool old = false; /* Whether to use non-latest-format when opening file */ + bool use_seed = false; /* Set to true if a seed was set on the command line */ unsigned random_seed = 0; /* Random # seed */ unsigned u; /* Local index variable */ int temp; @@ -305,13 +305,13 @@ main(int argc, char *argv[]) /* Be quiet */ case 'q': - verbose = FALSE; + verbose = false; u++; break; /* Random # seed */ case 'r': - use_seed = TRUE; + use_seed = true; temp = atoi(argv[u + 1]); random_seed = (unsigned)temp; u += 2; @@ -319,7 +319,7 @@ main(int argc, char *argv[]) /* Use non-latest-format when opening file */ case 'o': - old = TRUE; + old = true; u++; break; diff --git a/test/tarray.c b/test/tarray.c index b5ce921..3cfa2c8 100644 --- a/test/tarray.c +++ b/test/tarray.c @@ -1918,7 +1918,7 @@ test_compat(void) size_t off; /* Offset of compound field */ hid_t mtid; /* Datatype ID for field */ int i; /* Index variables */ - hbool_t driver_is_default_compatible; + bool driver_is_default_compatible; herr_t ret; /* Generic return value */ /* Output message about test being performed */ diff --git a/test/tattr.c b/test/tattr.c index 91cba51..25f8ddb 100644 --- a/test/tattr.c +++ b/test/tattr.c @@ -164,7 +164,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); @@ -2246,7 +2246,7 @@ test_attr_dense_create(hid_t fcpl, hid_t fapl) /* 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"); /* Add attributes, until just before converting to dense storage */ for (u = 0; u < max_compact; u++) { @@ -2266,7 +2266,7 @@ test_attr_dense_create(hid_t fcpl, hid_t fapl) /* 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"); /* Add one more attribute, to push into "dense" storage */ /* Create attribute */ @@ -2276,7 +2276,7 @@ test_attr_dense_create(hid_t fcpl, hid_t fapl) /* 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"); /* Write data into the attribute */ ret = H5Awrite(attr, H5T_NATIVE_UINT, &u); @@ -2392,7 +2392,7 @@ test_attr_dense_open(hid_t fcpl, hid_t fapl) /* 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"); /* Add attributes, until just before converting to dense storage */ for (u = 0; u < max_compact; u++) { @@ -2416,7 +2416,7 @@ test_attr_dense_open(hid_t fcpl, hid_t fapl) /* 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"); /* Add one more attribute, to push into "dense" storage */ /* Create attribute */ @@ -2426,7 +2426,7 @@ test_attr_dense_open(hid_t fcpl, hid_t fapl) /* 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"); /* Write data into the attribute */ ret = H5Awrite(attr, H5T_NATIVE_UINT, &u); @@ -2501,7 +2501,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); @@ -2554,7 +2554,7 @@ test_attr_dense_delete(hid_t fcpl, hid_t fapl) /* 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"); /* Add attributes, until well into dense storage */ for (u = 0; u < (max_compact * 2); u++) { @@ -2579,7 +2579,7 @@ test_attr_dense_delete(hid_t fcpl, hid_t fapl) /* 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"); /* Close dataspace */ ret = H5Sclose(sid); @@ -2615,7 +2615,7 @@ test_attr_dense_delete(hid_t fcpl, hid_t fapl) /* 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"); /* Delete one more attribute, which should cause reversion to compact storage */ HDsnprintf(attrname, sizeof(attrname), "attr %02u", u); @@ -2624,7 +2624,7 @@ test_attr_dense_delete(hid_t fcpl, hid_t fapl) /* 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"); /* Verify attributes still left */ ret = test_attr_dense_verify(dataset, (u - 1)); @@ -2637,7 +2637,7 @@ test_attr_dense_delete(hid_t fcpl, hid_t fapl) /* 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"); /* Verify attributes still left */ ret = test_attr_dense_verify(dataset, (u - 2)); @@ -2702,7 +2702,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); @@ -2742,7 +2742,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); @@ -2755,7 +2755,7 @@ test_attr_dense_rename(hid_t fcpl, hid_t fapl) /* 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"); /* Add attributes, until well into dense storage */ for (u = 0; u < (max_compact * 2); u++) { @@ -2787,7 +2787,7 @@ test_attr_dense_rename(hid_t fcpl, hid_t fapl) /* 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"); /* Close Dataset */ ret = H5Dclose(dataset); @@ -2898,7 +2898,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); @@ -2945,7 +2945,7 @@ test_attr_dense_unlink(hid_t fcpl, hid_t fapl) /* 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"); /* Add attributes, until well into dense storage */ for (u = 0; u < (max_compact * 2); u++) { @@ -2970,7 +2970,7 @@ test_attr_dense_unlink(hid_t fcpl, hid_t fapl) /* 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"); /* Close dataspace */ ret = H5Sclose(sid); @@ -3087,7 +3087,7 @@ test_attr_dense_limits(hid_t fcpl, hid_t fapl) /* 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"); /* Add first attribute, which should be immediately in dense storage */ @@ -3107,7 +3107,7 @@ test_attr_dense_limits(hid_t fcpl, hid_t fapl) /* 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"); /* Add second attribute, to allow deletions to be checked easily */ @@ -3127,7 +3127,7 @@ test_attr_dense_limits(hid_t fcpl, hid_t fapl) /* 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"); /* Delete second attribute, attributes should still be stored densely */ @@ -3137,7 +3137,7 @@ test_attr_dense_limits(hid_t fcpl, hid_t fapl) /* 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"); /* Delete first attribute, attributes should not be stored densely */ @@ -3149,7 +3149,7 @@ test_attr_dense_limits(hid_t fcpl, hid_t fapl) /* 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"); /* Close dataspace */ ret = H5Sclose(sid); @@ -3247,7 +3247,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl) /* 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"); /* Add attributes, until just before converting to dense storage */ for (u = 0; u < max_compact; u++) { @@ -3267,7 +3267,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl) /* 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"); /* Add one more attribute, to push into "dense" storage */ /* Create dataspace for attribute */ @@ -3281,7 +3281,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl) /* 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"); /* Open the attribute just created and get a second ID */ attr2 = H5Aopen(dataset, attrname, H5P_DEFAULT); @@ -3316,7 +3316,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl) /* 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"); /* Open first attribute for the dataset */ attr = H5Aopen(dataset, attrname, H5P_DEFAULT); @@ -3368,7 +3368,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl) /* 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"); /* Open first attribute for the dataset */ attr = H5Aopen(dataset, attrname, H5P_DEFAULT); @@ -3431,7 +3431,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl) /* 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"); /* Open first attribute for the dataset */ attr = H5Aopen_by_idx(dataset, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)4, H5P_DEFAULT, H5P_DEFAULT); @@ -3485,7 +3485,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl) /* 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"); /* 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); @@ -3499,7 +3499,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl) /* 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"); /* Open attribute for the second time */ attr2 = H5Aopen_by_idx(dataset, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)2, H5P_DEFAULT, H5P_DEFAULT); @@ -3549,7 +3549,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl) /* 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"); /* 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); @@ -3573,7 +3573,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl) /* 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"); /* Open attribute for the second time */ attr2 = H5Aopen_by_idx(dataset, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)3, H5P_DEFAULT, H5P_DEFAULT); @@ -3645,7 +3645,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl) /* 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"); /* Open the hard link just created */ gid2 = H5Gopen2(fid, GROUP2_NAME, H5P_DEFAULT); @@ -3784,9 +3784,9 @@ test_attr_big(hid_t fcpl, hid_t fapl) /* 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"); /* Add first "small" attribute, which should be in compact storage */ @@ -3802,9 +3802,9 @@ test_attr_big(hid_t fcpl, hid_t fapl) /* 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"); /* Add second "small" attribute, which should stay in compact storage */ @@ -3820,9 +3820,9 @@ test_attr_big(hid_t fcpl, hid_t fapl) /* 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"); /* Add first "big" attribute, which should push storage into dense form */ @@ -3843,9 +3843,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, (nshared_indices ? FALSE : TRUE), "H5O__is_attr_dense_test"); + VERIFY(is_dense, (nshared_indices ? false : true), "H5O__is_attr_dense_test"); /* Add second "big" attribute, which should leave storage in dense form */ @@ -3865,9 +3865,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, (nshared_indices ? FALSE : TRUE), "H5O__is_attr_dense_test"); + VERIFY(is_dense, (nshared_indices ? false : true), "H5O__is_attr_dense_test"); /* Delete second "small" attribute, attributes should still be stored densely */ @@ -3879,9 +3879,9 @@ test_attr_big(hid_t fcpl, hid_t fapl) /* 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"); /* Delete second "big" attribute, attributes should still be stored densely */ @@ -3893,9 +3893,9 @@ test_attr_big(hid_t fcpl, hid_t fapl) /* 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"); /* Delete first "big" attribute, attributes should _not_ be stored densely */ @@ -3907,9 +3907,9 @@ test_attr_big(hid_t fcpl, hid_t fapl) /* 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"); /* Delete first "small" attribute, should be no attributes now */ @@ -3921,7 +3921,7 @@ test_attr_big(hid_t fcpl, hid_t fapl) /* 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"); } /* end if */ else { /* Shouldn't be able to create "big" attributes with older version of format */ @@ -3933,9 +3933,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 */ /* Close dataspaces */ @@ -4040,7 +4040,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); @@ -4114,7 +4114,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); @@ -4289,7 +4289,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 */ @@ -4321,19 +4321,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"); @@ -4342,10 +4342,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 */ @@ -4373,19 +4373,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"); @@ -4480,9 +4480,9 @@ test_attr_corder_create_basic(hid_t fcpl, hid_t fapl) /* 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"); /* Close Dataset */ ret = H5Dclose(dataset); @@ -4506,9 +4506,9 @@ test_attr_corder_create_basic(hid_t fcpl, hid_t fapl) /* 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"); /* Retrieve dataset creation property list for group */ dcpl = H5Dget_create_plist(dataset); @@ -4615,9 +4615,9 @@ test_attr_corder_create_compact(hid_t fcpl, hid_t fapl) /* 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"); /* Create several attributes, but keep storage in compact form */ for (u = 0; u < max_compact; u++) { @@ -4639,9 +4639,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"); } /* end for */ } /* end for */ @@ -4701,9 +4701,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"); /* Loop through attributes, checking their creation order values */ /* (the name index is used, but the creation order value is in the same order) */ @@ -4716,7 +4716,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 */ @@ -4819,9 +4819,9 @@ test_attr_corder_create_dense(hid_t fcpl, hid_t fapl) /* 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"); /* Create several attributes, but keep storage in compact form */ for (u = 0; u < max_compact; u++) { @@ -4843,9 +4843,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"); } /* end for */ /* Create another attribute, to push into dense storage */ @@ -4866,9 +4866,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); @@ -4932,9 +4932,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"); /* Loop through attributes, checking their creation order values */ /* (the name index is used, but the creation order value is in the same order) */ @@ -4947,7 +4947,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 */ @@ -5160,9 +5160,9 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl) /* 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"); } /* end for */ /* Close Datasets */ @@ -5232,9 +5232,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"); } /* end for */ /* Create another attribute, to push into dense storage */ @@ -5255,9 +5255,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); @@ -5275,9 +5275,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); @@ -5295,9 +5295,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"); /* Re-add attributes to get back into dense form */ for (u = (min_dense - 1); u < (max_compact + 1); u++) { @@ -5320,9 +5320,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); @@ -5378,9 +5378,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); @@ -5398,9 +5398,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); @@ -5418,9 +5418,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"); /* Re-add attributes to get back into dense form */ for (u = (min_dense - 1); u < (max_compact + 1); u++) { @@ -5443,9 +5443,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); @@ -5535,7 +5535,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"); @@ -5569,9 +5569,9 @@ test_attr_corder_delete(hid_t fcpl, hid_t fapl) /* 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"); /* Create attributes, until attribute storage is in dense form */ for (u = 0; u < max_compact * 2; u++) { @@ -5594,9 +5594,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); @@ -5671,7 +5671,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 */ @@ -5806,7 +5806,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 */ @@ -5848,7 +5848,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")); @@ -5860,7 +5860,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"); @@ -5895,9 +5895,9 @@ test_attr_info_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) /* 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"); /* Check for query on non-existent attribute */ H5E_BEGIN_TRY @@ -5940,9 +5940,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"); /* Check for out of bound offset queries */ H5E_BEGIN_TRY @@ -5984,7 +5984,7 @@ test_attr_info_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) /* 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"); /* Verify information for new attribute */ ret = attr_info_by_idx_check(my_dataset, attrname, (hsize_t)u, use_index); @@ -5996,9 +5996,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 */ @@ -6288,7 +6288,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 */ @@ -6338,7 +6338,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) { @@ -6382,7 +6382,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"); @@ -6417,9 +6417,9 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) /* 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"); /* Check for deleting non-existent attribute */ H5E_BEGIN_TRY @@ -6455,9 +6455,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"); /* Check for out of bound deletions */ H5E_BEGIN_TRY @@ -6524,7 +6524,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) /* 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"); } /* end for */ /* Work on all the datasets */ @@ -6565,7 +6565,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 */ /* Verify information for new attribute */ @@ -6578,9 +6578,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 */ @@ -6657,7 +6657,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) /* 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"); /* Check for deletion on empty attribute storage again */ H5E_BEGIN_TRY @@ -6708,7 +6708,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 */ /* Verify information for new attribute */ @@ -6828,7 +6828,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) /* 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"); /* Check for deletion on empty attribute storage again */ H5E_BEGIN_TRY @@ -6911,7 +6911,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) @@ -6990,14 +6990,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); @@ -7005,14 +7005,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); @@ -7020,14 +7020,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"); #ifndef H5_NO_DEPRECATED_SYMBOLS /* Iterate over attributes on object, with H5Aiterate1 */ @@ -7036,14 +7036,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 */ /* Skip over some attributes on object */ @@ -7052,7 +7052,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"); @@ -7060,18 +7060,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(nvisit, max_attrs, "H5Aiterate2"); @@ -7083,7 +7083,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"); @@ -7091,18 +7091,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(nvisit, max_attrs, "H5Aiterate_by_name"); @@ -7114,7 +7114,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"); @@ -7122,18 +7122,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(nvisit, max_attrs, "H5Aiterate_by_name"); @@ -7146,7 +7146,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"); @@ -7154,18 +7154,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(nvisit, max_attrs, "H5Aiterate1"); @@ -7178,7 +7178,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"); @@ -7190,7 +7190,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"); @@ -7202,7 +7202,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"); @@ -7215,7 +7215,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"); @@ -7263,7 +7263,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 */ @@ -7281,7 +7281,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 */ @@ -7310,7 +7310,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; @@ -7319,7 +7319,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) { @@ -7363,7 +7363,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"); @@ -7401,9 +7401,9 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) /* 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"); /* Check for iterating over object with no attributes (should be OK) */ ret = H5Aiterate2(my_dataset, idx_type, order, NULL, attr_iterate2_cb, NULL); @@ -7443,9 +7443,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"); /* Check for out of bound iteration */ idx = u; @@ -7520,7 +7520,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 */ /* Verify information for new attribute */ @@ -7533,9 +7533,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 */ @@ -7667,7 +7667,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 */ @@ -7714,7 +7714,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) { @@ -7758,7 +7758,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"); @@ -7793,9 +7793,9 @@ test_attr_open_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) /* 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"); /* Check for opening an attribute on an object with no attributes */ H5E_BEGIN_TRY @@ -7832,9 +7832,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"); /* Check for out of bound opening an attribute on an object */ H5E_BEGIN_TRY @@ -7888,7 +7888,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 */ /* Verify information for new attribute */ @@ -7901,9 +7901,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 */ @@ -8038,7 +8038,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 */ @@ -8080,7 +8080,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")); @@ -8092,7 +8092,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"); @@ -8130,9 +8130,9 @@ test_attr_open_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) /* 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"); /* Check for opening a non-existent attribute on an object with no attributes */ H5E_BEGIN_TRY @@ -8181,9 +8181,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"); /* Check for opening a non-existent attribute on an object with compact attribute storage */ H5E_BEGIN_TRY @@ -8252,7 +8252,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 */ /* Verify information for new attribute */ @@ -8265,9 +8265,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 */ @@ -8334,7 +8334,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 */ @@ -8375,7 +8375,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")); @@ -8387,7 +8387,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"); @@ -8425,9 +8425,9 @@ test_attr_create_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) /* 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"); /* Create attributes, up to limit of compact form */ for (u = 0; u < max_compact; u++) { @@ -8455,9 +8455,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"); /* Test opening attributes stored compactly */ ret = attr_open_check(fid, dsetname, my_dataset, u); @@ -8505,7 +8505,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 */ /* Verify information for new attribute */ @@ -8518,9 +8518,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 */ @@ -8707,9 +8707,9 @@ test_attr_shared_write(hid_t fcpl, hid_t fapl) /* 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"); /* Add attributes to each dataset, until after converting to dense storage */ for (u = 0; u < max_compact * 2; u++) { @@ -8724,7 +8724,7 @@ test_attr_shared_write(hid_t fcpl, hid_t fapl) /* 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"); /* Write data into the attribute */ attr_value = u + 1; @@ -8738,7 +8738,7 @@ test_attr_shared_write(hid_t fcpl, hid_t fapl) /* 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); @@ -8763,9 +8763,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"); /* Alternate between creating "small" & "big" attributes */ if (u % 2) { @@ -8775,7 +8775,7 @@ test_attr_shared_write(hid_t fcpl, hid_t fapl) /* 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"); /* Write data into the attribute */ attr_value = u + 1; @@ -8789,7 +8789,7 @@ test_attr_shared_write(hid_t fcpl, hid_t fapl) /* 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); @@ -8814,9 +8814,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"); } /* end for */ /* Close attribute's datatype */ @@ -9044,9 +9044,9 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl) /* 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"); /* Add attributes to each dataset, until after converting to dense storage */ for (u = 0; u < max_compact * 2; u++) { @@ -9061,7 +9061,7 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl) /* 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"); /* Write data into the attribute */ attr_value = u + 1; @@ -9075,7 +9075,7 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl) /* 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); @@ -9100,9 +9100,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"); /* Alternate between creating "small" & "big" attributes */ if (u % 2) { @@ -9112,7 +9112,7 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl) /* 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"); /* Write data into the attribute */ attr_value = u + 1; @@ -9126,7 +9126,7 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl) /* 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); @@ -9151,9 +9151,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"); /* Create new attribute name */ HDsnprintf(attrname2, sizeof(attrname2), "new attr %02u", u); @@ -9171,12 +9171,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); @@ -9195,12 +9195,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); @@ -9225,12 +9225,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); @@ -9249,12 +9249,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); @@ -9491,9 +9491,9 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl) /* 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"); /* Add attributes to each dataset, until after converting to dense storage */ for (u = 0; u < max_compact * 2; u++) { @@ -9508,7 +9508,7 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl) /* 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"); /* Write data into the attribute */ attr_value = u + 1; @@ -9522,7 +9522,7 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl) /* 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); @@ -9547,9 +9547,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"); /* Alternate between creating "small" & "big" attributes */ if (u % 2) { @@ -9559,7 +9559,7 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl) /* 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"); /* Write data into the attribute */ attr_value = u + 1; @@ -9573,7 +9573,7 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl) /* 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); @@ -9598,9 +9598,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"); } /* end for */ /* Delete attributes from second dataset */ @@ -9621,12 +9621,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); @@ -9863,9 +9863,9 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl) /* 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"); /* Add attributes to each dataset, until after converting to dense storage */ for (u = 0; u < max_compact * 2; u++) { @@ -9880,7 +9880,7 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl) /* 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"); /* Write data into the attribute */ attr_value = u + 1; @@ -9894,7 +9894,7 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl) /* 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); @@ -9919,9 +9919,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"); /* Alternate between creating "small" & "big" attributes */ if (u % 2) { @@ -9931,7 +9931,7 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl) /* 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"); /* Write data into the attribute */ attr_value = u + 1; @@ -9945,7 +9945,7 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl) /* 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); @@ -9970,9 +9970,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"); } /* end for */ /* Close attribute's datatype */ @@ -9989,7 +9989,7 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl) /* 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"); /* Check ref count on attributes of first dataset */ for (u = 0; u < max_compact * 2; u++) { @@ -10003,12 +10003,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); @@ -10310,7 +10310,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); @@ -11454,12 +11454,12 @@ 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; } - for (new_format = FALSE; new_format <= TRUE; new_format++) { + for (new_format = false; new_format <= true; new_format++) { hid_t my_fapl; /* Set the FAPL for the type of format */ @@ -11500,10 +11500,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; } @@ -11553,7 +11553,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 */ @@ -11584,7 +11584,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 */ diff --git a/test/tcheck_version.c b/test/tcheck_version.c index 9e5e469..53ca861 100644 --- a/test/tcheck_version.c +++ b/test/tcheck_version.c @@ -109,13 +109,13 @@ abort_intercept(int H5_ATTR_UNUSED sig) #ifdef H5_HAVE_WIN32_API /* Turns off the modal dialog that is raised when the Windows CRT calls abort(). * - * Returning TRUE here lets Windows know that we've handled the abort() and that there + * Returning true here lets Windows know that we've handled the abort() and that there * is no need to alert the user with a modal dialog box. */ int handle_crt_abort(int reportType, char *message, int *returnValue) { - return TRUE; + return true; } #endif diff --git a/test/tcoords.c b/test/tcoords.c index dbe6ab1..4f6ea24 100644 --- a/test/tcoords.c +++ b/test/tcoords.c @@ -42,7 +42,7 @@ static int da_buffer[2][3][6][2]; ** *************************************************************/ static void -test_singleEnd_selElements(hid_t file, hbool_t is_chunked) +test_singleEnd_selElements(hid_t file, bool is_chunked) { hid_t sid, plid, did, msid; char dset_name[NAME_LEN]; /* Dataset name */ @@ -225,7 +225,7 @@ test_singleEnd_selElements(hid_t file, hbool_t is_chunked) ** *************************************************************/ static void -test_singleEnd_selHyperslab(hid_t file, hbool_t is_chunked) +test_singleEnd_selHyperslab(hid_t file, bool is_chunked) { hid_t sid, did, msid; char dset_name[NAME_LEN]; /* Dataset name */ @@ -371,7 +371,7 @@ test_singleEnd_selHyperslab(hid_t file, hbool_t is_chunked) ** *************************************************************/ static void -test_multiple_ends(hid_t file, hbool_t is_chunked) +test_multiple_ends(hid_t file, bool is_chunked) { hid_t sid, plid, did, msid; char dset_name[NAME_LEN]; /* Dataset name */ @@ -680,10 +680,10 @@ test_multiple_ends(hid_t file, hbool_t is_chunked) void test_coords(void) { - hid_t fid; - hbool_t is_chunk[2] = {TRUE, FALSE}; - int i; - herr_t ret; /* Generic error return */ + hid_t fid; + bool is_chunk[2] = {true, false}; + int i; + herr_t ret; /* Generic error return */ fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); CHECK(fid, FAIL, "H5Fcreate"); diff --git a/test/testframe.c b/test/testframe.c index 5973a78..44c1701 100644 --- a/test/testframe.c +++ b/test/testframe.c @@ -210,8 +210,8 @@ TestInfo(const char *ProgName) void TestParseCmdLine(int argc, char *argv[]) { - hbool_t skipped_all = FALSE; - int ret_code; + bool skipped_all = false; + int ret_code; while ((void)argv++, --argc > 0) { if ((HDstrcmp(*argv, "-verbose") == 0) || (HDstrcmp(*argv, "-v") == 0)) { @@ -258,7 +258,7 @@ TestParseCmdLine(int argc, char *argv[]) if (!skipped_all) { for (Loop = 0; Loop < Index; Loop++) Test[Loop].SkipFlag = 1; - skipped_all = TRUE; + skipped_all = true; } /* end if */ SetTest(*argv, ONLYTEST); } diff --git a/test/tfile.c b/test/tfile.c index 1b98647..9784370 100644 --- a/test/tfile.c +++ b/test/tfile.c @@ -1730,7 +1730,7 @@ test_file_is_accessible(const char *env_h5_drvr) unsigned char buf[1024]; /* Buffer of data to write */ htri_t is_hdf5; /* Whether a file is an HDF5 file */ int posix_ret; /* Return value from POSIX calls */ - hbool_t driver_is_default_compatible; + bool driver_is_default_compatible; herr_t ret; /* Return value from HDF5 calls */ /* Output message about test being performed */ @@ -1765,7 +1765,7 @@ test_file_is_accessible(const char *env_h5_drvr) /* Verify that the file is an HDF5 file */ is_hdf5 = H5Fis_accessible(filename, fapl_id); - VERIFY(is_hdf5, TRUE, "H5Fis_accessible"); + VERIFY(is_hdf5, true, "H5Fis_accessible"); /*****************************************/ /* Newly created file that is still open */ @@ -1784,7 +1784,7 @@ test_file_is_accessible(const char *env_h5_drvr) /* Verify that the file is an HDF5 file */ is_hdf5 = H5Fis_accessible(filename, fapl_id); - VERIFY(is_hdf5, TRUE, "H5Fis_accessible"); + VERIFY(is_hdf5, true, "H5Fis_accessible"); /* Close file */ ret = H5Fclose(fid); @@ -1819,7 +1819,7 @@ test_file_is_accessible(const char *env_h5_drvr) /* Verify that the file is an HDF5 file */ is_hdf5 = H5Fis_accessible(filename, fapl_id); - VERIFY(is_hdf5, TRUE, "H5Fis_accessible"); + VERIFY(is_hdf5, true, "H5Fis_accessible"); } /* end if */ if (driver_is_default_compatible) { @@ -1837,7 +1837,7 @@ test_file_is_accessible(const char *env_h5_drvr) /* Verify that the file is NOT an HDF5 file using the base filename */ is_hdf5 = H5Fis_accessible(non_hdf5_filename, fapl_id); - VERIFY(is_hdf5, FALSE, "H5Fis_accessible (empty non-HDF5 file)"); + VERIFY(is_hdf5, false, "H5Fis_accessible (empty non-HDF5 file)"); /***************************/ /* Non-empty non-HDF5 file */ @@ -1861,7 +1861,7 @@ test_file_is_accessible(const char *env_h5_drvr) /* Verify that the file is not an HDF5 file */ is_hdf5 = H5Fis_accessible(non_hdf5_filename, fapl_id); - VERIFY(is_hdf5, FALSE, "H5Fis_accessible (non-HDF5 file)"); + VERIFY(is_hdf5, false, "H5Fis_accessible (non-HDF5 file)"); } /* Clean up files */ @@ -1930,7 +1930,7 @@ test_file_ishdf5(const char *env_h5_drvr) /* Verify that the file is an HDF5 file */ is_hdf5 = H5Fis_hdf5(sb_filename); - VERIFY(is_hdf5, TRUE, "H5Fis_hdf5"); + VERIFY(is_hdf5, true, "H5Fis_hdf5"); /*******************************/ /* Non-default user block size */ @@ -1957,7 +1957,7 @@ test_file_ishdf5(const char *env_h5_drvr) /* Verify that the file is an HDF5 file */ is_hdf5 = H5Fis_hdf5(sb_filename); - VERIFY(is_hdf5, TRUE, "H5Fis_hdf5"); + VERIFY(is_hdf5, true, "H5Fis_hdf5"); /***************************/ /* Non-empty non-HDF5 file */ @@ -1984,7 +1984,7 @@ test_file_ishdf5(const char *env_h5_drvr) /* Verify that the file is not an HDF5 file */ is_hdf5 = H5Fis_hdf5(sb_filename); - VERIFY(is_hdf5, FALSE, "H5Fis_hdf5"); + VERIFY(is_hdf5, false, "H5Fis_hdf5"); /* Clean up files */ h5_delete_test_file(filename, fapl_id); @@ -2033,7 +2033,7 @@ test_file_delete(hid_t fapl_id) /* Verify that the file is an HDF5 file */ is_hdf5 = H5Fis_accessible(filename, fapl_id); - VERIFY(is_hdf5, TRUE, "H5Fis_accessible"); + VERIFY(is_hdf5, true, "H5Fis_accessible"); /* Delete the file */ ret = H5Fdelete(filename, fapl_id); @@ -2077,7 +2077,7 @@ test_file_delete(hid_t fapl_id) is_hdf5 = H5Fis_accessible(filename, fapl_id); } H5E_END_TRY - CHECK(is_hdf5, TRUE, "H5Fis_accessible"); + CHECK(is_hdf5, true, "H5Fis_accessible"); /* Try to delete it (should fail) */ H5E_BEGIN_TRY @@ -2590,7 +2590,7 @@ test_file_double_dataset_open(void) ** *****************************************************************/ static void -test_file_double_file_dataset_open(hbool_t new_format) +test_file_double_file_dataset_open(bool new_format) { hid_t fapl = -1; /* File access property list */ hid_t dcpl = -1; /* Dataset creation property list */ @@ -3187,7 +3187,7 @@ cal_chksum(const char *file, uint32_t *chksum) if (file_data) { /* Read file's data into memory */ bytes_read = HDread(fdes, file_data, (size_t)sb.st_size); - CHECK(bytes_read == sb.st_size, FALSE, "malloc"); + CHECK(bytes_read == sb.st_size, false, "malloc"); /* Calculate checksum */ *chksum = H5_checksum_lookup3(file_data, sizeof(file_data), 0); @@ -3318,7 +3318,7 @@ test_userblock_alignment_helper1(hid_t fcpl, hid_t fapl) ** *****************************************************************/ static int -test_userblock_alignment_helper2(hid_t fapl, hbool_t open_rw) +test_userblock_alignment_helper2(hid_t fapl, bool open_rw) { hid_t fid; /* File ID */ int curr_num_errs = GetTestNumErrs(); /* Retrieve the current # of errors */ @@ -3418,7 +3418,7 @@ test_userblock_alignment(const char *env_h5_drvr) /* Call helper routines to perform file manipulations */ ret = test_userblock_alignment_helper1(fcpl, fapl); CHECK(ret, FAIL, "test_userblock_alignment_helper1"); - ret = test_userblock_alignment_helper2(fapl, TRUE); + ret = test_userblock_alignment_helper2(fapl, true); CHECK(ret, FAIL, "test_userblock_alignment_helper2"); /* Release property lists */ @@ -3448,7 +3448,7 @@ test_userblock_alignment(const char *env_h5_drvr) /* Call helper routines to perform file manipulations */ ret = test_userblock_alignment_helper1(fcpl, fapl); CHECK(ret, FAIL, "test_userblock_alignment_helper1"); - ret = test_userblock_alignment_helper2(fapl, TRUE); + ret = test_userblock_alignment_helper2(fapl, true); CHECK(ret, FAIL, "test_userblock_alignment_helper2"); /* Release property lists */ @@ -3478,7 +3478,7 @@ test_userblock_alignment(const char *env_h5_drvr) /* Call helper routines to perform file manipulations */ ret = test_userblock_alignment_helper1(fcpl, fapl); CHECK(ret, FAIL, "test_userblock_alignment_helper1"); - ret = test_userblock_alignment_helper2(fapl, TRUE); + ret = test_userblock_alignment_helper2(fapl, true); CHECK(ret, FAIL, "test_userblock_alignment_helper2"); /* Release property lists */ @@ -3582,9 +3582,9 @@ test_userblock_alignment(const char *env_h5_drvr) CHECK(ret, FAIL, "H5Pset_alignment"); /* Call helper routines to perform file manipulations */ - ret = test_userblock_alignment_helper2(fapl, FALSE); + ret = test_userblock_alignment_helper2(fapl, false); CHECK(ret, FAIL, "test_userblock_alignment_helper2"); - ret = test_userblock_alignment_helper2(fapl, TRUE); + ret = test_userblock_alignment_helper2(fapl, true); CHECK(ret, FAIL, "test_userblock_alignment_helper2"); /* Release property lists */ @@ -3642,13 +3642,13 @@ test_userblock_alignment_paged(const char *env_h5_drvr) ret = H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST); CHECK(ret, FAIL, "H5Pset_libver_bounds"); - ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, FALSE, (hsize_t)1); + ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, false, (hsize_t)1); CHECK(ret, FAIL, "H5Pset_file_space_strategy"); /* Call helper routines to perform file manipulations */ ret = test_userblock_alignment_helper1(fcpl, fapl); CHECK(ret, FAIL, "test_userblock_alignment_helper1"); - ret = test_userblock_alignment_helper2(fapl, TRUE); + ret = test_userblock_alignment_helper2(fapl, true); CHECK(ret, FAIL, "test_userblock_alignment_helper2"); /* Release property lists */ @@ -3672,7 +3672,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr) CHECK(fcpl, FAIL, "H5Pcreate"); ret = H5Pset_userblock(fcpl, (hsize_t)1024); CHECK(ret, FAIL, "H5Pset_userblock"); - ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, FALSE, (hsize_t)1); + ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, false, (hsize_t)1); ret = H5Pset_file_space_page_size(fcpl, (hsize_t)512); /* Create file access property list */ @@ -3684,7 +3684,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr) /* Call helper routines to perform file manipulations */ ret = test_userblock_alignment_helper1(fcpl, fapl); CHECK(ret, FAIL, "test_userblock_alignment_helper1"); - ret = test_userblock_alignment_helper2(fapl, TRUE); + ret = test_userblock_alignment_helper2(fapl, true); CHECK(ret, FAIL, "test_userblock_alignment_helper2"); /* Release property lists */ @@ -3746,7 +3746,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr) CHECK(fcpl, FAIL, "H5Pcreate"); ret = H5Pset_userblock(fcpl, (hsize_t)512); CHECK(ret, FAIL, "H5Pset_userblock"); - ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, TRUE, (hsize_t)1); + ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, true, (hsize_t)1); CHECK(ret, FAIL, "H5Pset_file_space_strategy"); ret = H5Pset_file_space_page_size(fcpl, (hsize_t)512); CHECK(ret, FAIL, "H5Pset_file_space_page_size"); @@ -3760,7 +3760,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr) /* Call helper routines to perform file manipulations */ ret = test_userblock_alignment_helper1(fcpl, fapl); CHECK(ret, FAIL, "test_userblock_alignment_helper1"); - ret = test_userblock_alignment_helper2(fapl, TRUE); + ret = test_userblock_alignment_helper2(fapl, true); CHECK(ret, FAIL, "test_userblock_alignment_helper2"); /* Release property lists */ @@ -3784,7 +3784,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr) CHECK(fcpl, FAIL, "H5Pcreate"); ret = H5Pset_userblock(fcpl, (hsize_t)512); CHECK(ret, FAIL, "H5Pset_userblock"); - ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_NONE, FALSE, (hsize_t)1); + ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_NONE, false, (hsize_t)1); CHECK(ret, FAIL, "H5Pset_file_space_strategy"); ret = H5Pset_file_space_page_size(fcpl, (hsize_t)512); CHECK(ret, FAIL, "H5Pset_file_space_page_size"); @@ -3824,7 +3824,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr) CHECK(fcpl, FAIL, "H5Pcreate"); ret = H5Pset_userblock(fcpl, (hsize_t)1024); CHECK(ret, FAIL, "H5Pset_userblock"); - ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, TRUE, (hsize_t)1); + ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, true, (hsize_t)1); CHECK(ret, FAIL, "H5Pset_file_space_strategy"); ret = H5Pset_file_space_page_size(fcpl, (hsize_t)1023); CHECK(ret, FAIL, "H5Pset_file_space_page_size"); @@ -3864,7 +3864,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr) CHECK(fcpl, FAIL, "H5Pcreate"); ret = H5Pset_userblock(fcpl, (hsize_t)1024); CHECK(ret, FAIL, "H5Pset_userblock"); - ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, FALSE, (hsize_t)1); + ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, false, (hsize_t)1); CHECK(ret, FAIL, "H5Pset_file_space_strategy"); ret = H5Pset_file_space_page_size(fcpl, (hsize_t)1023); CHECK(ret, FAIL, "H5Pset_file_space_page_size"); @@ -3878,7 +3878,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr) /* Call helper routines to perform file manipulations */ ret = test_userblock_alignment_helper1(fcpl, fapl); CHECK(ret, FAIL, "test_userblock_alignment_helper1"); - ret = test_userblock_alignment_helper2(fapl, TRUE); + ret = test_userblock_alignment_helper2(fapl, true); CHECK(ret, FAIL, "test_userblock_alignment_helper2"); /* Release property lists */ @@ -3902,7 +3902,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr) CHECK(fcpl, FAIL, "H5Pcreate"); ret = H5Pset_userblock(fcpl, (hsize_t)512); CHECK(ret, FAIL, "H5Pset_userblock"); - ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, FALSE, (hsize_t)1); + ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, false, (hsize_t)1); CHECK(ret, FAIL, "H5Pset_file_space_strategy"); ret = H5Pset_file_space_page_size(fcpl, (hsize_t)1024); CHECK(ret, FAIL, "H5Pset_file_space_page_size"); @@ -3942,7 +3942,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr) CHECK(fcpl, FAIL, "H5Pcreate"); ret = H5Pset_userblock(fcpl, (hsize_t)512); CHECK(ret, FAIL, "H5Pset_userblock"); - ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_NONE, FALSE, (hsize_t)1); + ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_NONE, false, (hsize_t)1); CHECK(ret, FAIL, "H5Pset_file_space_strategy"); ret = H5Pset_file_space_page_size(fcpl, (hsize_t)1024); CHECK(ret, FAIL, "H5Pset_file_space_page_size"); @@ -3956,7 +3956,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr) /* Call helper routines to perform file manipulations */ ret = test_userblock_alignment_helper1(fcpl, fapl); CHECK(ret, FAIL, "test_userblock_alignment_helper1"); - ret = test_userblock_alignment_helper2(fapl, TRUE); + ret = test_userblock_alignment_helper2(fapl, true); CHECK(ret, FAIL, "test_userblock_alignment_helper2"); /* Release property lists */ @@ -3982,7 +3982,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr) CHECK(fcpl, FAIL, "H5Pcreate"); ret = H5Pset_userblock(fcpl, (hsize_t)512); CHECK(ret, FAIL, "H5Pset_userblock"); - ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, FALSE, (hsize_t)1); + ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, false, (hsize_t)1); CHECK(ret, FAIL, "H5Pset_file_space_strategy"); ret = H5Pset_file_space_page_size(fcpl, (hsize_t)512); CHECK(ret, FAIL, "H5Pset_file_space_page_size"); @@ -4002,9 +4002,9 @@ test_userblock_alignment_paged(const char *env_h5_drvr) CHECK(ret, FAIL, "H5Pset_alignment"); /* Call helper routines to perform file manipulations */ - ret = test_userblock_alignment_helper2(fapl, FALSE); + ret = test_userblock_alignment_helper2(fapl, false); CHECK(ret, FAIL, "test_userblock_alignment_helper2"); - ret = test_userblock_alignment_helper2(fapl, TRUE); + ret = test_userblock_alignment_helper2(fapl, true); CHECK(ret, FAIL, "test_userblock_alignment_helper2"); /* Release property lists */ @@ -4034,7 +4034,7 @@ test_filespace_info(const char *env_h5_drvr) hid_t fapl, new_fapl; /* File access property lists */ hid_t fcpl, fcpl1, fcpl2; /* File creation property lists */ H5F_fspace_strategy_t strategy; /* File space strategy */ - hbool_t persist; /* Persist free-space or not */ + bool persist; /* Persist free-space or not */ hsize_t threshold; /* Free-space section threshold */ unsigned new_format; /* New or old format */ H5F_fspace_strategy_t fs_strategy; /* File space strategy--iteration variable */ @@ -4042,14 +4042,14 @@ test_filespace_info(const char *env_h5_drvr) hsize_t fs_threshold; /* Free-space section threshold--iteration variable */ hsize_t fsp_size; /* File space page size */ char filename[FILENAME_LEN]; /* Filename to use */ - hbool_t contig_addr_vfd; /* Whether VFD used has a contiguous address space */ + bool contig_addr_vfd; /* Whether VFD used has a contiguous address space */ herr_t ret; /* Return value */ /* Output message about test being performed */ MESSAGE(5, ("Testing file creation public routines: H5Pget/set_file_space_strategy & " "H5Pget/set_file_space_page_size\n")); - contig_addr_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); + contig_addr_vfd = (bool)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0); fapl = h5_fileaccess(); h5_fixname(FILESPACE_NAME[0], fapl, filename, sizeof filename); @@ -4067,7 +4067,7 @@ test_filespace_info(const char *env_h5_drvr) * Check file space information from a default file creation property list. * Values expected: * strategy--H5F_FILE_SPACE_AGGR - * persist--FALSE + * persist--false * threshold--1 * file space page size--4096 */ @@ -4081,7 +4081,7 @@ test_filespace_info(const char *env_h5_drvr) /* Verify file space information */ VERIFY(strategy, H5F_FSPACE_STRATEGY_FSM_AGGR, "H5Pget_file_space_strategy"); - VERIFY(persist, FALSE, "H5Pget_file_space_strategy"); + VERIFY(persist, false, "H5Pget_file_space_strategy"); VERIFY(threshold, 1, "H5Pget_file_space_strategy"); /* Retrieve file space page size */ @@ -4152,7 +4152,7 @@ test_filespace_info(const char *env_h5_drvr) * Check file space information when creating a file with default properties. * Values expected: * strategy--H5F_FILE_SPACE_AGGR - * persist--FALSE + * persist--false * threshold--1 * file space page size--4096 */ @@ -4170,7 +4170,7 @@ test_filespace_info(const char *env_h5_drvr) /* Verify file space information */ VERIFY(strategy, H5F_FSPACE_STRATEGY_FSM_AGGR, "H5Pget_file_space_strategy"); - VERIFY(persist, FALSE, "H5Pget_file_space_strategy"); + VERIFY(persist, false, "H5Pget_file_space_strategy"); VERIFY(threshold, 1, "H5Pget_file_space_strategy"); /* Retrieve file space page size */ @@ -4190,7 +4190,7 @@ test_filespace_info(const char *env_h5_drvr) * latest library format and default properties. * Values expected: * strategy--H5F_FILE_SPACE_AGGR - * persist--FALSE + * persist--false * threshold--1 * file space page size--4096 */ @@ -4208,7 +4208,7 @@ test_filespace_info(const char *env_h5_drvr) /* Verify file space information */ VERIFY(strategy, H5F_FSPACE_STRATEGY_FSM_AGGR, "H5Pget_file_space_strategy"); - VERIFY(persist, FALSE, "H5Pget_file_space_strategy"); + VERIFY(persist, false, "H5Pget_file_space_strategy"); VERIFY(threshold, 1, "H5Pget_file_space_strategy"); /* Retrieve file space page size */ @@ -4235,7 +4235,7 @@ test_filespace_info(const char *env_h5_drvr) * File space page size: set to 512 * */ - for (new_format = FALSE; new_format <= TRUE; new_format++) { + for (new_format = false; new_format <= true; new_format++) { hid_t my_fapl; /* Set the FAPL for the type of format */ @@ -4248,8 +4248,8 @@ test_filespace_info(const char *env_h5_drvr) my_fapl = fapl; } /* end else */ - /* Test with TRUE or FALSE for persisting free-space */ - for (fs_persist = FALSE; fs_persist <= TRUE; fs_persist++) { + /* Test with true or false for persisting free-space */ + for (fs_persist = false; fs_persist <= true; fs_persist++) { /* Test with free-space section threshold size: 0 to 10 */ for (fs_threshold = 0; fs_threshold <= TEST_THRESHOLD10; fs_threshold++) { @@ -4266,7 +4266,7 @@ test_filespace_info(const char *env_h5_drvr) CHECK(fcpl, FAIL, "H5Pcreate"); /* Set file space information */ - ret = H5Pset_file_space_strategy(fcpl, fs_strategy, (hbool_t)fs_persist, fs_threshold); + ret = H5Pset_file_space_strategy(fcpl, fs_strategy, (bool)fs_persist, fs_threshold); CHECK(ret, FAIL, "H5Pset_file_space_strategy"); ret = H5Pset_file_space_page_size(fcpl, FSP_SIZE512); @@ -4280,11 +4280,11 @@ test_filespace_info(const char *env_h5_drvr) VERIFY(strategy, fs_strategy, "H5Pget_file_space_strategy"); if (fs_strategy < H5F_FSPACE_STRATEGY_AGGR) { - VERIFY(persist, (hbool_t)fs_persist, "H5Pget_file_space_strategy"); + VERIFY(persist, (bool)fs_persist, "H5Pget_file_space_strategy"); VERIFY(threshold, fs_threshold, "H5Pget_file_space_strategy"); } else { - VERIFY(persist, FALSE, "H5Pget_file_space_strategy"); + VERIFY(persist, false, "H5Pget_file_space_strategy"); VERIFY(threshold, 1, "H5Pget_file_space_strategy"); } @@ -4313,7 +4313,7 @@ test_filespace_info(const char *env_h5_drvr) VERIFY(threshold, fs_threshold, "H5Pget_file_space_strategy"); } else { - VERIFY(persist, FALSE, "H5Pget_file_space_strategy"); + VERIFY(persist, false, "H5Pget_file_space_strategy"); VERIFY(threshold, 1, "H5Pget_file_space_strategy"); } @@ -4345,7 +4345,7 @@ test_filespace_info(const char *env_h5_drvr) VERIFY(threshold, fs_threshold, "H5Pget_file_space_strategy"); } else { - VERIFY(persist, FALSE, "H5Pget_file_space_strategy"); + VERIFY(persist, false, "H5Pget_file_space_strategy"); VERIFY(threshold, 1, "H5Pget_file_space_strategy"); } @@ -4384,13 +4384,13 @@ test_filespace_info(const char *env_h5_drvr) ** *****************************************************************/ static int -set_multi_split(hid_t fapl, hsize_t pagesize, hbool_t split) +set_multi_split(hid_t fapl, hsize_t pagesize, bool split) { H5FD_mem_t memb_map[H5FD_MEM_NTYPES]; hid_t memb_fapl_arr[H5FD_MEM_NTYPES]; char *memb_name[H5FD_MEM_NTYPES]; haddr_t memb_addr[H5FD_MEM_NTYPES]; - hbool_t relax; + bool relax; H5FD_mem_t mt; assert(split); @@ -4453,7 +4453,7 @@ test_file_freespace(const char *env_h5_drvr) char filename[FILENAME_LEN]; /* Filename to use */ char name[32]; /* Dataset name */ unsigned new_format; /* To use old or new format */ - hbool_t split_vfd, multi_vfd; /* Indicate multi/split driver */ + bool split_vfd, multi_vfd; /* Indicate multi/split driver */ hsize_t expected_freespace; /* Freespace expected */ hsize_t expected_fs_del; /* Freespace expected after delete */ herr_t ret; /* Return value */ @@ -4476,7 +4476,7 @@ test_file_freespace(const char *env_h5_drvr) CHECK(fcpl, FAIL, "H5Pcreate"); /* Test with old & new format */ - for (new_format = FALSE; new_format <= TRUE; new_format++) { + for (new_format = false; new_format <= true; new_format++) { hid_t my_fapl; /* Set the FAPL for the type of format */ @@ -4490,7 +4490,7 @@ test_file_freespace(const char *env_h5_drvr) CHECK(ret, FAIL, "set_multi_split"); } - ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, FALSE, (hsize_t)1); + ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, false, (hsize_t)1); CHECK(ret, FAIL, "H5P_set_file_space_strategy"); expected_freespace = 4534; @@ -4604,7 +4604,7 @@ test_file_freespace(const char *env_h5_drvr) ** *****************************************************************/ static void -test_sects_freespace(const char *env_h5_drvr, hbool_t new_format) +test_sects_freespace(const char *env_h5_drvr, bool new_format) { char filename[FILENAME_LEN]; /* Filename to use */ hid_t file; /* File ID */ @@ -4628,7 +4628,7 @@ test_sects_freespace(const char *env_h5_drvr, hbool_t new_format) hsize_t dims[1]; /* Dimension sizes */ unsigned u; /* Local index variable */ H5FD_mem_t type; - hbool_t split_vfd = FALSE, multi_vfd = FALSE; + bool split_vfd = false, multi_vfd = false; herr_t ret; /* Return value */ /* Output message about test being performed */ @@ -4651,7 +4651,7 @@ test_sects_freespace(const char *env_h5_drvr, hbool_t new_format) CHECK(ret, FAIL, "H5Pset_libver_bounds"); /* Set to paged aggregation and persistent free-space */ - ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, TRUE, (hsize_t)1); + ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, true, (hsize_t)1); CHECK(ret, FAIL, "H5Pget_file_space_strategy"); /* Set up paged aligned address space for multi/split driver */ @@ -4661,7 +4661,7 @@ test_sects_freespace(const char *env_h5_drvr, hbool_t new_format) } } else { - ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, TRUE, (hsize_t)1); + ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, true, (hsize_t)1); CHECK(ret, FAIL, "H5Pget_file_space_strategy"); } @@ -4866,7 +4866,7 @@ test_filespace_compatible(void) ssize_t nread; /* Number of bytes read in */ unsigned i, j; /* Local index variable */ hssize_t free_space; /* Amount of free-space in the file */ - hbool_t persist; /* Persist free-space or not */ + bool persist; /* Persist free-space or not */ hsize_t threshold; /* Free-space section threshold */ H5F_fspace_strategy_t strategy; /* File space handling strategy */ herr_t ret; /* Return value */ @@ -4913,10 +4913,10 @@ test_filespace_compatible(void) CHECK(ret, FAIL, "H5Pget_file_space_strategy"); /* File space handling strategy should be H5F_FSPACE_STRATEGY_FSM_AGGR */ - /* Persisting free-space should be FALSE */ + /* Persisting free-space should be false */ /* Free-space section threshold should be 1 */ VERIFY(strategy, H5F_FSPACE_STRATEGY_FSM_AGGR, "H5Pget_file_space_strategy"); - VERIFY(persist, FALSE, "H5Pget_file_space_strategy"); + VERIFY(persist, false, "H5Pget_file_space_strategy"); VERIFY(threshold, 1, "H5Pget_file_space_strategy"); /* Generate raw data */ @@ -4991,7 +4991,7 @@ test_filespace_1_10_0_compatible(void) hid_t fid = -1; /* File id */ hid_t did = -1; /* Dataset id */ hid_t fcpl; /* File creation property list */ - hbool_t persist; /* Persist free-space or not */ + bool persist; /* Persist free-space or not */ hsize_t threshold; /* Free-space section threshold */ H5F_fspace_strategy_t strategy; /* File space handling strategy */ int wbuf[24]; /* Buffer for dataset data */ @@ -5044,7 +5044,7 @@ test_filespace_1_10_0_compatible(void) case 1: VERIFY(strategy, H5F_FSPACE_STRATEGY_FSM_AGGR, "H5Pget_file_space_strategy"); - VERIFY(persist, TRUE, "H5Pget_file_space_strategy"); + VERIFY(persist, true, "H5Pget_file_space_strategy"); VERIFY(threshold, H5F_FREE_SPACE_THRESHOLD_DEF, "H5Pget_file_space_strategy"); /* Open the dataset */ @@ -5306,7 +5306,7 @@ test_filespace_round_compatible(void) hid_t fcpl = -1; /* File creation property list ID */ unsigned j; /* Local index variable */ H5F_fspace_strategy_t strategy; /* File space strategy */ - hbool_t persist; /* Persist free-space or not */ + bool persist; /* Persist free-space or not */ hsize_t threshold; /* Free-space section threshold */ hssize_t free_space; /* Amount of free space in the file */ int status; /* Status from copying the existing file */ @@ -5331,7 +5331,7 @@ test_filespace_round_compatible(void) ret = H5Pget_file_space_strategy(fcpl, &strategy, &persist, &threshold); CHECK(ret, FAIL, "H5Pget_file_space_strategy"); VERIFY(strategy, H5F_FSPACE_STRATEGY_FSM_AGGR, "H5Pget_file_space_strategy"); - VERIFY(persist, FALSE, "H5Pget_file_space_strategy"); + VERIFY(persist, false, "H5Pget_file_space_strategy"); VERIFY(threshold, 1, "H5Pget_file_space_strategy"); /* There should not be any free space in the file */ @@ -5563,7 +5563,7 @@ test_libver_bounds_open(void) /* Get new low bound and verify that it has been upgraded properly */ ret = H5Pget_libver_bounds(new_fapl, &new_low, NULL); CHECK(ret, FAIL, "H5Pget_libver_bounds"); - VERIFY(new_low >= H5F_LIBVER_V110, TRUE, "Low bound should be upgraded to at least H5F_LIBVER_V110"); + VERIFY(new_low >= H5F_LIBVER_V110, true, "Low bound should be upgraded to at least H5F_LIBVER_V110"); ret = H5Pclose(new_fapl); CHECK(ret, FAIL, "H5Pclose"); @@ -5609,7 +5609,7 @@ test_libver_bounds_copy(void) hid_t fapl = -1; /* File access property list ID */ const char *src_fname; /* Source file name */ herr_t ret; /* Generic return value */ - hbool_t driver_is_default_compatible; + bool driver_is_default_compatible; /* Output message about the test being performed */ MESSAGE(5, ("Testing H5Ocopy a dataset in a 1.8 library file to a 1.10 library file\n")); @@ -5795,14 +5795,14 @@ test_libver_bounds_super(hid_t fapl, const char *env_h5_drvr) /* Verify superblock version when creating a file with input fapl, fcpl #A and with/without SWMR access */ if (H5FD__supports_swmr_test(env_h5_drvr)) - test_libver_bounds_super_create(fapl, fcpl, TRUE, FALSE); - test_libver_bounds_super_create(fapl, fcpl, FALSE, FALSE); + test_libver_bounds_super_create(fapl, fcpl, true, false); + test_libver_bounds_super_create(fapl, fcpl, false, false); /* Verify superblock version when opening a file which is created with input fapl, fcpl #A and with/without SWMR access */ if (H5FD__supports_swmr_test(env_h5_drvr)) - test_libver_bounds_super_open(fapl, fcpl, TRUE, FALSE); - test_libver_bounds_super_open(fapl, fcpl, FALSE, FALSE); + test_libver_bounds_super_open(fapl, fcpl, true, false); + test_libver_bounds_super_open(fapl, fcpl, false, false); /* Close the fcpl */ ret = H5Pclose(fcpl); @@ -5818,14 +5818,14 @@ test_libver_bounds_super(hid_t fapl, const char *env_h5_drvr) /* Verify superblock version when creating a file with input fapl, fcpl #B and with/without SWMR access */ if (H5FD__supports_swmr_test(env_h5_drvr)) - test_libver_bounds_super_create(fapl, fcpl, TRUE, FALSE); - test_libver_bounds_super_create(fapl, fcpl, FALSE, FALSE); + test_libver_bounds_super_create(fapl, fcpl, true, false); + test_libver_bounds_super_create(fapl, fcpl, false, false); /* Verify superblock version when opening a file which is created with input fapl, fcpl #B and with/without SWMR access */ if (H5FD__supports_swmr_test(env_h5_drvr)) - test_libver_bounds_super_open(fapl, fcpl, TRUE, FALSE); - test_libver_bounds_super_open(fapl, fcpl, FALSE, FALSE); + test_libver_bounds_super_open(fapl, fcpl, true, false); + test_libver_bounds_super_open(fapl, fcpl, false, false); /* Close the fcpl */ ret = H5Pclose(fcpl); @@ -5843,14 +5843,14 @@ test_libver_bounds_super(hid_t fapl, const char *env_h5_drvr) /* Verify superblock version when creating a file with input fapl, fcpl #C and with/without SWMR access */ if (H5FD__supports_swmr_test(env_h5_drvr)) - test_libver_bounds_super_create(fapl, fcpl, TRUE, FALSE); - test_libver_bounds_super_create(fapl, fcpl, FALSE, FALSE); + test_libver_bounds_super_create(fapl, fcpl, true, false); + test_libver_bounds_super_create(fapl, fcpl, false, false); /* Verify superblock version when opening a file which is created with input fapl, fcpl #C and with/without SWMR access */ if (H5FD__supports_swmr_test(env_h5_drvr)) - test_libver_bounds_super_open(fapl, fcpl, TRUE, FALSE); - test_libver_bounds_super_open(fapl, fcpl, FALSE, FALSE); + test_libver_bounds_super_open(fapl, fcpl, true, false); + test_libver_bounds_super_open(fapl, fcpl, false, false); /* Close the fcpl */ ret = H5Pclose(fcpl); @@ -5867,14 +5867,14 @@ test_libver_bounds_super(hid_t fapl, const char *env_h5_drvr) /* Verify superblock version when creating a file with input fapl, fcpl #D and with/without SWMR access */ if (H5FD__supports_swmr_test(env_h5_drvr)) - test_libver_bounds_super_create(fapl, fcpl, TRUE, TRUE); - test_libver_bounds_super_create(fapl, fcpl, FALSE, TRUE); + test_libver_bounds_super_create(fapl, fcpl, true, true); + test_libver_bounds_super_create(fapl, fcpl, false, true); /* Verify superblock version when opening a file which is created with input fapl, fcpl #D and with/without SWMR access */ if (H5FD__supports_swmr_test(env_h5_drvr)) - test_libver_bounds_super_open(fapl, fcpl, TRUE, TRUE); - test_libver_bounds_super_open(fapl, fcpl, FALSE, TRUE); + test_libver_bounds_super_open(fapl, fcpl, true, true); + test_libver_bounds_super_open(fapl, fcpl, false, true); /* Close the fcpl */ ret = H5Pclose(fcpl); @@ -5938,7 +5938,7 @@ test_libver_bounds_super_create(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t n hid_t fid = H5I_INVALID_HID; /* File ID */ H5F_t *f = NULL; /* Internal file pointer */ H5F_libver_t low, high; /* Low and high bounds */ - hbool_t ok; /* The result is ok or not */ + bool ok; /* The result is ok or not */ herr_t ret; /* The return value */ /* Try to create the file */ @@ -5963,15 +5963,15 @@ test_libver_bounds_super_create(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t n else if (is_swmr) { /* SWMR is enabled */ if (high >= H5F_LIBVER_V110) { /* Should succeed */ - VERIFY(fid >= 0, TRUE, "H5Fcreate"); + VERIFY(fid >= 0, true, "H5Fcreate"); VERIFY(HDF5_SUPERBLOCK_VERSION_3, f->shared->sblock->super_vers, "HDF5_superblock_ver_bounds"); - VERIFY(f->shared->low_bound >= H5F_LIBVER_V110, TRUE, "HDF5_superblock_ver_bounds"); + VERIFY(f->shared->low_bound >= H5F_LIBVER_V110, true, "HDF5_superblock_ver_bounds"); } else /* Should fail */ - VERIFY(fid >= 0, FALSE, "H5Fcreate"); + VERIFY(fid >= 0, false, "H5Fcreate"); } else { /* Should succeed */ - VERIFY(fid >= 0, TRUE, "H5Fcreate"); + VERIFY(fid >= 0, true, "H5Fcreate"); VERIFY(low, f->shared->low_bound, "HDF5_superblock_ver_bounds"); switch (low) { @@ -5979,12 +5979,12 @@ test_libver_bounds_super_create(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t n ok = (f->shared->sblock->super_vers == HDF5_SUPERBLOCK_VERSION_DEF || f->shared->sblock->super_vers == HDF5_SUPERBLOCK_VERSION_1 || f->shared->sblock->super_vers == HDF5_SUPERBLOCK_VERSION_2); - VERIFY(ok, TRUE, "HDF5_superblock_ver_bounds"); + VERIFY(ok, true, "HDF5_superblock_ver_bounds"); break; case H5F_LIBVER_V18: ok = (f->shared->sblock->super_vers == HDF5_SUPERBLOCK_VERSION_2); - VERIFY(ok, TRUE, "HDF5_superblock_ver_bounds"); + VERIFY(ok, true, "HDF5_superblock_ver_bounds"); break; case H5F_LIBVER_V110: @@ -5992,7 +5992,7 @@ test_libver_bounds_super_create(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t n case H5F_LIBVER_V114: case H5F_LIBVER_V116: ok = (f->shared->sblock->super_vers == HDF5_SUPERBLOCK_VERSION_3); - VERIFY(ok, TRUE, "HDF5_superblock_ver_bounds"); + VERIFY(ok, true, "HDF5_superblock_ver_bounds"); break; case H5F_LIBVER_ERROR: @@ -6124,7 +6124,7 @@ test_libver_bounds_super_open(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t non VERIFY(fid, H5I_INVALID_HID, "H5Fcreate"); } else { - VERIFY(fid >= 0, TRUE, "H5Fcreate"); + VERIFY(fid >= 0, true, "H5Fcreate"); /* Get the internal file pointer */ f = (H5F_t *)H5VL_object(fid); @@ -6177,8 +6177,8 @@ test_libver_bounds_super_open(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t non case 3: if (high >= H5F_LIBVER_V110) { /* Should succeed */ - VERIFY(fid >= 0, TRUE, "H5Fopen"); - VERIFY(f->shared->low_bound >= H5F_LIBVER_V110, TRUE, + VERIFY(fid >= 0, true, "H5Fopen"); + VERIFY(f->shared->low_bound >= H5F_LIBVER_V110, true, "HDF5_superblock_ver_bounds"); /* Close the file */ @@ -6186,15 +6186,15 @@ test_libver_bounds_super_open(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t non CHECK(ret, FAIL, "H5Fclose"); } else /* Should fail */ - VERIFY(fid >= 0, FALSE, "H5Fopen"); + VERIFY(fid >= 0, false, "H5Fopen"); break; case 2: if (is_swmr) /* Should fail */ - VERIFY(fid >= 0, FALSE, "H5Fopen"); + VERIFY(fid >= 0, false, "H5Fopen"); else { /* Should succeed */ - VERIFY(fid >= 0, TRUE, "H5Fopen"); - VERIFY(f->shared->low_bound >= H5F_LIBVER_V18, TRUE, + VERIFY(fid >= 0, true, "H5Fopen"); + VERIFY(f->shared->low_bound >= H5F_LIBVER_V18, true, "HDF5_superblock_ver_bounds"); /* Close the file */ @@ -6206,9 +6206,9 @@ test_libver_bounds_super_open(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t non case 1: case 0: if (is_swmr) /* Should fail */ - VERIFY(fid >= 0, FALSE, "H5Fopen"); + VERIFY(fid >= 0, false, "H5Fopen"); else { /* Should succeed */ - VERIFY(fid >= 0, TRUE, "H5Fopen"); + VERIFY(fid >= 0, true, "H5Fopen"); VERIFY(f->shared->low_bound, low, "HDF5_superblock_ver_bounds"); ret = H5Fclose(fid); @@ -7522,37 +7522,37 @@ test_libver_macros(void) /* Output message about test being performed */ MESSAGE(5, ("Testing macros for library version comparison\n")); - VERIFY(H5_VERSION_GE(major, minor, release), TRUE, "H5_VERSION_GE"); - VERIFY(H5_VERSION_GE(major - 1, minor, release), TRUE, "H5_VERSION_GE"); - VERIFY(H5_VERSION_GE(major - 1, minor + 1, release), TRUE, "H5_VERSION_GE"); - VERIFY(H5_VERSION_GE(major - 1, minor, release + 1), TRUE, "H5_VERSION_GE"); - VERIFY(H5_VERSION_GE(major, minor - 1, release), TRUE, "H5_VERSION_GE"); - VERIFY(H5_VERSION_GE(major, minor - 1, release + 1), TRUE, "H5_VERSION_GE"); + VERIFY(H5_VERSION_GE(major, minor, release), true, "H5_VERSION_GE"); + VERIFY(H5_VERSION_GE(major - 1, minor, release), true, "H5_VERSION_GE"); + VERIFY(H5_VERSION_GE(major - 1, minor + 1, release), true, "H5_VERSION_GE"); + VERIFY(H5_VERSION_GE(major - 1, minor, release + 1), true, "H5_VERSION_GE"); + VERIFY(H5_VERSION_GE(major, minor - 1, release), true, "H5_VERSION_GE"); + VERIFY(H5_VERSION_GE(major, minor - 1, release + 1), true, "H5_VERSION_GE"); if (H5_VERS_RELEASE > 0) - VERIFY(H5_VERSION_GE(major, minor, release - 1), TRUE, "H5_VERSION_GE"); - - VERIFY(H5_VERSION_GE(major + 1, minor, release), FALSE, "H5_VERSION_GE"); - VERIFY(H5_VERSION_GE(major + 1, minor - 1, release), FALSE, "H5_VERSION_GE"); - VERIFY(H5_VERSION_GE(major + 1, minor - 1, release - 1), FALSE, "H5_VERSION_GE"); - VERIFY(H5_VERSION_GE(major, minor + 1, release), FALSE, "H5_VERSION_GE"); - VERIFY(H5_VERSION_GE(major, minor + 1, release - 1), FALSE, "H5_VERSION_GE"); - VERIFY(H5_VERSION_GE(major, minor, release + 1), FALSE, "H5_VERSION_GE"); - - VERIFY(H5_VERSION_LE(major, minor, release), TRUE, "H5_VERSION_LE"); - VERIFY(H5_VERSION_LE(major + 1, minor, release), TRUE, "H5_VERSION_LE"); - VERIFY(H5_VERSION_LE(major + 1, minor - 1, release), TRUE, "H5_VERSION_LE"); - VERIFY(H5_VERSION_LE(major + 1, minor - 1, release - 1), TRUE, "H5_VERSION_LE"); - VERIFY(H5_VERSION_LE(major, minor + 1, release), TRUE, "H5_VERSION_LE"); - VERIFY(H5_VERSION_LE(major, minor + 1, release - 1), TRUE, "H5_VERSION_LE"); - VERIFY(H5_VERSION_LE(major, minor, release + 1), TRUE, "H5_VERSION_LE"); - - VERIFY(H5_VERSION_LE(major - 1, minor, release), FALSE, "H5_VERSION_LE"); - VERIFY(H5_VERSION_LE(major - 1, minor + 1, release), FALSE, "H5_VERSION_LE"); - VERIFY(H5_VERSION_LE(major - 1, minor + 1, release + 1), FALSE, "H5_VERSION_LE"); - VERIFY(H5_VERSION_LE(major, minor - 1, release), FALSE, "H5_VERSION_LE"); - VERIFY(H5_VERSION_LE(major, minor - 1, release + 1), FALSE, "H5_VERSION_LE"); + VERIFY(H5_VERSION_GE(major, minor, release - 1), true, "H5_VERSION_GE"); + + VERIFY(H5_VERSION_GE(major + 1, minor, release), false, "H5_VERSION_GE"); + VERIFY(H5_VERSION_GE(major + 1, minor - 1, release), false, "H5_VERSION_GE"); + VERIFY(H5_VERSION_GE(major + 1, minor - 1, release - 1), false, "H5_VERSION_GE"); + VERIFY(H5_VERSION_GE(major, minor + 1, release), false, "H5_VERSION_GE"); + VERIFY(H5_VERSION_GE(major, minor + 1, release - 1), false, "H5_VERSION_GE"); + VERIFY(H5_VERSION_GE(major, minor, release + 1), false, "H5_VERSION_GE"); + + VERIFY(H5_VERSION_LE(major, minor, release), true, "H5_VERSION_LE"); + VERIFY(H5_VERSION_LE(major + 1, minor, release), true, "H5_VERSION_LE"); + VERIFY(H5_VERSION_LE(major + 1, minor - 1, release), true, "H5_VERSION_LE"); + VERIFY(H5_VERSION_LE(major + 1, minor - 1, release - 1), true, "H5_VERSION_LE"); + VERIFY(H5_VERSION_LE(major, minor + 1, release), true, "H5_VERSION_LE"); + VERIFY(H5_VERSION_LE(major, minor + 1, release - 1), true, "H5_VERSION_LE"); + VERIFY(H5_VERSION_LE(major, minor, release + 1), true, "H5_VERSION_LE"); + + VERIFY(H5_VERSION_LE(major - 1, minor, release), false, "H5_VERSION_LE"); + VERIFY(H5_VERSION_LE(major - 1, minor + 1, release), false, "H5_VERSION_LE"); + VERIFY(H5_VERSION_LE(major - 1, minor + 1, release + 1), false, "H5_VERSION_LE"); + VERIFY(H5_VERSION_LE(major, minor - 1, release), false, "H5_VERSION_LE"); + VERIFY(H5_VERSION_LE(major, minor - 1, release + 1), false, "H5_VERSION_LE"); if (H5_VERS_RELEASE > 0) - VERIFY(H5_VERSION_LE(major, minor, release - 1), FALSE, "H5_VERSION_LE"); + VERIFY(H5_VERSION_LE(major, minor, release - 1), false, "H5_VERSION_LE"); } /* test_libver_macros() */ /**************************************************************** @@ -7600,7 +7600,7 @@ test_libver_macros2(void) CHECK(ret, FAIL, "H5Lunlink"); status = H5Lexists(file, "Group", H5P_DEFAULT); - VERIFY(status, FALSE, "H5Lexists"); + VERIFY(status, false, "H5Lexists"); #else ret = H5Gunlink(file, "Group"); CHECK(ret, FAIL, "H5Gunlink"); @@ -7666,7 +7666,7 @@ test_incr_filesize(void) CHECK(fcpl, FAIL, "H5Pcreate"); /* Set file space strategy */ - ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, FALSE, (hsize_t)1); + ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, false, (hsize_t)1); CHECK(ret, FAIL, "H5P_set_file_space_strategy"); /* Create the test file */ @@ -7762,7 +7762,7 @@ test_min_dset_ohdr(void) char filename[FILENAME_LEN] = ""; hid_t file_id = -1; hid_t file2_id = -1; - hbool_t minimize; + bool minimize; herr_t ret; MESSAGE(5, ("Testing dataset object header minimization\n")); @@ -7785,17 +7785,17 @@ test_min_dset_ohdr(void) */ ret = H5Fget_dset_no_attrs_hint(file_id, &minimize); CHECK(ret, FAIL, "H5Fget_dset_no_attrs_hint"); - VERIFY(minimize, FALSE, "minimize flag"); + VERIFY(minimize, false, "minimize flag"); /*---------------------------------------- - * TEST set to TRUE + * TEST set to true */ - ret = H5Fset_dset_no_attrs_hint(file_id, TRUE); + ret = H5Fset_dset_no_attrs_hint(file_id, true); CHECK(ret, FAIL, "H5Fset_dset_no_attrs_hint"); ret = H5Fget_dset_no_attrs_hint(file_id, &minimize); CHECK(ret, FAIL, "H5Fget_dset_no_attrs_hint"); - VERIFY(minimize, TRUE, "minimize flag"); + VERIFY(minimize, true, "minimize flag"); /*---------------------------------------- * TEST second file open on same filename @@ -7803,41 +7803,41 @@ test_min_dset_ohdr(void) file2_id = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT); CHECK_I(file2_id, "H5Fopen"); - /* verify TRUE setting on second open + /* verify true setting on second open */ ret = H5Fget_dset_no_attrs_hint(file_id, &minimize); CHECK(ret, FAIL, "H5Fget_dset_no_attrs_hint"); - VERIFY(minimize, TRUE, "minimize flag"); + VERIFY(minimize, true, "minimize flag"); - /* re-set to FALSE on first open + /* re-set to false on first open */ - ret = H5Fset_dset_no_attrs_hint(file_id, FALSE); + ret = H5Fset_dset_no_attrs_hint(file_id, false); CHECK(ret, FAIL, "H5Fset_dset_no_attrs_hint"); - /* verify FALSE set on both opens + /* verify false set on both opens */ ret = H5Fget_dset_no_attrs_hint(file_id, &minimize); CHECK(ret, FAIL, "H5Fget_dset_no_attrs_hint"); - VERIFY(minimize, FALSE, "minimize flag"); + VERIFY(minimize, false, "minimize flag"); ret = H5Fget_dset_no_attrs_hint(file2_id, &minimize); CHECK(ret, FAIL, "H5Fget_dset_no_attrs_hint"); - VERIFY(minimize, FALSE, "minimize flag"); + VERIFY(minimize, false, "minimize flag"); - /* re-set to TRUE on second open + /* re-set to true on second open */ - ret = H5Fset_dset_no_attrs_hint(file2_id, TRUE); + ret = H5Fset_dset_no_attrs_hint(file2_id, true); CHECK(ret, FAIL, "H5Fset_dset_no_attrs_hint"); - /* verify TRUE set on both opens + /* verify true set on both opens */ ret = H5Fget_dset_no_attrs_hint(file_id, &minimize); CHECK(ret, FAIL, "H5Fget_dset_no_attrs_hint"); - VERIFY(minimize, TRUE, "minimize flag"); + VERIFY(minimize, true, "minimize flag"); ret = H5Fget_dset_no_attrs_hint(file2_id, &minimize); CHECK(ret, FAIL, "H5Fget_dset_no_attrs_hint"); - VERIFY(minimize, TRUE, "minimize flag"); + VERIFY(minimize, true, "minimize flag"); /*---------------------------------------- * TEST error cases @@ -7846,7 +7846,7 @@ test_min_dset_ohdr(void) /* trying to set with invalid file ID */ H5E_BEGIN_TRY { - ret = H5Fset_dset_no_attrs_hint(-1, TRUE); + ret = H5Fset_dset_no_attrs_hint(-1, true); } H5E_END_TRY VERIFY(ret, FAIL, "H5Fset_dset_no_attrs_hint"); @@ -8116,7 +8116,7 @@ test_file(void) { const char *env_h5_drvr; /* File Driver value from environment */ hid_t fapl_id = H5I_INVALID_HID; /* VFD-dependent fapl ID */ - hbool_t driver_is_default_compatible; + bool driver_is_default_compatible; herr_t ret; /* Output message about test being performed */ @@ -8151,8 +8151,8 @@ test_file(void) test_file_double_group_open(); /* Test opening same group from two files works properly */ test_file_double_dataset_open(); /* Test opening same dataset from two files works properly */ test_file_double_datatype_open(); /* Test opening same named datatype from two files works properly */ - test_file_double_file_dataset_open(TRUE); - test_file_double_file_dataset_open(FALSE); + test_file_double_file_dataset_open(true); + test_file_double_file_dataset_open(false); test_userblock_file_size( env_h5_drvr); /* Tests that files created with a userblock have the correct size */ test_cached_stab_info(); /* Tests that files are created with cached stab info in the superblock */ @@ -8172,10 +8172,10 @@ test_file(void) /* Skipped testing for multi/split drivers */ /* Setup for multi/split drivers are there already */ test_sects_freespace(env_h5_drvr, - TRUE); /* Test file public routine H5Fget_free_sections() for new format */ + true); /* Test file public routine H5Fget_free_sections() for new format */ /* Skipped testing for multi/split drivers */ /* Setup for multi/split drivers are there already */ - test_sects_freespace(env_h5_drvr, FALSE); /* Test file public routine H5Fget_free_sections() */ + test_sects_freespace(env_h5_drvr, false); /* Test file public routine H5Fget_free_sections() */ /* Skipped testing for multi/split drivers */ if (driver_is_default_compatible) { diff --git a/test/th5o.c b/test/th5o.c index 9031b28..8c44f6f 100644 --- a/test/th5o.c +++ b/test/th5o.c @@ -973,7 +973,7 @@ test_h5o_link(void) /* Create LCPL with intermediate group creation flag set */ lcpl_id = H5Pcreate(H5P_LINK_CREATE); CHECK(lcpl_id, FAIL, "H5Pcreate"); - ret = H5Pset_create_intermediate_group(lcpl_id, TRUE); + ret = H5Pset_create_intermediate_group(lcpl_id, true); CHECK(ret, FAIL, "H5Pset_create_intermediate_group"); /* Create a file access property list */ @@ -1008,7 +1008,7 @@ test_h5o_link(void) ret = H5Tcommit_anon(file_id, type_id, H5P_DEFAULT, H5P_DEFAULT); CHECK(ret, FAIL, "H5Tcommit_anon"); committed = H5Tcommitted(type_id); - VERIFY(committed, TRUE, "H5Tcommitted"); + VERIFY(committed, true, "H5Tcommitted"); /* Create a dataset with no name using the committed datatype*/ dset_id = H5Dcreate_anon(file_id, type_id, space_id, H5P_DEFAULT, H5P_DEFAULT); diff --git a/test/th5s.c b/test/th5s.c index 6d703da..71b332b 100644 --- a/test/th5s.c +++ b/test/th5s.c @@ -125,7 +125,7 @@ test_h5s_basic(void) hsize_t tdims[4]; /* Dimension array to test with */ hsize_t tmax[4]; hssize_t n; /* Number of dataspace elements */ - hbool_t driver_is_default_compatible; + bool driver_is_default_compatible; herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -1606,7 +1606,7 @@ test_h5s_encode1(void) ****************************************************************/ static herr_t test_h5s_check_encoding(hid_t in_fapl, hid_t in_sid, uint32_t expected_version, uint8_t expected_enc_size, - hbool_t expected_to_fail) + bool expected_to_fail) { char *buf = NULL; /* Pointer to the encoded buffer */ size_t buf_size; /* Size of the encoded buffer */ @@ -1649,7 +1649,7 @@ test_h5s_check_encoding(hid_t in_fapl, hid_t in_sid, uint32_t expected_version, /* Verify if the two dataspace selections (in_sid, d_sid) are the same shape */ check = H5Sselect_shape_same(in_sid, d_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare the starting/ending coordinates of the bounding box for in_sid and d_sid */ ret = H5Sget_select_bounds(in_sid, in_low_bounds, in_high_bounds); @@ -1741,7 +1741,7 @@ test_h5s_encode_regular_hyper(H5F_libver_t low, H5F_libver_t high) /* Testing with each configuration */ for (config = CONFIG_16; config <= CONFIG_32; config++) { - hbool_t expected_to_fail = FALSE; + bool expected_to_fail = false; /* Testing with unlimited or not */ for (unlim = 0; unlim <= 1; unlim++) { @@ -1749,7 +1749,7 @@ test_h5s_encode_regular_hyper(H5F_libver_t low, H5F_libver_t high) count = unlim ? H5S_UNLIMITED : 2; if ((high <= H5F_LIBVER_V18) && (unlim || config == CONFIG_32)) - expected_to_fail = TRUE; + expected_to_fail = true; if (low >= H5F_LIBVER_V112) expected_version = 3; @@ -1934,7 +1934,7 @@ test_h5s_encode_irregular_hyper(H5F_libver_t low, H5F_libver_t high) /* Testing with each configuration */ for (config = CONFIG_8; config <= CONFIG_32; config++) { - hbool_t expected_to_fail = FALSE; /* Whether H5Sencode2 is expected to fail */ + bool expected_to_fail = false; /* Whether H5Sencode2 is expected to fail */ uint32_t expected_version = 0; /* Expected version for selection info */ uint32_t expected_enc_size = 0; /* Expected encoded size for selection info */ @@ -1945,7 +1945,7 @@ test_h5s_encode_irregular_hyper(H5F_libver_t low, H5F_libver_t high) /* H5Sencode2 is expected to fail for library v110 and below when the selection exceeds the 32 bits integer limit */ if (high <= H5F_LIBVER_V110 && config == CONFIG_32) - expected_to_fail = TRUE; + expected_to_fail = true; if (low >= H5F_LIBVER_V112 || config == CONFIG_32) expected_version = 3; @@ -2005,7 +2005,7 @@ test_h5s_encode_irregular_hyper(H5F_libver_t low, H5F_libver_t high) /* Should be irregular hyperslab */ is_regular = H5Sis_regular_hyperslab(sid); - VERIFY(is_regular, FALSE, "H5Sis_regular_hyperslab"); + VERIFY(is_regular, false, "H5Sis_regular_hyperslab"); /* Verify the version and encoded size expected for the configuration */ assert(expected_enc_size <= 255); @@ -2039,7 +2039,7 @@ test_h5s_encode_points(H5F_libver_t low, H5F_libver_t high) hsize_t vdsdims[1] = {total_particles}; /* Dimension size */ hsize_t coord[4]; /* The point coordinates */ herr_t ret; /* Generic return value */ - hbool_t expected_to_fail = FALSE; /* Expected to fail or not */ + bool expected_to_fail = false; /* Expected to fail or not */ uint32_t expected_version = 0; /* Expected version for selection info */ uint8_t expected_enc_size = 0; /* Expected encoded size of selection info */ @@ -2066,7 +2066,7 @@ test_h5s_encode_points(H5F_libver_t low, H5F_libver_t high) ret = H5Sselect_elements(sid, H5S_SELECT_SET, (size_t)4, coord); CHECK(ret, FAIL, "H5Sselect_elements"); - expected_to_fail = FALSE; + expected_to_fail = false; expected_enc_size = 4; expected_version = 1; @@ -2091,7 +2091,7 @@ test_h5s_encode_points(H5F_libver_t low, H5F_libver_t high) /* test 3 */ if (high <= H5F_LIBVER_V110) - expected_to_fail = TRUE; + expected_to_fail = true; if (high >= H5F_LIBVER_V112) { expected_version = 2; @@ -2659,423 +2659,423 @@ test_h5s_extent_equal(void) /* Compare null dataspace against all others, including itself */ ext_equal = H5Sextent_equal(null_space, null_space); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); ext_equal = H5Sextent_equal(null_space, scalar_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(null_space, d1_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(null_space, d1_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(null_space, d1_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(null_space, d1_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(null_space, d2_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(null_space, d2_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(null_space, d2_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(null_space, d2_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(null_space, d3_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(null_space, d3_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(null_space, d3_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(null_space, d3_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); /* Compare scalar dataspace against all others, including itself */ ext_equal = H5Sextent_equal(scalar_space, null_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(scalar_space, scalar_space); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); ext_equal = H5Sextent_equal(scalar_space, d1_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(scalar_space, d1_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(scalar_space, d1_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(scalar_space, d1_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(scalar_space, d2_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(scalar_space, d2_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(scalar_space, d2_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(scalar_space, d2_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(scalar_space, d3_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(scalar_space, d3_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(scalar_space, d3_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(scalar_space, d3_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); /* Compare small 1-D dataspace w/no max. dims against all others, including itself */ ext_equal = H5Sextent_equal(d1_space1, null_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space1, scalar_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space1, d1_space1); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space1, d1_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space1, d1_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space1, d1_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space1, d2_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space1, d2_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space1, d2_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space1, d2_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space1, d3_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space1, d3_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space1, d3_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space1, d3_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); /* Compare larger 1-D dataspace w/no max. dims against all others, including itself */ ext_equal = H5Sextent_equal(d1_space2, null_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space2, scalar_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space2, d1_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space2, d1_space2); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space2, d1_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space2, d1_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space2, d2_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space2, d2_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space2, d2_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space2, d2_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space2, d3_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space2, d3_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space2, d3_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space2, d3_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); /* Compare small 1-D dataspace w/fixed max. dims against all others, including itself */ ext_equal = H5Sextent_equal(d1_space3, null_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space3, scalar_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space3, d1_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space3, d1_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space3, d1_space3); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space3, d1_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space3, d2_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space3, d2_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space3, d2_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space3, d2_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space3, d3_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space3, d3_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space3, d3_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space3, d3_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); /* Compare small 1-D dataspace w/unlimited max. dims against all others, including itself */ ext_equal = H5Sextent_equal(d1_space4, null_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space4, scalar_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space4, d1_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space4, d1_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space4, d1_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space4, d1_space4); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space4, d2_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space4, d2_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space4, d2_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space4, d2_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space4, d3_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space4, d3_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space4, d3_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d1_space4, d3_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); /* Compare small 2-D dataspace w/no max. dims against all others, including itself */ ext_equal = H5Sextent_equal(d2_space1, null_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space1, scalar_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space1, d1_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space1, d1_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space1, d1_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space1, d1_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space1, d2_space1); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space1, d2_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space1, d2_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space1, d2_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space1, d3_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space1, d3_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space1, d3_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space1, d3_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); /* Compare larger 2-D dataspace w/no max. dims against all others, including itself */ ext_equal = H5Sextent_equal(d2_space2, null_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space2, scalar_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space2, d1_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space2, d1_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space2, d1_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space2, d1_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space2, d2_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space2, d2_space2); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space2, d2_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space2, d2_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space2, d3_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space2, d3_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space2, d3_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space2, d3_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); /* Compare small 2-D dataspace w/fixed max. dims against all others, including itself */ ext_equal = H5Sextent_equal(d2_space3, null_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space3, scalar_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space3, d1_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space3, d1_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space3, d1_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space3, d1_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space3, d2_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space3, d2_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space3, d2_space3); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space3, d2_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space3, d3_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space3, d3_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space3, d3_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space3, d3_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); /* Compare small 2-D dataspace w/unlimited max. dims against all others, including itself */ ext_equal = H5Sextent_equal(d2_space4, null_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space4, scalar_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space4, d1_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space4, d1_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space4, d1_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space4, d1_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space4, d2_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space4, d2_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space4, d2_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space4, d2_space4); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space4, d3_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space4, d3_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space4, d3_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d2_space4, d3_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); /* Compare small 3-D dataspace w/no max. dims against all others, including itself */ ext_equal = H5Sextent_equal(d3_space1, null_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space1, scalar_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space1, d1_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space1, d1_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space1, d1_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space1, d1_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space1, d2_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space1, d2_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space1, d2_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space1, d2_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space1, d3_space1); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space1, d3_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space1, d3_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space1, d3_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); /* Compare larger 2-D dataspace w/no max. dims against all others, including itself */ ext_equal = H5Sextent_equal(d3_space2, null_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space2, scalar_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space2, d1_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space2, d1_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space2, d1_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space2, d1_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space2, d2_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space2, d2_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space2, d2_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space2, d2_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space2, d3_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space2, d3_space2); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space2, d3_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space2, d3_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); /* Compare small 2-D dataspace w/fixed max. dims against all others, including itself */ ext_equal = H5Sextent_equal(d3_space3, null_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space3, scalar_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space3, d1_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space3, d1_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space3, d1_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space3, d1_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space3, d2_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space3, d2_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space3, d2_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space3, d2_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space3, d3_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space3, d3_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space3, d3_space3); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space3, d3_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); /* Compare small 2-D dataspace w/unlimited max. dims against all others, including itself */ ext_equal = H5Sextent_equal(d3_space4, null_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space4, scalar_space); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space4, d1_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space4, d1_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space4, d1_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space4, d1_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space4, d2_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space4, d2_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space4, d2_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space4, d2_space4); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space4, d3_space1); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space4, d3_space2); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space4, d3_space3); - VERIFY(ext_equal, FALSE, "H5Sextent_equal"); + VERIFY(ext_equal, false, "H5Sextent_equal"); ext_equal = H5Sextent_equal(d3_space4, d3_space4); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); /* Close dataspaces */ ret = H5Sclose(null_space); @@ -3198,7 +3198,7 @@ test_h5s_extent_copy(void) /* Verify that the extents are equal */ ext_equal = H5Sextent_equal(tmp_space, spaces[j]); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); /* Verify that the correct number of elements is selected */ npoints_ret = H5Sget_select_npoints(tmp_space); @@ -3210,7 +3210,7 @@ test_h5s_extent_copy(void) /* Verify that the extents are equal */ ext_equal = H5Sextent_equal(tmp_space, spaces[i]); - VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + VERIFY(ext_equal, true, "H5Sextent_equal"); /* Verify that the correct number of elements is selected */ npoints_ret = H5Sget_select_npoints(tmp_space); @@ -3261,7 +3261,7 @@ test_h5s_bug1(void) /* Check that space1's selection is valid */ select_valid = H5Sselect_valid(space1); CHECK(select_valid, FAIL, "H5Sselect_valid"); - VERIFY(select_valid, TRUE, "H5Sselect_valid result"); + VERIFY(select_valid, true, "H5Sselect_valid result"); /* Close dataspaces */ ret = H5Sclose(space1); @@ -3309,7 +3309,7 @@ test_h5s_bug2(void) /* Check that space's selection is valid */ select_valid = H5Sselect_valid(space); CHECK(select_valid, FAIL, "H5Sselect_valid"); - VERIFY(select_valid, TRUE, "H5Sselect_valid result"); + VERIFY(select_valid, true, "H5Sselect_valid result"); /* Check that 4 elements are selected */ elements_selected = H5Sget_select_npoints(space); @@ -380,15 +380,15 @@ test_is_valid(void) /* Check that the ID is valid */ tri_ret = H5Iis_valid(dtype); - VERIFY(tri_ret, TRUE, "H5Iis_valid"); - if (tri_ret != TRUE) + VERIFY(tri_ret, true, "H5Iis_valid"); + if (tri_ret != true) goto out; /* Artificially manipulate the reference counts so app_count is 0, and dtype * appears to be an internal id. This takes advantage of the fact that * H5Ipkg is included. */ - ret = H5I_inc_ref(dtype, FALSE); + ret = H5I_inc_ref(dtype, false); CHECK(ret, FAIL, "H5I_inc_ref"); if (ret < 0) goto out; @@ -399,8 +399,8 @@ test_is_valid(void) /* Check that dtype is invalid */ tri_ret = H5Iis_valid(dtype); - VERIFY(tri_ret, FALSE, "H5Iis_valid"); - if (tri_ret != FALSE) + VERIFY(tri_ret, false, "H5Iis_valid"); + if (tri_ret != false) goto out; /* Close dtype and verify that it has been closed */ @@ -419,14 +419,14 @@ test_is_valid(void) /* Check that dtype is invalid */ tri_ret = H5Iis_valid(dtype); - VERIFY(tri_ret, FALSE, "H5Iis_valid"); - if (tri_ret != FALSE) + VERIFY(tri_ret, false, "H5Iis_valid"); + if (tri_ret != false) goto out; /* Check that an id of -1 is invalid */ tri_ret = H5Iis_valid((hid_t)-1); - VERIFY(tri_ret, FALSE, "H4Iis_valid"); - if (tri_ret != FALSE) + VERIFY(tri_ret, false, "H4Iis_valid"); + if (tri_ret != false) goto out; return 0; @@ -602,7 +602,7 @@ typedef struct rct_obj_t { /* Whether we are currently freeing this object directly * through H5Idec_ref(). */ - hbool_t freeing; + bool freeing; /* Pointer to the master list of all objects */ rct_obj_list_t *list; @@ -660,7 +660,7 @@ rct_free_cb(void *_obj, void H5_ATTR_UNUSED **_ctx) * not free another object. We don't want to recursively free the * entire list when we free the first ID. */ - obj->list->objects[i].freeing = TRUE; + obj->list->objects[i].freeing = true; /* Decrement the reference count on the object */ ret = H5Idec_ref(obj->list->objects[i].id); @@ -669,7 +669,7 @@ rct_free_cb(void *_obj, void H5_ATTR_UNUSED **_ctx) goto error; /* Unset the "freeing" flag */ - obj->list->objects[i].freeing = FALSE; + obj->list->objects[i].freeing = false; } /* Verify the number of objects remaining in the master list is non-negative */ @@ -734,7 +734,7 @@ test_remove_clear_type(void) /* Object setup */ objects[j].nfrees = 0; - objects[j].freeing = FALSE; + objects[j].freeing = false; objects[j].list = &obj_list; /* Register an ID for it */ @@ -753,13 +753,13 @@ test_remove_clear_type(void) } /****************************************** - * Clear the type with force set to FALSE * + * Clear the type with force set to false * ******************************************/ - /* Clear the type. Since force is FALSE, only + /* Clear the type. Since force is false, only * IDs with a reference count of 1 will be cleared. */ - ret = H5Iclear_type(obj_type, FALSE); + ret = H5Iclear_type(obj_type, false); CHECK(ret, FAIL, "H5Iclear_type"); if (ret == FAIL) goto error; @@ -782,8 +782,8 @@ test_remove_clear_type(void) } /* No object should still be marked as "freeing" */ - VERIFY(objects[j].freeing, FALSE, "object marked as freeing"); - if (objects[j].freeing != FALSE) + VERIFY(objects[j].freeing, false, "object marked as freeing"); + if (objects[j].freeing != false) goto error; } @@ -804,11 +804,11 @@ test_remove_clear_type(void) goto error; /***************************************** - * Clear the type with force set to TRUE * + * Clear the type with force set to true * *****************************************/ - /* Clear the type. Since force is TRUE, all IDs will be cleared. */ - ret = H5Iclear_type(obj_type, TRUE); + /* Clear the type. Since force is true, all IDs will be cleared. */ + ret = H5Iclear_type(obj_type, true); CHECK(ret, FAIL, "H5Iclear_type"); if (ret == FAIL) goto error; @@ -822,8 +822,8 @@ test_remove_clear_type(void) goto error; /* No object should still be marked as "freeing" */ - VERIFY(objects[j].freeing, FALSE, "object marked as freeing"); - if (objects[j].freeing != FALSE) + VERIFY(objects[j].freeing, false, "object marked as freeing"); + if (objects[j].freeing != false) goto error; } @@ -1339,7 +1339,7 @@ test_future_ids(void) CHECK(ret, FAIL, "H5Pisa_class"); if (FAIL == ret) goto error; - if (TRUE != ret) + if (true != ret) goto error; /* Verify that the application believes the ID is still a property list */ diff --git a/test/titerate.c b/test/titerate.c index 8f5e44c..7c758c4 100644 --- a/test/titerate.c +++ b/test/titerate.c @@ -52,8 +52,8 @@ typedef struct { #define CORRUPTED_ATNAMELEN_FILE "memleak_H5O_dtype_decode_helper_H5Odtype.h5" #define DSET_NAME "image" typedef struct searched_err_t { - char message[256]; - hbool_t found; + char message[256]; + bool found; } searched_err_t; /* Call back function for test_corrupted_attnamelen */ @@ -119,7 +119,7 @@ liter_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info2_t H5_ATTR ** ****************************************************************/ static void -test_iter_group(hid_t fapl, hbool_t new_format) +test_iter_group(hid_t fapl, bool new_format) { hid_t file; /* File ID */ hid_t dataset; /* Dataset ID */ @@ -408,7 +408,7 @@ aiter_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5A_info_t H5_ATTR_ ** ****************************************************************/ static void -test_iter_attr(hid_t fapl, hbool_t new_format) +test_iter_attr(hid_t fapl, bool new_format) { hid_t file; /* File ID */ hid_t dataset; /* Common Dataset ID */ @@ -986,7 +986,7 @@ find_err_msg_cb(unsigned H5_ATTR_UNUSED n, const H5E_error2_t *err_desc, void *_ /* If the searched error message is found, stop the iteration */ if (err_desc->desc != NULL && HDstrcmp(err_desc->desc, searched_err->message) == 0) { - searched_err->found = TRUE; + searched_err->found = true; status = H5_ITER_STOP; } @@ -1008,7 +1008,7 @@ test_corrupted_attnamelen(void) searched_err_t err_caught; /* Data to be passed to callback func */ int err_status; /* Status returned by H5Aiterate2 */ herr_t ret; /* Return value */ - hbool_t driver_is_default_compatible; + bool driver_is_default_compatible; const char *testfile = H5_get_srcdir_filename(CORRUPTED_ATNAMELEN_FILE); /* Corrected test file name */ /* The error message produced when the failure occurs @@ -1044,14 +1044,14 @@ test_corrupted_attnamelen(void) if (err_status == -1) { /* Initialize client data */ HDstrcpy(err_caught.message, err_message); - err_caught.found = FALSE; + err_caught.found = false; /* Look for the correct error message */ ret = H5Ewalk2(H5E_DEFAULT, H5E_WALK_UPWARD, find_err_msg_cb, &err_caught); CHECK(ret, FAIL, "H5Ewalk2"); /* Fail if the indicated message is not found */ - CHECK(err_caught.found, FALSE, "test_corrupted_attnamelen: Expected error not found"); + CHECK(err_caught.found, false, "test_corrupted_attnamelen: Expected error not found"); } /* Close the dataset and file */ @@ -1175,7 +1175,7 @@ test_iterate(void) CHECK(ret, FAIL, "H5Pset_libver_bounds"); /* These next tests use the same file */ - for (new_format = FALSE; new_format <= TRUE; new_format++) { + for (new_format = false; new_format <= true; new_format++) { test_iter_group(new_format ? fapl2 : fapl, new_format); /* Test group iteration */ test_iter_group_large(new_format ? fapl2 : fapl); /* Test group iteration for large # of objects */ test_iter_attr(new_format ? fapl2 : fapl, new_format); /* Test attribute iteration */ diff --git a/test/tmisc.c b/test/tmisc.c index b66a80e..71791b2 100644 --- a/test/tmisc.c +++ b/test/tmisc.c @@ -1800,7 +1800,7 @@ test_misc10(void) hid_t dcpl; /* Dataset creation property list */ hid_t space, type; /* Old dataset's dataspace & datatype */ const char *testfile = H5_get_srcdir_filename(MISC10_FILE_OLD); /* Corrected test file name */ - hbool_t driver_is_default_compatible; + bool driver_is_default_compatible; herr_t ret; /* Output message about test being performed */ @@ -1883,7 +1883,7 @@ test_misc11(void) H5F_info2_t finfo; /* global information about file */ H5F_fspace_strategy_t strategy; /* File space strategy */ hsize_t threshold; /* Free-space section threshold */ - hbool_t persist; /* To persist free-space or not */ + bool persist; /* To persist free-space or not */ herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -1944,7 +1944,7 @@ test_misc11(void) ret = H5Pset_shared_mesg_nindexes(fcpl, MISC11_NINDEXES); CHECK(ret, FAIL, "H5Pset_shared_mesg"); - ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_NONE, FALSE, (hsize_t)1); + ret = H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_NONE, false, (hsize_t)1); CHECK(ret, FAIL, "H5Pset_file_space"); /* Creating a file with the non-default file creation property list should @@ -2011,7 +2011,7 @@ test_misc11(void) ret = H5Pget_file_space_strategy(fcpl, &strategy, &persist, &threshold); CHECK(ret, FAIL, "H5Pget_file_space_strategy"); VERIFY(strategy, 3, "H5Pget_file_space_strategy"); - VERIFY(persist, FALSE, "H5Pget_file_space_strategy"); + VERIFY(persist, false, "H5Pget_file_space_strategy"); VERIFY(threshold, 1, "H5Pget_file_space_strategy"); /* Close file */ @@ -2157,16 +2157,16 @@ misc13_init_data(unsigned *original_data) original_data[u] = u; } -static hbool_t +static bool misc13_verify_data_match(const unsigned *original_data, const unsigned *read_data) { unsigned u; for (u = 0; u < MISC13_DIM1; u++) if (original_data[u] != read_data[u]) - return FALSE; + return false; - return TRUE; + return true; } static void @@ -2380,8 +2380,7 @@ misc13_insert_user_block(const char *old_name, const char *new_name, const char } /* end misc13_insert_user_block() */ static void -misc13_verify_file(const char *name, const unsigned *data, hsize_t userblock_size, - hbool_t check_for_new_dataset) +misc13_verify_file(const char *name, const unsigned *data, hsize_t userblock_size, bool check_for_new_dataset) { hid_t fid = -1; /* File ID */ hid_t gid1 = -1; /* Group IDs */ @@ -2425,7 +2424,7 @@ misc13_verify_file(const char *name, const unsigned *data, hsize_t userblock_siz CHECK(tid, FAIL, "H5Topen2"); /* Verify the type is correct */ - VERIFY(H5Tequal(tid, H5T_NATIVE_INT), TRUE, "H5Tequal"); + VERIFY(H5Tequal(tid, H5T_NATIVE_INT), true, "H5Tequal"); /* Close named datatype */ ret = H5Tclose(tid); @@ -2446,7 +2445,7 @@ misc13_verify_file(const char *name, const unsigned *data, hsize_t userblock_siz CHECK(tid, FAIL, "H5Topen2"); /* Verify the type is correct */ - VERIFY(H5Tequal(tid, H5T_NATIVE_INT), TRUE, "H5Tequal"); + VERIFY(H5Tequal(tid, H5T_NATIVE_INT), true, "H5Tequal"); /* Close named datatype */ ret = H5Tclose(tid); @@ -2500,7 +2499,7 @@ test_misc13(void) { unsigned *data = NULL; /* Data to write to dataset */ hsize_t userblock_size; /* Correct size of userblock */ - hbool_t check_for_new_dataset; /* Whether to check for the post-userblock-creation dataset */ + bool check_for_new_dataset; /* Whether to check for the post-userblock-creation dataset */ /* Create a data buffer for the datasets */ data = (unsigned *)calloc(MISC13_DIM1, sizeof(unsigned)); @@ -2514,7 +2513,7 @@ test_misc13(void) /* Verify file contents are correct */ userblock_size = 0; - check_for_new_dataset = FALSE; + check_for_new_dataset = false; misc13_verify_file(MISC13_FILE_1, data, userblock_size, check_for_new_dataset); /* Create a new file by inserting a user block in front of the first file */ @@ -2522,7 +2521,7 @@ test_misc13(void) /* Verify file contents are still correct */ userblock_size = MISC13_USERBLOCK_SIZE; - check_for_new_dataset = FALSE; + check_for_new_dataset = false; misc13_verify_file(MISC13_FILE_2, data, userblock_size, check_for_new_dataset); /* Make certain we can modify the new file */ @@ -2530,7 +2529,7 @@ test_misc13(void) /* Verify file contents are still correct */ userblock_size = MISC13_USERBLOCK_SIZE; - check_for_new_dataset = TRUE; + check_for_new_dataset = true; misc13_verify_file(MISC13_FILE_2, data, userblock_size, check_for_new_dataset); /* Free the dataset buffer */ @@ -3703,7 +3702,7 @@ test_misc20(void) unsigned version; /* Version of storage layout info */ hsize_t contig_size; /* Size of contiguous storage size from layout into */ const char *testfile = H5_get_srcdir_filename(MISC20_FILE_OLD); /* Corrected test file name */ - hbool_t driver_is_default_compatible; + bool driver_is_default_compatible; herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -4180,7 +4179,7 @@ test_misc23(void) CHECK(create_id, FAIL, "H5Pcreate"); /* Set flag for intermediate group creation */ - status = H5Pset_create_intermediate_group(create_id, TRUE); + status = H5Pset_create_intermediate_group(create_id, true); CHECK(status, FAIL, "H5Pset_create_intermediate_group"); tmp_id = H5Gcreate2(file_id, "/A/B01/grp", create_id, H5P_DEFAULT, access_id); @@ -4241,7 +4240,7 @@ test_misc23(void) CHECK(create_id, FAIL, "H5Pcreate"); /* Set flag for intermediate group creation */ - status = H5Pset_create_intermediate_group(create_id, TRUE); + status = H5Pset_create_intermediate_group(create_id, true); CHECK(status, FAIL, "H5Pset_create_intermediate_group"); tmp_id = H5Dcreate2(file_id, "/A/B06/dset", type_id, space_id, create_id, H5P_DEFAULT, H5P_DEFAULT); @@ -4292,7 +4291,7 @@ test_misc23(void) CHECK(create_id, FAIL, "H5Pcreate"); /* Set flag for intermediate group creation */ - status = H5Pset_create_intermediate_group(create_id, TRUE); + status = H5Pset_create_intermediate_group(create_id, true); CHECK(status, FAIL, "H5Pset_create_intermediate_group"); tmp_id = H5Tcopy(H5T_NATIVE_INT16); @@ -4352,17 +4351,17 @@ test_misc23(void) CHECK(create_id, FAIL, "H5Pcreate"); /* Set flag for intermediate group creation */ - status = H5Pset_create_intermediate_group(create_id, TRUE); + status = H5Pset_create_intermediate_group(create_id, true); CHECK(status, FAIL, "H5Pset_create_intermediate_group"); status = H5Lcopy(file_id, "/A/B01/grp", file_id, "/A/B16/grp", create_id, access_id); CHECK(status, FAIL, "H5Lcopy"); tri_status = H5Lexists(file_id, "/A/B16/grp", access_id); - VERIFY(tri_status, TRUE, "H5Lexists"); + VERIFY(tri_status, true, "H5Lexists"); tri_status = H5Lexists(file_id, "/A/B01/grp", access_id); - VERIFY(tri_status, TRUE, "H5Lexists"); + VERIFY(tri_status, true, "H5Lexists"); /********************************************************************** * test H5Lmove() @@ -4372,10 +4371,10 @@ test_misc23(void) CHECK(status, FAIL, "H5Lmove"); tri_status = H5Lexists(file_id, "/A/B17/grp", access_id); - VERIFY(tri_status, TRUE, "H5Lexists"); + VERIFY(tri_status, true, "H5Lexists"); tri_status = H5Lexists(file_id, "/A/B16/grp", access_id); - VERIFY(tri_status, FALSE, "H5Lexists"); + VERIFY(tri_status, false, "H5Lexists"); /********************************************************************** * test H5Lcreate_hard() @@ -4385,7 +4384,7 @@ test_misc23(void) CHECK(status, FAIL, "H5Lcreate_hard"); tri_status = H5Lexists(file_id, "/A/B18/grp", access_id); - VERIFY(tri_status, TRUE, "H5Lexists"); + VERIFY(tri_status, true, "H5Lexists"); /********************************************************************** * test H5Lcreate_soft() @@ -4395,7 +4394,7 @@ test_misc23(void) CHECK(status, FAIL, "H5Lcreate_soft"); tri_status = H5Lexists(file_id, "/A/B19/grp", access_id); - VERIFY(tri_status, TRUE, "H5Lexists"); + VERIFY(tri_status, true, "H5Lexists"); /********************************************************************** * test H5Lcreate_external() @@ -4405,7 +4404,7 @@ test_misc23(void) CHECK(status, FAIL, "H5Lcreate_external"); tri_status = H5Lexists(file_id, "/A/B20/grp", access_id); - VERIFY(tri_status, TRUE, "H5Lexists"); + VERIFY(tri_status, true, "H5Lexists"); /********************************************************************** * test H5Lcreate_ud() @@ -4416,7 +4415,7 @@ test_misc23(void) CHECK(status, FAIL, "H5Lcreate_ud"); tri_status = H5Lexists(file_id, "/A/B21/grp", access_id); - VERIFY(tri_status, TRUE, "H5Lexists"); + VERIFY(tri_status, true, "H5Lexists"); /********************************************************************** * close @@ -4999,7 +4998,7 @@ test_misc25b(void) hid_t fid; /* File ID */ hid_t gid; /* Group ID */ const char *testfile = H5_get_srcdir_filename(MISC25B_FILE); /* Corrected test file name */ - hbool_t driver_is_default_compatible; + bool driver_is_default_compatible; herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -5260,7 +5259,7 @@ test_misc27(void) hid_t fid; /* File ID */ hid_t gid; /* Group ID */ const char *testfile = H5_get_srcdir_filename(MISC27_FILE); /* Corrected test file name */ - hbool_t driver_is_default_compatible; + bool driver_is_default_compatible; herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -5483,9 +5482,9 @@ test_misc28(void) static void test_misc29(void) { - hbool_t driver_is_default_compatible; - hid_t fid; /* File ID */ - herr_t ret; /* Generic return value */ + bool driver_is_default_compatible; + hid_t fid; /* File ID */ + herr_t ret; /* Generic return value */ /* Output message about test being performed */ MESSAGE(5, ("Speculative metadata reads\n")); @@ -5546,7 +5545,7 @@ test_misc30(void) /* Output message about test being performed */ MESSAGE(5, ("Local heap dropping free block info\n")); - for (get_info = FALSE; get_info <= TRUE; get_info++) { + for (get_info = false; get_info <= true; get_info++) { hid_t fid; /* File ID */ hid_t gid; /* Group ID */ int i; /* Local index counter */ @@ -5726,15 +5725,15 @@ test_misc32(void) /* Size zero returns NULL. * Also checks that a size of zero and setting the buffer clear flag - * to TRUE can be used together. + * to true can be used together. * * Note that we have asserts in the code, so only check when NDEBUG * is defined. */ #ifdef NDEBUG - buffer = H5allocate_memory(0, FALSE); + buffer = H5allocate_memory(0, false); CHECK_PTR_NULL(buffer, "H5allocate_memory"); /*BAD*/ - buffer = H5allocate_memory(0, TRUE); + buffer = H5allocate_memory(0, true); CHECK_PTR_NULL(buffer, "H5allocate_memory"); /*BAD*/ #endif /* NDEBUG */ @@ -5742,7 +5741,7 @@ test_misc32(void) /* Size zero returns NULL. Valgrind will confirm buffer is freed. */ size = 1024; - buffer = H5allocate_memory(size, TRUE); + buffer = H5allocate_memory(size, true); resized = H5resize_memory(buffer, 0); CHECK_PTR_NULL(resized, "H5resize_memory"); @@ -5775,7 +5774,7 @@ test_misc33(void) hid_t fid = -1; /* File ID */ const char *testfile = H5_get_srcdir_filename(MISC33_FILE); /* Corrected test file name */ H5O_info2_t oinfo; /* Structure for object metadata information */ - hbool_t driver_is_default_compatible; + bool driver_is_default_compatible; herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -5955,15 +5954,15 @@ static int test_misc36_context; static void test_misc36_cb1(void *_ctx) { - int *ctx = (int *)_ctx; /* Set up context pointer */ - hbool_t is_terminating; /* Flag indicating the library is terminating */ - herr_t ret; /* Return value */ + int *ctx = (int *)_ctx; /* Set up context pointer */ + bool is_terminating; /* Flag indicating the library is terminating */ + herr_t ret; /* Return value */ /* Check whether the library thinks it's terminating */ - is_terminating = FALSE; + is_terminating = false; ret = H5is_library_terminating(&is_terminating); CHECK(ret, FAIL, "H5is_library_terminating"); - VERIFY(is_terminating, TRUE, "H5is_library_terminating"); + VERIFY(is_terminating, true, "H5is_library_terminating"); /* Verify correct ordering for 'atclose' callbacks */ if (0 != *ctx) @@ -5976,15 +5975,15 @@ test_misc36_cb1(void *_ctx) static void test_misc36_cb2(void *_ctx) { - int *ctx = (int *)_ctx; /* Set up context pointer */ - hbool_t is_terminating; /* Flag indicating the library is terminating */ - herr_t ret; /* Return value */ + int *ctx = (int *)_ctx; /* Set up context pointer */ + bool is_terminating; /* Flag indicating the library is terminating */ + herr_t ret; /* Return value */ /* Check whether the library thinks it's terminating */ - is_terminating = FALSE; + is_terminating = false; ret = H5is_library_terminating(&is_terminating); CHECK(ret, FAIL, "H5is_library_terminating"); - VERIFY(is_terminating, TRUE, "H5is_library_terminating"); + VERIFY(is_terminating, true, "H5is_library_terminating"); /* Verify correct ordering for 'atclose' callbacks */ if (1 != *ctx) @@ -6002,27 +6001,27 @@ test_misc36_cb2(void *_ctx) static void test_misc36(void) { - hbool_t is_terminating; /* Flag indicating the library is terminating */ - herr_t ret; /* Return value */ + bool is_terminating; /* Flag indicating the library is terminating */ + herr_t ret; /* Return value */ /* Output message about test being performed */ MESSAGE(5, ("H5atclose and H5is_library_terminating API calls")); /* Check whether the library thinks it's terminating */ - is_terminating = TRUE; + is_terminating = true; ret = H5is_library_terminating(&is_terminating); CHECK(ret, FAIL, "H5is_library_terminating"); - VERIFY(is_terminating, FALSE, "H5is_library_terminating"); + VERIFY(is_terminating, false, "H5is_library_terminating"); /* Shut the library down */ test_misc36_context = 0; H5close(); /* Check whether the library thinks it's terminating */ - is_terminating = TRUE; + is_terminating = true; ret = H5is_library_terminating(&is_terminating); CHECK(ret, FAIL, "H5is_library_terminating"); - VERIFY(is_terminating, FALSE, "H5is_library_terminating"); + VERIFY(is_terminating, false, "H5is_library_terminating"); /* Check the close context was not changed */ VERIFY(test_misc36_context, 0, "H5atclose"); @@ -6031,10 +6030,10 @@ test_misc36(void) H5open(); /* Check whether the library thinks it's terminating */ - is_terminating = TRUE; + is_terminating = true; ret = H5is_library_terminating(&is_terminating); CHECK(ret, FAIL, "H5is_library_terminating"); - VERIFY(is_terminating, FALSE, "H5is_library_terminating"); + VERIFY(is_terminating, false, "H5is_library_terminating"); /* Register the 'atclose' callbacks */ /* (Note that these will be called in reverse order, which is checked) */ @@ -6073,7 +6072,7 @@ static void test_misc37(void) { const char *testfile = H5_get_srcdir_filename(CVE_2020_10812_FILENAME); - hbool_t driver_is_default_compatible; + bool driver_is_default_compatible; hid_t fid; herr_t ret; @@ -6110,7 +6109,7 @@ test_misc37(void) void test_misc(void) { - hbool_t default_driver = h5_using_default_driver(NULL); + bool default_driver = h5_using_default_driver(NULL); /* Output message about test being performed */ MESSAGE(5, ("Testing Miscellaneous Routines\n")); diff --git a/test/trefer.c b/test/trefer.c index 577fc69..d4c9175 100644 --- a/test/trefer.c +++ b/test/trefer.c @@ -1305,7 +1305,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) H5E_END_TRY if (dset1 < 0) { - VERIFY(libver_high <= H5F_LIBVER_V110, TRUE, "H5Dcreate2"); + VERIFY(libver_high <= H5F_LIBVER_V110, true, "H5Dcreate2"); ret = H5Sclose(sid1); CHECK(ret, FAIL, "H5Sclose"); @@ -1603,7 +1603,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) VERIFY(hssize_ret, (hssize_t)H5S_UNLIMITED, "H5Sget_select_npoints"); tri_ret = H5Sis_regular_hyperslab(sid2); CHECK(tri_ret, FAIL, "H5Sis_regular_hyperslab"); - VERIFY(tri_ret, TRUE, "H5Sis_regular_hyperslab Result"); + VERIFY(tri_ret, true, "H5Sis_regular_hyperslab Result"); ret = H5Sget_regular_hyperslab(sid2, start, stride, count, block); CHECK(ret, FAIL, "H5Sget_regular_hyperslab"); VERIFY(start[0], (hsize_t)1, "Hyperslab Coordinates"); @@ -1762,7 +1762,7 @@ test_reference_region_1D(H5F_libver_t libver_low, H5F_libver_t libver_high) if (dset1 < 0) { - VERIFY(libver_high <= H5F_LIBVER_V110, TRUE, "H5Dcreate2"); + VERIFY(libver_high <= H5F_LIBVER_V110, true, "H5Dcreate2"); ret = H5Sclose(sid1); CHECK(ret, FAIL, "H5Sclose"); diff --git a/test/trefer_deprec.c b/test/trefer_deprec.c index 209708b..f6c2872 100644 --- a/test/trefer_deprec.c +++ b/test/trefer_deprec.c @@ -883,7 +883,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) VERIFY(hssize_ret, (hssize_t)H5S_UNLIMITED, "H5Sget_select_npoints"); tri_ret = H5Sis_regular_hyperslab(sid2); CHECK(tri_ret, FAIL, "H5Sis_regular_hyperslab"); - VERIFY(tri_ret, TRUE, "H5Sis_regular_hyperslab Result"); + VERIFY(tri_ret, true, "H5Sis_regular_hyperslab Result"); ret = H5Sget_regular_hyperslab(sid2, start, stride, count, block); CHECK(ret, FAIL, "H5Sget_regular_hyperslab"); VERIFY(start[0], (hsize_t)1, "Hyperslab Coordinates"); diff --git a/test/tselect.c b/test/tselect.c index a7d9f8e..7bb19b8 100644 --- a/test/tselect.c +++ b/test/tselect.c @@ -1882,13 +1882,13 @@ verify_select_hyper_contig_dr__run_test(const uint16_t *cube_buf, size_t H5_ATTR uint16_t expected_value; /* Expected value in dataset */ unsigned i, j, k, l, m; /* Local index variables */ size_t s; /* Local index variable */ - hbool_t mis_match; /* Flag to indicate mismatch in expected value */ + bool mis_match; /* Flag to indicate mismatch in expected value */ assert(cube_buf); assert(cube_size > 0); expected_value = 0; - mis_match = FALSE; + mis_match = false; cube_ptr = cube_buf; s = 0; i = 0; @@ -1906,7 +1906,7 @@ verify_select_hyper_contig_dr__run_test(const uint16_t *cube_buf, size_t H5_ATTR /* Check for correct value */ if (*cube_ptr != expected_value) - mis_match = TRUE; + mis_match = true; /* Advance to next element */ cube_ptr++; @@ -1940,7 +1940,7 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co unsigned edge_size, unsigned chunk_edge_size, unsigned small_rank, unsigned large_rank, hid_t dset_type, hid_t xfer_plist) { - hbool_t mis_match; /* Flag indicating a value read in wasn't what was expected */ + bool mis_match; /* Flag indicating a value read in wasn't what was expected */ hid_t fapl; /* File access property list */ hid_t fid1; /* File ID */ hid_t small_cube_sid; /* Dataspace ID for small cube in memory & file */ @@ -2011,7 +2011,7 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co CHECK(fapl, FAIL, "H5Pcreate"); /* Use the 'core' VFD for this test */ - ret = H5Pset_fapl_core(fapl, (size_t)(1024 * 1024), FALSE); + ret = H5Pset_fapl_core(fapl, (size_t)(1024 * 1024), false); CHECK(ret, FAIL, "H5Pset_fapl_core"); /* Create file */ @@ -2158,7 +2158,7 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co * selections as having the same shape. */ check = H5Sselect_shape_same(small_cube_sid, file_large_cube_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Read selection from disk */ ret = H5Dread(large_cube_dataset, H5T_NATIVE_UINT16, small_cube_sid, file_large_cube_sid, @@ -2166,14 +2166,14 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co CHECK(ret, FAIL, "H5Dread"); /* verify that expected data is retrieved */ - mis_match = FALSE; + mis_match = false; ptr_1 = small_cube_buf_1; expected_value = (uint16_t)((u * edge_size * edge_size * edge_size * edge_size) + (v * edge_size * edge_size * edge_size) + (w * edge_size * edge_size) + (x * edge_size)); for (s = 0; s < small_cube_size; s++) { if (*ptr_1 != expected_value) - mis_match = TRUE; + mis_match = true; ptr_1++; expected_value++; } /* end for */ @@ -2223,7 +2223,7 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co * selections as having the same shape. */ check = H5Sselect_shape_same(small_cube_sid, mem_large_cube_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Read selection from disk */ ret = H5Dread(small_cube_dataset, H5T_NATIVE_UINT16, mem_large_cube_sid, small_cube_sid, @@ -2241,23 +2241,23 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co assert(start_index < stop_index); assert(stop_index <= large_cube_size); - mis_match = FALSE; + mis_match = false; ptr_1 = large_cube_buf_1; expected_value = 0; for (s = 0; s < start_index; s++) { if (*ptr_1 != 0) - mis_match = TRUE; + mis_match = true; ptr_1++; } /* end for */ for (; s <= stop_index; s++) { if (*ptr_1 != expected_value) - mis_match = TRUE; + mis_match = true; expected_value++; ptr_1++; } /* end for */ for (; s < large_cube_size; s++) { if (*ptr_1 != 0) - mis_match = TRUE; + mis_match = true; ptr_1++; } /* end for */ if (mis_match) @@ -2322,7 +2322,7 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co * on disk full small cube selections as having the same shape. */ check = H5Sselect_shape_same(small_cube_sid, mem_large_cube_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* write the slice from the in memory large cube to the on disk small cube */ ret = H5Dwrite(small_cube_dataset, H5T_NATIVE_UINT16, mem_large_cube_sid, small_cube_sid, @@ -2335,14 +2335,14 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co CHECK(ret, FAIL, "H5Dread"); /* verify that expected data is retrieved */ - mis_match = FALSE; + mis_match = false; ptr_1 = small_cube_buf_1; expected_value = (uint16_t)((u * edge_size * edge_size * edge_size * edge_size) + (v * edge_size * edge_size * edge_size) + (w * edge_size * edge_size) + (x * edge_size)); for (s = 0; s < small_cube_size; s++) { if (*ptr_1 != expected_value) - mis_match = TRUE; + mis_match = true; expected_value++; ptr_1++; } /* end for */ @@ -2409,7 +2409,7 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co * as having the same shape. */ check = H5Sselect_shape_same(small_cube_sid, file_large_cube_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* write the cube from memory to the target slice of the disk cube */ ret = H5Dwrite(large_cube_dataset, H5T_NATIVE_UINT16, small_cube_sid, file_large_cube_sid, @@ -2435,23 +2435,23 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co assert(start_index < stop_index); assert(stop_index <= large_cube_size); - mis_match = FALSE; + mis_match = false; ptr_1 = large_cube_buf_1; expected_value = 0; for (s = 0; s < start_index; s++) { if (*ptr_1 != 0) - mis_match = TRUE; + mis_match = true; ptr_1++; } /* end for */ for (; s <= stop_index; s++) { if (*ptr_1 != expected_value) - mis_match = TRUE; + mis_match = true; expected_value++; ptr_1++; } /* end for */ for (; s < large_cube_size; s++) { if (*ptr_1 != 0) - mis_match = TRUE; + mis_match = true; ptr_1++; } /* end for */ if (mis_match) @@ -2584,7 +2584,7 @@ test_select_hyper_checker_board_dr__select_checker_board(hid_t tgt_n_cube_sid, u unsigned edge_size, unsigned checker_edge_size, unsigned sel_rank, const hsize_t sel_start[]) { - hbool_t first_selection = TRUE; + bool first_selection = true; unsigned n_cube_offset; unsigned sel_offset; hsize_t base_count; @@ -2719,7 +2719,7 @@ test_select_hyper_checker_board_dr__select_checker_board(hid_t tgt_n_cube_sid, u if (((i + j + k + l + m) % 2) == 0) { if (first_selection) { - first_selection = FALSE; + first_selection = false; ret = H5Sselect_hyperslab(tgt_n_cube_sid, H5S_SELECT_SET, &(start[n_cube_offset]), &(stride[n_cube_offset]), @@ -2768,7 +2768,7 @@ test_select_hyper_checker_board_dr__select_checker_board(hid_t tgt_n_cube_sid, u ** test_select_hyper_checker_board_dr__verify_data(): ** ** Examine the supplied buffer to see if it contains the -** expected data. Return TRUE if it does, and FALSE +** expected data. Return true if it does, and false ** otherwise. ** ** The supplied buffer is presumed to contain the results @@ -2805,14 +2805,14 @@ test_select_hyper_checker_board_dr__select_checker_board(hid_t tgt_n_cube_sid, u ** a selected or an unselected checker. ** ****************************************************************/ -H5_ATTR_PURE static hbool_t +H5_ATTR_PURE static bool test_select_hyper_checker_board_dr__verify_data(uint16_t *buf_ptr, unsigned rank, unsigned edge_size, unsigned checker_edge_size, uint16_t first_expected_val, - hbool_t buf_starts_in_checker) + bool buf_starts_in_checker) { - hbool_t good_data = TRUE; - hbool_t in_checker; - hbool_t start_in_checker[5]; + bool good_data = true; + bool in_checker; + bool start_in_checker[5]; uint16_t expected_value; uint16_t *val_ptr; unsigned i, j, k, l, m; /* to track position in n-cube */ @@ -2877,11 +2877,11 @@ test_select_hyper_checker_board_dr__verify_data(uint16_t *buf_ptr, unsigned rank if (in_checker) { if (*val_ptr != expected_value) - good_data = FALSE; + good_data = false; } /* end if */ else { if (*val_ptr != 0) - good_data = FALSE; + good_data = false; } /* end else */ val_ptr++; @@ -2921,7 +2921,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ unsigned chunk_edge_size, unsigned small_rank, unsigned large_rank, hid_t dset_type, hid_t xfer_plist) { - hbool_t data_ok; + bool data_ok; hid_t fapl; /* File access property list */ hid_t fid; /* HDF5 File IDs */ hid_t full_small_cube_sid; /* Dataspace for small cube w/all selection */ @@ -2996,7 +2996,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ CHECK(fapl, FAIL, "H5Pcreate"); /* Use the 'core' VFD for this test */ - ret = H5Pset_fapl_core(fapl, (size_t)(1024 * 1024), FALSE); + ret = H5Pset_fapl_core(fapl, (size_t)(1024 * 1024), false); CHECK(ret, FAIL, "H5Pset_fapl_core"); /* Create file */ @@ -3163,7 +3163,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ * selections as having the same shape. */ check = H5Sselect_shape_same(mem_small_cube_sid, file_large_cube_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* zero the buffer that we will be using for reading */ memset(small_cube_buf_1, 0, sizeof(*small_cube_buf_1) * small_cube_size); @@ -3179,7 +3179,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ data_ok = test_select_hyper_checker_board_dr__verify_data(small_cube_buf_1, small_rank, edge_size, checker_edge_size, - expected_value, (hbool_t)TRUE); + expected_value, (bool)true); if (!data_ok) TestErrPrintf("small cube read from largecube has bad data! Line=%d\n", __LINE__); @@ -3243,7 +3243,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ * selections as having the same shape. */ check = H5Sselect_shape_same(file_small_cube_sid, mem_large_cube_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* zero out the in memory large cube */ memset(large_cube_buf_1, 0, sizeof(*large_cube_buf_1) * large_cube_size); @@ -3256,7 +3256,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ /* verify that the expected data and only the * expected data was read. */ - data_ok = TRUE; + data_ok = true; ptr_1 = large_cube_buf_1; expected_value = 0; start_index = (u * edge_size * edge_size * edge_size * edge_size) + @@ -3270,13 +3270,13 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ /* verify that the large cube contains only zeros before the slice */ for (s = 0; s < start_index; s++) { if (*ptr_1 != 0) - data_ok = FALSE; + data_ok = false; ptr_1++; } /* end for */ assert(s == start_index); data_ok &= test_select_hyper_checker_board_dr__verify_data( - ptr_1, small_rank, edge_size, checker_edge_size, (uint16_t)0, (hbool_t)TRUE); + ptr_1, small_rank, edge_size, checker_edge_size, (uint16_t)0, (bool)true); ptr_1 += small_cube_size; s += small_cube_size; @@ -3286,7 +3286,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ /* verify that the large cube contains only zeros after the slice */ for (s = stop_index + 1; s < large_cube_size; s++) { if (*ptr_1 != 0) - data_ok = FALSE; + data_ok = false; ptr_1++; } /* end for */ if (!data_ok) @@ -3363,7 +3363,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ * selections as having the same shape. */ check = H5Sselect_shape_same(file_small_cube_sid, mem_large_cube_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* write the slice from the in memory large cube to the * on disk small cube @@ -3386,7 +3386,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ data_ok = test_select_hyper_checker_board_dr__verify_data(small_cube_buf_1, small_rank, edge_size, checker_edge_size, - expected_value, (hbool_t)TRUE); + expected_value, (bool)true); if (!data_ok) TestErrPrintf("small cube read from largecube has bad data! Line=%d\n", __LINE__); @@ -3458,7 +3458,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ * selections as having the same shape. */ check = H5Sselect_shape_same(file_large_cube_sid, mem_small_cube_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* write the checker board selection of the in memory * small cube to a slice through the on disk large @@ -3480,7 +3480,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ * expected data was written to the on disk large * cube. */ - data_ok = TRUE; + data_ok = true; ptr_1 = large_cube_buf_1; expected_value = 0; start_index = (u * edge_size * edge_size * edge_size * edge_size) + @@ -3494,14 +3494,14 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ /* verify that the large cube contains only zeros before the slice */ for (s = 0; s < start_index; s++) { if (*ptr_1 != 0) - data_ok = FALSE; + data_ok = false; ptr_1++; } /* end for */ assert(s == start_index); /* verify that the slice contains the expected data */ data_ok &= test_select_hyper_checker_board_dr__verify_data( - ptr_1, small_rank, edge_size, checker_edge_size, (uint16_t)0, (hbool_t)TRUE); + ptr_1, small_rank, edge_size, checker_edge_size, (uint16_t)0, (bool)true); ptr_1 += small_cube_size; s += small_cube_size; @@ -3511,7 +3511,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ /* verify that the large cube contains only zeros after the slice */ for (s = stop_index + 1; s < large_cube_size; s++) { if (*ptr_1 != 0) - data_ok = FALSE; + data_ok = false; ptr_1++; } /* end for */ if (!data_ok) @@ -4115,7 +4115,7 @@ test_select_hyper_offset(void) ret = H5Soffset_simple(sid1, offset); CHECK(ret, FAIL, "H5Soffset_simple"); valid = H5Sselect_valid(sid1); - VERIFY(valid, TRUE, "H5Sselect_valid"); + VERIFY(valid, true, "H5Sselect_valid"); /* Check an invalid offset */ offset[0] = 10; @@ -4124,7 +4124,7 @@ test_select_hyper_offset(void) ret = H5Soffset_simple(sid1, offset); CHECK(ret, FAIL, "H5Soffset_simple"); valid = H5Sselect_valid(sid1); - VERIFY(valid, FALSE, "H5Sselect_valid"); + VERIFY(valid, false, "H5Sselect_valid"); /* Reset offset */ offset[0] = 0; @@ -4133,7 +4133,7 @@ test_select_hyper_offset(void) ret = H5Soffset_simple(sid1, offset); CHECK(ret, FAIL, "H5Soffset_simple"); valid = H5Sselect_valid(sid1); - VERIFY(valid, TRUE, "H5Sselect_valid"); + VERIFY(valid, true, "H5Sselect_valid"); /* Select 15x26 hyperslab for memory dataset */ start[0] = 15; @@ -4153,7 +4153,7 @@ test_select_hyper_offset(void) ret = H5Soffset_simple(sid2, offset); CHECK(ret, FAIL, "H5Soffset_simple"); valid = H5Sselect_valid(sid2); - VERIFY(valid, TRUE, "H5Sselect_valid"); + VERIFY(valid, true, "H5Sselect_valid"); /* Create a dataset */ dataset = H5Dcreate2(fid1, SPACE1_NAME, H5T_NATIVE_UCHAR, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); @@ -4284,7 +4284,7 @@ test_select_hyper_offset2(void) ret = H5Soffset_simple(sid1, offset); CHECK(ret, FAIL, "H5Soffset_simple"); valid = H5Sselect_valid(sid1); - VERIFY(valid, TRUE, "H5Sselect_valid"); + VERIFY(valid, true, "H5Sselect_valid"); /* Select 4x10 hyperslab for memory dataset */ start[0] = 1; @@ -4300,7 +4300,7 @@ test_select_hyper_offset2(void) ret = H5Soffset_simple(sid2, offset); CHECK(ret, FAIL, "H5Soffset_simple"); valid = H5Sselect_valid(sid2); - VERIFY(valid, TRUE, "H5Sselect_valid"); + VERIFY(valid, true, "H5Sselect_valid"); /* Create a dataset */ dataset = H5Dcreate2(fid1, SPACE7_NAME, H5T_NATIVE_UCHAR, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); @@ -4441,7 +4441,7 @@ test_select_point_offset(void) ret = H5Soffset_simple(sid1, offset); CHECK(ret, FAIL, "H5Soffset_simple"); valid = H5Sselect_valid(sid1); - VERIFY(valid, TRUE, "H5Sselect_valid"); + VERIFY(valid, true, "H5Sselect_valid"); /* Check an invalid offset */ offset[0] = 10; @@ -4450,7 +4450,7 @@ test_select_point_offset(void) ret = H5Soffset_simple(sid1, offset); CHECK(ret, FAIL, "H5Soffset_simple"); valid = H5Sselect_valid(sid1); - VERIFY(valid, FALSE, "H5Sselect_valid"); + VERIFY(valid, false, "H5Sselect_valid"); /* Reset offset */ offset[0] = 0; @@ -4459,7 +4459,7 @@ test_select_point_offset(void) ret = H5Soffset_simple(sid1, offset); CHECK(ret, FAIL, "H5Soffset_simple"); valid = H5Sselect_valid(sid1); - VERIFY(valid, TRUE, "H5Sselect_valid"); + VERIFY(valid, true, "H5Sselect_valid"); /* Select sequence of ten points for write dataset */ coord2[0][0] = 12; @@ -4491,7 +4491,7 @@ test_select_point_offset(void) ret = H5Soffset_simple(sid2, offset); CHECK(ret, FAIL, "H5Soffset_simple"); valid = H5Sselect_valid(sid2); - VERIFY(valid, TRUE, "H5Sselect_valid"); + VERIFY(valid, true, "H5Sselect_valid"); /* Create a dataset */ dataset = H5Dcreate2(fid1, SPACE1_NAME, H5T_NATIVE_UCHAR, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); @@ -6974,13 +6974,13 @@ test_select_valid(void) CHECK(error, FAIL, "H5Sselect_hyperslab"); valid = H5Sselect_valid(sub_space); - VERIFY(valid, TRUE, "H5Sselect_valid"); + VERIFY(valid, true, "H5Sselect_valid"); error = H5Sselect_hyperslab(sub_space, H5S_SELECT_OR, safe_start, NULL, safe_count, NULL); CHECK(error, FAIL, "H5Sselect_hyperslab"); valid = H5Sselect_valid(sub_space); - VERIFY(valid, TRUE, "H5Sselect_valid"); + VERIFY(valid, true, "H5Sselect_valid"); error = H5Sclose(sub_space); CHECK(error, FAIL, "H5Sclose"); @@ -6997,13 +6997,13 @@ test_select_valid(void) CHECK(error, FAIL, "H5Sselect_hyperslab"); valid = H5Sselect_valid(sub_space); - VERIFY(valid, FALSE, "H5Sselect_valid"); + VERIFY(valid, false, "H5Sselect_valid"); error = H5Sselect_hyperslab(sub_space, H5S_SELECT_OR, safe_start, NULL, safe_count, NULL); CHECK(error, FAIL, "H5Sselect_hyperslab"); valid = H5Sselect_valid(sub_space); - VERIFY(valid, FALSE, "H5Sselect_valid"); + VERIFY(valid, false, "H5Sselect_valid"); error = H5Sclose(sub_space); CHECK(error, FAIL, "H5Sclose"); @@ -7020,13 +7020,13 @@ test_select_valid(void) CHECK(error, FAIL, "H5Sselect_hyperslab"); valid = H5Sselect_valid(sub_space); - VERIFY(valid, FALSE, "H5Sselect_valid"); + VERIFY(valid, false, "H5Sselect_valid"); error = H5Sselect_hyperslab(sub_space, H5S_SELECT_OR, safe_start, NULL, safe_count, NULL); CHECK(error, FAIL, "H5Sselect_hyperslab"); valid = H5Sselect_valid(sub_space); - VERIFY(valid, FALSE, "H5Sselect_valid"); + VERIFY(valid, false, "H5Sselect_valid"); error = H5Sclose(sub_space); CHECK(error, FAIL, "H5Sclose"); @@ -8629,289 +8629,289 @@ test_shape_same(void) /* Compare "all" selection to all the selections created */ /* Compare against itself */ check = H5Sselect_shape_same(all_sid, all_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against copy of itself */ tmp_sid = H5Scopy(all_sid); CHECK(tmp_sid, FAIL, "H5Scopy"); check = H5Sselect_shape_same(all_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); /* Compare against "none" selection */ check = H5Sselect_shape_same(all_sid, none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against single point selection */ check = H5Sselect_shape_same(all_sid, single_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against multiple point selection */ check = H5Sselect_shape_same(all_sid, mult_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "plain" single hyperslab selection */ check = H5Sselect_shape_same(all_sid, single_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "all" single hyperslab selection */ check = H5Sselect_shape_same(all_sid, single_hyper_all_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against "single point" single hyperslab selection */ check = H5Sselect_shape_same(all_sid, single_hyper_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against regular, strided hyperslab selection */ check = H5Sselect_shape_same(all_sid, regular_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against irregular hyperslab selection */ check = H5Sselect_shape_same(all_sid, irreg_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "no" hyperslab selection */ check = H5Sselect_shape_same(all_sid, none_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against scalar "all" hyperslab selection */ check = H5Sselect_shape_same(all_sid, scalar_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against scalar "none" hyperslab selection */ check = H5Sselect_shape_same(all_sid, scalar_none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare "none" selection to all the selections created */ /* Compare against itself */ check = H5Sselect_shape_same(none_sid, none_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against copy of itself */ tmp_sid = H5Scopy(none_sid); CHECK(tmp_sid, FAIL, "H5Scopy"); check = H5Sselect_shape_same(none_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); /* Compare against "all" selection */ check = H5Sselect_shape_same(none_sid, all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against single point selection */ check = H5Sselect_shape_same(none_sid, single_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against multiple point selection */ check = H5Sselect_shape_same(none_sid, mult_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "plain" single hyperslab selection */ check = H5Sselect_shape_same(none_sid, single_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "all" single hyperslab selection */ check = H5Sselect_shape_same(none_sid, single_hyper_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "single point" single hyperslab selection */ check = H5Sselect_shape_same(none_sid, single_hyper_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against regular, strided hyperslab selection */ check = H5Sselect_shape_same(none_sid, regular_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against irregular hyperslab selection */ check = H5Sselect_shape_same(none_sid, irreg_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "no" hyperslab selection */ check = H5Sselect_shape_same(none_sid, none_hyper_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against scalar "all" hyperslab selection */ check = H5Sselect_shape_same(none_sid, scalar_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against scalar "none" hyperslab selection */ check = H5Sselect_shape_same(none_sid, scalar_none_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare single point selection to all the selections created */ /* Compare against itself */ check = H5Sselect_shape_same(single_pt_sid, single_pt_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against copy of itself */ tmp_sid = H5Scopy(single_pt_sid); CHECK(tmp_sid, FAIL, "H5Scopy"); check = H5Sselect_shape_same(single_pt_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); /* Compare against "all" selection */ check = H5Sselect_shape_same(single_pt_sid, all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "none" selection */ check = H5Sselect_shape_same(single_pt_sid, none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against multiple point selection */ check = H5Sselect_shape_same(single_pt_sid, mult_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "plain" single hyperslab selection */ check = H5Sselect_shape_same(single_pt_sid, single_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "all" single hyperslab selection */ check = H5Sselect_shape_same(single_pt_sid, single_hyper_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "single point" single hyperslab selection */ check = H5Sselect_shape_same(single_pt_sid, single_hyper_pt_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against regular, strided hyperslab selection */ check = H5Sselect_shape_same(single_pt_sid, regular_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against irregular hyperslab selection */ check = H5Sselect_shape_same(single_pt_sid, irreg_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "no" hyperslab selection */ check = H5Sselect_shape_same(single_pt_sid, none_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against scalar "all" hyperslab selection */ check = H5Sselect_shape_same(single_pt_sid, scalar_all_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against scalar "none" hyperslab selection */ check = H5Sselect_shape_same(single_pt_sid, scalar_none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare multiple point selection to all the selections created */ /* Compare against itself */ check = H5Sselect_shape_same(mult_pt_sid, mult_pt_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against copy of itself */ tmp_sid = H5Scopy(mult_pt_sid); CHECK(tmp_sid, FAIL, "H5Scopy"); check = H5Sselect_shape_same(mult_pt_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); /* Compare against "all" selection */ check = H5Sselect_shape_same(mult_pt_sid, all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "none" selection */ check = H5Sselect_shape_same(mult_pt_sid, none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against single point selection */ check = H5Sselect_shape_same(mult_pt_sid, single_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "plain" single hyperslab selection */ check = H5Sselect_shape_same(mult_pt_sid, single_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "all" single hyperslab selection */ check = H5Sselect_shape_same(mult_pt_sid, single_hyper_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "single point" single hyperslab selection */ check = H5Sselect_shape_same(mult_pt_sid, single_hyper_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against regular, strided hyperslab selection */ check = H5Sselect_shape_same(mult_pt_sid, regular_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against irregular hyperslab selection */ check = H5Sselect_shape_same(mult_pt_sid, irreg_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "no" hyperslab selection */ check = H5Sselect_shape_same(mult_pt_sid, none_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against scalar "all" hyperslab selection */ check = H5Sselect_shape_same(mult_pt_sid, scalar_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against scalar "none" hyperslab selection */ check = H5Sselect_shape_same(mult_pt_sid, scalar_none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare single "normal" hyperslab selection to all the selections created */ /* Compare against itself */ check = H5Sselect_shape_same(single_hyper_sid, single_hyper_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against copy of itself */ tmp_sid = H5Scopy(single_hyper_sid); CHECK(tmp_sid, FAIL, "H5Scopy"); check = H5Sselect_shape_same(single_hyper_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); /* Compare against "all" selection */ check = H5Sselect_shape_same(single_hyper_sid, all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "none" selection */ check = H5Sselect_shape_same(single_hyper_sid, none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against single point selection */ check = H5Sselect_shape_same(single_hyper_sid, single_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against multiple point selection */ check = H5Sselect_shape_same(single_hyper_sid, mult_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "all" single hyperslab selection */ check = H5Sselect_shape_same(single_hyper_sid, single_hyper_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "single point" single hyperslab selection */ check = H5Sselect_shape_same(single_hyper_sid, single_hyper_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against regular, strided hyperslab selection */ check = H5Sselect_shape_same(single_hyper_sid, regular_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against irregular hyperslab selection */ check = H5Sselect_shape_same(single_hyper_sid, irreg_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "no" hyperslab selection */ check = H5Sselect_shape_same(single_hyper_sid, none_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); #ifdef NOT_YET /* In theory, these two selections are the same shape, but the @@ -8938,7 +8938,7 @@ test_shape_same(void) /* Compare against hyperslab selection */ check = H5Sselect_shape_same(single_hyper_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); @@ -8969,69 +8969,69 @@ test_shape_same(void) /* Compare against hyperslab selection */ check = H5Sselect_shape_same(single_hyper_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); /* Compare against scalar "all" hyperslab selection */ check = H5Sselect_shape_same(single_hyper_sid, scalar_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against scalar "none" hyperslab selection */ check = H5Sselect_shape_same(single_hyper_sid, scalar_none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare single "all" hyperslab selection to all the selections created */ /* Compare against itself */ check = H5Sselect_shape_same(single_hyper_all_sid, single_hyper_all_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against copy of itself */ tmp_sid = H5Scopy(single_hyper_all_sid); CHECK(tmp_sid, FAIL, "H5Scopy"); check = H5Sselect_shape_same(single_hyper_all_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); /* Compare against "all" selection */ check = H5Sselect_shape_same(single_hyper_all_sid, all_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against "none" selection */ check = H5Sselect_shape_same(single_hyper_all_sid, none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against single point selection */ check = H5Sselect_shape_same(single_hyper_all_sid, single_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against multiple point selection */ check = H5Sselect_shape_same(single_hyper_all_sid, mult_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "plain" single hyperslab selection */ check = H5Sselect_shape_same(single_hyper_all_sid, single_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "single point" single hyperslab selection */ check = H5Sselect_shape_same(single_hyper_all_sid, single_hyper_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against regular, strided hyperslab selection */ check = H5Sselect_shape_same(single_hyper_all_sid, regular_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against irregular hyperslab selection */ check = H5Sselect_shape_same(single_hyper_all_sid, irreg_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "no" hyperslab selection */ check = H5Sselect_shape_same(single_hyper_all_sid, none_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); #ifdef NOT_YET /* In theory, these two selections are the same shape, but the @@ -9057,7 +9057,7 @@ test_shape_same(void) /* Compare against hyperslab selection */ check = H5Sselect_shape_same(single_hyper_all_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); @@ -9088,128 +9088,128 @@ test_shape_same(void) /* Compare against hyperslab selection */ check = H5Sselect_shape_same(single_hyper_all_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); /* Compare against scalar "all" hyperslab selection */ check = H5Sselect_shape_same(single_hyper_all_sid, scalar_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against scalar "none" hyperslab selection */ check = H5Sselect_shape_same(single_hyper_all_sid, scalar_none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare single "point" hyperslab selection to all the selections created */ /* Compare against itself */ check = H5Sselect_shape_same(single_hyper_pt_sid, single_hyper_pt_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against copy of itself */ tmp_sid = H5Scopy(single_hyper_pt_sid); CHECK(tmp_sid, FAIL, "H5Scopy"); check = H5Sselect_shape_same(single_hyper_pt_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); /* Compare against "all" selection */ check = H5Sselect_shape_same(single_hyper_pt_sid, all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "none" selection */ check = H5Sselect_shape_same(single_hyper_pt_sid, none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against single point selection */ check = H5Sselect_shape_same(single_hyper_pt_sid, single_pt_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against multiple point selection */ check = H5Sselect_shape_same(single_hyper_pt_sid, mult_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "plain" single hyperslab selection */ check = H5Sselect_shape_same(single_hyper_pt_sid, single_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "all" single hyperslab selection */ check = H5Sselect_shape_same(single_hyper_pt_sid, single_hyper_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against regular, strided hyperslab selection */ check = H5Sselect_shape_same(single_hyper_pt_sid, regular_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against irregular hyperslab selection */ check = H5Sselect_shape_same(single_hyper_pt_sid, irreg_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "no" hyperslab selection */ check = H5Sselect_shape_same(single_hyper_pt_sid, none_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against scalar "all" hyperslab selection */ check = H5Sselect_shape_same(single_hyper_pt_sid, scalar_all_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against scalar "none" hyperslab selection */ check = H5Sselect_shape_same(single_hyper_pt_sid, scalar_none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare regular, strided hyperslab selection to all the selections created */ /* Compare against itself */ check = H5Sselect_shape_same(regular_hyper_sid, regular_hyper_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against copy of itself */ tmp_sid = H5Scopy(regular_hyper_sid); CHECK(tmp_sid, FAIL, "H5Scopy"); check = H5Sselect_shape_same(regular_hyper_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); /* Compare against "all" selection */ check = H5Sselect_shape_same(regular_hyper_sid, all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "none" selection */ check = H5Sselect_shape_same(regular_hyper_sid, none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against single point selection */ check = H5Sselect_shape_same(regular_hyper_sid, single_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against multiple point selection */ check = H5Sselect_shape_same(regular_hyper_sid, mult_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "plain" single hyperslab selection */ check = H5Sselect_shape_same(regular_hyper_sid, single_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "all" single hyperslab selection */ check = H5Sselect_shape_same(regular_hyper_sid, single_hyper_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "single point" single hyperslab selection */ check = H5Sselect_shape_same(regular_hyper_sid, single_hyper_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against irregular hyperslab selection */ check = H5Sselect_shape_same(regular_hyper_sid, irreg_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "no" hyperslab selection */ check = H5Sselect_shape_same(regular_hyper_sid, none_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Construct point selection which matches regular, strided hyperslab selection */ /* Create dataspace for point selection */ @@ -9228,7 +9228,7 @@ test_shape_same(void) /* Compare against hyperslab selection */ check = H5Sselect_shape_same(regular_hyper_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); @@ -9258,7 +9258,7 @@ test_shape_same(void) /* Compare against hyperslab selection */ check = H5Sselect_shape_same(regular_hyper_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); @@ -9283,69 +9283,69 @@ test_shape_same(void) /* Compare against hyperslab selection */ check = H5Sselect_shape_same(regular_hyper_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); /* Compare against scalar "all" hyperslab selection */ check = H5Sselect_shape_same(regular_hyper_sid, scalar_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against scalar "none" hyperslab selection */ check = H5Sselect_shape_same(regular_hyper_sid, scalar_none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare irregular hyperslab selection to all the selections created */ /* Compare against itself */ check = H5Sselect_shape_same(irreg_hyper_sid, irreg_hyper_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against copy of itself */ tmp_sid = H5Scopy(irreg_hyper_sid); CHECK(tmp_sid, FAIL, "H5Scopy"); check = H5Sselect_shape_same(irreg_hyper_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); /* Compare against "all" selection */ check = H5Sselect_shape_same(irreg_hyper_sid, all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "none" selection */ check = H5Sselect_shape_same(irreg_hyper_sid, none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against single point selection */ check = H5Sselect_shape_same(irreg_hyper_sid, single_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against multiple point selection */ check = H5Sselect_shape_same(irreg_hyper_sid, mult_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "plain" single hyperslab selection */ check = H5Sselect_shape_same(irreg_hyper_sid, single_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "all" single hyperslab selection */ check = H5Sselect_shape_same(irreg_hyper_sid, single_hyper_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "single point" single hyperslab selection */ check = H5Sselect_shape_same(irreg_hyper_sid, single_hyper_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against regular, strided hyperslab selection */ check = H5Sselect_shape_same(irreg_hyper_sid, regular_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "no" hyperslab selection */ check = H5Sselect_shape_same(irreg_hyper_sid, none_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Construct hyperslab selection which matches irregular hyperslab selection */ /* Create dataspace for hyperslab selection */ @@ -9379,138 +9379,138 @@ test_shape_same(void) /* Compare against hyperslab selection */ check = H5Sselect_shape_same(irreg_hyper_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); /* Compare against scalar "all" hyperslab selection */ check = H5Sselect_shape_same(irreg_hyper_sid, scalar_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against scalar "none" hyperslab selection */ check = H5Sselect_shape_same(irreg_hyper_sid, scalar_none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare scalar "all" dataspace with all selections created */ /* Compare against itself */ check = H5Sselect_shape_same(scalar_all_sid, scalar_all_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against copy of itself */ tmp_sid = H5Scopy(scalar_all_sid); CHECK(tmp_sid, FAIL, "H5Scopy"); check = H5Sselect_shape_same(scalar_all_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); /* Compare against "all" selection */ check = H5Sselect_shape_same(scalar_all_sid, all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "none" selection */ check = H5Sselect_shape_same(scalar_all_sid, none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against single point selection */ check = H5Sselect_shape_same(scalar_all_sid, single_pt_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against multiple point selection */ check = H5Sselect_shape_same(scalar_all_sid, mult_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "plain" single hyperslab selection */ check = H5Sselect_shape_same(scalar_all_sid, single_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "all" single hyperslab selection */ check = H5Sselect_shape_same(scalar_all_sid, single_hyper_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "single point" single hyperslab selection */ check = H5Sselect_shape_same(scalar_all_sid, single_hyper_pt_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against regular, strided hyperslab selection */ check = H5Sselect_shape_same(scalar_all_sid, regular_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against irregular hyperslab selection */ check = H5Sselect_shape_same(scalar_all_sid, irreg_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "no" hyperslab selection */ check = H5Sselect_shape_same(scalar_all_sid, none_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against scalar "none" hyperslab selection */ check = H5Sselect_shape_same(scalar_all_sid, scalar_none_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare scalar "none" dataspace with all selections created */ /* Compare against itself */ check = H5Sselect_shape_same(scalar_none_sid, scalar_none_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against copy of itself */ tmp_sid = H5Scopy(scalar_none_sid); CHECK(tmp_sid, FAIL, "H5Scopy"); check = H5Sselect_shape_same(scalar_none_sid, tmp_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); /* Compare against "all" selection */ check = H5Sselect_shape_same(scalar_none_sid, all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "none" selection */ check = H5Sselect_shape_same(scalar_none_sid, none_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against single point selection */ check = H5Sselect_shape_same(scalar_none_sid, single_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against multiple point selection */ check = H5Sselect_shape_same(scalar_none_sid, mult_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "plain" single hyperslab selection */ check = H5Sselect_shape_same(scalar_none_sid, single_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "all" single hyperslab selection */ check = H5Sselect_shape_same(scalar_none_sid, single_hyper_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "single point" single hyperslab selection */ check = H5Sselect_shape_same(scalar_none_sid, single_hyper_pt_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against regular, strided hyperslab selection */ check = H5Sselect_shape_same(scalar_none_sid, regular_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against irregular hyperslab selection */ check = H5Sselect_shape_same(scalar_none_sid, irreg_hyper_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "no" hyperslab selection */ check = H5Sselect_shape_same(scalar_none_sid, none_hyper_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Compare against scalar "all" hyperslab selection */ check = H5Sselect_shape_same(scalar_none_sid, scalar_all_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Close dataspaces */ ret = H5Sclose(all_sid); @@ -9552,16 +9552,16 @@ test_shape_same(void) ** xz plane, and three parallel to the yz plane. ** ** Assuming that z is the fastest changing dimension, -** H5Sselect_shape_same() should return TRUE when comparing +** H5Sselect_shape_same() should return true when comparing ** the full 2-D space against any hyperslab parallel to the -** yz plane in the 3-D space, and FALSE when comparing the +** yz plane in the 3-D space, and false when comparing the ** full 2-D space against the other two hyperslabs. ** ** Also create two additional 3-D dataspaces (10 X 10 X 10), ** and select a (10 X 10 X 2) hyperslab parallel to the yz ** axis in one of them, and two parallel (10 X 10 X 1) hyper ** slabs parallel to the yz axis in the other. -** H5Sselect_shape_same() should return FALSE when comparing +** H5Sselect_shape_same() should return false when comparing ** each to the 2-D selection. ** ****************************************************************/ @@ -9736,39 +9736,39 @@ test_shape_same_dr__smoke_check_1(void) /* Compare against "xy" selection */ check = H5Sselect_shape_same(small_cube_xy_slice_0_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_xy_slice_1_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_xy_slice_2_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "xz" selection */ check = H5Sselect_shape_same(small_cube_xz_slice_0_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_xz_slice_1_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_xz_slice_2_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "yz" selection */ check = H5Sselect_shape_same(small_cube_yz_slice_0_sid, small_square_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_yz_slice_1_sid, small_square_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_yz_slice_2_sid, small_square_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_yz_slice_3_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_yz_slice_4_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Close dataspaces */ ret = H5Sclose(small_square_sid); @@ -9837,17 +9837,17 @@ test_shape_same_dr__smoke_check_1(void) ** to the yz plane. ** ** Assuming that z is the fastest changing dimension, -** H5Sselect_shape_same() should return TRUE when comparing +** H5Sselect_shape_same() should return true when comparing ** the 2-D space checker board selection against a checker ** board hyperslab parallel to the yz plane in the 3-D -** space, and FALSE when comparing the 2-D checkerboard +** space, and false when comparing the 2-D checkerboard ** selection against two hyperslabs parallel to the xy ** or xz planes. ** ** Also create an additional 3-D dataspaces (10 X 10 X 10), ** and select a checker board parallel with the yz axis, ** save with some squares being on different planes. -** H5Sselect_shape_same() should return FALSE when +** H5Sselect_shape_same() should return false when ** comparing this selection to the 2-D selection. ** ****************************************************************/ @@ -10113,36 +10113,36 @@ test_shape_same_dr__smoke_check_2(void) /* Compare against "xy" selection */ check = H5Sselect_shape_same(small_cube_xy_slice_0_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_xy_slice_1_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_xy_slice_2_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "xz" selection */ check = H5Sselect_shape_same(small_cube_xz_slice_0_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_xz_slice_1_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_xz_slice_2_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "yz" selection */ check = H5Sselect_shape_same(small_cube_yz_slice_0_sid, small_square_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_yz_slice_1_sid, small_square_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_yz_slice_2_sid, small_square_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_yz_slice_3_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Close dataspaces */ ret = H5Sclose(small_square_sid); @@ -10211,10 +10211,10 @@ test_shape_same_dr__smoke_check_2(void) ** cases. ** ** Assuming that z is the fastest changing dimension, -** H5Sselect_shape_same() should return TRUE when +** H5Sselect_shape_same() should return true when ** comparing the 2-D irregular hyperslab selection ** against the irregular hyperslab selections parallel -** to the yz plane in the 3-D space, and FALSE when +** to the yz plane in the 3-D space, and false when ** comparing it against the irregular hyperslabs ** selections parallel to the xy or xz planes. ** @@ -10594,33 +10594,33 @@ test_shape_same_dr__smoke_check_3(void) /* Compare against "xy" selection */ check = H5Sselect_shape_same(small_cube_xy_slice_0_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_xy_slice_1_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_xy_slice_2_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "xz" selection */ check = H5Sselect_shape_same(small_cube_xz_slice_0_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_xz_slice_1_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_xz_slice_2_sid, small_square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Compare against "yz" selection */ check = H5Sselect_shape_same(small_cube_yz_slice_0_sid, small_square_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_yz_slice_1_sid, small_square_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); check = H5Sselect_shape_same(small_cube_yz_slice_2_sid, small_square_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); /* Close dataspaces */ ret = H5Sclose(small_square_sid); @@ -10680,8 +10680,8 @@ test_shape_same_dr__smoke_check_3(void) ** ** Compare the 2-D space against all the other spaces ** with H5Sselect_shape_same(). The (1 X 10 X 10) & -** (1 X 1 X 10 X 10) should return TRUE. All others -** should return FALSE. +** (1 X 1 X 10 X 10) should return true. All others +** should return false. ** ****************************************************************/ static void @@ -10796,37 +10796,37 @@ test_shape_same_dr__smoke_check_4(void) /* setup is done -- run the tests: */ check = H5Sselect_shape_same(three_d_space_0_sid, square_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); check = H5Sselect_shape_same(three_d_space_1_sid, square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(three_d_space_2_sid, square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(three_d_space_3_sid, square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(four_d_space_0_sid, square_sid); - VERIFY(check, TRUE, "H5Sselect_shape_same"); + VERIFY(check, true, "H5Sselect_shape_same"); check = H5Sselect_shape_same(four_d_space_1_sid, square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(four_d_space_2_sid, square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(four_d_space_3_sid, square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(four_d_space_4_sid, square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(four_d_space_5_sid, square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); check = H5Sselect_shape_same(four_d_space_6_sid, square_sid); - VERIFY(check, FALSE, "H5Sselect_shape_same"); + VERIFY(check, false, "H5Sselect_shape_same"); /* Close dataspaces */ ret = H5Sclose(square_sid); @@ -10873,7 +10873,7 @@ test_shape_same_dr__smoke_check_4(void) ** of an m-cube (m > n) in a call to H5Sselect_shape_same(). ** Note that this test does not require the n-cube and the ** n-dimensional slice to have the same rank (although -** H5Sselect_shape_same() should always return FALSE if +** H5Sselect_shape_same() should always return false if ** they don't). ** ** Per Quincey's suggestion, only test up to 5 dimensional @@ -10882,7 +10882,7 @@ test_shape_same_dr__smoke_check_4(void) ****************************************************************/ static void test_shape_same_dr__full_space_vs_slice(int test_num, int small_rank, int large_rank, int offset, - hsize_t edge_size, hbool_t dim_selected[], hbool_t expected_result) + hsize_t edge_size, bool dim_selected[], bool expected_result) { char test_desc_0[128]; char test_desc_1[256]; @@ -11011,8 +11011,8 @@ test_shape_same_dr__full_space_vs_slice(int test_num, int small_rank, int large_ static void test_shape_same_dr__run_full_space_vs_slice_tests(void) { - hbool_t dim_selected[5]; - hbool_t expected_result; + bool dim_selected[5]; + bool expected_result; int i, j; int v, w, x, y, z; int test_num = 0; @@ -11025,52 +11025,52 @@ test_shape_same_dr__run_full_space_vs_slice_tests(void) v = 0; do { if (v == 0) - dim_selected[0] = FALSE; + dim_selected[0] = false; else - dim_selected[0] = TRUE; + dim_selected[0] = true; w = 0; do { if (w == 0) - dim_selected[1] = FALSE; + dim_selected[1] = false; else - dim_selected[1] = TRUE; + dim_selected[1] = true; x = 0; do { if (x == 0) - dim_selected[2] = FALSE; + dim_selected[2] = false; else - dim_selected[2] = TRUE; + dim_selected[2] = true; y = 0; do { if (y == 0) - dim_selected[3] = FALSE; + dim_selected[3] = false; else - dim_selected[3] = TRUE; + dim_selected[3] = true; z = 0; do { if (z == 0) - dim_selected[4] = FALSE; + dim_selected[4] = false; else - dim_selected[4] = TRUE; + dim_selected[4] = true; /* compute the expected result: */ i = 0; j = 4; - expected_result = TRUE; + expected_result = true; while ((i < small_rank) && expected_result) { if (!dim_selected[j]) - expected_result = FALSE; + expected_result = false; i++; j--; } while ((i < large_rank) && expected_result) { if (dim_selected[j]) - expected_result = FALSE; + expected_result = false; i++; j--; } @@ -11116,7 +11116,7 @@ test_shape_same_dr__run_full_space_vs_slice_tests(void) ** ** Note that this test does not require the n-cube and the ** n-dimensional slice to have the same rank (although -** H5Sselect_shape_same() should always return FALSE if +** H5Sselect_shape_same() should always return false if ** they don't). ** ** Per Quincey's suggestion, only test up to 5 dimensional @@ -11125,7 +11125,7 @@ test_shape_same_dr__run_full_space_vs_slice_tests(void) ****************************************************************/ static void test_shape_same_dr__checkerboard(int test_num, int small_rank, int large_rank, int offset, hsize_t edge_size, - hsize_t checker_size, hbool_t dim_selected[], hbool_t expected_result) + hsize_t checker_size, bool dim_selected[], bool expected_result) { char test_desc_0[128]; char test_desc_1[256]; @@ -11163,7 +11163,7 @@ test_shape_same_dr__checkerboard(int test_num, int small_rank, int large_rank, i assert(offset < (int)edge_size); for (i = SS_DR_MAX_RANK - large_rank; i < SS_DR_MAX_RANK; i++) - if (dim_selected[i] == TRUE) + if (dim_selected[i] == true) dims_selected++; assert(dims_selected >= 0); @@ -11450,65 +11450,65 @@ test_shape_same_dr__checkerboard(int test_num, int small_rank, int large_rank, i static void test_shape_same_dr__run_checkerboard_tests(void) { - hbool_t dim_selected[5]; - hbool_t expected_result; - int i, j; - int v, w, x, y, z; - int test_num = 0; - int small_rank; - int large_rank; + bool dim_selected[5]; + bool expected_result; + int i, j; + int v, w, x, y, z; + int test_num = 0; + int small_rank; + int large_rank; for (large_rank = 1; large_rank <= 5; large_rank++) { for (small_rank = 1; small_rank <= large_rank; small_rank++) { v = 0; do { if (v == 0) - dim_selected[0] = FALSE; + dim_selected[0] = false; else - dim_selected[0] = TRUE; + dim_selected[0] = true; w = 0; do { if (w == 0) - dim_selected[1] = FALSE; + dim_selected[1] = false; else - dim_selected[1] = TRUE; + dim_selected[1] = true; x = 0; do { if (x == 0) - dim_selected[2] = FALSE; + dim_selected[2] = false; else - dim_selected[2] = TRUE; + dim_selected[2] = true; y = 0; do { if (y == 0) - dim_selected[3] = FALSE; + dim_selected[3] = false; else - dim_selected[3] = TRUE; + dim_selected[3] = true; z = 0; do { if (z == 0) - dim_selected[4] = FALSE; + dim_selected[4] = false; else - dim_selected[4] = TRUE; + dim_selected[4] = true; /* compute the expected result: */ i = 0; j = 4; - expected_result = TRUE; + expected_result = true; while ((i < small_rank) && expected_result) { if (!dim_selected[j]) - expected_result = FALSE; + expected_result = false; i++; j--; } /* end while */ while ((i < large_rank) && expected_result) { if (dim_selected[j]) - expected_result = FALSE; + expected_result = false; i++; j--; } /* end while */ @@ -11628,13 +11628,13 @@ test_shape_same_dr__run_checkerboard_tests(void) ** ** Note that this test does not require the n-cube and the ** n-dimensional slice to have the same rank (although -** H5Sselect_shape_same() should always return FALSE if +** H5Sselect_shape_same() should always return false if ** they don't). ** ****************************************************************/ static void test_shape_same_dr__irregular(int test_num, int small_rank, int large_rank, int pattern_offset, - int slice_offset, hbool_t dim_selected[], hbool_t expected_result) + int slice_offset, bool dim_selected[], bool expected_result) { char test_desc_0[128]; char test_desc_1[256]; @@ -11708,7 +11708,7 @@ test_shape_same_dr__irregular(int test_num, int small_rank, int large_rank, int assert(pattern_offset <= 2); for (i = SS_DR_MAX_RANK - large_rank; i < SS_DR_MAX_RANK; i++) - if (dim_selected[i] == TRUE) + if (dim_selected[i] == true) dims_selected++; assert(dims_selected >= 0); @@ -11891,65 +11891,65 @@ test_shape_same_dr__irregular(int test_num, int small_rank, int large_rank, int static void test_shape_same_dr__run_irregular_tests(void) { - hbool_t dim_selected[5]; - hbool_t expected_result; - int i, j; - int v, w, x, y, z; - int test_num = 0; - int small_rank; - int large_rank; + bool dim_selected[5]; + bool expected_result; + int i, j; + int v, w, x, y, z; + int test_num = 0; + int small_rank; + int large_rank; for (large_rank = 1; large_rank <= 5; large_rank++) { for (small_rank = 1; small_rank <= large_rank; small_rank++) { v = 0; do { if (v == 0) - dim_selected[0] = FALSE; + dim_selected[0] = false; else - dim_selected[0] = TRUE; + dim_selected[0] = true; w = 0; do { if (w == 0) - dim_selected[1] = FALSE; + dim_selected[1] = false; else - dim_selected[1] = TRUE; + dim_selected[1] = true; x = 0; do { if (x == 0) - dim_selected[2] = FALSE; + dim_selected[2] = false; else - dim_selected[2] = TRUE; + dim_selected[2] = true; y = 0; do { if (y == 0) - dim_selected[3] = FALSE; + dim_selected[3] = false; else - dim_selected[3] = TRUE; + dim_selected[3] = true; z = 0; do { if (z == 0) - dim_selected[4] = FALSE; + dim_selected[4] = false; else - dim_selected[4] = TRUE; + dim_selected[4] = true; /* compute the expected result: */ i = 0; j = 4; - expected_result = TRUE; + expected_result = true; while ((i < small_rank) && expected_result) { if (!dim_selected[j]) - expected_result = FALSE; + expected_result = false; i++; j--; } /* end while */ while ((i < large_rank) && expected_result) { if (dim_selected[j]) - expected_result = FALSE; + expected_result = false; i++; j--; } /* end while */ @@ -12142,9 +12142,9 @@ test_space_rebuild(void) CHECK(ret, FAIL, "H5S_hyper_rebuild"); } if (ret != FAIL) { - /* In this case, rebuild_check should be TRUE. */ + /* In this case, rebuild_check should be true. */ rebuild_check = H5Sselect_shape_same(sid_reg1, sid_reg_ori1); - CHECK(rebuild_check, FALSE, "H5Sselect_shape_same"); + CHECK(rebuild_check, false, "H5Sselect_shape_same"); } /* For irregular hyperslab */ @@ -12229,9 +12229,9 @@ test_space_rebuild(void) CHECK(ret, FAIL, "H5S_hyper_rebuild"); } /* end if */ if (ret != FAIL) { - /* In this case, rebuild_check should be TRUE. */ + /* In this case, rebuild_check should be true. */ rebuild_check = H5Sselect_shape_same(sid_reg2, sid_reg_ori2); - CHECK(rebuild_check, FALSE, "H5Sselect_shape_same"); + CHECK(rebuild_check, false, "H5Sselect_shape_same"); } /* 2-D irregular case */ @@ -12326,9 +12326,9 @@ test_space_rebuild(void) CHECK(ret, FAIL, "H5S_hyper_rebuild"); } if (ret != FAIL) { - /* In this case, rebuild_check should be TRUE. */ + /* In this case, rebuild_check should be true. */ rebuild_check = H5Sselect_shape_same(sid_reg3, sid_reg_ori3); - CHECK(rebuild_check, FALSE, "H5Sselect_shape_same"); + CHECK(rebuild_check, false, "H5Sselect_shape_same"); } sid_irreg3 = H5Screate_simple(SPACERE3_RANK, dims3, NULL); @@ -12434,9 +12434,9 @@ test_space_rebuild(void) CHECK(ret, FAIL, "H5S_hyper_rebuild"); } if (ret != FAIL) { - /* In this case, rebuild_check should be TRUE. */ + /* In this case, rebuild_check should be true. */ rebuild_check = H5Sselect_shape_same(sid_reg4, sid_reg_ori4); - CHECK(rebuild_check, FALSE, "H5Sselect_shape_same"); + CHECK(rebuild_check, false, "H5Sselect_shape_same"); } /* Testing irregular selection */ @@ -12558,9 +12558,9 @@ test_space_rebuild(void) CHECK(ret, FAIL, "H5S_hyper_rebuild"); } if (ret != FAIL) { - /* In this case, rebuild_check should be TRUE. */ + /* In this case, rebuild_check should be true. */ rebuild_check = H5Sselect_shape_same(sid_reg5, sid_reg_ori5); - CHECK(rebuild_check, FALSE, "H5Sselect_shape_same"); + CHECK(rebuild_check, false, "H5Sselect_shape_same"); } sid_irreg5 = H5Screate_simple(SPACERE5_RANK, dims5, NULL); @@ -12622,7 +12622,7 @@ test_space_rebuild(void) /* No need to do shape comparison */ /* We use 5-D to test a special case with - rebuilding routine TRUE, FALSE and TRUE */ + rebuilding routine true, false and true */ sid_spec = H5Screate_simple(SPACERE5_RANK, dims5, NULL); /* Build up the original five dimensional regular selection */ @@ -14200,9 +14200,9 @@ test_hyper_regular(void) ret = H5Sselect_hyperslab(sid, H5S_SELECT_SET, start, stride, count, block); CHECK(ret, FAIL, "H5Sselect_hyperslab"); - /* Query if 'hyperslab' selection is regular hyperslab (should be TRUE) */ + /* Query if 'hyperslab' selection is regular hyperslab (should be true) */ is_regular = H5Sis_regular_hyperslab(sid); - VERIFY(is_regular, TRUE, "H5Sis_regular_hyperslab"); + VERIFY(is_regular, true, "H5Sis_regular_hyperslab"); /* Retrieve the hyperslab parameters */ ret = H5Sget_regular_hyperslab(sid, q_start, q_stride, q_count, q_block); @@ -14230,9 +14230,9 @@ test_hyper_regular(void) ret = H5Sselect_hyperslab(sid, H5S_SELECT_OR, t_start, NULL, t_count, NULL); CHECK(ret, FAIL, "H5Sselect_hyperslab"); - /* Query if 'hyperslab' selection is regular hyperslab (should be FALSE) */ + /* Query if 'hyperslab' selection is regular hyperslab (should be false) */ is_regular = H5Sis_regular_hyperslab(sid); - VERIFY(is_regular, FALSE, "H5Sis_regular_hyperslab"); + VERIFY(is_regular, false, "H5Sis_regular_hyperslab"); /* Query regular hyperslab selection info (should fail) */ H5E_BEGIN_TRY @@ -14252,9 +14252,9 @@ test_hyper_regular(void) ret = H5Sselect_hyperslab(sid, H5S_SELECT_XOR, t_start, NULL, t_count, NULL); CHECK(ret, FAIL, "H5Sselect_hyperslab"); - /* Query if 'hyperslab' selection is regular hyperslab (should be TRUE) */ + /* Query if 'hyperslab' selection is regular hyperslab (should be true) */ is_regular = H5Sis_regular_hyperslab(sid); - VERIFY(is_regular, TRUE, "H5Sis_regular_hyperslab"); + VERIFY(is_regular, true, "H5Sis_regular_hyperslab"); /* Retrieve the hyperslab parameters */ ret = H5Sget_regular_hyperslab(sid, q_start, q_stride, q_count, q_block); @@ -14945,54 +14945,54 @@ test_internal_consistency(void) CHECK(tmp_sid, FAIL, "H5Scopy"); check = H5S__internal_consistency_test(tmp_sid); - VERIFY(check, TRUE, "H5S__internal_consistency_test"); + VERIFY(check, true, "H5S__internal_consistency_test"); ret = H5Sclose(tmp_sid); CHECK(ret, FAIL, "H5Sclose"); /* Test "none" selection */ check = H5S__internal_consistency_test(none_sid); - VERIFY(check, TRUE, "H5S__internal_consistency_test"); + VERIFY(check, true, "H5S__internal_consistency_test"); /* Test single point selection */ check = H5S__internal_consistency_test(single_pt_sid); - VERIFY(check, TRUE, "H5S__internal_consistency_test"); + VERIFY(check, true, "H5S__internal_consistency_test"); /* Test multiple point selection */ check = H5S__internal_consistency_test(mult_pt_sid); - VERIFY(check, TRUE, "H5S__internal_consistency_test"); + VERIFY(check, true, "H5S__internal_consistency_test"); /* Test "plain" single hyperslab selection */ check = H5S__internal_consistency_test(single_hyper_sid); - VERIFY(check, TRUE, "H5S__internal_consistency_test"); + VERIFY(check, true, "H5S__internal_consistency_test"); /* Test "all" single hyperslab selection */ check = H5S__internal_consistency_test(single_hyper_all_sid); - VERIFY(check, TRUE, "H5S__internal_consistency_test"); + VERIFY(check, true, "H5S__internal_consistency_test"); /* Test "single point" single hyperslab selection */ check = H5S__internal_consistency_test(single_hyper_pt_sid); - VERIFY(check, TRUE, "H5S__internal_consistency_test"); + VERIFY(check, true, "H5S__internal_consistency_test"); /* Test regular, strided hyperslab selection */ check = H5S__internal_consistency_test(regular_hyper_sid); - VERIFY(check, TRUE, "H5S__internal_consistency_test"); + VERIFY(check, true, "H5S__internal_consistency_test"); /* Test irregular hyperslab selection */ check = H5S__internal_consistency_test(irreg_hyper_sid); - VERIFY(check, TRUE, "H5S__internal_consistency_test"); + VERIFY(check, true, "H5S__internal_consistency_test"); /* Test "no" hyperslab selection */ check = H5S__internal_consistency_test(none_hyper_sid); - VERIFY(check, TRUE, "H5S__internal_consistency_test"); + VERIFY(check, true, "H5S__internal_consistency_test"); /* Test scalar "all" hyperslab selection */ check = H5S__internal_consistency_test(scalar_all_sid); - VERIFY(check, TRUE, "H5S__internal_consistency_test"); + VERIFY(check, true, "H5S__internal_consistency_test"); /* Test scalar "none" hyperslab selection */ check = H5S__internal_consistency_test(scalar_none_sid); - VERIFY(check, TRUE, "H5S__internal_consistency_test"); + VERIFY(check, true, "H5S__internal_consistency_test"); /* Close dataspaces */ ret = H5Sclose(all_sid); @@ -15719,7 +15719,7 @@ test_select_intersect_block(void) /* Test block intersection with 'none' selection (always false) */ status = H5Sselect_intersect_block(sid, block_start, block_end); - VERIFY(status, FALSE, "H5Sselect_intersect_block"); + VERIFY(status, false, "H5Sselect_intersect_block"); /* Set selection to 'all' */ ret = H5Sselect_all(sid); @@ -15727,7 +15727,7 @@ test_select_intersect_block(void) /* Test block intersection with 'all' selection (always true) */ status = H5Sselect_intersect_block(sid, block_start, block_end); - VERIFY(status, TRUE, "H5Sselect_intersect_block"); + VERIFY(status, true, "H5Sselect_intersect_block"); /* Select sequence of ten points */ coord[0][0] = 0; @@ -15755,9 +15755,9 @@ test_select_intersect_block(void) /* Test block intersection with 'point' selection */ status = H5Sselect_intersect_block(sid, block_start, block_end); - VERIFY(status, TRUE, "H5Sselect_intersect_block"); + VERIFY(status, true, "H5Sselect_intersect_block"); status = H5Sselect_intersect_block(sid, block_start, block_end4); - VERIFY(status, FALSE, "H5Sselect_intersect_block"); + VERIFY(status, false, "H5Sselect_intersect_block"); /* Select single 4x6 hyperslab block at (2,1) */ start[0] = 2; @@ -15773,9 +15773,9 @@ test_select_intersect_block(void) /* Test block intersection with single 'hyperslab' selection */ status = H5Sselect_intersect_block(sid, block_start, block_end); - VERIFY(status, TRUE, "H5Sselect_intersect_block"); + VERIFY(status, true, "H5Sselect_intersect_block"); status = H5Sselect_intersect_block(sid, block_start, block_end4); - VERIFY(status, FALSE, "H5Sselect_intersect_block"); + VERIFY(status, false, "H5Sselect_intersect_block"); /* 'OR' another hyperslab block in, making an irregular hyperslab selection */ start[0] = 3; @@ -15791,9 +15791,9 @@ test_select_intersect_block(void) /* Test block intersection with 'hyperslab' selection */ status = H5Sselect_intersect_block(sid, block_start, block_end); - VERIFY(status, TRUE, "H5Sselect_intersect_block"); + VERIFY(status, true, "H5Sselect_intersect_block"); status = H5Sselect_intersect_block(sid, block_start, block_end4); - VERIFY(status, FALSE, "H5Sselect_intersect_block"); + VERIFY(status, false, "H5Sselect_intersect_block"); /* Select regular, strided hyperslab selection */ start[0] = 2; @@ -15809,9 +15809,9 @@ test_select_intersect_block(void) /* Test block intersection with single 'hyperslab' selection */ status = H5Sselect_intersect_block(sid, block_start, block_end); - VERIFY(status, TRUE, "H5Sselect_intersect_block"); + VERIFY(status, true, "H5Sselect_intersect_block"); status = H5Sselect_intersect_block(sid, block_start, block_end4); - VERIFY(status, FALSE, "H5Sselect_intersect_block"); + VERIFY(status, false, "H5Sselect_intersect_block"); /* Close dataspace */ ret = H5Sclose(sid); @@ -16026,7 +16026,7 @@ test_h5s_set_extent_none(void) null_sid = H5Screate(H5S_NULL); CHECK(null_sid, H5I_INVALID_HID, "H5Screate"); equal = H5Sextent_equal(sid, null_sid); - VERIFY(equal, TRUE, "H5Sextent_equal"); + VERIFY(equal, true, "H5Sextent_equal"); /* Close */ ret = H5Sclose(sid); diff --git a/test/tskiplist.c b/test/tskiplist.c index e94e3c0..7d4cda0 100644 --- a/test/tskiplist.c +++ b/test/tskiplist.c @@ -1519,7 +1519,7 @@ test_skiplist_remove_first_many(void) /* Remove objects from the skip list */ for (u = 0; u < NUM_ELEMS; u++) { found_item = (int *)H5SL_remove_first(slist); - VERIFY(*found_item > prev_item, TRUE, "H5SL_remove_first"); + VERIFY(*found_item > prev_item, true, "H5SL_remove_first"); prev_item = *found_item; } /* end for */ diff --git a/test/tsohm.c b/test/tsohm.c index fd931a0..6c20a8c 100644 --- a/test/tsohm.c +++ b/test/tsohm.c @@ -566,7 +566,7 @@ error: * * Purpose: Creates object headers that use a large datatype message. * - * Set test_file_closing to TRUE to add file closing and reopening + * Set test_file_closing to true to add file closing and reopening * whenever possible (to test that SOHMs are written correctly * on disk and not just in memory). * @@ -576,7 +576,7 @@ error: *------------------------------------------------------------------------- */ static hid_t -size1_helper(hid_t file, const char *filename, hid_t fapl_id, hbool_t test_file_closing) +size1_helper(hid_t file, const char *filename, hid_t fapl_id, bool test_file_closing) { dtype1_struct wdata; dtype1_struct rdata; @@ -616,7 +616,7 @@ size1_helper(hid_t file, const char *filename, hid_t fapl_id, hbool_t test_file_ * local disks. Don't close and reopen if express testing is enabled. */ if (GetTestExpress() > 1) - test_file_closing = FALSE; + test_file_closing = false; /* Initialize wdata */ memset(&wdata, 0, sizeof(wdata)); @@ -750,7 +750,7 @@ error: *---------------------------------------------------------------------------- */ static h5_stat_size_t -getsize_testsize1(const char *filename, hid_t fcpl_id, hid_t fapl_id, hbool_t test_file_closing, +getsize_testsize1(const char *filename, hid_t fcpl_id, hid_t fapl_id, bool test_file_closing, H5O_native_info_t *ninfo) { hid_t fid = H5I_INVALID_HID; @@ -759,7 +759,7 @@ getsize_testsize1(const char *filename, hid_t fcpl_id, hid_t fapl_id, hbool_t te fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl_id, fapl_id); CHECK(fid, H5I_INVALID_HID, "H5Fcreate"); - /* If test_file_closing is TRUE, you will get back a different ID, + /* If test_file_closing is true, you will get back a different ID, * which will need to be closed. The helper will close your passed-in * ID. */ @@ -833,7 +833,7 @@ test_sohm_size1(void) for (use_shared = 0; use_shared < 2; use_shared++) { for (use_btree = 0; use_btree < 2; use_btree++) { - hbool_t test_open_close; + bool test_open_close; /* cannot use btree indexing without shared messages; skip case */ if (use_btree && !use_shared) @@ -871,9 +871,9 @@ test_sohm_size1(void) file_sizes[size_index++] = h5_get_file_size(FILENAME, fapl_id); /* size of populated file, with different populating behaviors */ - test_open_close = TRUE; + test_open_close = true; file_sizes[size_index++] = getsize_testsize1(FILENAME, fcpl_id, fapl_id, test_open_close, &ninfo); - test_open_close = FALSE; + test_open_close = false; file_sizes[size_index++] = getsize_testsize1(FILENAME, fcpl_id, fapl_id, test_open_close, &ninfo); oh_sizes[oh_size_index++] = ninfo.hdr.space.total; @@ -1022,7 +1022,7 @@ test_sohm_size_consistency_open_create(void) * Add messages to previously-created file */ file = H5Fopen(FILENAME, H5F_ACC_RDWR, fapl_id); CHECK_I(file, "H5Fopen"); - file = size1_helper(file, FILENAME, fapl_id, FALSE); + file = size1_helper(file, FILENAME, fapl_id, false); CHECK_I(file, "size1_helper"); /* Get the size of a dataset object header */ @@ -1037,7 +1037,7 @@ test_sohm_size_consistency_open_create(void) * Add messages to a newly-created file */ file = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl_id, fapl_id); CHECK_I(file, "H5Fcreate"); - file = size1_helper(file, FILENAME, fapl_id, FALSE); + file = size1_helper(file, FILENAME, fapl_id, false); CHECK_I(file, "size1_helper"); /* Get the size of a dataset object header */ @@ -3198,9 +3198,9 @@ verify_dset_create_and_open_through_extlink_with_sohm(hid_t src_fcpl_id, hid_t d static void test_sohm_extlink(void) { - hid_t fcpl_id = -1; - hbool_t driver_is_default_compatible; - herr_t ret; + hid_t fcpl_id = -1; + bool driver_is_default_compatible; + herr_t ret; MESSAGE(5, ("Testing SOHM creation through external links\n")); @@ -3233,13 +3233,13 @@ test_sohm_extlink(void) * Purpose: Tests extending a dataset's dataspace when sharing is * enabled. * - * If close_reopen is TRUE, closes and reopens the file to + * If close_reopen is true, closes and reopens the file to * ensure that data is correctly written to disk. * *------------------------------------------------------------------------- */ static int -verify_dataset_extension(hid_t fcpl_id, hbool_t close_reopen) +verify_dataset_extension(hid_t fcpl_id, bool close_reopen) { hid_t file_id = H5I_INVALID_HID; hid_t orig_space_id = H5I_INVALID_HID; @@ -3510,54 +3510,54 @@ test_sohm_extend_dset(void) CHECK_I(ret, "H5Pset_shared_mesg_nindexes"); /* No shared messages */ - ret = verify_dataset_extension(fcpl_id, FALSE); + ret = verify_dataset_extension(fcpl_id, false); CHECK_I(ret, "verify_dataset_extension"); - ret = verify_dataset_extension(fcpl_id, TRUE); + ret = verify_dataset_extension(fcpl_id, true); CHECK_I(ret, "verify_dataset_extension"); /* Only dataspaces */ ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_SDSPACE_FLAG, 16); CHECK_I(ret, "H5Pset_shared_mesg_index"); - ret = verify_dataset_extension(fcpl_id, FALSE); + ret = verify_dataset_extension(fcpl_id, false); CHECK_I(ret, "verify_dataset_extension"); - ret = verify_dataset_extension(fcpl_id, TRUE); + ret = verify_dataset_extension(fcpl_id, true); CHECK_I(ret, "verify_dataset_extension"); /* All messages */ ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_ALL_FLAG, 16); CHECK_I(ret, "H5Pset_shared_mesg_index"); - ret = verify_dataset_extension(fcpl_id, FALSE); + ret = verify_dataset_extension(fcpl_id, false); CHECK_I(ret, "verify_dataset_extension"); - ret = verify_dataset_extension(fcpl_id, TRUE); + ret = verify_dataset_extension(fcpl_id, true); CHECK_I(ret, "verify_dataset_extension"); /* All messages in lists */ ret = H5Pset_shared_mesg_phase_change(fcpl_id, 100, 50); CHECK_I(ret, "H5Pset_shared_mesg_phase_change"); - ret = verify_dataset_extension(fcpl_id, FALSE); + ret = verify_dataset_extension(fcpl_id, false); CHECK_I(ret, "verify_dataset_extension"); - ret = verify_dataset_extension(fcpl_id, TRUE); + ret = verify_dataset_extension(fcpl_id, true); CHECK_I(ret, "verify_dataset_extension"); /* All messages in lists converted to B-trees */ ret = H5Pset_shared_mesg_phase_change(fcpl_id, 1, 0); CHECK_I(ret, "H5Pset_shared_mesg_phase_change"); - ret = verify_dataset_extension(fcpl_id, FALSE); + ret = verify_dataset_extension(fcpl_id, false); CHECK_I(ret, "verify_dataset_extension"); - ret = verify_dataset_extension(fcpl_id, TRUE); + ret = verify_dataset_extension(fcpl_id, true); CHECK_I(ret, "verify_dataset_extension"); /* All messages in B-trees */ ret = H5Pset_shared_mesg_phase_change(fcpl_id, 0, 0); CHECK_I(ret, "H5Pset_shared_mesg_phase_change"); - ret = verify_dataset_extension(fcpl_id, FALSE); + ret = verify_dataset_extension(fcpl_id, false); CHECK_I(ret, "verify_dataset_extension"); - ret = verify_dataset_extension(fcpl_id, TRUE); + ret = verify_dataset_extension(fcpl_id, true); CHECK_I(ret, "verify_dataset_extension"); ret = H5Pclose(fcpl_id); @@ -3711,7 +3711,7 @@ void test_sohm(void) { const char *env_h5_drvr; - hbool_t default_driver; + bool default_driver; MESSAGE(5, ("Testing Shared Object Header Messages\n")); diff --git a/test/ttsafe.c b/test/ttsafe.c index 2f792f5..d6e9d9b 100644 --- a/test/ttsafe.c +++ b/test/ttsafe.c @@ -53,15 +53,15 @@ num_digits(int num) void tts_is_threadsafe(void) { - hbool_t is_ts; - hbool_t should_be; + bool is_ts; + bool should_be; #ifdef H5_HAVE_THREADSAFE - is_ts = FALSE; - should_be = TRUE; + is_ts = false; + should_be = true; #else /* H5_HAVE_THREADSAFE */ - is_ts = TRUE; - should_be = FALSE; + is_ts = true; + should_be = false; #endif /* H5_HAVE_THREADSAFE */ if (H5is_library_threadsafe(&is_ts) != SUCCEED) diff --git a/test/tvlstr.c b/test/tvlstr.c index e36239d..be951dd 100644 --- a/test/tvlstr.c +++ b/test/tvlstr.c @@ -424,12 +424,12 @@ test_vlstring_type(void) ret = H5Tget_class(tid_vlstr); VERIFY(ret, H5T_STRING, "H5Tget_class"); ret = H5Tis_variable_str(tid_vlstr); - VERIFY(ret, TRUE, "H5Tis_variable_str"); + VERIFY(ret, true, "H5Tis_variable_str"); /* Verify that the class detects as a string */ vl_str = H5Tdetect_class(tid_vlstr, H5T_STRING); CHECK(vl_str, FAIL, "H5Tdetect_class"); - VERIFY(vl_str, TRUE, "H5Tdetect_class"); + VERIFY(vl_str, true, "H5Tdetect_class"); /* Check default character set and padding */ cset = H5Tget_cset(tid_vlstr); diff --git a/test/unlink.c b/test/unlink.c index df5b5b3..6740a1f 100644 --- a/test/unlink.c +++ b/test/unlink.c @@ -2639,11 +2639,11 @@ test_full_group_compact(hid_t fapl) } /* end for */ /* Check on group's status */ - if (H5G__is_empty_test(gid) == TRUE) + if (H5G__is_empty_test(gid) == true) TEST_ERROR; - if (H5G__has_links_test(gid, NULL) != TRUE) + if (H5G__has_links_test(gid, NULL) != true) TEST_ERROR; - if (H5G__has_stab_test(gid) == TRUE) + if (H5G__has_stab_test(gid) == true) TEST_ERROR; /* Close group with objects to delete */ @@ -2813,11 +2813,11 @@ test_full_group_dense(hid_t fapl) } /* end for */ /* Check on group's status */ - if (H5G__is_empty_test(gid) == TRUE) + if (H5G__is_empty_test(gid) == true) TEST_ERROR; - if (H5G__has_links_test(gid, NULL) == TRUE) + if (H5G__has_links_test(gid, NULL) == true) TEST_ERROR; - if (H5G__is_new_dense_test(gid) != TRUE) + if (H5G__is_new_dense_test(gid) != true) TEST_ERROR; /* Close group with objects to delete */ @@ -2920,7 +2920,7 @@ main(void) TEST_ERROR; /* Test with old & new format groups */ - for (new_format = FALSE; new_format <= TRUE; new_format++) { + for (new_format = false; new_format <= true; new_format++) { hid_t my_fapl; /* Set the FAPL for the type of format */ diff --git a/test/unregister.c b/test/unregister.c index d225881..10e194c 100644 --- a/test/unregister.c +++ b/test/unregister.c @@ -114,7 +114,7 @@ test_unregister_filters(hid_t fapl_id) /* Register DUMMY filter */ if (H5Zregister(H5Z_DUMMY) < 0) goto error; - if (H5Zfilter_avail(H5Z_FILTER_DUMMY) != TRUE) + if (H5Zfilter_avail(H5Z_FILTER_DUMMY) != true) goto error; /******************* @@ -275,9 +275,9 @@ error: int main(void) { - hid_t fapl_id = H5I_INVALID_HID; - int nerrors = 0; - hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ + hid_t fapl_id = H5I_INVALID_HID; + int nerrors = 0; + bool api_ctx_pushed = false; /* Whether API context pushed */ /* Testing setup */ h5_reset(); @@ -286,7 +286,7 @@ main(void) /* Push API context */ if (H5CX_push() < 0) FAIL_STACK_ERROR; - api_ctx_pushed = TRUE; + api_ctx_pushed = true; /* Test unregistering filter in its own file */ nerrors += (test_unregister_filters(fapl_id) < 0 ? 1 : 0); @@ -298,9 +298,9 @@ main(void) printf("All filter unregistration tests passed.\n"); /* Pop API context */ - if (api_ctx_pushed && H5CX_pop(FALSE) < 0) + if (api_ctx_pushed && H5CX_pop(false) < 0) FAIL_STACK_ERROR; - api_ctx_pushed = FALSE; + api_ctx_pushed = false; exit(EXIT_SUCCESS); @@ -309,7 +309,7 @@ error: printf("***** %d FILTER UNREGISTRATION TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); if (api_ctx_pushed) - H5CX_pop(FALSE); + H5CX_pop(false); exit(EXIT_FAILURE); } /* end main() */ @@ -51,7 +51,7 @@ typedef struct options_t { hsize_t nplanes; /* number of planes to write, default proportional to chunksize */ char *filename; /* use case data filename */ part_t launch; /* launch writer, reader or both */ - hbool_t use_swmr; /* use swmr open (1) or not */ + bool use_swmr; /* use swmr open (1) or not */ int iterations; /* iterations, default 1 */ hid_t fapl_id; /* instance-specific FAPL ID */ const char *progname; /* Program name (used in usage and dset name) */ @@ -63,5 +63,5 @@ int setup_parameters(int argc, char *const argv[], options_t *opts); void show_parameters(options_t *opts); void usage(const char *prog); int create_uc_file(options_t *opts); -int write_uc_file(hbool_t tosend, hid_t file_id, options_t *opts); -int read_uc_file(hbool_t towait, options_t *opts); +int write_uc_file(bool tosend, hid_t file_id, options_t *opts); +int read_uc_file(bool towait, options_t *opts); diff --git a/test/use_append_chunk.c b/test/use_append_chunk.c index 4f64a66..5a9b748 100644 --- a/test/use_append_chunk.c +++ b/test/use_append_chunk.c @@ -78,7 +78,7 @@ setup_parameters(int argc, char *const argv[], options_t *opts) /* use case defaults */ memset(opts, 0, sizeof(options_t)); opts->chunksize = Chunksize_DFT; - opts->use_swmr = TRUE; /* use swmr open */ + opts->use_swmr = true; /* use swmr open */ opts->iterations = 1; opts->chunkplanes = 1; opts->progname = USE_APPEND_CHUNK_PROGNAME; @@ -110,15 +110,15 @@ setup_parameters(int argc, char *const argv[], options_t *opts) int main(int argc, char *argv[]) { - pid_t childpid = 0; - pid_t mypid, tmppid; - int child_status; - int child_wait_option = 0; - int ret_value = 0; - int child_ret_value; - hbool_t send_wait = FALSE; - hid_t fapl = -1; /* File access property list */ - hid_t fid = -1; /* File ID */ + pid_t childpid = 0; + pid_t mypid, tmppid; + int child_status; + int child_wait_option = 0; + int ret_value = 0; + int child_ret_value; + bool send_wait = false; + hid_t fapl = -1; /* File access property list */ + hid_t fid = -1; /* File ID */ if (setup_parameters(argc, argv, &UC_opts) < 0) { Hgoto_error(1); @@ -127,7 +127,7 @@ main(int argc, char *argv[]) /* Determine the need to send/wait message file*/ if (UC_opts.launch == UC_READWRITE) { HDunlink(WRITER_MESSAGE); - send_wait = TRUE; + send_wait = true; } /* ==============================================================*/ diff --git a/test/use_append_chunk_mirror.c b/test/use_append_chunk_mirror.c index 0620c68..9fc5622 100644 --- a/test/use_append_chunk_mirror.c +++ b/test/use_append_chunk_mirror.c @@ -118,7 +118,7 @@ setup_parameters(int argc, char *const argv[], options_t *opts) /* use case defaults */ memset(opts, 0, sizeof(options_t)); opts->chunksize = Chunksize_DFT; - opts->use_swmr = TRUE; + opts->use_swmr = true; opts->iterations = 1; opts->chunkplanes = 1; opts->progname = THIS_PROGNAME; @@ -156,7 +156,7 @@ main(int argc, char *argv[]) int child_wait_option = 0; int ret_value = 0; int child_ret_value; - hbool_t send_wait = FALSE; + bool send_wait = false; hid_t fid = H5I_INVALID_HID; H5FD_mirror_fapl_t mirr_fa; H5FD_splitter_vfd_config_t *split_fa = NULL; @@ -181,13 +181,13 @@ main(int argc, char *argv[]) split_fa->magic = H5FD_SPLITTER_MAGIC; split_fa->version = H5FD_CURR_SPLITTER_VFD_CONFIG_VERSION; split_fa->log_file_path[0] = '\0'; /* none */ - split_fa->ignore_wo_errs = FALSE; + split_fa->ignore_wo_errs = false; HDstrncpy(split_fa->wo_path, MIRROR_FILE_NAME, H5FD_SPLITTER_PATH_MAX); /* Determine the need to send/wait message file*/ if (UC_opts.launch == UC_READWRITE) { HDunlink(WRITER_MESSAGE); - send_wait = TRUE; + send_wait = true; } /* ==============================================================*/ diff --git a/test/use_append_mchunks.c b/test/use_append_mchunks.c index 15f2f2a..8413645 100644 --- a/test/use_append_mchunks.c +++ b/test/use_append_mchunks.c @@ -104,15 +104,15 @@ setup_parameters(int argc, char *const argv[], options_t *opts) int main(int argc, char *argv[]) { - pid_t childpid = 0; - pid_t mypid, tmppid; - int child_status; - int child_wait_option = 0; - int ret_value = 0; - int child_ret_value; - hbool_t send_wait = 0; - hid_t fapl = -1; /* File access property list */ - hid_t fid = -1; /* File ID */ + pid_t childpid = 0; + pid_t mypid, tmppid; + int child_status; + int child_wait_option = 0; + int ret_value = 0; + int child_ret_value; + bool send_wait = 0; + hid_t fapl = -1; /* File access property list */ + hid_t fid = -1; /* File ID */ if (setup_parameters(argc, argv, &UC_opts) < 0) { Hgoto_error(1); diff --git a/test/use_common.c b/test/use_common.c index e77ec77..a58f8db 100644 --- a/test/use_common.c +++ b/test/use_common.c @@ -107,7 +107,7 @@ parse_option(int argc, char *const argv[], options_t *opts) usage(opts->progname); Hgoto_error(-1); } - opts->use_swmr = (hbool_t)use_swmr; + opts->use_swmr = (bool)use_swmr; break; case 'y': /* Number of planes per chunk */ if ((opts->chunkplanes = strtoul(optarg, NULL, 0)) <= 0) { @@ -258,7 +258,7 @@ create_uc_file(options_t *opts) * ---------------------------------------------------------------------------- */ int -write_uc_file(hbool_t tosend, hid_t file_id, options_t *opts) +write_uc_file(bool tosend, hid_t file_id, options_t *opts) { hid_t dsid; /* dataset ID */ hid_t dcpl; /* Dataset creation property list */ @@ -273,7 +273,7 @@ write_uc_file(hbool_t tosend, hid_t file_id, options_t *opts) hsize_t start[3] = {0, 0, 0}, count[3]; /* Hyperslab selection values */ hsize_t i, j, k; - if (TRUE == tosend) { + if (true == tosend) { /* Send a message that H5Fopen is complete--releasing the file lock */ h5_send_message(WRITER_MESSAGE, NULL, NULL); } @@ -447,7 +447,7 @@ write_uc_file(hbool_t tosend, hid_t file_id, options_t *opts) * ---------------------------------------------------------------------------- */ int -read_uc_file(hbool_t towait, options_t *opts) +read_uc_file(bool towait, options_t *opts) { hid_t fid; /* File ID for new HDF5 file */ hid_t dsid; /* dataset ID */ diff --git a/test/use_disable_mdc_flushes.c b/test/use_disable_mdc_flushes.c index 49dfa96..c2f1bb3 100644 --- a/test/use_disable_mdc_flushes.c +++ b/test/use_disable_mdc_flushes.c @@ -308,7 +308,7 @@ write_file(void) hsize_t dims[3]; /* Dataspace dimensions */ hsize_t memdims[3]; /* Memory space dimensions */ hsize_t start[3] = {0, 0, 0}, count[3]; /* Hyperslab selection values */ - hbool_t disabled; /* Object's disabled status */ + bool disabled; /* Object's disabled status */ hsize_t i, j, k; name = filename_g; @@ -121,7 +121,7 @@ vds_select_equal(hid_t space1, hid_t space2) hsize_t *buf1 = NULL; hsize_t *buf2 = NULL; size_t i; - htri_t ret_value = TRUE; + htri_t ret_value = true; /* Get and compare selection types */ if ((type1 = H5Sget_select_type(space1)) < 0) @@ -129,7 +129,7 @@ vds_select_equal(hid_t space1, hid_t space2) if ((type2 = H5Sget_select_type(space2)) < 0) TEST_ERROR; if (type1 != type2) - return FALSE; + return false; /* Check selection type */ switch (type1) { @@ -149,7 +149,7 @@ vds_select_equal(hid_t space1, hid_t space2) if ((rank2 = H5Sget_simple_extent_ndims(space2)) < 0) TEST_ERROR; if (rank1 != rank2) - return FALSE; + return false; /* Get and compare number of points */ if ((npoints1 = H5Sget_select_elem_npoints(space1)) < 0) @@ -157,7 +157,7 @@ vds_select_equal(hid_t space1, hid_t space2) if ((npoints2 = H5Sget_select_elem_npoints(space2)) < 0) TEST_ERROR; if (npoints1 != npoints2) - return FALSE; + return false; /* Allocate point lists. Do not return directly after * allocating, to make sure buffers are freed. */ @@ -173,7 +173,7 @@ vds_select_equal(hid_t space1, hid_t space2) TEST_ERROR; for (i = 0; i < ((size_t)rank1 * (size_t)npoints1); i++) if (buf1[i] != buf2[i]) { - ret_value = FALSE; + ret_value = false; break; } @@ -198,7 +198,7 @@ vds_select_equal(hid_t space1, hid_t space2) if ((rank2 = H5Sget_simple_extent_ndims(space2)) < 0) TEST_ERROR; if (rank1 != rank2) - return FALSE; + return false; /* Get and compare number of blocks */ if ((nblocks1 = H5Sget_select_hyper_nblocks(space1)) < 0) @@ -206,7 +206,7 @@ vds_select_equal(hid_t space1, hid_t space2) if ((nblocks2 = H5Sget_select_hyper_nblocks(space2)) < 0) TEST_ERROR; if (nblocks1 != nblocks2) - return FALSE; + return false; /* Allocate block lists. Do not return directly after * allocating, to make sure buffers are freed. */ @@ -224,7 +224,7 @@ vds_select_equal(hid_t space1, hid_t space2) TEST_ERROR; for (i = 0; i < ((size_t)2 * (size_t)rank1 * (size_t)nblocks1); i++) if (buf1[i] != buf2[i]) { - ret_value = FALSE; + ret_value = false; break; } @@ -12301,7 +12301,7 @@ main(void) unsigned bit_config; H5F_libver_t low, high; /* Low and high bounds */ const char *env_h5_drvr; /* File Driver value from environment */ - hbool_t driver_is_parallel; + bool driver_is_parallel; int nerrors = 0; env_h5_drvr = HDgetenv(HDF5_DRIVER); diff --git a/test/vds_env.c b/test/vds_env.c index 256455e..e2ab024 100644 --- a/test/vds_env.c +++ b/test/vds_env.c @@ -324,7 +324,7 @@ main(void) unsigned bit_config; H5F_libver_t low, high; /* Low and high bounds */ const char *env_h5_drvr; /* File Driver value from environment */ - hbool_t driver_is_parallel; + bool driver_is_parallel; int nerrors = 0; env_h5_drvr = HDgetenv(HDF5_DRIVER); @@ -88,7 +88,7 @@ static int __k; * * Helper macro to track the sizes of entries in a vector * I/O call when stepping through the vector incrementally. - * Assuming that bool_size_fixed is initialized to FALSE + * Assuming that bool_size_fixed is initialized to false * before the scan, this macro will detect the sizes array * optimization for the case in which all remaining entries * are of the same size, and set size_value accordingly. @@ -102,20 +102,20 @@ static int __k; if ((sizes_array)[idx] == 0) { \ \ assert((idx) > 0); \ - (bool_size_fixed) = TRUE; \ + (bool_size_fixed) = true; \ } \ else { \ \ (size_value) = (sizes_array)[idx]; \ } \ } \ - } while (FALSE) + } while (false) /* Macro SET_TYPE() * * Helper macro to track the types of entries in a vector * I/O call when stepping through the vector incrementally. - * Assuming that bool_type_fixed is initialized to FALSE + * Assuming that bool_type_fixed is initialized to false * before the scan, this macro will detect the types array * optimization for the case in which all remaining entries * are of the same type, and set type_value accordingly. @@ -129,14 +129,14 @@ static int __k; if ((types_array)[idx] == H5FD_MEM_NOLIST) { \ \ assert((idx) > 0); \ - (bool_type_fixed) = TRUE; \ + (bool_type_fixed) = true; \ } \ else { \ \ (type_value) = (types_array)[idx]; \ } \ } \ - } while (FALSE) + } while (false) /* Helper structure to pass around dataset information. */ @@ -159,8 +159,8 @@ static int splitter_prepare_file_paths(H5FD_splitter_vfd_config_t *vfd_config, c static int splitter_create_single_file_at(const char *filename, hid_t fapl_id, const struct splitter_dataset_def *data); static int splitter_compare_expected_data(hid_t file_id, const struct splitter_dataset_def *data); -static int run_splitter_test(const struct splitter_dataset_def *data, hbool_t ignore_wo_errors, - hbool_t provide_logfile_path, const hid_t sub_fapl_ids[2]); +static int run_splitter_test(const struct splitter_dataset_def *data, bool ignore_wo_errors, + bool provide_logfile_path, const hid_t sub_fapl_ids[2]); static int splitter_RO_test(const struct splitter_dataset_def *data, hid_t child_fapl_id); static int splitter_tentative_open_test(hid_t child_fapl_id); static int file_exists(const char *filename, hid_t fapl_id); @@ -314,8 +314,8 @@ test_core(void) void *os_file_handle = NULL; /* OS file handle */ hsize_t file_size; /* file size */ size_t increment; /* core VFD increment */ - hbool_t backing_store; /* use backing store? */ - hbool_t use_write_tracking; /* write tracking flag */ + bool backing_store; /* use backing store? */ + bool use_write_tracking; /* write tracking flag */ size_t write_tracking_page_size; /* write tracking page size */ int *data_w = NULL; /* data written to the dataset */ int *data_r = NULL; /* data read from the dataset */ @@ -344,7 +344,7 @@ test_core(void) FAIL_PUTS_ERROR("unable to remove backing store file"); /* Create and close file w/ backing store off */ - if (H5Pset_fapl_core(fapl_id, (size_t)CORE_INCREMENT, FALSE) < 0) + if (H5Pset_fapl_core(fapl_id, (size_t)CORE_INCREMENT, false) < 0) TEST_ERROR; /* Check that the VFD feature flags are correct. @@ -379,7 +379,7 @@ test_core(void) TEST_ERROR; /* Check for the backing store file */ if (HDaccess(filename, F_OK) != -1) - FAIL_PUTS_ERROR("file created when backing store set to FALSE"); + FAIL_PUTS_ERROR("file created when backing store set to false"); /************************************************************************ * Check basic core VFD operation and properties. This is done with the @@ -387,7 +387,7 @@ test_core(void) ************************************************************************/ /* Turn the backing store on */ - if (H5Pset_fapl_core(fapl_id, (size_t)CORE_INCREMENT, TRUE) < 0) + if (H5Pset_fapl_core(fapl_id, (size_t)CORE_INCREMENT, true) < 0) TEST_ERROR; /* Check that write tracking is off by default and that the default @@ -395,13 +395,13 @@ test_core(void) */ if (H5Pget_core_write_tracking(fapl_id, &use_write_tracking, &write_tracking_page_size) < 0) TEST_ERROR; - if (FALSE != use_write_tracking) + if (false != use_write_tracking) FAIL_PUTS_ERROR("write tracking should be off by default"); if (0 == write_tracking_page_size) FAIL_PUTS_ERROR("write tracking page size should never be zero"); /* Set core VFD properties */ - if (H5Pset_core_write_tracking(fapl_id, TRUE, CORE_PAGE_SIZE) < 0) + if (H5Pset_core_write_tracking(fapl_id, true, CORE_PAGE_SIZE) < 0) TEST_ERROR; /* Create the file */ @@ -423,7 +423,7 @@ test_core(void) TEST_ERROR; if (increment != (size_t)CORE_INCREMENT) FAIL_PUTS_ERROR("incorrect increment from file fapl"); - if (backing_store != TRUE) + if (backing_store != true) FAIL_PUTS_ERROR("incorrect backing store flag from file fapl"); /* Check that the backing store write tracking info was saved */ @@ -433,7 +433,7 @@ test_core(void) */ if (H5Pget_core_write_tracking(fapl_id, &use_write_tracking, &write_tracking_page_size) < 0) TEST_ERROR; - if (TRUE != use_write_tracking) + if (true != use_write_tracking) FAIL_PUTS_ERROR("write tracking flag incorrect in fapl obtained from H5Fget_access_plist"); if (CORE_PAGE_SIZE != write_tracking_page_size) FAIL_PUTS_ERROR("write tracking page size incorrect in fapl obtained from H5Fget_access_plist"); @@ -472,7 +472,7 @@ test_core(void) /* Open the file with backing store off for read and write. * Changes won't be saved in file. */ - if (H5Pset_fapl_core(fapl_id, (size_t)CORE_INCREMENT, FALSE) < 0) + if (H5Pset_fapl_core(fapl_id, (size_t)CORE_INCREMENT, false) < 0) TEST_ERROR; if ((fid = H5Fopen(filename, H5F_ACC_RDWR, fapl_id)) < 0) TEST_ERROR; @@ -555,7 +555,7 @@ test_core(void) /* Open the file with backing store on for read and write. * Changes will be saved in file. */ - if (H5Pset_fapl_core(fapl_id, (size_t)CORE_INCREMENT, TRUE) < 0) + if (H5Pset_fapl_core(fapl_id, (size_t)CORE_INCREMENT, true) < 0) TEST_ERROR; if ((fid = H5Fopen(filename, H5F_ACC_RDWR, fapl_id)) < 0) TEST_ERROR; @@ -626,7 +626,7 @@ test_core(void) ************************************************************************/ /* Create and close a file */ - if (H5Pset_fapl_core(fapl_id, (size_t)CORE_INCREMENT, TRUE) < 0) + if (H5Pset_fapl_core(fapl_id, (size_t)CORE_INCREMENT, true) < 0) TEST_ERROR; if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id)) < 0) TEST_ERROR; @@ -634,20 +634,20 @@ test_core(void) TEST_ERROR; /* Try to delete the file with the backing store off (shouldn't delete anything) */ - if (H5Pset_fapl_core(fapl_id, (size_t)CORE_INCREMENT, FALSE) < 0) + if (H5Pset_fapl_core(fapl_id, (size_t)CORE_INCREMENT, false) < 0) TEST_ERROR; if (H5Fdelete(filename, fapl_id) < 0) TEST_ERROR; if (-1 == HDaccess(filename, F_OK)) - FAIL_PUTS_ERROR("file deleted when backing store set to FALSE"); + FAIL_PUTS_ERROR("file deleted when backing store set to false"); /* Try to delete the file with the backing store on (should work) */ - if (H5Pset_fapl_core(fapl_id, (size_t)CORE_INCREMENT, TRUE) < 0) + if (H5Pset_fapl_core(fapl_id, (size_t)CORE_INCREMENT, true) < 0) TEST_ERROR; if (H5Fdelete(filename, fapl_id) < 0) TEST_ERROR; if (0 == HDaccess(filename, F_OK)) - FAIL_PUTS_ERROR("file not deleted when backing store set to TRUE"); + FAIL_PUTS_ERROR("file not deleted when backing store set to true"); /************************************************************************ * Clean up @@ -1525,7 +1525,7 @@ test_multi(void) memb_name[H5FD_MEM_GHEAP] = sv[H5FD_MEM_GHEAP]; memb_addr[H5FD_MEM_GHEAP] = (HADDR_MAX / 4) * 3; - if (H5Pset_fapl_multi(fapl, memb_map, memb_fapl, memb_name, memb_addr, TRUE) < 0) + if (H5Pset_fapl_multi(fapl, memb_map, memb_fapl, memb_name, memb_addr, true) < 0) TEST_ERROR; h5_fixname(FILENAME[4], fapl, filename, sizeof filename); @@ -1764,7 +1764,7 @@ test_multi_compat(void) memb_name[H5FD_MEM_DRAW] = sv[H5FD_MEM_DRAW]; memb_addr[H5FD_MEM_DRAW] = HADDR_MAX / 2; - if (H5Pset_fapl_multi(fapl, memb_map, memb_fapl, memb_name, memb_addr, TRUE) < 0) + if (H5Pset_fapl_multi(fapl, memb_map, memb_fapl, memb_name, memb_addr, true) < 0) TEST_ERROR; h5_fixname(FILENAME[9], fapl, newname, sizeof newname); @@ -2264,7 +2264,7 @@ test_ros3(void) H5FD_ros3_fapl_t test_ros3_fa; H5FD_ros3_fapl_t ros3_fa_0 = { /* version = */ H5FD_CURR_ROS3_FAPL_T_VERSION, - /* authenticate = */ FALSE, + /* authenticate = */ false, /* aws_region = */ "", /* secret_id = */ "", /* secret_key = */ "plugh", @@ -2428,8 +2428,8 @@ done: *------------------------------------------------------------------------- */ static int -run_splitter_test(const struct splitter_dataset_def *data, hbool_t ignore_wo_errors, - hbool_t provide_logfile_path, const hid_t sub_fapl_ids[2]) +run_splitter_test(const struct splitter_dataset_def *data, bool ignore_wo_errors, bool provide_logfile_path, + const hid_t sub_fapl_ids[2]) { hid_t file_id = H5I_INVALID_HID; hid_t fapl_id = H5I_INVALID_HID; @@ -2457,7 +2457,7 @@ run_splitter_test(const struct splitter_dataset_def *data, hbool_t ignore_wo_err SPLITTER_TEST_FAULT("can't prepare file paths\n"); } - if (provide_logfile_path == FALSE) { + if (provide_logfile_path == false) { vfd_config->log_file_path[0] = '\0'; /* reset as empty string */ } @@ -2556,8 +2556,8 @@ run_splitter_test(const struct splitter_dataset_def *data, hbool_t ignore_wo_err /* Verify existence of logfile if appropriate */ logfile = fopen(vfd_config->log_file_path, "r"); - if ((TRUE == provide_logfile_path && NULL == logfile) || - (FALSE == provide_logfile_path && NULL != logfile)) { + if ((true == provide_logfile_path && NULL == logfile) || + (false == provide_logfile_path && NULL != logfile)) { SPLITTER_TEST_FAULT("no logfile when one was expected\n"); } @@ -2616,7 +2616,7 @@ driver_is_splitter_compatible(hid_t fapl_id) } vfd_config->magic = H5FD_SPLITTER_MAGIC; vfd_config->version = H5FD_CURR_SPLITTER_VFD_CONFIG_VERSION; - vfd_config->ignore_wo_errs = FALSE; + vfd_config->ignore_wo_errs = false; vfd_config->rw_fapl_id = H5P_DEFAULT; vfd_config->wo_fapl_id = fapl_id; HDstrncpy(vfd_config->wo_path, "nonesuch", H5FD_SPLITTER_PATH_MAX); @@ -2681,7 +2681,7 @@ splitter_RO_test(const struct splitter_dataset_def *data, hid_t child_fapl_id) vfd_config->magic = H5FD_SPLITTER_MAGIC; vfd_config->version = H5FD_CURR_SPLITTER_VFD_CONFIG_VERSION; - vfd_config->ignore_wo_errs = FALSE; + vfd_config->ignore_wo_errs = false; vfd_config->rw_fapl_id = child_fapl_id; vfd_config->wo_fapl_id = child_fapl_id; @@ -3044,7 +3044,7 @@ splitter_tentative_open_test(hid_t child_fapl_id) vfd_config->magic = H5FD_SPLITTER_MAGIC; vfd_config->version = H5FD_CURR_SPLITTER_VFD_CONFIG_VERSION; - vfd_config->ignore_wo_errs = FALSE; + vfd_config->ignore_wo_errs = false; vfd_config->rw_fapl_id = child_fapl_id; vfd_config->wo_fapl_id = child_fapl_id; @@ -3393,9 +3393,9 @@ test_splitter(void) * specified), logfile, and Write Channel error ignoring behavior. */ for (i = 0; i < 4; i++) { - hbool_t ignore_wo_errors = (i & 1) ? TRUE : FALSE; - hbool_t provide_logfile_path = (i & 2) ? TRUE : FALSE; - hid_t child_fapl_ids[2] = {H5P_DEFAULT, H5P_DEFAULT}; + bool ignore_wo_errors = (i & 1) ? true : false; + bool provide_logfile_path = (i & 2) ? true : false; + hid_t child_fapl_ids[2] = {H5P_DEFAULT, H5P_DEFAULT}; /* Test child driver definition/default combination */ for (j = 0; j < 4; j++) { @@ -3446,7 +3446,7 @@ error: static void setup_rand(void) { - hbool_t use_predefined_seed = FALSE; + bool use_predefined_seed = false; unsigned predefined_seed = 18669; unsigned seed; struct timeval tv; @@ -3604,10 +3604,10 @@ static const H5FD_class_t H5FD_ctl_test_vfd_g = { static herr_t run_ctl_test(uint64_t op_code, uint64_t flags, ctl_test_opc_type opc_type, hid_t fapl_id) { - hbool_t fail_if_unknown = FALSE; - hbool_t routing_flag_set = FALSE; - hbool_t is_passthrough_vfd = FALSE; - hbool_t expect_fail = FALSE; + bool fail_if_unknown = false; + bool routing_flag_set = false; + bool is_passthrough_vfd = false; + bool expect_fail = false; H5FD_t *file_drv_ptr = NULL; herr_t ctl_result = SUCCEED; hid_t driver_id = H5I_INVALID_HID; @@ -3807,7 +3807,7 @@ test_ctl(void) splitter_config->magic = H5FD_SPLITTER_MAGIC; splitter_config->version = H5FD_CURR_SPLITTER_VFD_CONFIG_VERSION; - splitter_config->ignore_wo_errs = TRUE; + splitter_config->ignore_wo_errs = true; splitter_config->rw_fapl_id = H5P_DEFAULT; splitter_config->wo_fapl_id = H5P_DEFAULT; h5_fixname(FILENAME[15], splitter_config->wo_fapl_id, splitter_config->wo_path, H5FD_SPLITTER_PATH_MAX); @@ -3992,17 +3992,17 @@ error: * All arrays parameters are presumed to be of length * count. * - * Return: Return TRUE if successful, and FALSE if any errors + * Return: Return true if successful, and false if any errors * are encountered. * *------------------------------------------------------------------------- */ -static hbool_t +static bool test_vector_io__setup_v(uint32_t count, H5FD_mem_t types[], haddr_t addrs[], size_t sizes[], const void *write_bufs[], void *read_bufs[], char base_fill_char) { - hbool_t result = TRUE; /* will set to FALSE on failure */ + bool result = true; /* will set to false on failure */ char fill_char = base_fill_char; void *temp_buf = NULL; uint32_t i; @@ -4032,7 +4032,7 @@ test_vector_io__setup_v(uint32_t count, H5FD_mem_t types[], haddr_t addrs[], siz if ((NULL == temp_buf) || (NULL == read_bufs[i])) { fprintf(stderr, "%s: can't malloc read / write bufs.\n", __func__); - result = FALSE; + result = false; break; } @@ -4091,17 +4091,17 @@ test_vector_io__setup_v(uint32_t count, H5FD_mem_t types[], haddr_t addrs[], siz * count. Count is presumed to be a power of 2, and at * least 2. * - * Return: Return TRUE if successful, and FALSE if any errors + * Return: Return true if successful, and false if any errors * are encountered. * *------------------------------------------------------------------------- */ -static hbool_t +static bool test_vector_io__setup_fixed_size_v(uint32_t count, H5FD_mem_t types[], haddr_t addrs[], size_t sizes[], const void *write_bufs[], void *read_bufs[], char base_fill_char) { - hbool_t result = TRUE; /* will set to FALSE on failure */ + bool result = true; /* will set to false on failure */ char fill_char = base_fill_char; void *temp_buf = NULL; uint32_t fix_point; @@ -4166,7 +4166,7 @@ test_vector_io__setup_fixed_size_v(uint32_t count, H5FD_mem_t types[], haddr_t a if ((NULL == temp_buf) || (NULL == read_bufs[i])) { fprintf(stderr, "%s: can't malloc read / write bufs.\n", __func__); - result = FALSE; + result = false; break; } @@ -4221,20 +4221,20 @@ test_vector_io__setup_fixed_size_v(uint32_t count, H5FD_mem_t types[], haddr_t a * All arrays parameters are presumed to be of length * count. * - * Return: Return TRUE if successful, and FALSE if any errors + * Return: Return true if successful, and false if any errors * are encountered. * *------------------------------------------------------------------------- */ -static hbool_t +static bool test_vector_io__read_v_indiv(H5FD_t *lf, uint32_t count, H5FD_mem_t types[], haddr_t addrs[], size_t sizes[], void *read_bufs[]) { - hbool_t size_fixed = FALSE; - hbool_t type_fixed = FALSE; - hbool_t result = TRUE; /* will set to FALSE on failure */ - hbool_t verbose = FALSE; + bool size_fixed = false; + bool type_fixed = false; + bool result = true; /* will set to false on failure */ + bool verbose = false; uint32_t i; size_t size = SIZE_MAX; H5FD_mem_t type = H5FD_MEM_NTYPES; @@ -4251,7 +4251,7 @@ test_vector_io__read_v_indiv(H5FD_t *lf, uint32_t count, H5FD_mem_t types[], had fprintf(stdout, "%s: H5FDread() failed on entry %d.\n", __func__, i); } - result = FALSE; + result = false; break; } } @@ -4269,20 +4269,20 @@ test_vector_io__read_v_indiv(H5FD_t *lf, uint32_t count, H5FD_mem_t types[], had * All arrays parameters are presumed to be of length * count. * - * Return: Return TRUE if successful, and FALSE if any errors + * Return: Return true if successful, and false if any errors * are encountered. * *------------------------------------------------------------------------- */ -static hbool_t +static bool test_vector_io__write_v_indiv(H5FD_t *lf, uint32_t count, H5FD_mem_t types[], haddr_t addrs[], size_t sizes[], const void *write_bufs[]) { - hbool_t size_fixed = FALSE; - hbool_t type_fixed = FALSE; - hbool_t result = TRUE; /* will set to FALSE on failure */ - hbool_t verbose = FALSE; + bool size_fixed = false; + bool type_fixed = false; + bool result = true; /* will set to false on failure */ + bool verbose = false; uint32_t i; size_t size = SIZE_MAX; H5FD_mem_t type = H5FD_MEM_NTYPES; @@ -4299,7 +4299,7 @@ test_vector_io__write_v_indiv(H5FD_t *lf, uint32_t count, H5FD_mem_t types[], ha fprintf(stdout, "%s: HDwrite() failed on entry %d.\n", __func__, i); } - result = FALSE; + result = false; break; } } @@ -4315,20 +4315,20 @@ test_vector_io__write_v_indiv(H5FD_t *lf, uint32_t count, H5FD_mem_t types[], ha * Purpose: Verify that the read and write buffers of the supplied * vectors are identical. * - * Return: TRUE if the read and write vectors are identical, and - * FALSE otherwise. + * Return: true if the read and write vectors are identical, and + * false otherwise. * *------------------------------------------------------------------------- */ -static hbool_t +static bool test_vector_io__verify_v(uint32_t count, H5FD_mem_t types[], size_t sizes[], const void *write_bufs[], void *read_bufs[], const char *name) { - hbool_t size_fixed = FALSE; - hbool_t type_fixed = FALSE; - hbool_t identical = TRUE; - hbool_t verbose = TRUE; + bool size_fixed = false; + bool type_fixed = false; + bool identical = true; + bool verbose = true; uint32_t i; size_t j; const char *w_buf; @@ -4354,7 +4354,7 @@ test_vector_io__verify_v(uint32_t count, H5FD_mem_t types[], size_t sizes[], con if (w_buf[j] != r_buf[j]) { - identical = FALSE; + identical = false; if (verbose) { @@ -4391,8 +4391,8 @@ static void test_vector_io__dump_test_vectors(uint32_t count, H5FD_mem_t types[], haddr_t addrs[], size_t sizes[], const void *write_bufs[], void *read_bufs[], const char *name) { - hbool_t size_fixed = FALSE; - hbool_t type_fixed = FALSE; + bool size_fixed = false; + bool type_fixed = false; uint32_t i; const char *mem_type_names[7] = {"H5FD_MEM_DEFAULT", "H5FD_MEM_SUPER", "H5FD_MEM_BTREE", "H5FD_MEM_DRAW", "H5FD_MEM_GHEAP", "H5FD_MEM_LHEAP", "H5FD_MEM_OHDR"}; @@ -4463,13 +4463,13 @@ static herr_t test_vector_io(const char *vfd_name) { char test_title[80]; - hbool_t size_fixed_0 = FALSE; /* whether remaining entry */ - hbool_t size_fixed_1 = FALSE; /* sizes in vector are fixed. */ - hbool_t size_fixed_2 = FALSE; /* */ - hbool_t type_fixed_0 = FALSE; /* whether remaining entry */ - hbool_t type_fixed_1 = FALSE; /* types in vector are fixed. */ - hbool_t type_fixed_2 = FALSE; /* */ - hbool_t verbose = FALSE; + bool size_fixed_0 = false; /* whether remaining entry */ + bool size_fixed_1 = false; /* sizes in vector are fixed. */ + bool size_fixed_2 = false; /* */ + bool type_fixed_0 = false; /* whether remaining entry */ + bool type_fixed_1 = false; /* types in vector are fixed. */ + bool type_fixed_2 = false; /* */ + bool verbose = false; hid_t fapl_id = -1; /* file access property list ID */ haddr_t eoa; /* file eoa */ char filename[1024]; /* filename */ @@ -4741,9 +4741,9 @@ test_vector_io(const char *vfd_name) /* Null the read vectors */ - size_fixed_0 = FALSE; - size_fixed_1 = FALSE; - size_fixed_2 = FALSE; + size_fixed_0 = false; + size_fixed_1 = false; + size_fixed_2 = false; for (i = 0; i < count; i++) { @@ -4889,8 +4889,8 @@ error: * Purpose: Updates write buffers to ensure a unique value is written * to each element and issues a selection write call. * - * Return: Success: TRUE - * Failure: FALSE + * Return: Success: true + * Failure: false *------------------------------------------------------------------------- */ /* Array dimensions, used for all selection I/O tests. Currently both must be @@ -4939,15 +4939,15 @@ error: * count the last element in erbufs will be repeated to make * up the difference. * - * Return: Success: TRUE - * Failure: FALSE + * Return: Success: true + * Failure: false * *------------------------------------------------------------------------- */ static herr_t test_selection_io_read_verify(H5FD_t *lf, H5FD_mem_t type, uint32_t count, hid_t mem_spaces[], hid_t file_spaces[], haddr_t offsets[], size_t element_sizes[], - uint32_t rbufcount, int *erbufs[], hbool_t shorten_rbufs) + uint32_t rbufcount, int *erbufs[], bool shorten_rbufs) { int rbuf1[SEL_IO_DIM0 * SEL_IO_DIM1]; int rbuf2[SEL_IO_DIM0 * SEL_IO_DIM1]; @@ -5121,7 +5121,7 @@ test_selection_io(const char *vfd_name) /* Read and verify */ if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[0], &file_spaces[0], &addrs[0], - element_sizes, 1, (int **)&fbufs[0], FALSE) < 0) + element_sizes, 1, (int **)&fbufs[0], false) < 0) TEST_ERROR; /* @@ -5139,7 +5139,7 @@ test_selection_io(const char *vfd_name) /* Read and verify */ if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[1], &file_spaces[1], &addrs[1], - element_sizes, 1, (int **)&fbufs[1], FALSE) < 0) + element_sizes, 1, (int **)&fbufs[1], false) < 0) TEST_ERROR; /* @@ -5177,7 +5177,7 @@ test_selection_io(const char *vfd_name) /* Read and verify */ if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[0], &file_spaces[0], &addrs[0], - element_sizes, 1, (int **)&erbufs[0], FALSE) < 0) + element_sizes, 1, (int **)&erbufs[0], false) < 0) TEST_ERROR; /* Reset selections */ @@ -5188,7 +5188,7 @@ test_selection_io(const char *vfd_name) /* Read entire file buffer and verify */ if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[0], &file_spaces[0], &addrs[0], - element_sizes, 1, (int **)&fbufs[0], FALSE) < 0) + element_sizes, 1, (int **)&fbufs[0], false) < 0) TEST_ERROR; /* @@ -5226,7 +5226,7 @@ test_selection_io(const char *vfd_name) /* Read and verify */ if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[0], &file_spaces[0], &addrs[0], - element_sizes, 1, (int **)&erbufs[0], FALSE) < 0) + element_sizes, 1, (int **)&erbufs[0], false) < 0) TEST_ERROR; /* Reset selections */ @@ -5237,7 +5237,7 @@ test_selection_io(const char *vfd_name) /* Read entire file buffer and verify */ if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[0], &file_spaces[0], &addrs[0], - element_sizes, 1, (int **)&fbufs[0], FALSE) < 0) + element_sizes, 1, (int **)&fbufs[0], false) < 0) TEST_ERROR; /* @@ -5276,7 +5276,7 @@ test_selection_io(const char *vfd_name) /* Read and verify */ if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[0], &file_spaces[0], &addrs[0], - element_sizes, 1, (int **)&erbufs[0], FALSE) < 0) + element_sizes, 1, (int **)&erbufs[0], false) < 0) TEST_ERROR; /* Reset selections */ @@ -5287,7 +5287,7 @@ test_selection_io(const char *vfd_name) /* Read entire file buffer and verify */ if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[0], &file_spaces[0], &addrs[0], - element_sizes, 1, (int **)&fbufs[0], FALSE) < 0) + element_sizes, 1, (int **)&fbufs[0], false) < 0) TEST_ERROR; /* @@ -5329,7 +5329,7 @@ test_selection_io(const char *vfd_name) /* Read and verify */ if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[1], &file_spaces[1], &addrs[1], - element_sizes, 1, (int **)&erbufs[1], FALSE) < 0) + element_sizes, 1, (int **)&erbufs[1], false) < 0) TEST_ERROR; /* Reset selections */ @@ -5340,7 +5340,7 @@ test_selection_io(const char *vfd_name) /* Read entire file buffer and verify */ if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[1], &file_spaces[1], &addrs[1], - element_sizes, 1, (int **)&fbufs[1], FALSE) < 0) + element_sizes, 1, (int **)&fbufs[1], false) < 0) TEST_ERROR; /* @@ -5382,7 +5382,7 @@ test_selection_io(const char *vfd_name) /* Read and verify */ if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[1], &file_spaces[1], &addrs[1], - element_sizes, 1, (int **)&erbufs[1], FALSE) < 0) + element_sizes, 1, (int **)&erbufs[1], false) < 0) TEST_ERROR; /* Reset selections */ @@ -5393,7 +5393,7 @@ test_selection_io(const char *vfd_name) /* Read entire file buffer and verify */ if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[1], &file_spaces[1], &addrs[1], - element_sizes, 1, (int **)&fbufs[1], FALSE) < 0) + element_sizes, 1, (int **)&fbufs[1], false) < 0) TEST_ERROR; /* @@ -5453,7 +5453,7 @@ test_selection_io(const char *vfd_name) /* Read and verify */ if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[1], &file_spaces[1], &addrs[1], - element_sizes, 1, (int **)&erbufs[1], FALSE) < 0) + element_sizes, 1, (int **)&erbufs[1], false) < 0) TEST_ERROR; /* Reset selections */ @@ -5464,7 +5464,7 @@ test_selection_io(const char *vfd_name) /* Read entire file buffer and verify */ if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[1], &file_spaces[1], &addrs[1], - element_sizes, 1, (int **)&fbufs[1], FALSE) < 0) + element_sizes, 1, (int **)&fbufs[1], false) < 0) TEST_ERROR; /* @@ -5514,7 +5514,7 @@ test_selection_io(const char *vfd_name) /* Read and verify */ if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[0], &file_spaces[1], &addrs[1], - element_sizes, 1, (int **)&erbufs[0], FALSE) < 0) + element_sizes, 1, (int **)&erbufs[0], false) < 0) TEST_ERROR; /* Reset selections */ @@ -5525,7 +5525,7 @@ test_selection_io(const char *vfd_name) /* Read entire file buffer and verify */ if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[0], &file_spaces[1], &addrs[1], - element_sizes, 1, (int **)&fbufs[1], FALSE) < 0) + element_sizes, 1, (int **)&fbufs[1], false) < 0) TEST_ERROR; /* @@ -5574,7 +5574,7 @@ test_selection_io(const char *vfd_name) /* Read and verify */ if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[1], &file_spaces[0], &addrs[0], - element_sizes, 1, (int **)&erbufs[1], FALSE) < 0) + element_sizes, 1, (int **)&erbufs[1], false) < 0) TEST_ERROR; /* Reset selections */ @@ -5585,7 +5585,7 @@ test_selection_io(const char *vfd_name) /* Read entire file buffer and verify */ if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[1], &file_spaces[0], &addrs[0], - element_sizes, 1, (int **)&fbufs[0], FALSE) < 0) + element_sizes, 1, (int **)&fbufs[0], false) < 0) TEST_ERROR; /* Run tests with full and partial element sizes array */ @@ -5666,7 +5666,7 @@ test_selection_io(const char *vfd_name) /* Read and verify */ if (test_selection_io_read_verify(lf, type, 2, mem_spaces, file_spaces, addrs, element_sizes, 2, - (int **)erbufs, FALSE) < 0) + (int **)erbufs, false) < 0) TEST_ERROR; /* Reset selections */ @@ -5681,7 +5681,7 @@ test_selection_io(const char *vfd_name) /* Read entire file buffer and verify */ if (test_selection_io_read_verify(lf, type, 2, mem_spaces, file_spaces, addrs, element_sizes, 2, - (int **)fbufs, FALSE) < 0) + (int **)fbufs, false) < 0) TEST_ERROR; /* @@ -5784,7 +5784,7 @@ test_selection_io(const char *vfd_name) /* Read and verify */ if (test_selection_io_read_verify(lf, type, 2, mem_spaces, file_spaces, addrs, element_sizes, 1, - (int **)&erbufs[1], shorten_element_sizes ? TRUE : FALSE) < 0) + (int **)&erbufs[1], shorten_element_sizes ? true : false) < 0) TEST_ERROR; /* Reset selections */ @@ -5799,7 +5799,7 @@ test_selection_io(const char *vfd_name) /* Read entire file buffer and verify */ if (test_selection_io_read_verify(lf, type, 2, mem_spaces, file_spaces, addrs, element_sizes, 2, - (int **)fbufs, FALSE) < 0) + (int **)fbufs, false) < 0) TEST_ERROR; /* Reset first spaces to 1D */ diff --git a/test/vfd_plugin.c b/test/vfd_plugin.c index 28aa769..21ef9bd 100644 --- a/test/vfd_plugin.c +++ b/test/vfd_plugin.c @@ -42,7 +42,7 @@ test_set_by_name(void) /* The null VFD should not be registered at the start of the test */ if ((is_registered = H5FDis_driver_registered_by_name(NULL_VFD_NAME)) < 0) TEST_ERROR; - if (TRUE == is_registered) + if (true == is_registered) FAIL_PUTS_ERROR("NULL VFD is inappropriately registered"); /* Register the null VFD by name */ @@ -54,7 +54,7 @@ test_set_by_name(void) /* The null VFD should be registered now */ if ((is_registered = H5FDis_driver_registered_by_name(NULL_VFD_NAME)) < 0) TEST_ERROR; - if (FALSE == is_registered) + if (false == is_registered) FAIL_PUTS_ERROR("NULL VFD was not registered"); /* Unregister the null VFD */ @@ -70,7 +70,7 @@ test_set_by_name(void) /* The null VFD should not be registered now */ if ((is_registered = H5FDis_driver_registered_by_name(NULL_VFD_NAME)) < 0) TEST_ERROR; - if (TRUE == is_registered) + if (true == is_registered) FAIL_PUTS_ERROR("NULL VFD is inappropriately registered"); PASSED(); @@ -109,7 +109,7 @@ test_set_by_value(void) /* The null VFD should not be registered at the start of the test */ if ((is_registered = H5FDis_driver_registered_by_value(NULL_VFD_VALUE)) < 0) TEST_ERROR; - if (TRUE == is_registered) + if (true == is_registered) FAIL_PUTS_ERROR("NULL VFD is inappropriately registered"); /* Register the null VFD by value */ @@ -121,7 +121,7 @@ test_set_by_value(void) /* The null VFD should be registered now */ if ((is_registered = H5FDis_driver_registered_by_value(NULL_VFD_VALUE)) < 0) TEST_ERROR; - if (FALSE == is_registered) + if (false == is_registered) FAIL_PUTS_ERROR("NULL VFD was not registered"); /* Unregister the null VFD */ @@ -137,7 +137,7 @@ test_set_by_value(void) /* The null VFD should not be registered now */ if ((is_registered = H5FDis_driver_registered_by_value(NULL_VFD_VALUE)) < 0) TEST_ERROR; - if (TRUE == is_registered) + if (true == is_registered) FAIL_PUTS_ERROR("NULL VFD is inappropriately registered"); PASSED(); @@ -177,7 +177,7 @@ test_set_multi(void) /* The null VFD should not be registered at the start of the test */ if ((is_registered = H5FDis_driver_registered_by_name(NULL_VFD_NAME)) < 0) TEST_ERROR; - if (TRUE == is_registered) + if (true == is_registered) FAIL_PUTS_ERROR("NULL VFD is inappropriately registered"); /* Register the VFD multiple times */ @@ -191,7 +191,7 @@ test_set_multi(void) /* The null VFD should be registered now */ if ((is_registered = H5FDis_driver_registered_by_name(NULL_VFD_NAME)) < 0) TEST_ERROR; - if (FALSE == is_registered) + if (false == is_registered) FAIL_PUTS_ERROR("NULL VFD was not registered"); /* Unregister the null VFD */ @@ -209,7 +209,7 @@ test_set_multi(void) /* The null VFD should not be registered now */ if ((is_registered = H5FDis_driver_registered_by_name(NULL_VFD_NAME)) < 0) TEST_ERROR; - if (TRUE == is_registered) + if (true == is_registered) FAIL_PUTS_ERROR("NULL VFD is inappropriately registered"); /* Repeat testing with the _by_value routines */ @@ -217,7 +217,7 @@ test_set_multi(void) /* The null VFD should not be registered at the start of the test */ if ((is_registered = H5FDis_driver_registered_by_value(NULL_VFD_VALUE)) < 0) TEST_ERROR; - if (TRUE == is_registered) + if (true == is_registered) FAIL_PUTS_ERROR("NULL VFD is inappropriately registered"); /* Register the VFD multiple times */ @@ -231,7 +231,7 @@ test_set_multi(void) /* The null VFD should be registered now */ if ((is_registered = H5FDis_driver_registered_by_value(NULL_VFD_VALUE)) < 0) TEST_ERROR; - if (FALSE == is_registered) + if (false == is_registered) FAIL_PUTS_ERROR("NULL VFD was not registered"); /* Unregister the null VFD */ @@ -249,7 +249,7 @@ test_set_multi(void) /* The null VFD should not be registered now */ if ((is_registered = H5FDis_driver_registered_by_value(NULL_VFD_VALUE)) < 0) TEST_ERROR; - if (TRUE == is_registered) + if (true == is_registered) FAIL_PUTS_ERROR("NULL VFD is inappropriately registered"); PASSED(); @@ -913,14 +913,14 @@ test_basic_file_operation(const char *env_h5_drvr) TEST_ERROR; /* Can't compare VFD properties for several VFDs */ - if ((hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0 && - HDstrcmp(env_h5_drvr, "family") != 0 && HDstrcmp(env_h5_drvr, "direct") != 0 && - HDstrcmp(env_h5_drvr, "core") != 0 && HDstrcmp(env_h5_drvr, "core_paged") != 0 && - HDstrcmp(env_h5_drvr, "mpio") != 0 && HDstrcmp(env_h5_drvr, "splitter") != 0)) { + if ((bool)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0 && + HDstrcmp(env_h5_drvr, "family") != 0 && HDstrcmp(env_h5_drvr, "direct") != 0 && + HDstrcmp(env_h5_drvr, "core") != 0 && HDstrcmp(env_h5_drvr, "core_paged") != 0 && + HDstrcmp(env_h5_drvr, "mpio") != 0 && HDstrcmp(env_h5_drvr, "splitter") != 0)) { /* H5Fget_access_plist */ if ((fapl_id2 = H5Fget_access_plist(fid)) < 0) TEST_ERROR; - if (H5Pequal(fapl_id, fapl_id2) != TRUE) + if (H5Pequal(fapl_id, fapl_id2) != true) TEST_ERROR; if (H5Pclose(fapl_id2) < 0) TEST_ERROR; @@ -937,8 +937,8 @@ test_basic_file_operation(const char *env_h5_drvr) TEST_ERROR; /* Can't retrieve VFD handle for split / multi / family VFDs */ - if ((hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0 && - HDstrcmp(env_h5_drvr, "family") != 0)) { + if ((bool)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0 && + HDstrcmp(env_h5_drvr, "family") != 0)) { /* H5Fget_vfd_handle */ if (H5Fget_vfd_handle(fid, H5P_DEFAULT, &os_file_handle) < 0) TEST_ERROR; @@ -977,14 +977,14 @@ test_basic_file_operation(const char *env_h5_drvr) TEST_ERROR; /* Can't compare VFD properties for several VFDs */ - if ((hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0 && - HDstrcmp(env_h5_drvr, "family") != 0 && HDstrcmp(env_h5_drvr, "direct") != 0 && - HDstrcmp(env_h5_drvr, "core") != 0 && HDstrcmp(env_h5_drvr, "core_paged") != 0 && - HDstrcmp(env_h5_drvr, "mpio") != 0 && HDstrcmp(env_h5_drvr, "splitter") != 0)) { + if ((bool)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0 && + HDstrcmp(env_h5_drvr, "family") != 0 && HDstrcmp(env_h5_drvr, "direct") != 0 && + HDstrcmp(env_h5_drvr, "core") != 0 && HDstrcmp(env_h5_drvr, "core_paged") != 0 && + HDstrcmp(env_h5_drvr, "mpio") != 0 && HDstrcmp(env_h5_drvr, "splitter") != 0)) { /* H5Fget_access_plist */ if ((fapl_id2 = H5Fget_access_plist(fid)) < 0) TEST_ERROR; - if (H5Pequal(fapl_id, fapl_id2) != TRUE) + if (H5Pequal(fapl_id, fapl_id2) != true) TEST_ERROR; if (H5Pclose(fapl_id2) < 0) TEST_ERROR; @@ -994,14 +994,14 @@ test_basic_file_operation(const char *env_h5_drvr) TEST_ERROR; /* Can't compare VFD properties for several VFDs */ - if ((hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0 && - HDstrcmp(env_h5_drvr, "family") != 0 && HDstrcmp(env_h5_drvr, "direct") != 0 && - HDstrcmp(env_h5_drvr, "core") != 0 && HDstrcmp(env_h5_drvr, "core_paged") != 0 && - HDstrcmp(env_h5_drvr, "mpio") != 0 && HDstrcmp(env_h5_drvr, "splitter") != 0)) { + if ((bool)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0 && + HDstrcmp(env_h5_drvr, "family") != 0 && HDstrcmp(env_h5_drvr, "direct") != 0 && + HDstrcmp(env_h5_drvr, "core") != 0 && HDstrcmp(env_h5_drvr, "core_paged") != 0 && + HDstrcmp(env_h5_drvr, "mpio") != 0 && HDstrcmp(env_h5_drvr, "splitter") != 0)) { /* H5Fget_access_plist */ if ((fapl_id2 = H5Fget_access_plist(fid_reopen)) < 0) TEST_ERROR; - if (H5Pequal(fapl_id, fapl_id2) != TRUE) + if (H5Pequal(fapl_id, fapl_id2) != true) TEST_ERROR; if (H5Pclose(fapl_id2) < 0) TEST_ERROR; @@ -1055,7 +1055,7 @@ test_basic_group_operation(void) hid_t gcpl_id = H5I_INVALID_HID; char filename[1024]; H5G_info_t info; - hbool_t driver_is_parallel; + bool driver_is_parallel; TESTING("Basic VOL group operations"); @@ -1173,7 +1173,7 @@ test_basic_dataset_operation(void) haddr_t offset; H5D_space_status_t status; - hbool_t driver_is_parallel; + bool driver_is_parallel; int in_buf[N_ELEMENTS]; int out_buf[N_ELEMENTS]; @@ -1488,7 +1488,7 @@ test_basic_object_operation(void) //! [H5Oget_info_by_name3_snip] /* H5Oexists_by_name */ - if (H5Oexists_by_name(fid, NATIVE_VOL_TEST_GROUP_NAME, H5P_DEFAULT) != TRUE) + if (H5Oexists_by_name(fid, NATIVE_VOL_TEST_GROUP_NAME, H5P_DEFAULT) != true) TEST_ERROR; /* H5Oopen/close */ @@ -1615,13 +1615,13 @@ error: static herr_t test_basic_datatype_operation(void) { - hid_t fid = H5I_INVALID_HID; - hid_t fapl_id = H5I_INVALID_HID; - hid_t tid = H5I_INVALID_HID; - hid_t tid_anon = H5I_INVALID_HID; - hid_t tcpl_id = H5I_INVALID_HID; - char filename[1024]; - hbool_t driver_is_parallel; + hid_t fid = H5I_INVALID_HID; + hid_t fapl_id = H5I_INVALID_HID; + hid_t tid = H5I_INVALID_HID; + hid_t tid_anon = H5I_INVALID_HID; + hid_t tcpl_id = H5I_INVALID_HID; + char filename[1024]; + bool driver_is_parallel; TESTING("Basic VOL datatype operations"); @@ -1776,12 +1776,12 @@ exercise_reg_opt_oper(hid_t fake_vol_id, hid_t reg_opt_vol_id, H5VL_subclass_t s H5CX_push(); /* Create fake object on fake VOL connector */ - if (H5I_INVALID_HID == (obj_id = H5VL_register_using_vol_id(id_type, &fake_obj, fake_vol_id, TRUE))) + if (H5I_INVALID_HID == (obj_id = H5VL_register_using_vol_id(id_type, &fake_obj, fake_vol_id, true))) TEST_ERROR; /* Pop the API context off the stack */ if (H5VL_SUBCLS_DATATYPE == subcls) - H5CX_pop(FALSE); + H5CX_pop(false); /* Attempt to issue operation on fake VOL connector */ fake_obj = -1; @@ -1832,12 +1832,12 @@ exercise_reg_opt_oper(hid_t fake_vol_id, hid_t reg_opt_vol_id, H5VL_subclass_t s H5CX_push(); /* Create fake object on reg_opt VOL connector */ - if (H5I_INVALID_HID == (obj_id = H5VL_register_using_vol_id(id_type, &fake_obj, reg_opt_vol_id, TRUE))) + if (H5I_INVALID_HID == (obj_id = H5VL_register_using_vol_id(id_type, &fake_obj, reg_opt_vol_id, true))) TEST_ERROR; /* Pop the API context off the stack */ if (H5VL_SUBCLS_DATATYPE == subcls) - H5CX_pop(FALSE); + H5CX_pop(false); /* Issue first operation */ fake_obj = -1; @@ -2122,7 +2122,7 @@ test_async_vol_props(void) FAIL_STACK_ERROR; /* Set environment variable to use 'fake async' connector & re-init default connector */ - if (HDsetenv(HDF5_VOL_CONNECTOR, "fake_async", TRUE) < 0) + if (HDsetenv(HDF5_VOL_CONNECTOR, "fake_async", true) < 0) TEST_ERROR; if (H5VL__reparse_def_vol_conn_variable_test() < 0) TEST_ERROR; @@ -2190,7 +2190,7 @@ test_async_vol_props(void) /* Restore environment variable, if there was one */ if (conn_env_str) { - if (HDsetenv(HDF5_VOL_CONNECTOR, conn_env_str, TRUE) < 0) + if (HDsetenv(HDF5_VOL_CONNECTOR, conn_env_str, true) < 0) TEST_ERROR; free(conn_env_str); diff --git a/test/vol_plugin.c b/test/vol_plugin.c index acf4dfc..ae115e4 100644 --- a/test/vol_plugin.c +++ b/test/vol_plugin.c @@ -44,7 +44,7 @@ test_registration_by_value(void) /* The null VOL connector should not be registered at the start of the test */ if ((is_registered = H5VLis_connector_registered_by_value(NULL_VOL_CONNECTOR_VALUE)) < 0) TEST_ERROR; - if (TRUE == is_registered) + if (true == is_registered) FAIL_PUTS_ERROR("NULL VOL connector is inappropriately registered"); /* Register the connector by value */ @@ -54,7 +54,7 @@ test_registration_by_value(void) /* The connector should be registered now */ if ((is_registered = H5VLis_connector_registered_by_value(NULL_VOL_CONNECTOR_VALUE)) < 0) TEST_ERROR; - if (FALSE == is_registered) + if (false == is_registered) FAIL_PUTS_ERROR("NULL VOL connector was not registered"); /* Unregister the connector */ @@ -64,7 +64,7 @@ test_registration_by_value(void) /* The connector should not be registered now */ if ((is_registered = H5VLis_connector_registered_by_value(NULL_VOL_CONNECTOR_VALUE)) < 0) TEST_ERROR; - if (TRUE == is_registered) + if (true == is_registered) FAIL_PUTS_ERROR("NULL VOL connector is inappropriately registered"); PASSED(); @@ -101,7 +101,7 @@ test_registration_by_name(void) /* The null VOL connector should not be registered at the start of the test */ if ((is_registered = H5VLis_connector_registered_by_name(NULL_VOL_CONNECTOR_NAME)) < 0) TEST_ERROR; - if (TRUE == is_registered) + if (true == is_registered) FAIL_PUTS_ERROR("NULL VOL connector is inappropriately registered"); /* Register the connector by name */ @@ -111,7 +111,7 @@ test_registration_by_name(void) /* The connector should be registered now */ if ((is_registered = H5VLis_connector_registered_by_name(NULL_VOL_CONNECTOR_NAME)) < 0) TEST_ERROR; - if (FALSE == is_registered) + if (false == is_registered) FAIL_PUTS_ERROR("NULL VOL connector was not registered"); /* Unregister the connector */ @@ -121,7 +121,7 @@ test_registration_by_name(void) /* The connector should not be registered now */ if ((is_registered = H5VLis_connector_registered_by_name(NULL_VOL_CONNECTOR_NAME)) < 0) TEST_ERROR; - if (TRUE == is_registered) + if (true == is_registered) FAIL_PUTS_ERROR("NULL VOL connector is inappropriately registered"); PASSED(); @@ -159,7 +159,7 @@ test_multiple_registration(void) /* The null VOL connector should not be registered at the start of the test */ if ((is_registered = H5VLis_connector_registered_by_name(NULL_VOL_CONNECTOR_NAME)) < 0) TEST_ERROR; - if (TRUE == is_registered) + if (true == is_registered) FAIL_PUTS_ERROR("NULL VOL connector is inappropriately registered"); /* Register the connector multiple times */ @@ -171,7 +171,7 @@ test_multiple_registration(void) /* The connector should be registered now */ if ((is_registered = H5VLis_connector_registered_by_name(NULL_VOL_CONNECTOR_NAME)) < 0) TEST_ERROR; - if (FALSE == is_registered) + if (false == is_registered) FAIL_PUTS_ERROR("NULL VOL connector was not registered"); /* Unregister the connector */ @@ -189,13 +189,13 @@ test_multiple_registration(void) /* The connector should not be registered now */ if ((is_registered = H5VLis_connector_registered_by_name(NULL_VOL_CONNECTOR_NAME)) < 0) TEST_ERROR; - if (TRUE == is_registered) + if (true == is_registered) FAIL_PUTS_ERROR("NULL VOL connector is inappropriately registered"); /* Repeat testing with the _by_value routines */ if ((is_registered = H5VLis_connector_registered_by_value(NULL_VOL_CONNECTOR_VALUE)) < 0) TEST_ERROR; - if (TRUE == is_registered) + if (true == is_registered) FAIL_PUTS_ERROR("NULL VOL connector is inappropriately registered"); /* Register the connector multiple times */ @@ -207,7 +207,7 @@ test_multiple_registration(void) /* The connector should be registered now */ if ((is_registered = H5VLis_connector_registered_by_value(NULL_VOL_CONNECTOR_VALUE)) < 0) TEST_ERROR; - if (FALSE == is_registered) + if (false == is_registered) FAIL_PUTS_ERROR("NULL VOL connector was not registered"); /* Unregister the connector */ @@ -225,7 +225,7 @@ test_multiple_registration(void) /* The connector should not be registered now */ if ((is_registered = H5VLis_connector_registered_by_value(NULL_VOL_CONNECTOR_VALUE)) < 0) TEST_ERROR; - if (TRUE == is_registered) + if (true == is_registered) FAIL_PUTS_ERROR("NULL VOL connector is inappropriately registered"); PASSED(); @@ -263,7 +263,7 @@ test_getters(void) /* The null VOL connector should not be registered at the start of the test */ if ((is_registered = H5VLis_connector_registered_by_name(NULL_VOL_CONNECTOR_NAME)) < 0) TEST_ERROR; - if (TRUE == is_registered) + if (true == is_registered) FAIL_PUTS_ERROR("NULL VOL connector is inappropriately registered"); /* Register the connector by name */ @@ -285,7 +285,7 @@ test_getters(void) /* Repeat testing with the _by_value routines */ if ((is_registered = H5VLis_connector_registered_by_value(NULL_VOL_CONNECTOR_VALUE)) < 0) TEST_ERROR; - if (TRUE == is_registered) + if (true == is_registered) FAIL_PUTS_ERROR("NULL VOL connector is inappropriately registered"); /* Register the connector by value */ |