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/API | |
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/API')
-rw-r--r-- | test/API/H5_api_async_test.c | 78 | ||||
-rw-r--r-- | test/API/H5_api_attribute_test.c | 150 | ||||
-rw-r--r-- | test/API/H5_api_dataset_test.c | 116 | ||||
-rw-r--r-- | test/API/H5_api_datatype_test.c | 32 | ||||
-rw-r--r-- | test/API/H5_api_group_test.c | 38 | ||||
-rw-r--r-- | test/API/H5_api_link_test.c | 36 | ||||
-rw-r--r-- | test/API/H5_api_misc_test.c | 28 | ||||
-rw-r--r-- | test/API/H5_api_object_test.c | 68 | ||||
-rw-r--r-- | test/API/H5_api_test.c | 28 | ||||
-rw-r--r-- | test/API/H5_api_test_util.c | 44 | ||||
-rw-r--r-- | test/API/H5_api_test_util.h | 4 | ||||
-rw-r--r-- | test/API/tarray.c | 2 | ||||
-rw-r--r-- | test/API/tattr.c | 538 | ||||
-rw-r--r-- | test/API/tcoords.c | 14 | ||||
-rw-r--r-- | test/API/testhdf5.c | 14 | ||||
-rw-r--r-- | test/API/testhdf5.h | 16 | ||||
-rw-r--r-- | test/API/tfile.c | 316 | ||||
-rw-r--r-- | test/API/th5o.c | 4 | ||||
-rw-r--r-- | test/API/th5s.c | 422 | ||||
-rw-r--r-- | test/API/tid.c | 48 | ||||
-rw-r--r-- | test/API/titerate.c | 18 | ||||
-rw-r--r-- | test/API/tmisc.c | 112 | ||||
-rw-r--r-- | test/API/trefer.c | 6 | ||||
-rw-r--r-- | test/API/tselect.c | 736 | ||||
-rw-r--r-- | test/API/tvlstr.c | 4 |
25 files changed, 1436 insertions, 1436 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); |